Changeset 1491 for Deliverables/D2.2

Timestamp:

Nov 4, 2011, 1:39:01 PM (9 years ago)

Author:

ayache

Message:

Function pointers good and working.

File:

• Deliverables/D2.2/8051/src/LIN/LINToASM.ml (modified) (4 diffs)

Deliverables/D2.2/8051/src/LIN/LINToASM.ml

@@ -56 +56 @@
 let data16_of_int i = `DATA16 (vect_of_int i `Sixteen)
 let acc_addr = I8051.reg_addr I8051.a
+let dpl_addr = I8051.reg_addr I8051.dpl
+let dph_addr = I8051.reg_addr I8051.dph
+let st0_addr = I8051.reg_addr I8051.st0
+let st1_addr = I8051.reg_addr I8051.st1
 
 
-let rec translate_statement env = function
+let translate_statement env = function
   | LIN.St_goto lbl -> [`Jmp lbl]
   | LIN.St_label lbl -> [`Label lbl]
@@ -72 +76 @@
   | LIN.St_push ->
     [`PUSH acc_addr]
-(*
-  | LIN.St_addr x when List.mem_assoc x env.globals_addr ->
-    [`MOV (`U4 (`DPTR, data16_of_int (List.assoc x env.globals_addr)))]
-  | LIN.St_addr x when List.mem x env.fun_names ->
-    [`Mov (`DPTR, x)]
-  | LIN.St_addr x ->
-    error
-      ("unknown symbol " ^ x ^ ". Primitives and externals are not supported")
-*)
   | LIN.St_addr x when List.mem x env.externals ->
     error ("Primitive or external " ^ x ^ " is not supported.")
@@ -117 +112 @@
   | LIN.St_store ->
     [`MOVX (`U2 (`EXT_IND_DPTR, `A))]
+  | LIN.St_call_id x when List.mem x env.externals ->
+    error ("Primitive or external " ^ x ^ " is not supported.")
   | LIN.St_call_id f ->
     [`Call f]
-(*
-  | LIN.St_call_ptr ->
-    (`Call env.set_ra_lbl) :: (call_ptr_instrs env)
-*)
   | LIN.St_call_ptr ->
     let lbl = env.fresh () in
-    translate_code env
-      [LIN.St_to_acc I8051.dpl ;
-       LIN.St_from_acc I8051.st0 ;
-       LIN.St_to_acc I8051.dph ;
-       LIN.St_from_acc I8051.st1 ;
-       LIN.St_addr lbl ;
-       LIN.St_to_acc I8051.dpl ;
-       LIN.St_push ;
-       LIN.St_to_acc I8051.dph ;
-       LIN.St_push ;
-       LIN.St_to_acc I8051.st0 ;
-       LIN.St_push ;
-       LIN.St_to_acc I8051.st1 ;
-       LIN.St_push ;
-       LIN.St_return ;
-       LIN.St_label lbl]
+    [`MOV (`U3 (st0_addr, dpl_addr)) ;
+     `MOV (`U3 (st1_addr, dph_addr)) ;
+     `Mov (`DPTR, lbl) ;
+     `PUSH dpl_addr ;
+     `PUSH dph_addr ;
+     `PUSH st0_addr ;
+     `PUSH st1_addr ;
+     `RET ;
+     `Label lbl]
   | LIN.St_condacc lbl ->
     [`WithLabel (`JNZ (`Label lbl))]
@@ -146 +132 @@
     [`RET]
 
-and translate_code env code =
+let translate_code env code =
   List.flatten (List.map (translate_statement env) code)