diff options
| author | Björn Gustavsson <[email protected]> | 2010-12-14 07:23:19 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-01-17 15:23:40 +0100 |
| commit | 56da36ef79a1c7ffb39836e1838084ed53dda6f0 (patch) | |
| tree | 33371d2db9f501bc9ce80ba695ac642337646356 /erts/emulator/beam | |
| parent | 4d6e7ac0aa307271e0b265dd41dea4eb0fc1dee7 (diff) | |
| download | otp-56da36ef79a1c7ffb39836e1838084ed53dda6f0.tar.gz otp-56da36ef79a1c7ffb39836e1838084ed53dda6f0.tar.bz2 otp-56da36ef79a1c7ffb39836e1838084ed53dda6f0.zip | |
Support packing of the 'I' type in a 64-bit emulator
In many (not all) cases, the value for the 'I' type will
fit into 32 bits.
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/beam_debug.c | 6 | ||||
| -rw-r--r-- | erts/emulator/beam/beam_emu.c | 1 | ||||
| -rw-r--r-- | erts/emulator/beam/beam_load.c | 5 |
3 files changed, 12 insertions, 0 deletions
diff --git a/erts/emulator/beam/beam_debug.c b/erts/emulator/beam/beam_debug.c index 9f8d338fbd..4fa9d60bca 100644 --- a/erts/emulator/beam/beam_debug.c +++ b/erts/emulator/beam/beam_debug.c @@ -378,6 +378,12 @@ print_op(int to, void *to_arg, int op, int size, BeamInstr* addr) *ap++ = packed & BEAM_LOOSE_MASK; packed >>= BEAM_LOOSE_SHIFT; break; +#ifdef ARCH_64 + case 'w': /* Shift 32 steps */ + *ap++ = packed & BEAM_WIDE_MASK; + packed >>= BEAM_WIDE_SHIFT; + break; +#endif case 'p': *sp++ = *--ap; break; diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c index 266b897672..bce51a001f 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -345,6 +345,7 @@ extern int count_instructions; #define yb(N) (*(Eterm *) (((unsigned char *)E) + (N))) #define fb(N) (*(double *) (((unsigned char *)&(freg[0].fd)) + (N))) #define Qb(N) (N) +#define Ib(N) (N) #define x(N) reg[N] #define y(N) E[N] #define r(N) x##N diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c index 65cd6f91bb..8c380536ae 100644 --- a/erts/emulator/beam/beam_load.c +++ b/erts/emulator/beam/beam_load.c @@ -2002,6 +2002,11 @@ load_code(LoaderState* stp) case '6': /* Shift 16 steps */ packed = (packed << BEAM_LOOSE_SHIFT) | code[--ci]; break; +#ifdef ARCH_64 + case 'w': /* Shift 32 steps */ + packed = (packed << BEAM_WIDE_SHIFT) | code[--ci]; + break; +#endif case 'p': /* Put instruction (from stack). */ code[ci++] = *--sp; break; |