diff options
| author | Mike Pall <mike> | 2013-08-22 19:29:42 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2013-08-22 19:29:42 +0200 |
| commit | b33e96f3522e96e816cc46470b19d121bf88cfc8 (patch) | |
| tree | cd4cdbd01869b9ea396a84c77294769f0da5d917 | |
| parent | 5451089b5b6a8dd926d800113694c87dd01fb25f (diff) | |
| parent | a6936be814adee5d4d61e729d91b2c3dd8e16e6e (diff) | |
| download | luajit-b33e96f3522e96e816cc46470b19d121bf88cfc8.tar.gz luajit-b33e96f3522e96e816cc46470b19d121bf88cfc8.tar.bz2 luajit-b33e96f3522e96e816cc46470b19d121bf88cfc8.zip | |
Merge branch 'master' into v2.1
| -rw-r--r-- | src/host/buildvm_asm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/host/buildvm_asm.c b/src/host/buildvm_asm.c index f18d1493..6117c7ed 100644 --- a/src/host/buildvm_asm.c +++ b/src/host/buildvm_asm.c | |||
| @@ -100,7 +100,7 @@ static void emit_asm_wordreloc(BuildCtx *ctx, uint8_t *p, int n, | |||
| 100 | fprintf(ctx->fp, "\tblx %s\n", sym); | 100 | fprintf(ctx->fp, "\tblx %s\n", sym); |
| 101 | } else if ((ins & 0x0e000000u) == 0x0a000000u) { | 101 | } else if ((ins & 0x0e000000u) == 0x0a000000u) { |
| 102 | fprintf(ctx->fp, "\t%s%.2s %s\n", (ins & 0x01000000u) ? "bl" : "b", | 102 | fprintf(ctx->fp, "\t%s%.2s %s\n", (ins & 0x01000000u) ? "bl" : "b", |
| 103 | "eqnecsccmiplvsvchilsgeltgtle" + 2*(ins >> 28), sym); | 103 | &"eqnecsccmiplvsvchilsgeltgtle"[2*(ins >> 28)], sym); |
| 104 | } else { | 104 | } else { |
| 105 | fprintf(stderr, | 105 | fprintf(stderr, |
| 106 | "Error: unsupported opcode %08x for %s symbol relocation.\n", | 106 | "Error: unsupported opcode %08x for %s symbol relocation.\n", |