diff options
| -rw-r--r-- | checklink/Asm_printers.ml | 2 | ||||
| -rw-r--r-- | checklink/Check.ml | 2 | ||||
| -rw-r--r-- | powerpc/Asm.v | 4 | ||||
| -rw-r--r-- | powerpc/Asmexpand.ml | 2 | ||||
| -rw-r--r-- | powerpc/TargetPrinter.ml | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/checklink/Asm_printers.ml b/checklink/Asm_printers.ml index 43c974f2..c475d7da 100644 --- a/checklink/Asm_printers.ml +++ b/checklink/Asm_printers.ml @@ -289,7 +289,7 @@ let string_of_instruction = function | Pstwu (i0, c1, i2) -> "Pstwu(" ^ string_of_ireg i0 ^ ", " ^ string_of_constant c1 ^ ", " ^ string_of_ireg i2 ^ ")" | Pstwx (i0, i1, i2) -> "Pstwx(" ^ string_of_ireg i0 ^ ", " ^ string_of_ireg i1 ^ ", " ^ string_of_ireg i2 ^ ")" | Pstwx_a (i0, i1, i2) -> "Pstwx_a(" ^ string_of_ireg i0 ^ ", " ^ string_of_ireg i1 ^ ", " ^ string_of_ireg i2 ^ ")" -| Pstwxu (i0, i1, i2) -> "Pstwxu(" ^ string_of_ireg i0 ^ ", " ^ string_of_ireg i1 ^ ", " ^ string_of_ireg i2 ^ ")" +| Pstwux (i0, i1, i2) -> "Pstwux(" ^ string_of_ireg i0 ^ ", " ^ string_of_ireg i1 ^ ", " ^ string_of_ireg i2 ^ ")" | Pstwbrx (i0, i1, i2) -> "Pstwbrx(" ^ string_of_ireg i0 ^ ", " ^ string_of_ireg i1 ^ ", " ^ string_of_ireg i2 ^ ")" | Pstwcx_ (i0, i1, i2) -> "Pstwcx_(" ^ string_of_ireg i0 ^ ", " ^ string_of_ireg i1 ^ ", " ^ string_of_ireg i2 ^ ")" | Psubfc (i0, i1, i2) -> "Psubfc(" ^ string_of_ireg i0 ^ ", " ^ string_of_ireg i1 ^ ", " ^ string_of_ireg i2 ^ ")" diff --git a/checklink/Check.ml b/checklink/Check.ml index 4924744c..bfd03c97 100644 --- a/checklink/Check.ml +++ b/checklink/Check.ml @@ -2130,7 +2130,7 @@ let rec compare_code ccode ecode pc: checker = fun fw -> >>= recur_simpl | _ -> error end - | Pstwxu(rd, r1, r2) -> + | Pstwux(rd, r1, r2) -> begin match ecode with | STWUX(rS, rA, rB) :: es -> OK(fw) diff --git a/powerpc/Asm.v b/powerpc/Asm.v index d707b2b5..3fa7af31 100644 --- a/powerpc/Asm.v +++ b/powerpc/Asm.v @@ -260,7 +260,7 @@ Inductive instruction : Type := | Pstw: ireg -> constant -> ireg -> instruction (**r store 32-bit int *) | Pstwu: ireg -> constant -> ireg -> instruction (**r store 32-bit int with update *) | Pstwx: ireg -> ireg -> ireg -> instruction (**r same, with 2 index regs *) - | Pstwxu: ireg -> ireg -> ireg -> instruction (**r same, with 2 index regs and update *) + | Pstwux: ireg -> ireg -> ireg -> instruction (**r same, with 2 index regs and update *) | Pstw_a: ireg -> constant -> ireg -> instruction (**r store 32-bit quantity from int reg *) | Pstwx_a: ireg -> ireg -> ireg -> instruction (**r same, with 2 index regs *) | Pstwbrx: ireg -> ireg -> ireg -> instruction (**r store 32-bit int with reverse endianness *) @@ -878,7 +878,7 @@ Definition exec_instr (f: function) (i: instruction) (rs: regset) (m: mem) : out | Pstfdu _ _ _ | Psthbrx _ _ _ | Pstwu _ _ _ - | Pstwxu _ _ _ + | Pstwux _ _ _ | Psubfze _ _ | Psync | Ptrap diff --git a/powerpc/Asmexpand.ml b/powerpc/Asmexpand.ml index aec8f66e..699c841f 100644 --- a/powerpc/Asmexpand.ml +++ b/powerpc/Asmexpand.ml @@ -457,7 +457,7 @@ let expand_instruction instr = emit (Pstwu(GPR1, Cint(coqint_of_camlint adj), GPR1)) else begin emit_loadimm GPR0 (coqint_of_camlint adj); - emit (Pstwxu(GPR1, GPR1, GPR0)) + emit (Pstwux(GPR1, GPR1, GPR0)) end; emit (Pcfi_adjust (coqint_of_camlint sz)); if variadic then begin diff --git a/powerpc/TargetPrinter.ml b/powerpc/TargetPrinter.ml index 3789d62e..2d47acb0 100644 --- a/powerpc/TargetPrinter.ml +++ b/powerpc/TargetPrinter.ml @@ -620,8 +620,8 @@ module Target (System : SYSTEM):TARGET = fprintf oc " stwu %a, %a(%a)\n" ireg r1 constant c ireg r2 | Pstwx(r1, r2, r3) | Pstwx_a(r1, r2, r3) -> fprintf oc " stwx %a, %a, %a\n" ireg r1 ireg r2 ireg r3 - | Pstwxu(r1, r2, r3) -> - fprintf oc " stwxu %a, %a, %a\n" ireg r1 ireg r2 ireg r3 + | Pstwux(r1, r2, r3) -> + fprintf oc " stwux %a, %a, %a\n" ireg r1 ireg r2 ireg r3 | Pstwbrx(r1, r2, r3) -> fprintf oc " stwbrx %a, %a, %a\n" ireg r1 ireg r2 ireg r3 | Pstwcx_(r1, r2, r3) -> |