assembly.c

@@ -116,12 +116,6 @@
 //  | 14'hE | Calculate the sin of a register             |      YES     |   operand  |            |
 //  +-------+---------------------------------------------+--------------+------------+------------+
 //  | 14'hF | Calculate the cos of a register             |      YES     |   operand  |            |
-//  +-------+---------------------------------------------+--------------+------------+------------+
-//  | 14'h10| DEC                                         |      YES     |   operand  |            |
-//  +-------+---------------------------------------------+--------------+------------+------------+
-//  | 14'h11| INC                                         |      YES     |   operand  |            |
-//  +-------+---------------------------------------------+--------------+------------+------------+
-//  | 14'h12| MOV                                         |      YES     |   operand  |            |
 //
 //
 //  INSTRUCTION FORMAT 2 OPCODE NUM:
@@ -239,15 +233,6 @@ char *disassemble(uint32_t opcode_be){
 			case 0x0F:
 				snprintf(ret,MAX_INSTRUCTION_LENGTH,"COS %%R%0d",val1);
 				break;
-			case 0x10:
-				snprintf(ret,MAX_INSTRUCTION_LENGTH,"DEC %%R%0d",val1);
-				break;
-			case 0x11:
-				snprintf(ret,MAX_INSTRUCTION_LENGTH,"INC %%R%0d",val1);
-				break;
-			case 0x12:
-				snprintf(ret,MAX_INSTRUCTION_LENGTH,"MOV %%R%0d,%%R%0d",val1,val2);
-				break;
 			default:
 				snprintf(ret,MAX_INSTRUCTION_LENGTH,"UNRECOGNISED INSTRUCTION");
 				break;
@@ -464,14 +449,6 @@ int64_t assemble_line(char *line, struct assembler_context_t *assembler_context)
 			x=3;
 			opcode=0x200F;
 			params=1;
-		}else if(strncmp(line,"DEC ",4)==0){
-			x=3;
-			opcode=0x2010;
-			params=1;
-		}else if(strncmp(line,"INC ",4)==0){
-			x=3;
-			opcode=0x2011;
-			params=1;
 		}else
 			params=0;
 		if(params!=0){
@@ -601,18 +578,6 @@ int64_t assemble_line(char *line, struct assembler_context_t *assembler_context)
 										return -2;
 								}else
 									return -2;
-							}else if(line[x]=='%'){
-								x++;
-								if(line[x]=='R'){
-									x++;
-									if(line[x]>='0'&&line[x]<='7'){
-										r1=line[x]-'0';
-										return 0x20120000|(r0&0xFF)<<8|(r1&0xFF);
-									}else
-										return -2;
-								}else
-									return -2;
-
 							}else
 								return -2;
 						}else

cpu.c

@@ -97,9 +97,6 @@ int decode(struct simdata_t *simdata){
 				case 0x0D:
 				case 0x0E:
 				case 0x0F:
-				case 0x10:
-				case 0x11:
-				case 0x12:
 					simdata->exec_data->in_op1->OP_ADDR=REGISTER;
 					simdata->exec_data->in_op2->OP_ADDR=REGISTER;
 					break;
@@ -125,7 +122,6 @@ int decode(struct simdata_t *simdata){
 					break;
 				case 0x08:
 				case 0x09:
-				case 0x12:
 					simdata->exec_data->EXEC_ACTION=MOVE;
 					break;
 				default:
@@ -141,7 +137,6 @@ int decode(struct simdata_t *simdata){
 				case 0x0B:
 				case 0x0C:
 				case 0x0D:
-				case 0x12:
 					simdata->exec_data->out_op->OP_ADDR=REGISTER;
 					simdata->exec_data->out_op->data=op2;
 					break;
@@ -149,8 +144,6 @@ int decode(struct simdata_t *simdata){
 				case 0x03:
 				case 0x0E:
 				case 0x0F:
-				case 0x10:
-				case 0x11:
 					simdata->exec_data->out_op->OP_ADDR=REGISTER;
 					simdata->exec_data->out_op->data=op1;
 					break;
@@ -176,7 +169,6 @@ int decode(struct simdata_t *simdata){
 				case 0x07:
 				case 0x08:
 				case 0x09:
-				case 0x12:
 					break;
 				case 0x0A: simdata->exec_data->ALU_OP=ALU_FDIV;  break;
 				case 0x0B: simdata->exec_data->ALU_OP=ALU_FMUL;  break;
@@ -184,8 +176,6 @@ int decode(struct simdata_t *simdata){
 				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;
-				case 0x10: simdata->exec_data->ALU_OP=ALU_DEC;  break;
-				case 0x11: simdata->exec_data->ALU_OP=ALU_INC;  break;
 				default:
 					return 1;
 			}
@@ -335,16 +325,6 @@ int exec(struct simdata_t *simdata){
 					case ALU_FCOS:
 						*(float*)&result = cosf(*(float*)(&simdata->registers->GPR[simdata->exec_data->in_op1->data]));
 						break;
-					case ALU_DEC:
-						*(uint32_t*)&result = *(uint32_t*)(&simdata->registers->GPR[simdata->exec_data->in_op1->data])-1;
-						simdata->registers->FLAGS=(simdata->registers->FLAGS&0xFFFFFFFD)|
-							(simdata->registers->GPR[simdata->exec_data->out_op->data] > simdata->registers->GPR[simdata->exec_data->in_op1->data])<<1;
-						break;
-					case ALU_INC:
-						*(uint32_t*)&result = *(uint32_t*)(&simdata->registers->GPR[simdata->exec_data->in_op1->data])+1;
-						simdata->registers->FLAGS=(simdata->registers->FLAGS&0xFFFFFFFD)|
-							(simdata->registers->GPR[simdata->exec_data->out_op->data] > simdata->registers->GPR[simdata->exec_data->in_op1->data])<<1;
-						break;
 					default:
 						return 1;
 				}
@@ -390,8 +370,6 @@ int exec(struct simdata_t *simdata){
 							simdata->registers->GPR[simdata->exec_data->out_op->data]=*(uint32_t*)(simdata->RAM+simdata->registers->GPR[simdata->exec_data->in_op1->data]);
 						else
 							return 2;
-					}else if(simdata->exec_data->in_op1->OP_ADDR==REGISTER){
-						simdata->registers->GPR[simdata->exec_data->out_op->data]=simdata->registers->GPR[simdata->exec_data->in_op1->data];
 					}else
 						return 1;
 					break;

cpu.h

@@ -36,9 +36,7 @@ enum ALU_OP_t {
 	ALU_FADD,
 	ALU_FSUB,
 	ALU_FSIN,
-	ALU_FCOS,
+	ALU_FCOS
-	ALU_DEC,
-	ALU_INC
 };
 
 enum OP_ADDR_t {