fix(powerpc): fix immediate size

Author: PerfectLaugh

plugins/powerpc/powerpc.mli

@@ -351,14 +351,18 @@ module Std : sig
   (** The type of lifter functions *)
 
   val signed : 'a ec -> 'a
-  (** [signed ec] - returnst a signed expression from given [ec] *)
+  (** [signed ec] - returns a signed expression from given [ec] *)
 
   val unsigned : 'a ec -> 'a
   (** [unsigned ec] - returns an unsigned expression from given [ec] *)
 
   val imm : (op -> exp) ec
   (** imm constructor - constructs an immediate from operand *)
 
+  val imm_32 : (op -> exp) ec
+  (** imm_32 constructor - constructs an immediate from operand without trimming to 16 bits
+  *)
+
   val var : (bitwidth -> exp) ec
   (** var constructor - constructs a variable of bitwidth *)
 

plugins/powerpc/powerpc_branch.ml

@@ -7,13 +7,13 @@ let update_link_register cpu _ops =
     examples: 4b ff fe f0 b .+67108592 4b ff fe f2 ba 67108592 4b ff fe f1 bl
     .+67108592 4b ff fe f3 bla 67108592 *)
 let b cpu ops =
-  let im = signed imm ops.(0) in
+  let im = signed imm_32 ops.(0) in
   let tm = signed var cpu.word_width in
   let sh = unsigned const byte 2 in
   RTL.[ tm := last (im << sh) 26; cpu.jmp (cpu.pc + tm) ]
 
 let ba cpu ops =
-  let im = signed imm ops.(0) in
+  let im = signed imm_32 ops.(0) in
   let tm = signed var cpu.word_width in
   let sh = unsigned const byte 2 in
   RTL.[ tm := last (im << sh) 26; cpu.jmp tm ]
@@ -25,9 +25,9 @@ let bla = update_link_register ^ ba
     3.0 B examples: 42 9f 00 04 bc 20, 31, .+4 42 9f 00 06 bca 20, 31, 4 42 9f
     00 05 bcl 20, 31, .+4 42 9f 00 07 bcla 20, 31, 4 *)
 let bc cpu ops =
-  let bo = unsigned imm ops.(0) in
+  let bo = unsigned imm_32 ops.(0) in
   let bi = unsigned cpu.reg ops.(1) in
-  let bd = signed imm ops.(2) in
+  let bd = signed imm_32 ops.(2) in
   let sh = unsigned const byte 2 in
   let ctr_ok = unsigned var bit in
   let cond_ok = unsigned var bit in
@@ -44,9 +44,9 @@ let bc cpu ops =
     ]
 
 let bca cpu ops =
-  let bo = unsigned imm ops.(0) in
+  let bo = unsigned imm_32 ops.(0) in
   let bi = unsigned cpu.reg ops.(1) in
-  let bd = signed imm ops.(2) in
+  let bd = signed imm_32 ops.(2) in
   let sh = unsigned const byte 2 in
   let ctr_ok = unsigned var bit in
   let cond_ok = unsigned var bit in
@@ -66,7 +66,7 @@ let bcla = update_link_register ^ bca
 
 (** bdz target = bc 18,0, target *)
 let bdz cpu ops =
-  let bd = unsigned imm ops.(0) in
+  let bd = unsigned imm_32 ops.(0) in
   let sh = unsigned const byte 2 in
   let tm = signed var cpu.word_width in
   RTL.
@@ -79,7 +79,7 @@ let bdz cpu ops =
 
 (** bdnz target = bc 16,0, target *)
 let bdnz cpu ops =
-  let bd = unsigned imm ops.(0) in
+  let bd = unsigned imm_32 ops.(0) in
   let sh = unsigned const byte 2 in
   let tm = signed var cpu.word_width in
   RTL.
@@ -94,7 +94,7 @@ let bdnz cpu ops =
     Power ISATM Version 3.0 B examples: 4e 9f 00 20 bclr 20, 31 4e 9f 00 21
     bclrl 20, 31 *)
 let bclr cpu ops =
-  let bo = unsigned imm ops.(0) in
+  let bo = unsigned imm_32 ops.(0) in
   let bi = unsigned cpu.reg ops.(1) in
   let sh = unsigned const byte 2 in
   let ctr_ok = unsigned var bit in
@@ -111,7 +111,7 @@ let bclr cpu ops =
     ]
 
 let bclrl cpu ops =
-  let bo = unsigned imm ops.(0) in
+  let bo = unsigned imm_32 ops.(0) in
   let bi = unsigned cpu.reg ops.(1) in
   let sh = unsigned const byte 2 in
   let ctr_ok = unsigned var bit in
