~ubuntu-branches/ubuntu/trusty/luajit/trusty

« back to all changes in this revision

Viewing changes to debian/patches/beta9_hotfix1.patch

Committer: Package Import Robot
Author(s): Enrico Tassi
Date: 2012-11-03 14:07:56 UTC
mfrom: (1.2.1) (15.1.1 experimental)
Revision ID: package-import@ubuntu.com-20121103140756-z0zcnyrwqlvuc2m5

Tags: 2.0.0+dfsg-1

New upstream release

files added:
.pc/.quilt_patches

.pc/.quilt_series

.pc/multi-arch-path.patch

.pc/multi-arch-path.patch/src

.pc/multi-arch-path.patch/src/luaconf.h

debian/patches/multi-arch-path.patch

dynasm/dasm_mips.h

dynasm/dasm_mips.lua

src/host

src/host/README

src/host/buildvm.c

src/host/buildvm.h

src/host/buildvm_asm.c

src/host/buildvm_fold.c

src/host/buildvm_lib.c

src/host/buildvm_peobj.c

src/host/genminilua.lua

src/host/minilua.c

src/jit

src/jit/bc.lua

src/jit/bcsave.lua

src/jit/dis_arm.lua

src/jit/dis_mips.lua

src/jit/dis_mipsel.lua

src/jit/dis_ppc.lua

src/jit/dis_x64.lua

src/jit/dis_x86.lua

src/jit/dump.lua

src/jit/v.lua

src/lj_asm_mips.h

src/lj_emit_mips.h

src/lj_load.c

src/lj_opt_sink.c

src/lj_strscan.c

src/lj_strscan.h

src/lj_target_mips.h

src/vm_arm.dasc

src/vm_mips.dasc

src/vm_ppc.dasc

src/vm_ppcspe.dasc

src/vm_x86.dasc

files removed:
.pc/beta9_hotfix1.patch

.pc/beta9_hotfix1.patch/src

.pc/beta9_hotfix1.patch/src/lj_bcwrite.c

.pc/beta9_hotfix1.patch/src/lj_lex.c

.pc/multi-arch-paths.patch

.pc/multi-arch-paths.patch/Makefile

.pc/multi-arch-paths.patch/src

.pc/multi-arch-paths.patch/src/Makefile

.pc/multi-arch-paths.patch/src/luaconf.h

debian/patches/beta9_hotfix1.patch

debian/patches/multi-arch-paths.patch

etc/strict.lua

lib/bc.lua

lib/bcsave.lua

lib/dis_arm.lua

lib/dis_ppc.lua

lib/dis_x64.lua

lib/dis_x86.lua

lib/dump.lua

lib/v.lua

src/buildvm.c

src/buildvm.h

src/buildvm_arm.dasc

src/buildvm_arm.h

src/buildvm_asm.c

src/buildvm_fold.c

src/buildvm_lib.c

src/buildvm_peobj.c

src/buildvm_ppc.dasc

src/buildvm_ppc.h

src/buildvm_ppcspe.dasc

src/buildvm_ppcspe.h

src/buildvm_x64.h

src/buildvm_x64win.h

src/buildvm_x86.dasc

src/buildvm_x86.h

files modified:
.pc/applied-patches

Makefile

README

debian/changelog

debian/control

debian/patches/series

debian/rules

dynasm/dasm_arm.h

dynasm/dasm_arm.lua

dynasm/dasm_ppc.h

dynasm/dasm_ppc.lua

dynasm/dasm_proto.h

dynasm/dasm_x64.lua

dynasm/dasm_x86.h

dynasm/dasm_x86.lua

dynasm/dynasm.lua

etc/luajit.1

etc/luajit.pc

src/Makefile

src/Makefile.dep

src/lauxlib.h

src/lib_aux.c

src/lib_base.c

src/lib_bit.c

src/lib_debug.c

src/lib_ffi.c

src/lib_io.c

src/lib_jit.c

src/lib_math.c

src/lib_os.c

src/lib_package.c

src/lib_string.c

src/lib_table.c

src/lj.supp

src/lj_alloc.c

src/lj_api.c

src/lj_arch.h

src/lj_asm.c

src/lj_asm.h

src/lj_asm_arm.h

src/lj_asm_ppc.h

src/lj_asm_x86.h

src/lj_bc.c

src/lj_bc.h

src/lj_bcdump.h

src/lj_bcread.c

src/lj_bcwrite.c

src/lj_carith.c

src/lj_carith.h

src/lj_ccall.c

src/lj_ccall.h

src/lj_ccallback.c

src/lj_ccallback.h

src/lj_cconv.c

src/lj_cconv.h

src/lj_cdata.c

src/lj_cdata.h

src/lj_char.h

src/lj_clib.c

src/lj_clib.h

src/lj_cparse.c

src/lj_cparse.h

src/lj_crecord.c

src/lj_crecord.h

src/lj_ctype.c

src/lj_ctype.h

src/lj_debug.c

src/lj_debug.h

src/lj_def.h

src/lj_dispatch.c

src/lj_dispatch.h

