Ian Cameron Computer Architecture

ls8/cpu.c

@@ -1,27 +1,61 @@
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h> 
+
 #include "cpu.h"
 
 #define DATA_LEN 6
 
 /**
  * Load the binary bytes from a .ls8 source file into a RAM array
  */
-void cpu_load(struct cpu *cpu)
+void cpu_load(struct cpu *cpu, char *filename)
 {
-  char data[DATA_LEN] = {
-    // From print8.ls8
-    0b10000010, // LDI R0,8
-    0b00000000,
-    0b00001000,
-    0b01000111, // PRN R0
-    0b00000000,
-    0b00000001  // HLT
-  };
+  //open file
+  FILE *fptr = fopen(filename, "r");
+
+  if (fptr == NULL)
+  {
+    printf("File %s is not recognized.\n", filename);
+    exit(2);
+  }
 
+  //read line by line until returns null, ignore blank lines and comments
+  char line[1000];
   int address = 0;
 
-  for (int i = 0; i < DATA_LEN; i++) {
-    cpu->ram[address++] = data[i];
+  while(fgets(line, sizeof line, fptr) != NULL)
+  {
+    //convert string to a number. if get an error 
+    char *endpointer;
+    unsigned char value = strtoul(line, &endpointer, 2);  //needs pointer to a pointer so need & as address of pointer
+    //ignore lines where no numbers read
+    if (endpointer == NULL)  //endpointer == line??
+    {
+      continue;
+    }
+    //save data into ram, have to convert binary strings to int values to store in ram with strtoul
+    //cpu_ram_write(cpu, address++, value);
+    cpu->ram[address++] = value;
   }
+  fclose(fptr);
+
+  //original hard code we're refactoring
+  // char data[DATA_LEN] = {
+  //   // From print8.ls8
+  //   0b10000010, // LDI R0,8
+  //   0b00000000,
+  //   0b00001000,
+  //   0b01000111, // PRN R0
+  //   0b00000000,
+  //   0b00000001  // HLT
+  // };
+
+  // int address = 0;
+
+  // for (int i = 0; i < DATA_LEN; i++) {
+  //   cpu->ram[address++] = data[i];
+  // }
 
   // TODO: Replace this with something less hard-coded
 }
@@ -34,12 +68,59 @@ void alu(struct cpu *cpu, enum alu_op op, unsigned char regA, unsigned char regB
   switch (op) {
     case ALU_MUL:
       // TODO
+      cpu->reg[regA] = cpu->reg[regA]*cpu->reg[regB];  //reg[regA] *= valB??
       break;
-
     // TODO: implement more ALU ops
+    case ALU_ADD:
+      cpu->reg[regA] = cpu->reg[regA]+cpu->reg[regB];
+      break;
   }
 }
 
+unsigned char cpu_ram_read(struct cpu *cpu, unsigned char mar)
+{
+  return cpu->ram[mar];
+}
+
+//mar is index in ram so set to new value 
+void cpu_ram_write(struct cpu *cpu, unsigned char mar, unsigned char mdr)
+{
+  cpu->ram[mar] =  mdr;
+}
+
+void push(struct cpu *cpu, unsigned char val)
+{
+  //push the value in the given register to top of the stack
+  //decrement the sp
+  cpu->reg[7]--;
+  //copy the value in the given register to the address pointed to by the sp
+  //another variable? add sp to struct? 
+  cpu_ram_write(cpu, cpu->reg[7], cpu->reg[val]);
+}
+
+void pop(struct cpu *cpu, unsigned char val)
+{
+  //pop the value at the top of the stack into given register
+  //copy the value from the address pointed to by sp to given register
+  //put value in register take it out of ram (by reading) get address reg7 and store it in given register
+  cpu->reg[val] = cpu_ram_read(cpu, cpu->reg[7]);
+  //increment sp
+  cpu->reg[7]++;
+}
+
+void call(struct cpu *cpu, unsigned char registerAddress)
+{
+  //push address of instruction on to stack so we can return to where we left off after subroutine executes
+  unsigned char address = cpu->reg[registerAddress];
+  //stack grows down so make room on stack to store address
+  cpu->reg[7]--;  
+  //add return location to stack.
+  cpu->ram[cpu->reg[7]];
+  //set program counter to location of subroutine
+  cpu->pc = address;
+  //pc is set to address stored in given register. jump to that location and execute the instruction in the subroutine.
+}
+
 /**
  * Run the CPU
  */
@@ -50,10 +131,54 @@ void cpu_run(struct cpu *cpu)
   while (running) {
     // TODO
     // 1. Get the value of the current instruction (in address PC).
+    unsigned char IR = cpu_ram_read(cpu, cpu->pc);
     // 2. Figure out how many operands this next instruction requires
     // 3. Get the appropriate value(s) of the operands following this instruction
+    unsigned char operandA = cpu_ram_read(cpu, cpu->pc+1);
+    unsigned char operandB = cpu_ram_read(cpu, cpu->pc+2);
+    printf("TRACE: %02X: %02X  %02X  %02X \n", cpu->pc, IR, operandA, operandB);
     // 4. switch() over it to decide on a course of action.
     // 5. Do whatever the instruction should do according to the spec.
+    switch(IR)
+    {
+      case LDI:
+        //sets value in given register to value specified 
+        cpu->reg[operandA] = operandB;
+        //increment by 3 since 3 arguments (CP+2)
+        cpu->pc += 3;
+        break;
+      case PRN:
+        //print out numerically in given register 
+        printf("%d\n", cpu->reg[operandA]);
+        cpu->pc += 2;
+        break;
+      case MUL:
+        alu(cpu, ALU_MUL, operandA, operandB);
+        cpu->pc += 3;
+        break;
+      case ADD:
+        alu(cpu, ALU_ADD, operandA, operandB);
+        cpu->pc += 3;
+        break;
+      case PUSH:  
+        push(cpu, operandA);
+        cpu->pc += 2;
+        break;
+      case POP:
+        pop(cpu, operandA);
+        cpu->pc += 2;
+        break;
+      case CALL:
+        call(cpu, operandA);
+        cpu->pc += 2;
+        break;
+      case HLT: 
+        running = 0;  //set running to false
+        break;
+      default:  //program stops if gets instruction it doesnt know
+        printf("unexpected instruction: 0x%0X2 at 0x%0X2 \n", IR, cpu->pc);
+        exit(1);
+    }
     // 6. Move the PC to the next instruction.
   }
 }
