diff --git a/ls8/cpu.py b/ls8/cpu.py index 9a307496e..19981a9fc 100644 --- a/ls8/cpu.py +++ b/ls8/cpu.py @@ -1,44 +1,66 @@ """CPU functionality.""" - +# import sys +#instruction set: +HLT = 0b00000001 +LDI = 0b10000010 +PRN = 0b01000111 +MUL = 0b10100010 +PUSH = 0b01000101 +POP = 0b01000110 +CALL = 0b01010000 +RET = 0b00010001 + class CPU: """Main CPU class.""" def __init__(self): - """Construct a new CPU.""" - pass - - def load(self): - """Load a program into memory.""" + self.registers = [0] * 8 + self.ram = [0] * 256 + self.pc = 0 + self.sp = 0 #set it to the first one in the stack? - address = 0 + self.registers[self.sp] = 0xf4 - # For now, we've just hardcoded a program: - - program = [ - # From print8.ls8 - 0b10000010, # LDI R0,8 - 0b00000000, - 0b00001000, - 0b01000111, # PRN R0 - 0b00000000, - 0b00000001, # HLT - ] - - for instruction in program: - self.ram[address] = instruction - address += 1 +#originally this part is `hardcoded` and needs the parser instead + def load(self, filename): + """Load a program into memory.""" + try: + address = 0 #constant ram address + with open(filename) as f: + for line in f: + comment_split = line.split("#") + num = comment_split[0].strip() + if num == '': + continue + + self.ram[address] = int(num) + address += 1 + + except FileNotFoundError: + print("file not found") + sys.exit(2) + + load(filename) + + def ram_read(self, address): + return self.ram[address] + + def ram_write(self, newvalue, address): + self.ram[address] = newvalue def alu(self, op, reg_a, reg_b): """ALU operations.""" if op == "ADD": self.reg[reg_a] += self.reg[reg_b] - #elif op == "SUB": etc - else: - raise Exception("Unsupported ALU operation") + self.pc += 3 + elif op == "MUL": + self.reg[reg_a] *= self.reg[reg_b] + self.pc += 3 + print() def trace(self): """ @@ -61,5 +83,62 @@ def trace(self): print() def run(self): - """Run the CPU.""" - pass + running = True + while running: + instruction = self.ram[self.pc] + operand_a = self.ram[self.pc + 1] + operand_b = self.ram[self.pc + 2] +# LDI + if instruction == LDI: + reg_index = operand_a + num = operand_b + self.registers[reg_index] = num + self.pc += 3 +# PRN + elif instruction == PRN: + reg_index = operand_a + num = self.registers[reg_index] + print(num) + self.pc += 2 +#MUL + elif instruction == MUL: + reg_index = operand_a + reg_index = operand_b + self.alu("MUL", self.reg_a, self.reg_b) +#PUSH + elif instruction == PUSH: + reg_index = operand_a + val = self.registers[reg_index] + + self.registers[self.sp] -= 1 + + self.ram[self.registers[self.sp]] = val + self.pc += 2 +#POP + elif instruction == POP: + reg_index = operand_a + + self.registers[reg_index] = self.ram[self.registers[self.sp]] + + self.registers[self.sp] += 1 + self.pc += 2 +# HLT + elif instruction == HLT: + running = False + sys.exit(0) +# CALL + elif instruction == CALL: + address_to_return_to = self.pc + 2 + self.registers[self.pc] -= 1 + self.ram[self.registers[self.sp]] = address_to_return_to + reg_index = operand_a + address_to_call = self.registers[reg_index] + self.pc = address_to_call + + elif instruction == RET: + self.pc = self.ram[self.registers[self.sp]] + self.registers[self.sp] + 1 + + else: + print("WRONG WAY") + sys.exit(1) \ No newline at end of file diff --git a/ls8/ls8.py b/ls8/ls8.py index 74128d36b..3acd2633c 100755 --- a/ls8/ls8.py +++ b/ls8/ls8.py @@ -5,7 +5,20 @@ import sys from cpu import * +if len(sys.argv) != 2: + print("Usage: python3 fileio.py ") + sys.exit(1) + +try: + with open(sys.argv[1]) as f: + for line in f: + print(int(line)) + +except FileNotFoundError: + print("file not found") + sys.exit(2) + cpu = CPU() -cpu.load() +cpu.load(filename) cpu.run() \ No newline at end of file