diff options
Diffstat (limited to 'src/buildvm_x64win.h')
-rw-r--r-- | src/buildvm_x64win.h | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/src/buildvm_x64win.h b/src/buildvm_x64win.h index de65f400..97ab59d9 100644 --- a/src/buildvm_x64win.h +++ b/src/buildvm_x64win.h | |||
@@ -12,7 +12,7 @@ | |||
12 | #define DASM_SECTION_CODE_OP 0 | 12 | #define DASM_SECTION_CODE_OP 0 |
13 | #define DASM_SECTION_CODE_SUB 1 | 13 | #define DASM_SECTION_CODE_SUB 1 |
14 | #define DASM_MAXSECTION 2 | 14 | #define DASM_MAXSECTION 2 |
15 | static const unsigned char build_actionlist[13976] = { | 15 | static const unsigned char build_actionlist[13997] = { |
16 | 254,1,248,10,252,247,198,237,15,132,244,11,131,230,252,248,41,252,242,72, | 16 | 254,1,248,10,252,247,198,237,15,132,244,11,131,230,252,248,41,252,242,72, |
17 | 141,76,49,252,248,139,114,252,252,199,68,10,4,237,248,12,131,192,1,137,68, | 17 | 141,76,49,252,248,139,114,252,252,199,68,10,4,237,248,12,131,192,1,137,68, |
18 | 36,84,252,247,198,237,15,132,244,13,248,14,252,247,198,237,15,132,244,10, | 18 | 36,84,252,247,198,237,15,132,244,13,248,14,252,247,198,237,15,132,244,10, |
@@ -676,9 +676,10 @@ static const unsigned char build_actionlist[13976] = { | |||
676 | 233,102,68,15,127,129,233,102,68,15,127,137,233,102,68,15,127,145,233,102, | 676 | 233,102,68,15,127,129,233,102,68,15,127,137,233,102,68,15,127,145,233,102, |
677 | 68,15,127,153,233,102,68,15,127,161,233,102,68,15,127,169,233,102,68,15,127, | 677 | 68,15,127,153,233,102,68,15,127,161,233,102,68,15,127,169,233,102,68,15,127, |
678 | 177,233,102,68,15,127,185,233,252,255,224,255,141,180,253,134,233,139,6,15, | 678 | 177,233,102,68,15,127,185,233,252,255,224,255,141,180,253,134,233,139,6,15, |
679 | 182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,139,190,233, | 679 | 182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,137,252,245, |
680 | 139,108,36,96,141,12,202,59,141,233,15,135,244,23,15,182,142,233,57,200,15, | 680 | 209,252,237,129,229,239,102,131,172,253,43,233,1,15,132,244,142,255,139,190, |
681 | 134,244,249,248,2,255,15,183,70,252,254,252,233,245,255,248,3,199,68,194, | 681 | 233,139,108,36,96,141,12,202,59,141,233,15,135,244,23,15,182,142,233,57,200, |
682 | 15,134,244,249,248,2,255,15,183,70,252,254,252,233,245,255,248,3,199,68,194, | ||
682 | 252,252,237,131,192,1,57,200,15,134,244,3,252,233,244,2,255,141,44,197,237, | 683 | 252,252,237,131,192,1,57,200,15,134,244,3,252,233,244,2,255,141,44,197,237, |
683 | 141,4,194,139,122,252,248,137,104,252,252,137,120,252,248,139,108,36,96,141, | 684 | 141,4,194,139,122,252,248,137,104,252,252,137,120,252,248,139,108,36,96,141, |
684 | 12,200,59,141,233,15,135,244,22,137,209,137,194,15,182,174,233,133,252,237, | 685 | 12,200,59,141,233,15,135,244,22,137,209,137,194,15,182,174,233,133,252,237, |
@@ -2150,6 +2151,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) | |||
2150 | 2151 | ||
2151 | case BC_FUNCF: | 2152 | case BC_FUNCF: |
2152 | #if LJ_HASJIT | 2153 | #if LJ_HASJIT |
2154 | dasm_put(Dst, 13692, HOTCOUNT_PCMASK, GG_DISP2HOT); | ||
2153 | #endif | 2155 | #endif |
2154 | case BC_FUNCV: /* NYI: compiled vararg functions. */ | 2156 | case BC_FUNCV: /* NYI: compiled vararg functions. */ |
2155 | break; | 2157 | break; |
@@ -2159,13 +2161,13 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) | |||
2159 | break; | 2161 | break; |
2160 | #endif | 2162 | #endif |
2161 | case BC_IFUNCF: | 2163 | case BC_IFUNCF: |
2162 | dasm_put(Dst, 13692, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); | 2164 | dasm_put(Dst, 13713, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); |
2163 | if (op == BC_JFUNCF) { | 2165 | if (op == BC_JFUNCF) { |
2164 | dasm_put(Dst, 13722, BC_JLOOP); | 2166 | dasm_put(Dst, 13743, BC_JLOOP); |
2165 | } else { | 2167 | } else { |
2166 | dasm_put(Dst, 9539); | 2168 | dasm_put(Dst, 9539); |
2167 | } | 2169 | } |
2168 | dasm_put(Dst, 13731, LJ_TNIL); | 2170 | dasm_put(Dst, 13752, LJ_TNIL); |
2169 | break; | 2171 | break; |
2170 | 2172 | ||
2171 | case BC_JFUNCV: | 2173 | case BC_JFUNCV: |
@@ -2176,30 +2178,30 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) | |||
2176 | break; /* NYI: compiled vararg functions. */ | 2178 | break; /* NYI: compiled vararg functions. */ |
2177 | 2179 | ||
2178 | case BC_IFUNCV: | 2180 | case BC_IFUNCV: |
2179 | dasm_put(Dst, 13753, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); | 2181 | dasm_put(Dst, 13774, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); |
2180 | if (op == BC_JFUNCV) { | 2182 | if (op == BC_JFUNCV) { |
2181 | dasm_put(Dst, 13722, BC_JLOOP); | 2183 | dasm_put(Dst, 13743, BC_JLOOP); |
2182 | } else { | 2184 | } else { |
2183 | dasm_put(Dst, 13844, -4+PC2PROTO(k)); | 2185 | dasm_put(Dst, 13865, -4+PC2PROTO(k)); |
2184 | } | 2186 | } |
2185 | dasm_put(Dst, 13867, LJ_TNIL); | 2187 | dasm_put(Dst, 13888, LJ_TNIL); |
2186 | break; | 2188 | break; |
2187 | 2189 | ||
2188 | case BC_FUNCC: | 2190 | case BC_FUNCC: |
2189 | case BC_FUNCCW: | 2191 | case BC_FUNCCW: |
2190 | dasm_put(Dst, 13889, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); | 2192 | dasm_put(Dst, 13910, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); |
2191 | if (op == BC_FUNCC) { | 2193 | if (op == BC_FUNCC) { |
2192 | dasm_put(Dst, 13919); | 2194 | dasm_put(Dst, 13940); |
2193 | } else { | 2195 | } else { |
2194 | dasm_put(Dst, 13923); | 2196 | dasm_put(Dst, 13944); |
2195 | } | 2197 | } |
2196 | dasm_put(Dst, 13931, DISPATCH_GL(vmstate), ~LJ_VMST_C); | 2198 | dasm_put(Dst, 13952, DISPATCH_GL(vmstate), ~LJ_VMST_C); |
2197 | if (op == BC_FUNCC) { | 2199 | if (op == BC_FUNCC) { |
2198 | dasm_put(Dst, 13940); | 2200 | dasm_put(Dst, 13961); |
2199 | } else { | 2201 | } else { |
2200 | dasm_put(Dst, 13944, DISPATCH_GL(wrapf)); | 2202 | dasm_put(Dst, 13965, DISPATCH_GL(wrapf)); |
2201 | } | 2203 | } |
2202 | dasm_put(Dst, 13949, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); | 2204 | dasm_put(Dst, 13970, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); |
2203 | break; | 2205 | break; |
2204 | 2206 | ||
2205 | /* ---------------------------------------------------------------------- */ | 2207 | /* ---------------------------------------------------------------------- */ |
@@ -2227,7 +2229,7 @@ static int build_backend(BuildCtx *ctx) | |||
2227 | 2229 | ||
2228 | build_subroutines(ctx, cmov, sse); | 2230 | build_subroutines(ctx, cmov, sse); |
2229 | 2231 | ||
2230 | dasm_put(Dst, 13974); | 2232 | dasm_put(Dst, 13995); |
2231 | for (op = 0; op < BC__MAX; op++) | 2233 | for (op = 0; op < BC__MAX; op++) |
2232 | build_ins(ctx, (BCOp)op, op, cmov, sse); | 2234 | build_ins(ctx, (BCOp)op, op, cmov, sse); |
2233 | 2235 | ||