Changeset 1488 for Deliverables/D2.2/8051/src/ASM

Timestamp:

Nov 4, 2011, 12:22:17 PM (9 years ago)

Author:

ayache

Message:

Function pointers in D2.2/8051. Bugged for now.

Location:

Deliverables/D2.2/8051/src/ASM

Files:

• ASMInterpret.ml (modified) (2 diffs)
• ASMInterpret.mli (modified) (1 diff)
• I8051.ml (modified) (1 diff)
• I8051.mli (modified) (1 diff)

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

@@ -1036 +1036 @@
              List.flatten (List.map assembly1 translation)
       | `Mov (`DPTR,s) ->
-          let addrr16 = StringTools.Map.find s datalabels in
-           assembly1 (`MOV (`U4 (`DPTR,`DATA16 addrr16)))
+          (* let addr16 = StringTools.Map.find s datalabels in *)
+          let addrr16 =
+            try StringTools.Map.find s datalabels
+            with Not_found -> StringTools.Map.find s labels in
+          assembly1 (`MOV (`U4 (`DPTR,`DATA16 addrr16)))
       | `Jmp s ->
           let pc_offset = StringTools.Map.find s labels in
@@ -2005 +2008 @@
     (res, List.rev !trace)
   else (IntValue.Int32.zero, [])
+
+
+let size_of_instr instr =
+  let exit_lbl = "exit" in
+  let p = { ASM.ppreamble = [] ; ASM.pexit_label = exit_lbl ;
+            ASM.pcode = [instr ; `Label exit_lbl] ; ASM.phas_main = false } in
+  let p = assembly p in
+  let status = load_program p in
+  let addr_zero = BitVectors.vect_of_int 0 `Sixteen in
+  let (_, size, _) = fetch status.code_memory addr_zero in
+  BitVectors.int_of_vect size
+
+let size_of_instrs instrs =
+  let f res instr = res + (size_of_instr instr) in
+  List.fold_left f 0 instrs

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

@@ -129 +129 @@
 val load_program : ASM.program -> status
 val interpret    : bool -> ASM.program -> AST.trace
+
+val size_of_instrs : ASM.labelled_instruction list -> int

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

@@ -170 +170 @@
 let rets = [dpl ; dph ; r00 ; r01]
 
+let spl_addr = spl
+let spl_init = 255
+let sph_addr = sph
+let sph_init = 255
 let isp_addr = 129
 let isp_init = 47

Deliverables/D2.2/8051/src/ASM/I8051.mli

@@ -55 +55 @@
 val carry : register (* only used for the liveness analysis *)
 
+val spl_addr : int
+val spl_init : int
+val sph_addr : int
+val sph_init : int
 val isp_addr : int
 val isp_init : int