gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 15:14:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up some more DynASM target dependencies.

Browse Source
This commit is contained in:
Mike Pall 2010-08-08 18:03:20 +02:00
parent be19218a6c
commit 0d6f6f3fa0
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dynasm/dasm_proto.h
View File

@ -29,9 +29,6 @@
/* Internal DynASM encoder state. */ /* Internal DynASM encoder state. */
typedef struct dasm_State dasm_State; typedef struct dasm_State dasm_State;
/* Action list type. */
typedef const unsigned char *dasm_ActList;
/* Initialize and free DynASM state. */ /* Initialize and free DynASM state. */
DASM_FDEF void dasm_init(Dst_DECL, int maxsection); DASM_FDEF void dasm_init(Dst_DECL, int maxsection);
@ -44,7 +41,7 @@ DASM_FDEF void dasm_setupglobal(Dst_DECL, void **gl, unsigned int maxgl);
DASM_FDEF void dasm_growpc(Dst_DECL, unsigned int maxpc); DASM_FDEF void dasm_growpc(Dst_DECL, unsigned int maxpc);
/* Setup encoder. */ /* Setup encoder. */
DASM_FDEF void dasm_setup(Dst_DECL, dasm_ActList actionlist); DASM_FDEF void dasm_setup(Dst_DECL, const void *actionlist);
/* Feed encoder with actions. Calls are generated by pre-processor. */ /* Feed encoder with actions. Calls are generated by pre-processor. */
DASM_FDEF void dasm_put(Dst_DECL, int start, ...); DASM_FDEF void dasm_put(Dst_DECL, int start, ...);

7
dynasm/dasm_x86.h
View File

@ -47,6 +47,9 @@ enum {
#define DASM_POS2SEC(pos) ((pos)>>24) #define DASM_POS2SEC(pos) ((pos)>>24)
#define DASM_POS2PTR(D, pos) (D->sections[DASM_POS2SEC(pos)].rbuf + (pos)) #define DASM_POS2PTR(D, pos) (D->sections[DASM_POS2SEC(pos)].rbuf + (pos))
/* Action list type. */
typedef const unsigned char *dasm_ActList;
/* Per-section structure. */ /* Per-section structure. */
typedef struct dasm_Section { typedef struct dasm_Section {
int *rbuf; /* Biased buffer pointer (negative section bias). */ int *rbuf; /* Biased buffer pointer (negative section bias). */
@ -132,11 +135,11 @@ void dasm_growpc(Dst_DECL, unsigned int maxpc)
} }
/* Setup encoder. */ /* Setup encoder. */
void dasm_setup(Dst_DECL, dasm_ActList actionlist) void dasm_setup(Dst_DECL, const void *actionlist)
{ {
dasm_State *D = Dst_REF; dasm_State *D = Dst_REF;
int i; int i;
D->actionlist = actionlist; D->actionlist = (dasm_ActList)actionlist;
D->status = DASM_S_OK; D->status = DASM_S_OK;
D->section = &D->sections[0]; D->section = &D->sections[0];
memset((void *)D->lglabels, 0, D->lgsize); memset((void *)D->lglabels, 0, D->lgsize);

6
src/buildvm.c
View File

@ -189,7 +189,7 @@ static int build_code(BuildCtx *ctx)
ctx->npc = build_backend(ctx); ctx->npc = build_backend(ctx);
/* Finalize the code. */ /* Finalize the code. */
(void)dasm_checkstep(Dst, DASM_SECTION_CODE); (void)dasm_checkstep(Dst, -1);
if ((status = dasm_link(Dst, &ctx->codesz))) return status; if ((status = dasm_link(Dst, &ctx->codesz))) return status;
ctx->code = (uint8_t *)malloc(ctx->codesz); ctx->code = (uint8_t *)malloc(ctx->codesz);
if ((status = dasm_encode(Dst, (void *)ctx->code))) return status; if ((status = dasm_encode(Dst, (void *)ctx->code))) return status;
@ -431,9 +431,7 @@ int main(int argc, char **argv)
} }
switch (ctx->mode) { switch (ctx->mode) {
#if LJ_TARGET_X86ORX64
case BUILD_peobj: case BUILD_peobj:
#endif
case BUILD_raw: case BUILD_raw:
binmode = 1; binmode = 1;
break; break;
@ -461,11 +459,9 @@ int main(int argc, char **argv)
emit_asm(ctx); emit_asm(ctx);
emit_asm_debug(ctx); emit_asm_debug(ctx);
break; break;
#if LJ_TARGET_X86ORX64
case BUILD_peobj: case BUILD_peobj:
emit_peobj(ctx); emit_peobj(ctx);
break; break;
#endif
case BUILD_raw: case BUILD_raw:
emit_raw(ctx); emit_raw(ctx);
break; break;