diff options
| author | Alan Modra <amodra@gmail.com> | 2020-01-11 12:32:11 +1030 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2020-01-13 12:12:05 +1030 |
| commit | 202e762b322444344827acbf98162fcb2910e0dd (patch) | |
| tree | 16e2e65d75ba1e4fb0c66277c2955eb8fd2c322a /cpu | |
| parent | 7ef412cf72a197d68e532604cc1fa21351adc858 (diff) | |
| download | binutils-gdb-202e762b322444344827acbf98162fcb2910e0dd.tar.gz | |
ubsan: fr30: left shift of negative value
cpu/
* fr30.cpu (f-disp9, f-disp10, f-s10, f-rel9, f-rel12): Don't
left shift signed values.
opcodes/
* fr30-ibld.c: Regenerate.
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/ChangeLog | 5 | ||||
| -rw-r--r-- | cpu/fr30.cpu | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/cpu/ChangeLog b/cpu/ChangeLog index a5d0843c4cd..cd40af41132 100644 --- a/cpu/ChangeLog +++ b/cpu/ChangeLog @@ -1,3 +1,8 @@ +2020-01-13 Alan Modra <amodra@gmail.com> + + * fr30.cpu (f-disp9, f-disp10, f-s10, f-rel9, f-rel12): Don't + left shift signed values. + 2020-01-06 Alan Modra <amodra@gmail.com> * m32c.cpu (f-dsp-8-u16, f-dsp-8-s16): Rearrange to mask any sign diff --git a/cpu/fr30.cpu b/cpu/fr30.cpu index 84c32cf5d78..07bf1daf119 100644 --- a/cpu/fr30.cpu +++ b/cpu/fr30.cpu @@ -193,15 +193,15 @@ (df f-disp8 "8 bit signed offset" () 4 8 INT #f #f) (df f-disp9 "9 bit signed offset" () 4 8 INT ((value pc) (sra WI value (const 1))) - ((value pc) (sll WI value (const 1))) + ((value pc) (mul WI value (const 2))) ) (df f-disp10 "10 bit signed offset" () 4 8 INT ((value pc) (sra WI value (const 2))) - ((value pc) (sll WI value (const 2))) + ((value pc) (mul WI value (const 4))) ) (df f-s10 "10 bit signed offset" () 8 8 INT ((value pc) (sra WI value (const 2))) - ((value pc) (sll WI value (const 2))) + ((value pc) (mul WI value (const 4))) ) (df f-u10 "10 bit unsigned offset" () 8 8 UINT ((value pc) (srl UWI value (const 2))) @@ -209,7 +209,7 @@ ) (df f-rel9 "9 pc relative signed offset" (PCREL-ADDR) 8 8 INT ((value pc) (sra WI (sub WI value (add WI pc (const 2))) (const 1))) - ((value pc) (add WI (sll WI value (const 1)) (add WI pc (const 2)))) + ((value pc) (add WI (mul WI value (const 2)) (add WI pc (const 2)))) ) (dnf f-dir8 "8 bit direct address" () 8 8) (df f-dir9 "9 bit direct address" () 8 8 UINT @@ -222,7 +222,7 @@ ) (df f-rel12 "12 bit pc relative signed offset" (PCREL-ADDR) 5 11 INT ((value pc) (sra WI (sub WI value (add WI pc (const 2))) (const 1))) - ((value pc) (add WI (sll WI value (const 1)) (add WI pc (const 2)))) + ((value pc) (add WI (mul WI value (const 2)) (add WI pc (const 2)))) ) (dnf f-reglist_hi_st "8 bit register mask for stm" () 8 8) |