@@ -64,4 +189,13 @@ void cpu_run(struct cpu *cpu)
 void cpu_init(struct cpu *cpu)
 {
   // TODO: Initialize the PC and other special registers
+  cpu->pc = 0;
+  memset(cpu->reg, 0, sizeof cpu->reg);   //R7??????
+  cpu->reg[7] = 0xf4; 
+  memset(cpu->ram, 0, sizeof cpu->ram);
 }
+// When the LS-8 is booted, the following steps occur:
+// * `R0`-`R6` are cleared to `0`.
+// * `R7` is set to `0xF4`.
+// * `PC` and `FL` registers are cleared to `0`.
+// * RAM is cleared to `0`.

ls8/cpu.h

@@ -2,20 +2,29 @@
 #define _CPU_H_
 
 // Holds all information about the CPU
-struct cpu {
+typedef struct cpu {
   // TODO
   // PC
+  unsigned char pc;
+  unsigned char fl;
   // registers (array)
+  unsigned char reg[8];
   // ram (array)
-};
+  unsigned char ram[256];
+} cpu;
 
 // ALU operations
 enum alu_op {
-	ALU_MUL
+	ALU_MUL,
+  ALU_ADD
 	// Add more here
 };
 
 // Instructions
+//memory locations !!!!!!!!!!!!!!!!!
+#define ADD_EMPTY_STACK 0xf4
+#define ADD_PROGRAM_ENTRY 0x00
+
 
 // These use binary literals. If these aren't available with your compiler, hex
 // literals should be used.
@@ -24,10 +33,16 @@ enum alu_op {
 #define HLT  0b00000001
 #define PRN  0b01000111
 // TODO: more instructions here. These can be used in cpu_run().
+#define MUL  0b10100010
+#define ADD  0b10100000
+#define PUSH 0b01000101
+#define POP  0b01000110
+#define CALL 0b01010000
+#define RET  0b00010001
 
 // Function declarations
 
-extern void cpu_load(struct cpu *cpu);
+extern void cpu_load(struct cpu *cpu, char *filename);
 extern void cpu_init(struct cpu *cpu);
 extern void cpu_run(struct cpu *cpu);
 

ls8/ls8.c

@@ -4,13 +4,26 @@
 /**
  * Main
  */
-int main(void)
+//the way this is set up shows us the order that this should be built out
+int main(int argc, char *argv[]) //changed from void for command line processing. arg count and array of strings that hold indiv args.
 {
   struct cpu cpu;
 
+  if (argc != 2)
+  {
+    fprintf(stderr, "This function requires two arguments.");
+    return 1;  //same as exit(1) b/c normally return 0
+  }
+
+  char *filename = argv[1];
+
   cpu_init(&cpu);
-  cpu_load(&cpu);
+  cpu_load(&cpu, filename);  //also update prototype to include char pointer
   cpu_run(&cpu);
 
   return 0;
-}
+}
+
+
+//argv[0] == "./ls8"
+//argv[1] == "examples/mult.ls8"