|
 |
2ece25 |
commit fb6f7abcbc92506d302fb18a2c5fc853d2929248
|
|
|
2ece25 |
Author: Carl Love <cel@us.ibm.com>
|
|
|
2ece25 |
Date: Tue Jun 9 10:42:03 2020 -0500
|
|
|
2ece25 |
|
|
|
2ece25 |
Power PC Fix extraction of the L field for sync instruction
|
|
|
2ece25 |
|
|
|
2ece25 |
The L field is currently a two bit[22:21] field in ISA 3.0. The size of the
|
|
|
2ece25 |
L field has changed over time.
|
|
|
2ece25 |
|
|
|
2ece25 |
Currently the ISA 3.0 Valgrind sync instruction support code sets the
|
|
|
2ece25 |
flag_L for the instruction L field to a five bit value that includes bits
|
|
|
2ece25 |
that are marked reserved the sync instruction. This patch fixes the issue for ISA 3.0
|
|
|
2ece25 |
to only setting flag_L the specified two bits.
|
|
|
2ece25 |
|
|
|
2ece25 |
Valgrind bugzilla: https://bugs.kde.org/show_bug.cgi?id=422677
|
|
|
2ece25 |
|
|
|
2ece25 |
diff --git a/VEX/priv/guest_ppc_toIR.c b/VEX/priv/guest_ppc_toIR.c
|
|
|
2ece25 |
index 582c59ec0..c4965a19e 100644
|
|
|
2ece25 |
--- a/VEX/priv/guest_ppc_toIR.c
|
|
|
2ece25 |
+++ b/VEX/priv/guest_ppc_toIR.c
|
|
|
2ece25 |
@@ -8777,7 +8777,7 @@ static Bool dis_memsync ( UInt theInstr )
|
|
|
2ece25 |
/* X-Form, XL-Form */
|
|
|
2ece25 |
UChar opc1 = ifieldOPC(theInstr);
|
|
|
2ece25 |
UInt b11to25 = IFIELD(theInstr, 11, 15);
|
|
|
2ece25 |
- UChar flag_L = ifieldRegDS(theInstr);
|
|
|
2ece25 |
+ UChar flag_L = IFIELD(theInstr, 21, 2); //ISA 3.0
|
|
|
2ece25 |
UInt b11to20 = IFIELD(theInstr, 11, 10);
|
|
|
2ece25 |
UInt M0 = IFIELD(theInstr, 11, 5);
|
|
|
2ece25 |
UChar rD_addr = ifieldRegDS(theInstr);
|