Random cleanups

Author: dplassgit

src/com/plasstech/lang/c/codegen/AssemblyType.java

@@ -6,8 +6,8 @@
  * Page 261.
  */
 public enum AssemblyType {
-  Longword("l"),
-  Quadword("q");
+  Longword("l"), // 4 bytes
+  Quadword("q"); // 8 bytes
 
   private final String suffix;
 
@@ -16,9 +16,9 @@ public enum AssemblyType {
   }
 
   public static AssemblyType from(Type type) {
-    if (type.equals(Type.LONG)) {
+    if (type.equals(Type.LONG) || type.equals(Type.UNSIGNED_LONG)) {
       return Quadword;
-    } else if (type.equals(Type.INT)) {
+    } else if (type.equals(Type.INT) || type.equals(Type.UNSIGNED_INT)) {
       return Longword;
     }
     throw new IllegalStateException(

src/com/plasstech/lang/c/codegen/tacky/FixupVisitor.java

@@ -26,7 +26,6 @@
 import com.plasstech.lang.c.codegen.Movsx;
 import com.plasstech.lang.c.codegen.Operand;
 import com.plasstech.lang.c.codegen.Push;
-import com.plasstech.lang.c.codegen.RegisterOperand;
 import com.plasstech.lang.c.codegen.Ret;
 import com.plasstech.lang.c.codegen.SetCC;
 
@@ -89,9 +88,9 @@ public List<Instruction> visit(AsmBinary n) {
             n.dst().inMemory() || (n.type() == AssemblyType.Quadword && immOutOfRange(n.src()));
         if (needsIntermediary) {
           return ImmutableList.of(
-              new Mov(n.type(), n.src(), RegisterOperand.R11), // NOTYPO
-              new AsmBinary(n.operator(), n.type(), n.dst(), RegisterOperand.R11),
-              new Mov(n.type(), RegisterOperand.R11, n.dst()));
+              new Mov(n.type(), n.src(), R11), // NOTYPO
+              new AsmBinary(n.operator(), n.type(), n.dst(), R11),
+              new Mov(n.type(), R11, n.dst()));
         }
       }
         break;

test/com/plasstech/lang/c/codegen/tacky/TackyCodeGenTest.java

@@ -233,14 +233,9 @@ int main(void) {
         """;
     TackyProgram tp = generate(input);
     assertThat(tp.topLevelDefinitions()).hasSize(1);
-    for (var tld : tp.topLevelDefinitions()) {
-      if (tld instanceof TackyFunction fn) {
-        List<TackyInstruction> instructions = fn.body();
-        assertThat(instructions.size()).isGreaterThan(0);
-      } else {
-        fail("Expected TackyFunctionDef");
-      }
-    }
+    TackyFunction fn = (TackyFunction) tp.topLevelDefinitions().get(0);
+    List<TackyInstruction> instructions = fn.body();
+    assertThat(instructions.size()).isGreaterThan(0);
   }
 
   @Test
@@ -312,9 +307,9 @@ long main(void) {
     Program prog = new Parser(new Scanner(input)).parse();
     prog = semanticAnalyzer.validate(prog);
     TackyCodeGen cg = new TackyCodeGen(symtab);
-    Collection<Symbol> beforeGeneration = ImmutableSet.copyOf(symtab.values());
+    Collection<Symbol> beforeGenerationSymbols = ImmutableSet.copyOf(symtab.values());
     cg.generate(prog);
-    assertThat(beforeGeneration).isEqualTo(ImmutableSet.copyOf(symtab.values()));
+    assertThat(beforeGenerationSymbols).isEqualTo(ImmutableSet.copyOf(symtab.values()));
   }
 
   @Test
@@ -342,8 +337,8 @@ int main(void) {
     Program prog = p.parse();
     prog = semanticAnalyzer.validate(prog);
     TackyCodeGen cg = new TackyCodeGen(symtab);
-    Collection<Symbol> beforeGeneration = ImmutableSet.copyOf(symtab.values());
+    Collection<Symbol> beforeGenerationSymbols = ImmutableSet.copyOf(symtab.values());
     cg.generate(prog);
-    assertThat(beforeGeneration).isNotEqualTo(symtab.values());
+    assertThat(beforeGenerationSymbols).isNotEqualTo(symtab.values());
   }
 }