diff options
| author | Björn Gustavsson <[email protected]> | 2010-12-17 10:58:54 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-01-17 15:23:41 +0100 |
| commit | 9cea01fb88b0e18e387b08fa3e6273dbf1f76082 (patch) | |
| tree | c56b1b8b400bc1f92cca83d7bbca4b9685480959 /erts/emulator | |
| parent | 33aca759679ed65ad5addebbdc8f2ad8929125a2 (diff) | |
| download | otp-9cea01fb88b0e18e387b08fa3e6273dbf1f76082.tar.gz otp-9cea01fb88b0e18e387b08fa3e6273dbf1f76082.tar.bz2 otp-9cea01fb88b0e18e387b08fa3e6273dbf1f76082.zip | |
beam_load: Run the packing engine before loading list arguments
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/beam/beam_load.c | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c index 8c380536ae..bc6186751e 100644 --- a/erts/emulator/beam/beam_load.c +++ b/erts/emulator/beam/beam_load.c @@ -1952,34 +1952,6 @@ load_code(LoaderState* stp) } /* - * Load any list arguments using the primitive tags. - */ - - for ( ; arg < tmp_op->arity; arg++) { - switch (tmp_op->a[arg].type) { - case TAG_i: - CodeNeed(1); - code[ci++] = make_small(tmp_op->a[arg].val); - break; - case TAG_u: - case TAG_a: - case TAG_v: - CodeNeed(1); - code[ci++] = tmp_op->a[arg].val; - break; - case TAG_f: - CodeNeed(1); - code[ci] = stp->labels[tmp_op->a[arg].val].patches; - stp->labels[tmp_op->a[arg].val].patches = ci; - ci++; - break; - default: - LoadError1(stp, "unsupported primitive type '%c'", - tag_to_letter[tmp_op->a[arg].type]); - } - } - - /* * The packing engine. */ if (opc[stp->specific_op].pack[0]) { @@ -2022,6 +1994,34 @@ load_code(LoaderState* stp) } /* + * Load any list arguments using the primitive tags. + */ + + for ( ; arg < tmp_op->arity; arg++) { + switch (tmp_op->a[arg].type) { + case TAG_i: + CodeNeed(1); + code[ci++] = make_small(tmp_op->a[arg].val); + break; + case TAG_u: + case TAG_a: + case TAG_v: + CodeNeed(1); + code[ci++] = tmp_op->a[arg].val; + break; + case TAG_f: + CodeNeed(1); + code[ci] = stp->labels[tmp_op->a[arg].val].patches; + stp->labels[tmp_op->a[arg].val].patches = ci; + ci++; + break; + default: + LoadError1(stp, "unsupported primitive type '%c'", + tag_to_letter[tmp_op->a[arg].type]); + } + } + + /* * Handle a few special cases. */ switch (stp->specific_op) { |