diff options
| author | Mike Pall <mike> | 2010-08-08 18:03:20 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2010-08-08 18:03:20 +0200 |
| commit | 0d6f6f3fa002373e160e70d00417dacba108296d (patch) | |
| tree | bddb4be9061f35a86785c667f721171b3746b9e1 /dynasm | |
| parent | be19218a6cb2f8b8682d655e51a3069c20db5bfb (diff) | |
| download | luajit-0d6f6f3fa002373e160e70d00417dacba108296d.tar.gz luajit-0d6f6f3fa002373e160e70d00417dacba108296d.tar.bz2 luajit-0d6f6f3fa002373e160e70d00417dacba108296d.zip | |
Clean up some more DynASM target dependencies.
Diffstat (limited to 'dynasm')
| -rw-r--r-- | dynasm/dasm_proto.h | 5 | ||||
| -rw-r--r-- | dynasm/dasm_x86.h | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/dynasm/dasm_proto.h b/dynasm/dasm_proto.h index 3e77f70b..114f0fb8 100644 --- a/dynasm/dasm_proto.h +++ b/dynasm/dasm_proto.h | |||
| @@ -29,9 +29,6 @@ | |||
| 29 | /* Internal DynASM encoder state. */ | 29 | /* Internal DynASM encoder state. */ |
| 30 | typedef struct dasm_State dasm_State; | 30 | typedef struct dasm_State dasm_State; |
| 31 | 31 | ||
| 32 | /* Action list type. */ | ||
| 33 | typedef const unsigned char *dasm_ActList; | ||
| 34 | |||
| 35 | 32 | ||
| 36 | /* Initialize and free DynASM state. */ | 33 | /* Initialize and free DynASM state. */ |
| 37 | DASM_FDEF void dasm_init(Dst_DECL, int maxsection); | 34 | 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); | |||
| 44 | DASM_FDEF void dasm_growpc(Dst_DECL, unsigned int maxpc); | 41 | DASM_FDEF void dasm_growpc(Dst_DECL, unsigned int maxpc); |
| 45 | 42 | ||
| 46 | /* Setup encoder. */ | 43 | /* Setup encoder. */ |
| 47 | DASM_FDEF void dasm_setup(Dst_DECL, dasm_ActList actionlist); | 44 | DASM_FDEF void dasm_setup(Dst_DECL, const void *actionlist); |
| 48 | 45 | ||
| 49 | /* Feed encoder with actions. Calls are generated by pre-processor. */ | 46 | /* Feed encoder with actions. Calls are generated by pre-processor. */ |
| 50 | DASM_FDEF void dasm_put(Dst_DECL, int start, ...); | 47 | DASM_FDEF void dasm_put(Dst_DECL, int start, ...); |
diff --git a/dynasm/dasm_x86.h b/dynasm/dasm_x86.h index a1f08896..517ee4f6 100644 --- a/dynasm/dasm_x86.h +++ b/dynasm/dasm_x86.h | |||
| @@ -47,6 +47,9 @@ enum { | |||
| 47 | #define DASM_POS2SEC(pos) ((pos)>>24) | 47 | #define DASM_POS2SEC(pos) ((pos)>>24) |
| 48 | #define DASM_POS2PTR(D, pos) (D->sections[DASM_POS2SEC(pos)].rbuf + (pos)) | 48 | #define DASM_POS2PTR(D, pos) (D->sections[DASM_POS2SEC(pos)].rbuf + (pos)) |
| 49 | 49 | ||
| 50 | /* Action list type. */ | ||
| 51 | typedef const unsigned char *dasm_ActList; | ||
| 52 | |||
| 50 | /* Per-section structure. */ | 53 | /* Per-section structure. */ |
| 51 | typedef struct dasm_Section { | 54 | typedef struct dasm_Section { |
| 52 | int *rbuf; /* Biased buffer pointer (negative section bias). */ | 55 | int *rbuf; /* Biased buffer pointer (negative section bias). */ |
| @@ -132,11 +135,11 @@ void dasm_growpc(Dst_DECL, unsigned int maxpc) | |||
| 132 | } | 135 | } |
| 133 | 136 | ||
| 134 | /* Setup encoder. */ | 137 | /* Setup encoder. */ |
| 135 | void dasm_setup(Dst_DECL, dasm_ActList actionlist) | 138 | void dasm_setup(Dst_DECL, const void *actionlist) |
| 136 | { | 139 | { |
| 137 | dasm_State *D = Dst_REF; | 140 | dasm_State *D = Dst_REF; |
| 138 | int i; | 141 | int i; |
| 139 | D->actionlist = actionlist; | 142 | D->actionlist = (dasm_ActList)actionlist; |
| 140 | D->status = DASM_S_OK; | 143 | D->status = DASM_S_OK; |
| 141 | D->section = &D->sections[0]; | 144 | D->section = &D->sections[0]; |
| 142 | memset((void *)D->lglabels, 0, D->lgsize); | 145 | memset((void *)D->lglabels, 0, D->lgsize); |
