Changeset 1525 for Deliverables/D2.2/8051/src/LIN/LINToASM.ml

Timestamp:

Nov 21, 2011, 6:17:45 PM (9 years ago)

Author:

ayache

Message:

D2.2: function pointers using JMP.

File:

• Deliverables/D2.2/8051/src/LIN/LINToASM.ml (modified) (1 diff)

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

@@ -118 +118 @@
   | LIN.St_call_ptr ->
     let lbl = env.fresh () in
-    [`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]
-(* TODO: tell Claudio about the false assertion raised by the following. *)
-(*
-  | LIN.St_call_ptr ->
-    let lbl = env.fresh () in
-    [`MOV (`U3 (st0_addr, dpl_addr)) ;
-     `MOV (`U3 (st1_addr, dph_addr)) ;
-     `Mov (`DPTR, lbl) ;
-     `PUSH dpl_addr ;
-     `PUSH dph_addr ;
-     `MOV (`U3 (dpl_addr, st0_addr)) ;
-     `MOV (`U3 (dph_addr, st1_addr)) ;
-     `JMP `IND_DPTR ;
-     `Label lbl]
-*)
+    [`MOV (`U3 (st0_addr, dpl_addr)) ; (* save DPL *)
+     `MOV (`U3 (st1_addr, dph_addr)) ; (* save DPH *)
+     `Mov (`DPTR, lbl) ;               (* DPTR <- return address *)
+     `PUSH dpl_addr ;                  (* push DPL *)
+     `PUSH dph_addr ;                  (* push DPH *)
+     `MOV (`U3 (dpl_addr, st0_addr)) ; (* restore DPL *)
+     `MOV (`U3 (dph_addr, st1_addr)) ; (* restore DPH *)
+     `MOV (`U1 (`A, data_of_int 0)) ;  (* A <- 0 *)
+     `JMP `IND_DPTR ;                  (* jump to A+DPTR *)
+     `Label lbl]                       (* return address *)
   | LIN.St_condacc lbl ->
     [`WithLabel (`JNZ (`Label lbl))]