Changeset 625 for Deliverables/D2.2/8051

Timestamp:

Mar 3, 2011, 12:57:35 PM (10 years ago)

Author:

mulligan

Message:

Fixed ASMInterpret so no assert false is generated. Working on actually getting the compiler to spit out meaningful code.

Location:

Deliverables/D2.2/8051

Files:

• myocamlbuild_config.ml (modified) (1 diff)
• src/ASM/ASMInterpret.ml (modified) (3 diffs)

Deliverables/D2.2/8051/myocamlbuild_config.ml

@@ -1 @@
-let parser_lib = "/home/ayache/Downloads/Bol/Deliverables/D2.2/8051/lib"
+let parser_lib = "/home/dpm/Projects/Cerco/Deliverables/D2.2/8051/lib"

Deliverables/D2.2/8051/src/ASM/ASMInterpret.ml

@@ -954 +954 @@
    (fun (pc,exit_addr,labels,costs) i ->
      match i with
-        `Label s when s = p.ASM.pexit_label ->
-          pc, pc, StringTools.Map.add s pc labels, costs
-      | `Label s ->
-          pc, exit_addr, StringTools.Map.add s pc labels, costs
+        `Label s when s = p.ASM.pexit_label -> pc, pc, StringTools.Map.add s pc labels, costs
+      | `Label s -> pc, exit_addr, StringTools.Map.add s pc labels, costs
       | `Cost s -> pc, exit_addr, labels, BitVectors.WordMap.add pc s costs
-      | `Mov (_,_) -> pc, exit_addr, labels, costs
+      | `Mov (_,_) -> (snd (half_add pc (vect_of_int 1 `Sixteen))), exit_addr, labels, costs
       | `Jmp _ 
-      | `Call _ ->
-        (snd (half_add pc (BitVectors.vect_of_int 3 `Sixteen))),
-        exit_addr, labels, costs
+      | `Call _ -> (snd (half_add pc (BitVectors.vect_of_int 3 `Sixteen))), exit_addr, labels, costs
       (*CSC: very stupid: always expand to worst opcode *)
       | `WithLabel i ->
@@ -970 +966 @@
         let i',pc',_ = fetch (load_code_memory (assembly1 fake_jump)) (vect_of_int 0 `Sixteen) in
         assert (fake_jump = i');
-        (snd (half_add pc pc'), exit_addr, labels, costs)
+        let pc' = snd (half_add pc' (vect_of_int 5 `Sixteen)) in
+          (snd (half_add pc pc'), exit_addr, labels, costs)
       | #instruction as i ->
         let i',pc',_ = fetch (load_code_memory (assembly1 i)) (vect_of_int 0 `Sixteen) in
@@ -985 +982 @@
       | `Cost _ -> []
       | `WithLabel i ->
-         let translation = assert false (*
+         (* We need to expand a conditional jump to a label to a machine language
+            conditional jump.  Suppose we have:
+              JC label
+            This should be expanded to:
+              JC 2         -- size of a short jump
+              SJMP 3       -- size of a long jump
+              LJMP offset  -- offset = position of label in code
+            And, for ever label appearing after the location of the jump in code
+            memory, we must increment by 5, as we added two new instructions. *)
+         let offset, jmp_address, translated_jump =
            match i with
-             `JC (`Label a) -> (*
-               let offset = vect_of_int 2 `Eight in
-               let address = StringTools.Map.find a labels in *)
-                 assert false
-           | `JNC a ->
-               (* let offset = vect_of_int 2 `Eight in *)
-                 assert false
-           | `JB (b, a) ->
-               (* let offset = vect_of_int 3 `Eight in *)
-                 assert false
-           | `JNB (b, a) ->
-               (* let offset = vect_of_int 3 `Eight in *)
-                 assert false
-           | `JBC (b, a) ->
-               (* let offset = vect_of_int 2 `Eight in *)
-                 assert false
-           | `JZ a ->
-               (* let offset = vect_of_int 2 `Eight in *)
-                 assert false
-           | `JNZ a ->
-               (* let offset = vect_of_int 2 `Eight in *)
-                 assert false
-           | `CJNE (args, a) ->
-               (* let offset = vect_of_int 3 `Eight in *)
-                 assert false
-           | `DJNZ ((`DIRECT, `REL _), a) ->
-               (* let offset = vect_of_int 3 `Eight in *)
-                 assert false
-           | `DJNZ ((`REG _, `REL _), a) ->
-               (* let offset = vect_of_int 2 `Eight in *)
-                 assert false *)
+             `JC (`Label a) ->
+               let address = StringTools.Map.find a labels in
+               let reconstructed = `JC (`REL (vect_of_int 2 `Eight)) in
+                 5, address, reconstructed
+           | `JNC (`Label a) ->
+               let address = StringTools.Map.find a labels in
+               let reconstructed = `JC (`REL (vect_of_int 2 `Eight)) in
+                 5, address, reconstructed
+           | `JB (b, `Label a) ->
+               let address = StringTools.Map.find a labels in
+               let reconstructed = `JC (`REL (vect_of_int 2 `Eight)) in
+                 5, address, reconstructed
+           | `JNB (b, `Label a) ->
+               let address = StringTools.Map.find a labels in
+               let reconstructed = `JC (`REL (vect_of_int 2 `Eight)) in
+                 5, address, reconstructed
+           | `JBC (b, `Label a) ->
+               let address = StringTools.Map.find a labels in
+               let reconstructed = `JC (`REL (vect_of_int 2 `Eight)) in
+                 5, address, reconstructed
+           | `JZ (`Label a) ->
+               let address = StringTools.Map.find a labels in
+               let reconstructed = `JC (`REL (vect_of_int 2 `Eight)) in
+                 5, address, reconstructed
+           | `JNZ (`Label a) ->
+               let address = StringTools.Map.find a labels in
+               let reconstructed = `JC (`REL (vect_of_int 2 `Eight)) in
+                 5, address, reconstructed
+           | `CJNE (args, `Label a) ->
+               let address = StringTools.Map.find a labels in
+               let reconstructed = `JC (`REL (vect_of_int 2 `Eight)) in
+                 5, address, reconstructed
+           | `DJNZ (args, `Label a) ->
+               let address = StringTools.Map.find a labels in
+               let reconstructed = `JC (`REL (vect_of_int 2 `Eight)) in
+                 5, address, reconstructed
          in
-           List.flatten (List.map assembly1 translation)
+           let sjmp, jmp = `SJMP (`REL (vect_of_int 3 `Eight)), `LJMP (`ADDR16 jmp_address) in
+           let translation = [ translated_jump; sjmp; jmp ] in
+             List.flatten (List.map assembly1 translation)
       | `Mov (`DPTR,s) ->
           let addrr16 = StringTools.Map.find s datalabels in