merge

Author: jsiek

README.md

@@ -1,2 +1,11 @@
 # python-student-support-code
-Support for for students (Python)
+
+Support code for students (Python version).
+
+The `runtime.c` file needs to be compiled by doing the following
+```
+   gcc -c -g -std=c99 runtime.c
+```
+This will produce a file named `runtime.o`. The -g flag is to tell the
+compiler to produce debug information that you may need to use
+the gdb (or lldb) debugger.

compiler.py

@@ -83,14 +83,6 @@ def patch_instructions(self, p: X86Program) -> X86Program:
         # YOUR CODE HERE
         pass        
 
-    ############################################################################
-    # Generate Main Function
-    ############################################################################
-
-    def generate_main(self, p: X86Program) -> X86Program:
-        # YOUR CODE HERE
-        pass        
-
     ############################################################################
     # Prelude & Conclusion
     ############################################################################

interp_x86/__pycache__/convert_x86.cpython-310.pyc

@@ -72,7 +72,7 @@ def eval_program(self, p):
 
     def eval_instructions(self, s):
         import pandas as pd
-        
+
         p = x86_parser_instrs.parse(s)
 
         assert p.data == 'instrs'

interp_x86/__pycache__/eval_x86.cpython-310.pyc

@@ -202,8 +202,6 @@ def is_python_extension(filename):
 # expected "golden" output.
 def test_pass(passname, interp, program_root, ast,
               compiler_name):
-    if not interp:
-        return 0
     input_file = program_root + '.in'
     output_file = program_root + '.out'
     stdin = sys.stdin
@@ -230,11 +228,7 @@ def compile_and_test(compiler, compiler_name, type_check_P, interp_P, interp_C,
                      program_filename):
     total_passes = 0
     successful_passes = 0
-    emulate_x86 = True
-    if emulate_x86:
-        from interp_x86.eval_x86 import interp_x86
-    else:
-        interp_x86 = None
+    from interp_x86.eval_x86 import interp_x86
 
     program_root = program_filename.split('.')[0]
     with open(program_filename) as source:
@@ -297,16 +291,17 @@ def compile_and_test(compiler, compiler_name, type_check_P, interp_P, interp_C,
         test_pass('patch instructions', interp_x86, program_root, x86,
                   compiler_name)
 
-    trace('\n**********\n print x86 \n**********\n')            
+    trace('\n**********\n prelude and conclusion \n**********\n')
+    x86 = compiler.prelude_and_conclusion(x86)
+    
     x86_filename = program_root + ".s"
     with open(x86_filename, "w") as dest:
-        dest.write(compiler.print_x86(x86))
-
-    x86 = compiler.generate_main(x86)
+        dest.write(repr(x86))
 
     total_passes += 1
 
-    # Run the x86 program
+    # Run the final x86 program
+    emulate_x86 = False
     if emulate_x86:
         stdin = sys.stdin
         stdout = sys.stdout

interp_x86/__pycache__/parser_x86.cpython-310.pyc

@@ -1,4 +1,5 @@
 from typing import List
+from utils import label_name
 
 class X86Program:
     __match_args__ = ("body",)
@@ -8,10 +9,15 @@ def __repr__(self):
         result = ''
         if type(self.body) == dict:
             for (l,ss) in self.body.items():
+                if l == label_name('main'):
+                    result += '\t.globl ' + label_name('main') + '\n'
                 result += l + ':\n'
                 result += '\n'.join([repr(s) for s in ss]) + '\n\n'
         else:
-            result = '\n'.join([repr(s) for s in self.body])
+            result += '\t.globl ' + label_name('main') + '\n' + \
+                      label_name('main') + ':\n'
+            result += '\n'.join([repr(s) for s in self.body])
+        result += '\n'
         return result
 
 class instr: ...
@@ -31,16 +37,36 @@ def source(self):
     def target(self):
         return self.args[-1]
     def __repr__(self):
-        return self.instr + ' ' + ', '.join(repr(a) for a in self.args)
+        return '\t' + self.instr + ' ' + ', '.join(repr(a) for a in self.args)
 
 class Callq(instr):
     __match_args__ = ("func", "num_args")
     def __init__(self, func, num_args):
         self.func = func
         self.num_args = num_args
     def __repr__(self):
-        return 'callq' + ' ' + self.func
+        return '\tcallq' + ' ' + self.func
 
+class JumpIf(instr):
+    cc: str
+    label: str
+    
+    __match_args__ = ("cc", "label")
+    def __init__(self, cc, label):
+        self.cc = cc
+        self.label = label
+    def __repr__(self):
+        return '\tj' + self.cc + ' ' + self.label
+
+class Jump(instr):
+    label: str
+    
+    __match_args__ = ("label",)
+    def __init__(self, label):
+        self.label = label
+    def __repr__(self):
+        return '\tjmp ' + self.label
+
 class Variable(location):
     __match_args__ = ("id",)
     def __init__(self, id):
@@ -60,7 +86,7 @@ class Immediate(arg):
     def __init__(self, value):
         self.value = value
     def __repr__(self):
-        return repr(self.value)
+        return '$' +  repr(self.value)
     def __eq__(self, other):
         if isinstance(other, Immediate):
             return self.value == other.value
@@ -112,22 +138,3 @@ def __eq__(self, other):
     def __hash__(self):
         return hash((self.reg, self.offset))
 
-class JumpIf(instr):
-    cc: str
-    label: str
-    
-    __match_args__ = ("cc", "label")
-    def __init__(self, cc, label):
-        self.cc = cc
-        self.label = label
-    def __repr__(self):
-        return 'j' + self.cc + ' ' + self.label
-
-class Jump(instr):
-    label: str
-    
-    __match_args__ = ("label",)
-    def __init__(self, label):
-        self.label = label
-    def __repr__(self):
-        return 'jmp ' + self.label