Changeset 949 for src/ASM/Status.ma

Timestamp:

Jun 13, 2011, 6:42:14 PM (9 years ago)

Author:

mulligan

Message:

resolved conflict, work from today

File:

• src/ASM/Status.ma (modified) (8 diffs)

src/ASM/Status.ma

@@ -420 +420 @@
     let sfr ≝ special_function_registers_8051 ? s in
     let psw ≝ get_index_v Byte 19 sfr (sfr_8051_index SFR_PSW) ? in
-      get_index_v bool 8 psw (S O) ?.
+      get_index_v bool 8 psw 1 ?.
     normalize
     repeat (@ (le_S_S ? ?))
@@ -826 +826 @@
         λdirect: True.
           let 〈 nu, nl 〉 ≝ split … 4 4 d in
-          let bit_1 ≝ get_index_v … nu 1 ? in
-            match bit_1 with
-              [ true ⇒
-                  let 〈 bit_one, three_bits 〉 ≝ split ? 1 3 nu in
+          let bit_one ≝ get_index_v ? ? nu 0 ? in
+          let 〈 ignore, three_bits 〉 ≝ split ? 1 3 nu in
+            match bit_one with
+              [ false ⇒
                   let address ≝ three_bits @@ nl in
                     lookup ? 7 address (low_internal_ram ? s) (zero 8)
-              | false ⇒ get_bit_addressable_sfr ? s 8 d l
+              | true ⇒ get_bit_addressable_sfr ? s 8 d l
               ]
       | INDIRECT i ⇒
@@ -839 +839 @@
           let 〈 bit_one_v, three_bits 〉 ≝ split ? 1 3 nu in
           let bit_1 ≝ get_index_v … bit_one_v O ? in
-          match bit_1 with
-            [ true ⇒
+          match  bit_1 with
+            [ false ⇒
                 lookup ? 7 (three_bits @@ nl) (low_internal_ram ? s) (zero 8)
-            | false ⇒ 
+            | true ⇒ 
                 lookup ? 7 (three_bits @@ nl) (high_internal_ram ? s) (zero 8)
             ]
@@ -865 +865 @@
         λdirect: True.
           let 〈 nu, nl 〉 ≝ split … 4 4 d in
-          let bit_1 ≝ get_index_v … nu 1 ? in
+          let bit_one ≝ get_index_v ? ? nu 0 ? in
           let 〈 ignore, three_bits 〉 ≝ split ? 1 3 nu in
-            match bit_1 with
+            match bit_one with
               [ true ⇒ set_bit_addressable_sfr ? s d v
               | false ⇒
@@ -877 +877 @@
           let register ≝ get_register ? s [[ false; false; i ]] in
           let 〈nu, nl〉 ≝ split ? 4 4 register in
-          let bit_1 ≝ get_index_v … nu 1 ? in
+          let bit_1 ≝ get_index_v … nu 0 ? in
           let 〈ignore, three_bits〉 ≝ split ? 1 3 nu in
             match bit_1 with
-              [ true ⇒
+              [ false ⇒
                 let memory ≝ insert … (three_bits @@ nl) v (low_internal_ram ? s) in
                   set_low_internal_ram ? s memory
-              | false ⇒ 
+              | true ⇒ 
                 let memory ≝ insert … (three_bits @@ nl) v (high_internal_ram ? s) in
                   set_high_internal_ram ? s memory
@@ -972 +972 @@
         λbit_addr: True.
           let 〈 nu, nl 〉 ≝ split … 4 4 b in
-          let bit_1 ≝ get_index_v … nu 1 ? in
+          let bit_1 ≝ get_index_v … nu 0 ? in
           let 〈 bit_one_v, three_bits 〉 ≝ split ? 1 3 nu in
             match bit_1 with
@@ -991 +991 @@
         λn_bit_addr: True.
           let 〈 nu, nl 〉 ≝ split … 4 4 n in
-          let bit_1 ≝ get_index_v … nu 1 ? in
+          let bit_1 ≝ get_index_v … nu 0 ? in
           let 〈 bit_one_v, three_bits 〉 ≝ split ? 1 3 nu in
             match bit_1 with
@@ -1026 +1026 @@
       [ BIT_ADDR b ⇒ λbit_addr: True.
           let 〈 nu, nl 〉 ≝ split ? 4 4 (get_8051_sfr ? s SFR_PSW) in
-          let bit_1 ≝ get_index_v … nu 1 ? in
+          let bit_1 ≝ get_index_v … nu 0 ? in
           let 〈 ignore, three_bits 〉 ≝ split ? 1 3 nu in
           match bit_1 with