peter1010

Author: PeterStan

branchTest.txt

@@ -2,4 +2,5 @@ addi $1 $0 88
 addi $2 $1 0
 beq $1 $2 1
 addi $2 $2 4
-addi $3 $2 0
+addi $3 $2 0
+haltSimulation

lwTest.txt

@@ -4,3 +4,4 @@ sw $1 4($2)
 addi $3 $0 8
 lw $4 4($2)
 add $5 $4 $3
+haltSimulation

rawTest.txt

@@ -1,4 +1,5 @@
 addi $1 $0 80
 addi $2 $0 8
 add $3 $1 $2
-addi $4 $3 0
+addi $4 $3 0
+haltSimulation

sim-mips.c

@@ -241,6 +241,7 @@ int main (int argc, char *argv[]){
 	int IF_c,ID_c,EX_c,MEM_c,WB_c; 
 	IF_c = 0; ID_c = 0; EX_c = 0; MEM_c = 0; WB_c = 0;
 
+
 	while(!HALT_SIMULATION){
 		printf("\n\n\nPROGRAM COUNT:%d    ##################\n",pgm_c);
 
@@ -283,6 +284,8 @@ int main (int argc, char *argv[]){
 	}
 
 
+
+
 
 
 
@@ -1218,12 +1221,15 @@ int MEM(int mem_cycles, struct buffer ExeMem){//should take sim_cycle, c from co
 		int address = ExeMem.instruction.rs + ExeMem.instruction.Imm;
 
 		if(ExeMem.instruction.opcode == sw){
-			ExeMem.instruction.rt = dataMemory[address];
+			//ExeMem.instruction.rt = dataMemory[address];
+			dataMemory[address] = ExeMem.instruction.rt;
+
 
 			cycles += mem_cycles;
 
 		}else if(ExeMem.instruction.opcode == lw){
-			dataMemory[address] = ExeMem.instruction.rt; 
+			//dataMemory[address] = ExeMem.instruction.rt; 
+			ExeMem.instruction.rt = dataMemory[address];
 
 			cycles += mem_cycles;
 		}
@@ -1250,7 +1256,7 @@ int WB(long *registers, struct buffer MemWb){
 
 			cycles++;
 
-		}else if(MemWb.instruction.opcode == sw){
+		}else if(MemWb.instruction.opcode == lw){
 			registers[MemWb.instruction.rd] = MemWb.instruction.rt;
 
 			cycles++;

sim-test.c

@@ -104,8 +104,6 @@ int progScanner_Test1(){
 
 	char *testStr = progScanner("add	$s0,,$s1         ,     $s2");
 
-	printf("Here is the string:%s\n", testStr);
-
 	return strcmp(testStr, "add $s0 $s1 $s2") == 0;
 }
 
@@ -183,9 +181,9 @@ int parser_Test3(){
 }
 
 int parser_Test4(){
-	struct inst test = {lw, 8, 16, 0, 8};
+	struct inst test = {lw, 8, 16, 0, 4};
 
-	char *line = regNumberConverter(progScanner("lw $s0 8 $t0"));
+	char *line = regNumberConverter(progScanner("lw $s0 4 $t0"));
 	printf("%s\n", line);
 
 	struct inst peter = parser(regNumberConverter("lw $s0 8 $t0"));
@@ -225,10 +223,10 @@ int parser_Test6(){
 }
 
 int parser_Test7(){
-	struct inst test = {lw, 8, 16, 0, 8};
+	struct inst test = {lw, 8, 16, 0, 24};
 
 	printf("%s\n", progScanner("lw $s0, 8($t0)"));
-	char *line = regNumberConverter(progScanner("lw $s0, 8($t0)"));
+	char *line = regNumberConverter(progScanner("lw $s0, 24($t0)"));
 	printf("[%s]\n", line);