src/lj_emit_arm.h

src/lj_emit_ppc.h

src/lj_emit_x86.h

src/lj_err.c

src/lj_err.h

src/lj_errmsg.h

src/lj_ff.h

src/lj_ffrecord.c

src/lj_ffrecord.h

src/lj_frame.h

src/lj_func.c

src/lj_func.h

src/lj_gc.c

src/lj_gc.h

src/lj_gdbjit.c

src/lj_gdbjit.h

src/lj_ir.c

src/lj_ir.h

src/lj_ircall.h

src/lj_iropt.h

src/lj_jit.h

src/lj_lex.c

src/lj_lex.h

src/lj_lib.c

src/lj_lib.h

src/lj_mcode.c

src/lj_mcode.h

src/lj_meta.c

src/lj_meta.h

src/lj_obj.c

src/lj_obj.h

src/lj_opt_dce.c

src/lj_opt_fold.c

src/lj_opt_loop.c

src/lj_opt_mem.c

src/lj_opt_narrow.c

src/lj_opt_split.c

src/lj_parse.c

src/lj_parse.h

src/lj_record.c

src/lj_record.h

src/lj_snap.c

src/lj_snap.h

src/lj_state.c

src/lj_state.h

src/lj_str.c

src/lj_str.h

src/lj_tab.c

src/lj_tab.h

src/lj_target.h

src/lj_target_arm.h

src/lj_target_ppc.h

src/lj_target_x86.h

src/lj_trace.c

src/lj_trace.h

src/lj_traceerr.h

src/lj_udata.c

src/lj_udata.h

src/lj_vm.h

src/lj_vmevent.c

src/lj_vmevent.h

src/lj_vmmath.c

src/ljamalg.c

src/lua.h

src/luaconf.h

src/luajit.c

src/luajit.h

src/lualib.h

src/msvcbuild.bat

Show diffs side-by-side

added added

removed removed

debian/patches/beta9_hotfix1.patch

Fix parsing of hex literals with exponents.

Fix bytecode dump for certain number constants.

Index: luajit-2.0.0~beta9+dfsg/src/lj_lex.c

===================================================================

--- luajit-2.0.0~beta9+dfsg.orig/src/lj_lex.c 2011-12-14 15:15:00.000000000 +0100

+++ luajit-2.0.0~beta9+dfsg/src/lj_lex.c 2012-02-04 13:29:50.000000000 +0100

@@ -137,14 +137,17 @@

/* Parse a number literal. */

static void lex_number(LexState *ls, TValue *tv)

{

- int c;

+ int c, xp = 'E';

lua_assert(lj_char_isdigit(ls->current));

- do {

+ if ((c = ls->current) == '0') {

+ save_and_next(ls);

+ if ((ls->current & ~0x20) == 'X') xp = 'P';

+ }

+ while (lj_char_isident(ls->current) || ls->current == '.' ||

+ ((ls->current == '-' || ls->current == '+') && (c & ~0x20) == xp)) {

c = ls->current;

save_and_next(ls);

- } while (lj_char_isident(ls->current) || ls->current == '.' ||

- ((ls->current == '-' || ls->current == '+') &&

- ((c & ~0x20) == 'E' || (c & ~0x20) == 'P')));

+ }

#if LJ_HASFFI

c &= ~0x20;

if ((c == 'I' || c == 'L' || c == 'U') && !ctype_ctsG(G(ls->L)))

Index: luajit-2.0.0~beta9+dfsg/src/lj_bcwrite.c

===================================================================

--- luajit-2.0.0~beta9+dfsg.orig/src/lj_bcwrite.c 2011-12-14 15:15:00.000000000 +0100

+++ luajit-2.0.0~beta9+dfsg/src/lj_bcwrite.c 2012-02-04 13:29:50.000000000 +0100

@@ -219,13 +219,19 @@

k = lj_num2int(num);

if (num == (lua_Number)k) { /* -0 is never a constant. */

save_int:

- bcwrite_uleb128(ctx, 2*(uint32_t)k);

- if (k < 0) ctx->sb.buf[ctx->sb.n-1] |= 0x10;

+ bcwrite_uleb128(ctx, 2*(uint32_t)k | ((uint32_t)k & 0x80000000u));

+ if (k < 0) {

+ char *p = &ctx->sb.buf[ctx->sb.n-1];

+ *p = (*p & 7) | ((k>>27) & 0x18);

+ }

continue;

}

- bcwrite_uleb128(ctx, 1+2*o->u32.lo);

- if (o->u32.lo >= 0x80000000u) ctx->sb.buf[ctx->sb.n-1] |= 0x10;

+ bcwrite_uleb128(ctx, 1+(2*o->u32.lo | (o->u32.lo & 0x80000000u)));

+ if (o->u32.lo >= 0x80000000u) {

+ char *p = &ctx->sb.buf[ctx->sb.n-1];

+ *p = (*p & 7) | ((o->u32.lo>>27) & 0x18);

+ }

bcwrite_uleb128(ctx, o->u32.hi);

}

Older »