@@ -162,7 +162,7 @@ let bdnzlr cpu _ops =
     Power ISATM Version 3.0 B examples: 4d 5f 04 20 bcctr 10,31 4d 5f 04 21
     bcctrl 10,31 *)
 let bcctr cpu ops =
-  let bo = unsigned imm ops.(0) in
+  let bo = unsigned imm_32 ops.(0) in
   let bi = unsigned cpu.reg ops.(1) in
   let cond_ok = unsigned var bit in
   let x = unsigned var (bitwidth 5) in
@@ -189,7 +189,7 @@ let bctrl = update_link_register ^ bctr
     IBM Power ISATM Version 3.0 B examples: 4e 9f 04 60 bctar 4e 9f 04 61 bctarl
 *)
 let bctar cpu ops =
-  let bo = unsigned imm ops.(0) in
+  let bo = unsigned imm_32 ops.(0) in
   let bi = unsigned cpu.reg ops.(1) in
   let sh = unsigned const byte 2 in
   let cond_ok = unsigned var bit in

plugins/powerpc/powerpc_dsl.ml

@@ -24,10 +24,12 @@ let int_of_imm = function
       | Some x -> x
       | None -> ppc_fail "failed to convert imm operand to int")
 
-let imm signed op =
-  let w = Word.of_int ~width:32 (int_of_imm op) in
+let imm' width signed op =
+  let w = Word.of_int ~width (int_of_imm op) in
   if signed then Exp.(signed @@ of_word w) else Exp.(unsigned @@ of_word w)
 
+let imm = imm' 16
+let imm_32 = imm' 32
 let signed f = f true
 let unsigned f = f false
 let apply_signess signed e = if signed then Exp.signed e else Exp.unsigned e

plugins/powerpc/powerpc_dsl.mli

@@ -14,6 +14,7 @@ val quadword : bitwidth
 val bitwidth : int -> bitwidth
 val int_of_bitwidth : bitwidth -> int
 val imm : (op -> exp) ec
+val imm_32 : (op -> exp) ec
 val var : (bitwidth -> exp) ec
 val reg : (reg -> exp) -> (op -> exp) ec
 val const : (bitwidth -> int -> exp) ec

plugins/powerpc/powerpc_logical.ml

@@ -10,15 +10,15 @@ open Powerpc.Std
 let andi cpu ops =
   let ra = unsigned cpu.reg ops.(0) in
   let rs = unsigned cpu.reg ops.(1) in
-  let im = unsigned imm ops.(2) in
+  let im = unsigned imm_32 ops.(2) in
   RTL.[ ra := rs land im ]
 
 (** Fixed-point AND Immediate Shifted Pages 92-98 of IBM Power ISATM Version 3.0
     B examples: 75 2a 08 00 andis. r10,r9,2048 *)
 let andis cpu ops =
   let ra = unsigned cpu.reg ops.(0) in
   let rs = unsigned cpu.reg ops.(1) in
-  let im = unsigned imm ops.(2) in
+  let im = unsigned imm_32 ops.(2) in
   let sh = unsigned const byte 16 in
   RTL.[ ra := rs land (im << sh) ]
 
@@ -43,7 +43,7 @@ let andc cpu ops =
 let ori cpu ops =
   let ra = unsigned cpu.reg ops.(0) in
   let rs = unsigned cpu.reg ops.(1) in
-  let im = unsigned imm ops.(2) in
+  let im = unsigned imm_32 ops.(2) in
   RTL.[ ra := rs lor im ]
 
 (** 60 00 00 00 nop (equivalen to ori 0,0,0 *)
@@ -54,7 +54,7 @@ let nop cpu ops = []
 let oris cpu ops =
   let ra = unsigned cpu.reg ops.(0) in
   let rs = unsigned cpu.reg ops.(1) in
-  let im = unsigned imm ops.(2) in
+  let im = unsigned imm_32 ops.(2) in
   let sh = unsigned const byte 16 in
   RTL.[ ra := rs lor (im << sh) ]
 
@@ -79,15 +79,15 @@ let orc cpu ops =
 let xori cpu ops =
   let ra = unsigned cpu.reg ops.(0) in
   let rs = unsigned cpu.reg ops.(1) in
-  let im = unsigned imm ops.(2) in
+  let im = unsigned imm_32 ops.(2) in
   RTL.[ ra := rs lxor im ]
 
 (** Fixed-point XOR Immediate Shifted Pages 92-98 of IBM Power ISATM Version 3.0
     B examples: 6d 2a 04 00 xoris r10,r9,1024 *)
 let xoris cpu ops =
   let ra = unsigned cpu.reg ops.(0) in
   let rs = unsigned cpu.reg ops.(1) in
-  let im = unsigned imm ops.(2) in
+  let im = unsigned imm_32 ops.(2) in
   let sh = unsigned const byte 16 in
   RTL.[ ra := rs lxor (im << sh) ]