diff options
| author | Nickolas Lloyd | 2017-02-01 21:07:03 -0500 |
|---|---|---|
| committer | Nickolas Lloyd | 2017-02-01 21:10:32 -0500 |
| commit | 5d8f2548ceaa5a0b33c08a39f1d6c11071ec63aa (patch) | |
| tree | cb634d796ce62dbba8c3e9295749d8e6f9e9c345 /src/bytecode.c | |
| parent | 3dcb25deaefb52c9d314c4eddb93a3a815a58ec0 (diff) | |
| download | emacs-5d8f2548ceaa5a0b33c08a39f1d6c11071ec63aa.tar.gz emacs-5d8f2548ceaa5a0b33c08a39f1d6c11071ec63aa.zip | |
; Fix errors introduced during merge.
Diffstat (limited to 'src/bytecode.c')
| -rw-r--r-- | src/bytecode.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/src/bytecode.c b/src/bytecode.c index 02a3f700fdd..88df30c9721 100644 --- a/src/bytecode.c +++ b/src/bytecode.c | |||
| @@ -58,28 +58,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 58 | #endif /* BYTE_CODE_METER */ | 58 | #endif /* BYTE_CODE_METER */ |
| 59 | 59 | ||
| 60 | 60 | ||
| 61 | /* Relocate program counters in the stacks on byte_stack_list. Called | ||
| 62 | when GC has completed. */ | ||
| 63 | |||
| 64 | void | ||
| 65 | relocate_byte_stack (struct byte_stack *stack) | ||
| 66 | { | ||
| 67 | for (; stack; stack = stack->next) | ||
| 68 | { | ||
| 69 | #ifdef HAVE_LIBJIT | ||
| 70 | if (!stack->byte_string_start) | ||
| 71 | continue; | ||
| 72 | #endif | ||
| 73 | if (stack->byte_string_start != SDATA (stack->byte_string)) | ||
| 74 | { | ||
| 75 | ptrdiff_t offset = stack->pc - stack->byte_string_start; | ||
| 76 | stack->byte_string_start = SDATA (stack->byte_string); | ||
| 77 | stack->pc = stack->byte_string_start + offset; | ||
| 78 | } | ||
| 79 | } | ||
| 80 | } | ||
| 81 | |||
| 82 | |||
| 83 | /* Fetch the next byte from the bytecode stream. */ | 61 | /* Fetch the next byte from the bytecode stream. */ |
| 84 | 62 | ||
| 85 | #define FETCH (*pc++) | 63 | #define FETCH (*pc++) |