Changeset 2100 for Deliverables/D2.2/8051/src

Timestamp:

Jun 18, 2012, 5:16:08 PM (9 years ago)

Author:

tranquil

Message:

temporary solution to a bug where operations on spilled registers disrupted the carry bit

File:

• Deliverables/D2.2/8051/src/ERTL/ERTLToLTLI.ml (modified) (7 diffs)

Deliverables/D2.2/8051/src/ERTL/ERTLToLTLI.ml

@@ -49 +49 @@
   let adjust off = locals - (off + I8051.int_size)
 
-  (* side-effects : dpl, dph, a *)
+  (* side-effects : dpl, dph, a, st1 if adjust off <> 0 *)
   let move_sp_to_dptr off l =
     let off = adjust off in
@@ -58 +58 @@
       LTL.St_to_acc (I8051.spl, l)
     else
+      let l = generate (LTL.St_op2 (I8051.Sub, LTL.Reg I8051.st1, l)) in
+      let l = generate (LTL.St_clear_carry l) in
+      let l = generate (LTL.St_int (I8051.a, 0, l)) in
+      (* ^ restore the carry bit ^ *)
       let l = generate (LTL.St_from_acc (I8051.dph, l)) in
       let l = generate (LTL.St_op2 (I8051.Addc, LTL.Reg I8051.sph, l)) in
@@ -63 +67 @@
       let l = generate (LTL.St_from_acc (I8051.dpl, l)) in
       let l = generate (LTL.St_op2 (I8051.Add, LTL.Reg I8051.spl, l)) in
-      LTL.St_int (I8051.a, off, l)
-
-
-  (* side-effects : dpl, dph, a *)
+      let l = generate (LTL.St_int (I8051.a, off, l)) in
+      let l = generate (LTL.St_from_acc (I8051.st1, l)) in
+      let l = generate (LTL.St_op2 (I8051.Addc, LTL.Imm 0, l)) in
+      LTL.St_int (I8051.a, 0, l)
+      (* ^ save the carry bit ^ *)
+
+
+  (* side-effects : dpl, dph, a, st1 if adjust off <> 0 *)
   let get_stack r off l =
     let l =
@@ -73 +81 @@
     move_sp_to_dptr off l
 
-  (* side-effects : dpl, dph, a *)
+  (* side-effects : dpl, dph, a, st1 if adjust off <> 0 *)
   let set_stack_not_a off r l =
     let l = generate (LTL.St_store l) in
@@ -79 +87 @@
     move_sp_to_dptr off l
 
-  (* side-effects : dpl, dph, st0 *)
+  (* side-effects : dpl, dph, st0, st1 if adjust off <> 0 *)
   let set_stack_a off l =
     let l = generate (set_stack_not_a off I8051.st0 l) in
     LTL.St_from_acc (I8051.st0, l)
 
-  (* side-effects : dpl, dph, st0 if r = a, a if r != a *)
+  (* side-effects : dpl, dph, st0 if r = a, a if r != a, st1 if adjust off <> 0 *)
   let set_stack off r =
     if I8051.eq_reg r I8051.a then set_stack_a off else
       set_stack_not_a off r
 
-  (* side-effects : dpl, dph, a *)
+  (* side-effects : dpl, dph, a, st1 if adjust off <> 0 *)
   let set_stack_int off k l =
     let l = generate (LTL.St_store l) in
@@ -96 +104 @@
 
 
-  (* side-effects : (dpl, dph, a) if dest spilled *)
+  (* side-effects : (dpl, dph, a, st1 if adjust off <> 0) if dest spilled *)
   let move_int (dest : decision) (k : int) l =
     match dest with
@@ -103 +111 @@
 
   (* side-effects : none if dest = src, a if both colored,
-                    (dpl, dph, a) if src spilled or src imm and dest spilled,
-                    (dpl, dph, a, st0) if dest spilled *)
+                    (dpl, dph, a, st1 if adjust off <> 0) if src spilled or src imm and dest spilled,
+                    (dpl, dph, a, st0, st1 if adjust off <> 0) if dest spilled *)
   let move (dest : decision) (src : argument) l =
     match dest, src with