diff options
| author | Patrik Nyblom <[email protected]> | 2010-08-30 14:43:00 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2010-08-30 14:43:00 +0200 |
| commit | 2b2b92774d47c8b51cc25bb8bc1d7b4e356936d7 (patch) | |
| tree | 0c063cafef84bb187b9b860d9d972f2312c1824b /erts/emulator/beam/beam_load.c | |
| parent | ec15e459e53ed4f9a74336513357702b1be446ec (diff) | |
| parent | d36f3b0ab48aced7668974530549004b4f16075f (diff) | |
| download | otp-2b2b92774d47c8b51cc25bb8bc1d7b4e356936d7.tar.gz otp-2b2b92774d47c8b51cc25bb8bc1d7b4e356936d7.tar.bz2 otp-2b2b92774d47c8b51cc25bb8bc1d7b4e356936d7.zip | |
Merge branch 'pan/ets_binary_overhead/OTP-8762' into dev
* pan/ets_binary_overhead/OTP-8762:
Remove binary overhead counter from ets objects
Diffstat (limited to 'erts/emulator/beam/beam_load.c')
| -rw-r--r-- | erts/emulator/beam/beam_load.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c index 30f276b95a..74777e4c26 100644 --- a/erts/emulator/beam/beam_load.c +++ b/erts/emulator/beam/beam_load.c @@ -1566,7 +1566,8 @@ load_code(LoaderState* stp) case 0: /* Floating point number */ { Eterm* hp; -#if !defined(ARCH_64) || HALFWORD_HEAP /* XXX:PaN - Should use ARCH_64 variant instead */ +/* XXX:PaN - Halfword should use ARCH_64 variant instead */ +#if !defined(ARCH_64) || HALFWORD_HEAP Uint high, low; # endif last_op->a[arg].val = new_literal(stp, &hp, @@ -1933,7 +1934,7 @@ load_code(LoaderState* stp) } code[ci++] = (BeamInstr) stp->import[i].bf; break; - case 'P': /* Byte offset into tuple */ /* XXX:PaN - * sizeof(Eterm or Eterm *) ? */ + case 'P': /* Byte offset into tuple */ VerifyTag(stp, tag, TAG_u); tmp = tmp_op->a[arg].val; code[ci++] = (BeamInstr) ((tmp_op->a[arg].val+1) * sizeof(Eterm)); |