CPU,ASM: Added the trigonometric instructions SIN and COS
This commit is contained in:
parent
fba8c1f2f4
commit
da8ffaf3a4
2
Makefile
2
Makefile
@ -26,7 +26,7 @@ all:${MAIN_ROM}
|
|||||||
|
|
||||||
first: ${OBJECT_FILES}
|
first: ${OBJECT_FILES}
|
||||||
${QUIET_LINK}
|
${QUIET_LINK}
|
||||||
${Q}gcc -ggdb $^ -fsanitize=address -fsanitize=undefined -fsanitize=leak -lncursesw -ltinfow -o $@
|
${Q}gcc -ggdb $^ -fsanitize=address -fsanitize=undefined -fsanitize=leak -lncursesw -ltinfow -lm -o $@
|
||||||
|
|
||||||
%.rom:%.asm first
|
%.rom:%.asm first
|
||||||
$(QUIET_FAS)
|
$(QUIET_FAS)
|
||||||
|
28
assembly.c
28
assembly.c
@ -112,6 +112,10 @@
|
|||||||
// | 14'hC | Floating point addition | YES | operand 1 | operand 2 |
|
// | 14'hC | Floating point addition | YES | operand 1 | operand 2 |
|
||||||
// +-------+---------------------------------------------+--------------+------------+------------+
|
// +-------+---------------------------------------------+--------------+------------+------------+
|
||||||
// | 14'hD | Floating point subtraction | YES | operand 1 | operand 2 |
|
// | 14'hD | Floating point subtraction | YES | operand 1 | operand 2 |
|
||||||
|
// +-------+---------------------------------------------+--------------+------------+------------+
|
||||||
|
// | 14'hE | Calculate the sin of a register | YES | operand | |
|
||||||
|
// +-------+---------------------------------------------+--------------+------------+------------+
|
||||||
|
// | 14'hF | Calculate the cos of a register | YES | operand | |
|
||||||
//
|
//
|
||||||
//
|
//
|
||||||
// INSTRUCTION FORMAT 2 OPCODE NUM:
|
// INSTRUCTION FORMAT 2 OPCODE NUM:
|
||||||
@ -223,6 +227,12 @@ char *disassemble(uint32_t opcode_be){
|
|||||||
case 0x0D:
|
case 0x0D:
|
||||||
snprintf(ret,MAX_INSTRUCTION_LENGTH,"FSUB %%R%0d,%%R%0d",val1,val2);
|
snprintf(ret,MAX_INSTRUCTION_LENGTH,"FSUB %%R%0d,%%R%0d",val1,val2);
|
||||||
break;
|
break;
|
||||||
|
case 0x0E:
|
||||||
|
snprintf(ret,MAX_INSTRUCTION_LENGTH,"SIN %%R%0d",val1);
|
||||||
|
break;
|
||||||
|
case 0x0F:
|
||||||
|
snprintf(ret,MAX_INSTRUCTION_LENGTH,"COS %%R%0d",val1);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
snprintf(ret,MAX_INSTRUCTION_LENGTH,"UNRECOGNISED INSTRUCTION");
|
snprintf(ret,MAX_INSTRUCTION_LENGTH,"UNRECOGNISED INSTRUCTION");
|
||||||
break;
|
break;
|
||||||
@ -416,21 +426,29 @@ int64_t assemble_line(char *line, struct assembler_context_t *assembler_context)
|
|||||||
opcode=0x2004;
|
opcode=0x2004;
|
||||||
params=2;
|
params=2;
|
||||||
}else if(strncmp(line,"FDIV ",5)==0){
|
}else if(strncmp(line,"FDIV ",5)==0){
|
||||||
x=5;
|
x=4;
|
||||||
opcode=0x200A;
|
opcode=0x200A;
|
||||||
params=2;
|
params=2;
|
||||||
}else if(strncmp(line,"FMUL ",5)==0){
|
}else if(strncmp(line,"FMUL ",5)==0){
|
||||||
x=5;
|
x=4;
|
||||||
opcode=0x200B;
|
opcode=0x200B;
|
||||||
params=2;
|
params=2;
|
||||||
}else if(strncmp(line,"FADD ",5)==0){
|
}else if(strncmp(line,"FADD ",5)==0){
|
||||||
x=5;
|
x=4;
|
||||||
opcode=0x200C;
|
opcode=0x200C;
|
||||||
params=2;
|
params=2;
|
||||||
}else if(strncmp(line,"FSUB ",5)==0){
|
}else if(strncmp(line,"FSUB ",5)==0){
|
||||||
x=5;
|
x=4;
|
||||||
opcode=0x200D;
|
opcode=0x200D;
|
||||||
params=2;
|
params=2;
|
||||||
|
}else if(strncmp(line,"SIN ",4)==0){
|
||||||
|
x=3;
|
||||||
|
opcode=0x200E;
|
||||||
|
params=1;
|
||||||
|
}else if(strncmp(line,"COS ",4)==0){
|
||||||
|
x=3;
|
||||||
|
opcode=0x200F;
|
||||||
|
params=1;
|
||||||
}else
|
}else
|
||||||
params=0;
|
params=0;
|
||||||
if(params!=0){
|
if(params!=0){
|
||||||
@ -463,7 +481,7 @@ int64_t assemble_line(char *line, struct assembler_context_t *assembler_context)
|
|||||||
}else
|
}else
|
||||||
return -2;
|
return -2;
|
||||||
}else
|
}else
|
||||||
return (opcode<<16)|r0<<2;
|
return (opcode<<16)|r0<<8;
|
||||||
}else
|
}else
|
||||||
return -2;
|
return -2;
|
||||||
}else
|
}else
|
||||||
|
17
cpu.c
17
cpu.c
@ -1,6 +1,7 @@
|
|||||||
#include "simdata.h"
|
#include "simdata.h"
|
||||||
#include "cpu.h"
|
#include "cpu.h"
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <math.h>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -94,6 +95,8 @@ int decode(struct simdata_t *simdata){
|
|||||||
case 0x0B:
|
case 0x0B:
|
||||||
case 0x0C:
|
case 0x0C:
|
||||||
case 0x0D:
|
case 0x0D:
|
||||||
|
case 0x0E:
|
||||||
|
case 0x0F:
|
||||||
simdata->exec_data->in_op1->OP_ADDR=REGISTER;
|
simdata->exec_data->in_op1->OP_ADDR=REGISTER;
|
||||||
simdata->exec_data->in_op2->OP_ADDR=REGISTER;
|
simdata->exec_data->in_op2->OP_ADDR=REGISTER;
|
||||||
break;
|
break;
|
||||||
@ -137,8 +140,10 @@ int decode(struct simdata_t *simdata){
|
|||||||
simdata->exec_data->out_op->OP_ADDR=REGISTER;
|
simdata->exec_data->out_op->OP_ADDR=REGISTER;
|
||||||
simdata->exec_data->out_op->data=op2;
|
simdata->exec_data->out_op->data=op2;
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 0x02:
|
||||||
case 3:
|
case 0x03:
|
||||||
|
case 0x0E:
|
||||||
|
case 0x0F:
|
||||||
simdata->exec_data->out_op->OP_ADDR=REGISTER;
|
simdata->exec_data->out_op->OP_ADDR=REGISTER;
|
||||||
simdata->exec_data->out_op->data=op1;
|
simdata->exec_data->out_op->data=op1;
|
||||||
break;
|
break;
|
||||||
@ -169,6 +174,8 @@ int decode(struct simdata_t *simdata){
|
|||||||
case 0x0B: simdata->exec_data->ALU_OP=ALU_FMUL; break;
|
case 0x0B: simdata->exec_data->ALU_OP=ALU_FMUL; break;
|
||||||
case 0x0C: simdata->exec_data->ALU_OP=ALU_FADD; break;
|
case 0x0C: simdata->exec_data->ALU_OP=ALU_FADD; break;
|
||||||
case 0x0D: simdata->exec_data->ALU_OP=ALU_FSUB; break;
|
case 0x0D: simdata->exec_data->ALU_OP=ALU_FSUB; break;
|
||||||
|
case 0x0E: simdata->exec_data->ALU_OP=ALU_FSIN; break;
|
||||||
|
case 0x0F: simdata->exec_data->ALU_OP=ALU_FCOS; break;
|
||||||
default:
|
default:
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@ -312,6 +319,12 @@ int exec(struct simdata_t *simdata){
|
|||||||
*(float*)&result = *(float*)(&simdata->registers->GPR[simdata->exec_data->in_op2->data])-
|
*(float*)&result = *(float*)(&simdata->registers->GPR[simdata->exec_data->in_op2->data])-
|
||||||
*(float*)(&simdata->registers->GPR[simdata->exec_data->in_op1->data]);
|
*(float*)(&simdata->registers->GPR[simdata->exec_data->in_op1->data]);
|
||||||
break;
|
break;
|
||||||
|
case ALU_FSIN:
|
||||||
|
*(float*)&result = sinf(*(float*)(&simdata->registers->GPR[simdata->exec_data->in_op1->data]));
|
||||||
|
break;
|
||||||
|
case ALU_FCOS:
|
||||||
|
*(float*)&result = cosf(*(float*)(&simdata->registers->GPR[simdata->exec_data->in_op1->data]));
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user