diff options
| author | frosch <frosch@openttd.org> | 2018-10-31 13:07:51 +0100 |
|---|---|---|
| committer | Niels Martin Hansen <nielsm@indvikleren.dk> | 2018-10-31 14:35:46 +0100 |
| commit | 18ca3e8660f90737d672b6780301ff4b998df56f (patch) | |
| tree | facb4aeaa2480f19938a253887b899c1c8332a2b /src/newgrf_spritegroup.cpp | |
| parent | b3dc90af58474e08971c9c70e0cd62bd1ed4dd88 (diff) | |
| download | openttd-18ca3e8660f90737d672b6780301ff4b998df56f.tar.xz | |
Fix: [NewGRF] Make VA2 operator 11 (ror) behave well-defined when rotating by 0 bits.
Diffstat (limited to 'src/newgrf_spritegroup.cpp')
| -rw-r--r-- | src/newgrf_spritegroup.cpp | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/newgrf_spritegroup.cpp b/src/newgrf_spritegroup.cpp index 59b845f10..1bcb4a035 100644 --- a/src/newgrf_spritegroup.cpp +++ b/src/newgrf_spritegroup.cpp @@ -144,22 +144,6 @@ static inline uint32 GetVariable(const ResolverObject &object, ScopeResolver *sc return &this->default_scope; } -/** - * Rotate val rot times to the right - * @param val the value to rotate - * @param rot the amount of times to rotate - * @return the rotated value - */ -static uint32 RotateRight(uint32 val, uint32 rot) -{ - /* Do not rotate more than necessary */ - rot %= 32; - assert(rot > 0); - - return (val >> rot) | (val << (32 - rot)); -} - - /* Evaluate an adjustment for a variable of the given size. * U is the unsigned type and S is the signed type to use. */ template <typename U, typename S> @@ -192,7 +176,7 @@ static U EvalAdjustT(const DeterministicSpriteGroupAdjust *adjust, ScopeResolver case DSGA_OP_STO: _temp_store.StoreValue((U)value, (S)last_value); return last_value; case DSGA_OP_RST: return value; case DSGA_OP_STOP: scope->StorePSA((U)value, (S)last_value); return last_value; - case DSGA_OP_ROR: return RotateRight(last_value, value); + case DSGA_OP_ROR: return ROR<uint32>((U)last_value, (U)value & 0x1F); // mask 'value' to 5 bits, which should behave the same on all architectures. case DSGA_OP_SCMP: return ((S)last_value == (S)value) ? 1 : ((S)last_value < (S)value ? 0 : 2); case DSGA_OP_UCMP: return ((U)last_value == (U)value) ? 1 : ((U)last_value < (U)value ? 0 : 2); case DSGA_OP_SHL: return (uint32)(U)last_value << ((U)value & 0x1F); // Same behaviour as in ParamSet, mask 'value' to 5 bits, which should behave the same on all architectures. |