aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Pall <mike>2010-02-14 20:48:33 +0100
committerMike Pall <mike>2010-02-14 20:48:33 +0100
commit2a2f8ed6a144fe763379f9cf0eb6a45750432a47 (patch)
tree5b2b97d2f3dd22c80a0840132df5b3d7fc136484
parent8e38231f9ea0bd1185c0b9688e71cef52f96bb31 (diff)
downloadluajit-2a2f8ed6a144fe763379f9cf0eb6a45750432a47.tar.gz
luajit-2a2f8ed6a144fe763379f9cf0eb6a45750432a47.tar.bz2
luajit-2a2f8ed6a144fe763379f9cf0eb6a45750432a47.zip
Implement return hooks for Lua functions (zero-cost if disabled).
Diffstat
-rw-r--r--doc/changes.html2
-rw-r--r--doc/status.html4
-rw-r--r--src/buildvm_x64.h1099
-rw-r--r--src/buildvm_x64win.h761
-rw-r--r--src/buildvm_x86.dasc8
-rw-r--r--src/buildvm_x86.h1025
-rw-r--r--src/lj_dispatch.c38
-rw-r--r--src/lj_dispatch.h3
-rw-r--r--src/lj_vm.h3
9 files changed, 1493 insertions, 1450 deletions
diff --git a/doc/changes.html b/doc/changes.html
index 2a6dad43..c650139e 100644
--- a/doc/changes.html
+++ b/doc/changes.html
@@ -56,7 +56,7 @@ to see whether newer versions are available.
56<h2 id="snap">Development Snapshot</h2> 56<h2 id="snap">Development Snapshot</h2>
57<ul> 57<ul>
58<li>Build of preliminary x64 interpreter works on Linux/x64 or WIN64.</li> 58<li>Build of preliminary x64 interpreter works on Linux/x64 or WIN64.</li>
59<li>Implement call hooks (zero-cost if disabled).</li> 59<li>Implement call/return hooks (zero-cost if disabled).</li>
60<li>Major redesign of internal function call handling.</li> 60<li>Major redesign of internal function call handling.</li>
61<li>Implement yield from C hooks.</li> 61<li>Implement yield from C hooks.</li>
62<li>Add abstract C call handling to IR.</li> 62<li>Add abstract C call handling to IR.</li>
diff --git a/doc/status.html b/doc/status.html
index b3d2ecfa..c5564d58 100644
--- a/doc/status.html
+++ b/doc/status.html
@@ -90,8 +90,8 @@ known incompatibilities with standard Lua:
90<ul> 90<ul>
91<li> 91<li>
92The Lua <b>debug API</b> is missing a couple of features (return 92The Lua <b>debug API</b> is missing a couple of features (return
93hooks) and shows slightly different behavior (no per-coroutine hooks, 93hooks for non-Lua functions) and shows slightly different behavior
94no tail call counting). 94(no per-coroutine hooks, no tail call counting).
95</li> 95</li>
96<li> 96<li>
97<b>Bytecode</b> currently cannot be loaded or dumped. Note that 97<b>Bytecode</b> currently cannot be loaded or dumped. Note that
diff --git a/src/buildvm_x64.h b/src/buildvm_x64.h
index ac2ee63e..c738eaa4 100644
--- a/src/buildvm_x64.h
+++ b/src/buildvm_x64.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
15static const unsigned char build_actionlist[13665] = { 15static const unsigned char build_actionlist[13682] = {
16 254,1,248,10,252,247,195,237,15,132,244,11,131,227,252,248,41,218,72,141, 16 254,1,248,10,252,247,195,237,15,132,244,11,131,227,252,248,41,218,72,141,
17 76,25,252,248,139,90,252,252,199,68,10,4,237,248,12,131,192,1,137,68,36,4, 17 76,25,252,248,139,90,252,252,199,68,10,4,237,248,12,131,192,1,137,68,36,4,
18 252,247,195,237,15,132,244,13,248,14,252,247,195,237,15,132,244,10,65,199, 18 252,247,195,237,15,132,244,13,248,14,252,247,195,237,15,132,244,10,65,199,
@@ -354,254 +354,255 @@ static const unsigned char build_actionlist[13665] = {
354 1,19,139,149,233,139,133,233,41,208,193,232,3,131,192,1,72,139,108,36,24, 354 1,19,139,149,233,139,133,233,41,208,193,232,3,131,192,1,72,139,108,36,24,
355 85,195,248,136,255,65,15,182,134,233,168,235,15,133,244,251,168,235,15,133, 355 85,195,248,136,255,65,15,182,134,233,168,235,15,133,244,251,168,235,15,133,
356 244,247,168,235,15,132,244,247,65,252,255,142,233,252,233,244,247,255,248, 356 244,247,168,235,15,132,244,247,65,252,255,142,233,252,233,244,247,255,248,
357 137,65,15,182,134,233,168,235,15,133,244,251,168,235,15,132,244,251,65,252, 357 137,65,15,182,134,233,168,235,15,133,244,251,252,233,244,247,248,138,65,15,
358 255,142,233,15,132,244,247,168,235,15,132,244,251,248,1,139,108,36,16,137, 358 182,134,233,168,235,15,133,244,251,168,235,15,132,244,251,65,252,255,142,
359 149,233,137,222,137,252,239,232,251,1,20,248,3,139,149,233,248,4,15,182,75, 359 233,15,132,244,247,168,235,15,132,244,251,248,1,255,139,108,36,16,137,149,
360 252,253,248,5,255,15,182,107,252,252,15,183,67,252,254,65,252,255,164,253, 360 233,137,222,137,252,239,232,251,1,20,248,3,139,149,233,248,4,15,182,75,252,
361 252,238,233,248,138,131,195,4,139,77,232,137,76,36,4,252,233,244,4,248,139, 361 253,248,5,15,182,107,252,252,15,183,67,252,254,65,252,255,164,253,252,238,
362 255,204,255,248,140,255,73,199,134,233,0,0,0,0,252,233,244,247,255,248,141, 362 233,248,139,131,195,4,139,77,232,137,76,36,4,252,233,244,4,248,140,255,204,
363 255,73,137,174,233,248,1,255,141,68,194,252,248,139,108,36,16,137,149,233, 363 255,248,141,255,73,199,134,233,0,0,0,0,252,233,244,247,255,248,142,255,73,
364 137,133,233,137,222,137,252,239,137,92,36,20,232,251,1,21,199,68,36,20,0, 364 137,174,233,248,1,255,141,68,194,252,248,139,108,36,16,137,149,233,137,133,
365 0,0,0,139,149,233,72,137,193,139,133,233,41,208,72,137,205,15,182,75,252, 365 233,137,222,137,252,239,137,92,36,20,232,251,1,21,199,68,36,20,0,0,0,0,139,
366 253,193,232,3,131,192,1,252,255,229,248,142,255,248,143,255,68,139,122,252, 366 149,233,72,137,193,139,133,233,41,208,72,137,205,15,182,75,252,253,193,232,
367 248,69,139,191,233,69,139,191,233,65,199,134,233,0,0,0,0,65,199,134,233,237, 367 3,131,192,1,252,255,229,248,143,255,248,144,255,68,139,122,252,248,69,139,
368 139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255, 368 191,233,69,139,191,233,65,199,134,233,0,0,0,0,65,199,134,233,237,139,3,15,
369 248,82,255,217,124,36,4,137,68,36,8,102,184,0,4,102,11,68,36,4,102,37,252, 369 182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,248,82,
370 255,252,247,102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,139,68, 370 255,217,124,36,4,137,68,36,8,102,184,0,4,102,11,68,36,4,102,37,252,255,252,
371 36,8,195,255,248,144,72,184,237,237,102,72,15,110,208,72,184,237,237,102, 371 247,102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,139,68,36,8,195,
372 72,15,110,216,15,40,200,102,15,84,202,102,15,46,217,15,134,244,247,102,15, 372 255,248,145,72,184,237,237,102,72,15,110,208,72,184,237,237,102,72,15,110,
373 85,208,252,242,15,88,203,252,242,15,92,203,102,15,86,202,72,184,237,237,102, 373 216,15,40,200,102,15,84,202,102,15,46,217,15,134,244,247,102,15,85,208,252,
374 72,15,110,208,252,242,15,194,193,1,102,15,84,194,252,242,15,92,200,15,40, 374 242,15,88,203,252,242,15,92,203,102,15,86,202,72,184,237,237,102,72,15,110,
375 193,248,1,195,248,84,255,217,124,36,4,137,68,36,8,102,184,0,8,102,11,68,36, 375 208,252,242,15,194,193,1,102,15,84,194,252,242,15,92,200,15,40,193,248,1,
376 4,102,37,252,255,252,251,102,137,68,36,6,217,108,36,6,217,252,252,217,108, 376 195,248,84,255,217,124,36,4,137,68,36,8,102,184,0,8,102,11,68,36,4,102,37,
377 36,4,139,68,36,8,195,255,248,145,72,184,237,237,102,72,15,110,208,72,184, 377 252,255,252,251,102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,139,
378 237,237,102,72,15,110,216,15,40,200,102,15,84,202,102,15,46,217,15,134,244,
379 247,102,15,85,208,252,242,15,88,203,252,242,15,92,203,102,15,86,202,72,184,
380 237,237,102,72,15,110,208,252,242,15,194,193,6,102,15,84,194,252,242,15,92,
381 200,15,40,193,248,1,195,248,104,255,217,124,36,4,137,68,36,8,102,184,0,12,
382 102,11,68,36,4,102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,139,
383 68,36,8,195,255,248,146,72,184,237,237,102,72,15,110,208,72,184,237,237,102, 378 68,36,8,195,255,248,146,72,184,237,237,102,72,15,110,208,72,184,237,237,102,
384 72,15,110,216,15,40,200,102,15,84,202,102,15,46,217,15,134,244,247,102,15, 379 72,15,110,216,15,40,200,102,15,84,202,102,15,46,217,15,134,244,247,102,15,
385 85,208,15,40,193,252,242,15,88,203,252,242,15,92,203,72,184,237,237,102,72, 380 85,208,252,242,15,88,203,252,242,15,92,203,102,15,86,202,72,184,237,237,102,
386 15,110,216,252,242,15,194,193,1,102,15,84,195,252,242,15,92,200,102,15,86, 381 72,15,110,208,252,242,15,194,193,6,102,15,84,194,252,242,15,92,200,15,40,
387 202,15,40,193,248,1,195,248,147,255,15,40,232,252,242,15,94,193,72,184,237, 382 193,248,1,195,248,104,255,217,124,36,4,137,68,36,8,102,184,0,12,102,11,68,
388 237,102,72,15,110,208,72,184,237,237,102,72,15,110,216,15,40,224,102,15,84, 383 36,4,102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,139,68,36,8,195,
389 226,102,15,46,220,15,134,244,247,102,15,85,208,252,242,15,88,227,252,242, 384 255,248,147,72,184,237,237,102,72,15,110,208,72,184,237,237,102,72,15,110,
390 15,92,227,102,15,86,226,72,184,237,237,102,72,15,110,208,252,242,15,194,196, 385 216,15,40,200,102,15,84,202,102,15,46,217,15,134,244,247,102,15,85,208,15,
391 1,102,15,84,194,252,242,15,92,224,15,40,197,252,242,15,89,204,252,242,15, 386 40,193,252,242,15,88,203,252,242,15,92,203,72,184,237,237,102,72,15,110,216,
392 92,193,195,248,1,252,242,15,89,200,15,40,197,252,242,15,92,193,195,255,217, 387 252,242,15,194,193,1,102,15,84,195,252,242,15,92,200,102,15,86,202,15,40,
393 193,216,252,241,217,124,36,4,102,184,0,4,102,11,68,36,4,102,37,252,255,252, 388 193,248,1,195,248,148,255,15,40,232,252,242,15,94,193,72,184,237,237,102,
394 247,102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,222,201,222,252, 389 72,15,110,208,72,184,237,237,102,72,15,110,216,15,40,224,102,15,84,226,102,
395 233,195,255,248,88,217,252,234,222,201,248,148,217,84,36,252,248,129,124, 390 15,46,220,15,134,244,247,102,15,85,208,252,242,15,88,227,252,242,15,92,227,
396 36,252,248,0,0,128,127,15,132,244,247,129,124,36,252,248,0,0,128,252,255, 391 102,15,86,226,72,184,237,237,102,72,15,110,208,252,242,15,194,196,1,102,15,
397 15,132,244,248,248,149,217,192,217,252,252,220,252,233,217,201,217,252,240, 392 84,194,252,242,15,92,224,15,40,197,252,242,15,89,204,252,242,15,92,193,195,
398 217,232,222,193,217,252,253,221,217,248,1,195,248,2,221,216,217,252,238,195, 393 248,1,252,242,15,89,200,15,40,197,252,242,15,92,193,195,255,217,193,216,252,
399 255,248,107,255,248,150,252,242,15,45,193,252,242,15,42,208,102,15,46,202, 394 241,217,124,36,4,102,184,0,4,102,11,68,36,4,102,37,252,255,252,247,102,137,
400 15,133,244,254,15,138,244,255,248,151,131,252,248,1,15,142,244,252,248,1, 395 68,36,6,217,108,36,6,217,252,252,217,108,36,4,222,201,222,252,233,195,255,
401 169,1,0,0,0,15,133,244,248,252,242,15,89,192,209,232,252,233,244,1,248,2, 396 248,88,217,252,234,222,201,248,149,217,84,36,252,248,129,124,36,252,248,0,
402 209,232,15,132,244,251,15,40,200,248,3,252,242,15,89,192,209,232,15,132,244, 397 0,128,127,15,132,244,247,129,124,36,252,248,0,0,128,252,255,15,132,244,248,
403 250,15,131,244,3,255,252,242,15,89,200,252,233,244,3,248,4,252,242,15,89, 398 248,150,217,192,217,252,252,220,252,233,217,201,217,252,240,217,232,222,193,
404 193,248,5,195,248,6,15,132,244,5,15,130,244,253,80,72,184,237,237,102,72, 399 217,252,253,221,217,248,1,195,248,2,221,216,217,252,238,195,255,248,107,255,
405 15,110,200,252,242,15,94,200,88,15,40,193,252,247,216,131,252,248,1,15,132, 400 248,151,252,242,15,45,193,252,242,15,42,208,102,15,46,202,15,133,244,254,
406 244,5,252,233,244,1,248,7,72,184,237,237,102,72,15,110,192,195,248,8,102, 401 15,138,244,255,248,152,131,252,248,1,15,142,244,252,248,1,169,1,0,0,0,15,
407 72,15,126,200,72,209,224,72,193,192,12,72,61,252,254,15,0,0,15,132,244,248, 402 133,244,248,252,242,15,89,192,209,232,252,233,244,1,248,2,209,232,15,132,
408 255,102,72,15,126,192,72,209,224,15,132,244,250,72,193,192,12,72,61,252,254, 403 244,251,15,40,200,248,3,252,242,15,89,192,209,232,15,132,244,250,15,131,244,
409 15,0,0,15,132,244,251,252,242,15,17,76,36,252,240,252,242,15,17,68,36,252, 404 3,255,252,242,15,89,200,252,233,244,3,248,4,252,242,15,89,193,248,5,195,248,
410 248,221,68,36,252,240,221,68,36,252,248,217,252,241,217,192,217,252,252,220, 405 6,15,132,244,5,15,130,244,253,80,72,184,237,237,102,72,15,110,200,252,242,
411 252,233,217,201,217,252,240,217,232,222,193,217,252,253,221,217,221,92,36, 406 15,94,200,88,15,40,193,252,247,216,131,252,248,1,15,132,244,5,252,233,244,
412 252,248,252,242,15,16,68,36,252,248,195,248,9,72,184,237,237,102,72,15,110, 407 1,248,7,72,184,237,237,102,72,15,110,192,195,248,8,102,72,15,126,200,72,209,
413 208,102,15,46,194,15,132,244,247,15,40,193,248,1,195,248,2,72,184,237,237, 408 224,72,193,192,12,72,61,252,254,15,0,0,15,132,244,248,255,102,72,15,126,192,
414 102,72,15,110,208,102,15,84,194,72,184,237,237,102,72,15,110,208,102,15,46, 409 72,209,224,15,132,244,250,72,193,192,12,72,61,252,254,15,0,0,15,132,244,251,
415 194,15,132,244,1,102,15,80,193,15,87,192,136,196,15,146,208,48,224,15,133, 410 252,242,15,17,76,36,252,240,252,242,15,17,68,36,252,248,221,68,36,252,240,
416 244,1,248,3,72,184,237,237,255,102,72,15,110,192,195,248,4,102,15,80,193, 411 221,68,36,252,248,217,252,241,217,192,217,252,252,220,252,233,217,201,217,
417 133,192,15,133,244,3,15,87,192,195,248,5,102,15,80,193,133,192,15,132,244, 412 252,240,217,232,222,193,217,252,253,221,217,221,92,36,252,248,252,242,15,
418 3,15,87,192,195,248,152,255,131,252,255,1,15,130,244,82,15,132,244,84,131, 413 16,68,36,252,248,195,248,9,72,184,237,237,102,72,15,110,208,102,15,46,194,
419 252,255,3,15,130,244,104,15,135,244,248,252,242,15,81,192,195,248,2,252,242, 414 15,132,244,247,15,40,193,248,1,195,248,2,72,184,237,237,102,72,15,110,208,
420 15,17,68,36,252,248,221,68,36,252,248,131,252,255,5,15,135,244,248,15,132, 415 102,15,84,194,72,184,237,237,102,72,15,110,208,102,15,46,194,15,132,244,1,
421 244,247,232,244,88,252,233,244,253,248,1,232,244,148,255,252,233,244,253, 416 102,15,80,193,15,87,192,136,196,15,146,208,48,224,15,133,244,1,248,3,72,184,
422 248,2,131,252,255,7,15,132,244,247,15,135,244,248,217,252,237,217,201,217, 417 237,237,255,102,72,15,110,192,195,248,4,102,15,80,193,133,192,15,133,244,
423 252,241,252,233,244,253,248,1,217,232,217,201,217,252,241,252,233,244,253, 418 3,15,87,192,195,248,5,102,15,80,193,133,192,15,132,244,3,15,87,192,195,248,
424 248,2,131,252,255,9,15,132,244,247,15,135,244,248,217,252,236,217,201,217, 419 153,255,131,252,255,1,15,130,244,82,15,132,244,84,131,252,255,3,15,130,244,
425 252,241,252,233,244,253,248,1,255,217,252,254,252,233,244,253,248,2,131,252, 420 104,15,135,244,248,252,242,15,81,192,195,248,2,252,242,15,17,68,36,252,248,
426 255,11,15,132,244,247,15,135,244,255,217,252,255,252,233,244,253,248,1,217, 421 221,68,36,252,248,131,252,255,5,15,135,244,248,15,132,244,247,232,244,88,
427 252,242,221,216,248,7,221,92,36,252,248,252,242,15,16,68,36,252,248,195,255, 422 252,233,244,253,248,1,232,244,149,255,252,233,244,253,248,2,131,252,255,7,
428 139,124,36,12,221,68,36,4,131,252,255,1,15,130,244,82,15,132,244,84,131,252, 423 15,132,244,247,15,135,244,248,217,252,237,217,201,217,252,241,252,233,244,
429 255,3,15,130,244,104,15,135,244,248,217,252,250,195,248,2,131,252,255,5,15, 424 253,248,1,217,232,217,201,217,252,241,252,233,244,253,248,2,131,252,255,9,
430 130,244,88,15,132,244,148,131,252,255,7,15,132,244,247,15,135,244,248,217, 425 15,132,244,247,15,135,244,248,217,252,236,217,201,217,252,241,252,233,244,
431 252,237,217,201,217,252,241,195,248,1,217,232,217,201,217,252,241,195,248, 426 253,248,1,255,217,252,254,252,233,244,253,248,2,131,252,255,11,15,132,244,
432 2,131,252,255,9,15,132,244,247,255,15,135,244,248,217,252,236,217,201,217, 427 247,15,135,244,255,217,252,255,252,233,244,253,248,1,217,252,242,221,216,
433 252,241,195,248,1,217,252,254,195,248,2,131,252,255,11,15,132,244,247,15, 428 248,7,221,92,36,252,248,252,242,15,16,68,36,252,248,195,255,139,124,36,12,
434 135,244,255,217,252,255,195,248,1,217,252,242,221,216,195,255,248,9,204,248, 429 221,68,36,4,131,252,255,1,15,130,244,82,15,132,244,84,131,252,255,3,15,130,
435 153,255,131,252,255,1,15,132,244,247,15,135,244,248,252,242,15,88,193,195, 430 244,104,15,135,244,248,217,252,250,195,248,2,131,252,255,5,15,130,244,88,
436 248,1,252,242,15,92,193,195,248,2,131,252,255,3,15,132,244,247,15,135,244, 431 15,132,244,149,131,252,255,7,15,132,244,247,15,135,244,248,217,252,237,217,
437 248,252,242,15,89,193,195,248,1,252,242,15,94,193,195,248,2,131,252,255,5, 432 201,217,252,241,195,248,1,217,232,217,201,217,252,241,195,248,2,131,252,255,
438 15,130,244,147,15,132,244,107,131,252,255,7,15,132,244,247,15,135,244,248, 433 9,15,132,244,247,255,15,135,244,248,217,252,236,217,201,217,252,241,195,248,
439 72,184,237,237,255,102,72,15,110,200,15,87,193,195,248,1,72,184,237,237,102, 434 1,217,252,254,195,248,2,131,252,255,11,15,132,244,247,15,135,244,255,217,
440 72,15,110,200,15,84,193,195,248,2,131,252,255,9,15,135,244,248,252,242,15, 435 252,255,195,248,1,217,252,242,221,216,195,255,248,9,204,248,154,255,131,252,
441 17,68,36,252,248,252,242,15,17,76,36,252,240,221,68,36,252,248,221,68,36, 436 255,1,15,132,244,247,15,135,244,248,252,242,15,88,193,195,248,1,252,242,15,
442 252,240,15,132,244,247,217,252,243,248,7,221,92,36,252,248,252,242,15,16, 437 92,193,195,248,2,131,252,255,3,15,132,244,247,15,135,244,248,252,242,15,89,
443 68,36,252,248,195,248,1,217,201,217,252,253,221,217,252,233,244,7,248,2,131, 438 193,195,248,1,252,242,15,94,193,195,248,2,131,252,255,5,15,130,244,148,15,
444 252,255,11,15,132,244,247,15,135,244,255,252,242,15,93,193,195,248,1,252, 439 132,244,107,131,252,255,7,15,132,244,247,15,135,244,248,72,184,237,237,255,
445 242,15,95,193,195,248,9,204,255,139,68,36,20,221,68,36,4,221,68,36,12,131, 440 102,72,15,110,200,15,87,193,195,248,1,72,184,237,237,102,72,15,110,200,15,
446 252,248,1,15,132,244,247,15,135,244,248,222,193,195,248,1,222,252,233,195, 441 84,193,195,248,2,131,252,255,9,15,135,244,248,252,242,15,17,68,36,252,248,
447 248,2,131,252,248,3,15,132,244,247,15,135,244,248,222,201,195,248,1,222,252, 442 252,242,15,17,76,36,252,240,221,68,36,252,248,221,68,36,252,240,15,132,244,
448 249,195,248,2,131,252,248,5,15,130,244,147,15,132,244,107,131,252,248,7,15, 443 247,217,252,243,248,7,221,92,36,252,248,252,242,15,16,68,36,252,248,195,248,
449 132,244,247,15,135,244,248,255,221,216,217,224,195,248,1,221,216,217,225, 444 1,217,201,217,252,253,221,217,252,233,244,7,248,2,131,252,255,11,15,132,244,
450 195,248,2,131,252,248,9,15,132,244,247,15,135,244,248,217,252,243,195,248, 445 247,15,135,244,255,252,242,15,93,193,195,248,1,252,242,15,95,193,195,248,
451 1,217,201,217,252,253,221,217,195,248,2,131,252,248,11,15,132,244,247,15, 446 9,204,255,139,68,36,20,221,68,36,4,221,68,36,12,131,252,248,1,15,132,244,
452 135,244,255,255,219,252,233,219,209,221,217,195,248,1,219,252,233,218,209, 447 247,15,135,244,248,222,193,195,248,1,222,252,233,195,248,2,131,252,248,3,
453 221,217,195,255,221,225,223,224,252,246,196,1,15,132,244,248,217,201,248, 448 15,132,244,247,15,135,244,248,222,201,195,248,1,222,252,249,195,248,2,131,
454 2,221,216,195,248,1,221,225,223,224,252,246,196,1,15,133,244,248,217,201, 449 252,248,5,15,130,244,148,15,132,244,107,131,252,248,7,15,132,244,247,15,135,
455 248,2,221,216,195,255,248,154,137,252,248,83,15,162,137,6,137,94,4,137,78, 450 244,248,255,221,216,217,224,195,248,1,221,216,217,225,195,248,2,131,252,248,
456 8,137,86,12,91,195,255,249,255,129,124,253,202,4,239,15,135,244,41,129,124, 451 9,15,132,244,247,15,135,244,248,217,252,243,195,248,1,217,201,217,252,253,
457 253,194,4,239,15,135,244,41,255,252,242,15,16,4,194,131,195,4,102,15,46,4, 452 221,217,195,248,2,131,252,248,11,15,132,244,247,15,135,244,255,255,219,252,
458 202,255,221,4,202,221,4,194,131,195,4,255,223,252,233,221,216,255,218,252, 453 233,219,209,221,217,195,248,1,219,252,233,218,209,221,217,195,255,221,225,
459 233,223,224,158,255,15,134,244,248,255,15,131,244,248,255,248,1,15,183,67, 454 223,224,252,246,196,1,15,132,244,248,217,201,248,2,221,216,195,248,1,221,
460 252,254,141,156,253,131,233,248,2,139,3,15,182,204,15,182,232,131,195,4,193, 455 225,223,224,252,246,196,1,15,133,244,248,217,201,248,2,221,216,195,255,248,
461 232,16,65,252,255,36,252,238,255,139,108,194,4,131,195,4,129,252,253,239, 456 155,137,252,248,83,15,162,137,6,137,94,4,137,78,8,137,86,12,91,195,255,249,
462 15,135,244,251,129,124,253,202,4,239,15,135,244,251,255,252,242,15,16,4,194, 457 255,129,124,253,202,4,239,15,135,244,41,129,124,253,194,4,239,15,135,244,
463 102,15,46,4,202,255,221,4,202,221,4,194,255,15,138,244,248,15,133,244,248, 458 41,255,252,242,15,16,4,194,131,195,4,102,15,46,4,202,255,221,4,202,221,4,
464 255,15,138,244,248,15,132,244,247,255,248,1,15,183,67,252,254,141,156,253, 459 194,131,195,4,255,223,252,233,221,216,255,218,252,233,223,224,158,255,15,
465 131,233,248,2,255,248,2,15,183,67,252,254,141,156,253,131,233,248,1,255,248, 460 134,244,248,255,15,131,244,248,255,248,1,15,183,67,252,254,141,156,253,131,
466 5,57,108,202,4,15,133,244,2,129,252,253,239,15,131,244,1,139,12,202,139,4, 461 233,248,2,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,
467 194,57,193,15,132,244,1,129,252,253,239,15,135,244,2,139,169,233,133,252, 462 252,238,255,139,108,194,4,131,195,4,129,252,253,239,15,135,244,251,129,124,
468 237,15,132,244,2,252,246,133,233,235,15,133,244,2,255,49,252,237,255,189, 463 253,202,4,239,15,135,244,251,255,252,242,15,16,4,194,102,15,46,4,202,255,
469 1,0,0,0,255,252,233,244,45,255,72,252,247,208,131,195,4,129,124,253,202,4, 464 221,4,202,221,4,194,255,15,138,244,248,15,133,244,248,255,15,138,244,248,
470 239,15,133,244,248,139,12,202,65,59,12,135,255,131,195,4,129,124,253,202, 465 15,132,244,247,255,248,1,15,183,67,252,254,141,156,253,131,233,248,2,255,
471 4,239,15,135,244,248,255,252,242,65,15,16,4,199,102,15,46,4,202,255,221,4, 466 248,2,15,183,67,252,254,141,156,253,131,233,248,1,255,248,5,57,108,202,4,
472 202,65,221,4,199,255,72,252,247,208,131,195,4,57,68,202,4,255,139,108,194, 467 15,133,244,2,129,252,253,239,15,131,244,1,139,12,202,139,4,194,57,193,15,
473 4,131,195,4,129,252,253,239,255,15,131,244,247,255,15,130,244,247,255,137, 468 132,244,1,129,252,253,239,15,135,244,2,139,169,233,133,252,237,15,132,244,
474 108,202,4,139,44,194,137,44,202,255,15,183,67,252,254,141,156,253,131,233, 469 2,252,246,133,233,235,15,133,244,2,255,49,252,237,255,189,1,0,0,0,255,252,
475 248,1,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252, 470 233,244,45,255,72,252,247,208,131,195,4,129,124,253,202,4,239,15,133,244,
476 238,255,139,108,194,4,139,4,194,137,108,202,4,137,4,202,139,3,15,182,204, 471 248,139,12,202,65,59,12,135,255,131,195,4,129,124,253,202,4,239,15,135,244,
477 15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,49,252,237,129, 472 248,255,252,242,65,15,16,4,199,102,15,46,4,202,255,221,4,202,65,221,4,199,
478 124,253,194,4,239,129,213,239,137,108,202,4,139,3,15,182,204,15,182,232,131, 473 255,72,252,247,208,131,195,4,57,68,202,4,255,139,108,194,4,131,195,4,129,
479 195,4,193,232,16,65,252,255,36,252,238,255,129,124,253,194,4,239,15,135,244, 474 252,253,239,255,15,131,244,247,255,15,130,244,247,255,137,108,202,4,139,44,
480 48,255,252,242,15,16,4,194,72,184,237,237,102,72,15,110,200,15,87,193,252, 475 194,137,44,202,255,15,183,67,252,254,141,156,253,131,233,248,1,139,3,15,182,
481 242,15,17,4,202,255,221,4,194,217,224,221,28,202,255,129,124,253,194,4,239, 476 204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,139,108,194,
482 15,133,244,248,139,4,194,255,15,87,192,252,242,15,42,128,233,248,1,252,242, 477 4,139,4,194,137,108,202,4,137,4,202,139,3,15,182,204,15,182,232,131,195,4,
483 15,17,4,202,255,219,128,233,248,1,221,28,202,255,139,3,15,182,204,15,182, 478 193,232,16,65,252,255,36,252,238,255,49,252,237,129,124,253,194,4,239,129,
484 232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,129,124,253,194,4,239, 479 213,239,137,108,202,4,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,
485 15,133,244,50,139,60,194,137,213,232,251,1,18,255,252,242,15,42,192,137,252, 480 252,255,36,252,238,255,129,124,253,194,4,239,15,135,244,48,255,252,242,15,
486 234,255,15,182,75,252,253,252,233,244,1,255,15,182,252,236,15,182,192,255, 481 16,4,194,72,184,237,237,102,72,15,110,200,15,87,193,252,242,15,17,4,202,255,
487 129,124,253,252,234,4,239,15,135,244,46,255,252,242,15,16,4,252,234,252,242, 482 221,4,194,217,224,221,28,202,255,129,124,253,194,4,239,15,133,244,248,139,
488 65,15,88,4,199,255,221,4,252,234,65,220,4,199,255,129,124,253,252,234,4,239, 483 4,194,255,15,87,192,252,242,15,42,128,233,248,1,252,242,15,17,4,202,255,219,
489 15,135,244,47,255,252,242,65,15,16,4,199,252,242,15,88,4,252,234,255,65,221, 484 128,233,248,1,221,28,202,255,139,3,15,182,204,15,182,232,131,195,4,193,232,
490 4,199,220,4,252,234,255,129,124,253,252,234,4,239,15,135,244,49,129,124,253, 485 16,65,252,255,36,252,238,248,2,129,124,253,194,4,239,15,133,244,50,139,60,
491 194,4,239,15,135,244,49,255,252,242,15,16,4,252,234,252,242,15,88,4,194,255, 486 194,137,213,232,251,1,18,255,252,242,15,42,192,137,252,234,255,15,182,75,
492 221,4,252,234,220,4,194,255,252,242,15,16,4,252,234,252,242,65,15,92,4,199, 487 252,253,252,233,244,1,255,15,182,252,236,15,182,192,255,129,124,253,252,234,
493 255,221,4,252,234,65,220,36,199,255,252,242,65,15,16,4,199,252,242,15,92, 488 4,239,15,135,244,46,255,252,242,15,16,4,252,234,252,242,65,15,88,4,199,255,
494 4,252,234,255,65,221,4,199,220,36,252,234,255,252,242,15,16,4,252,234,252, 489 221,4,252,234,65,220,4,199,255,129,124,253,252,234,4,239,15,135,244,47,255,
495 242,15,92,4,194,255,221,4,252,234,220,36,194,255,252,242,15,16,4,252,234, 490 252,242,65,15,16,4,199,252,242,15,88,4,252,234,255,65,221,4,199,220,4,252,
496 252,242,65,15,89,4,199,255,221,4,252,234,65,220,12,199,255,252,242,65,15, 491 234,255,129,124,253,252,234,4,239,15,135,244,49,129,124,253,194,4,239,15,
497 16,4,199,252,242,15,89,4,252,234,255,65,221,4,199,220,12,252,234,255,252, 492 135,244,49,255,252,242,15,16,4,252,234,252,242,15,88,4,194,255,221,4,252,
498 242,15,16,4,252,234,252,242,15,89,4,194,255,221,4,252,234,220,12,194,255, 493 234,220,4,194,255,252,242,15,16,4,252,234,252,242,65,15,92,4,199,255,221,
499 252,242,15,16,4,252,234,252,242,65,15,94,4,199,255,221,4,252,234,65,220,52, 494 4,252,234,65,220,36,199,255,252,242,65,15,16,4,199,252,242,15,92,4,252,234,
500 199,255,252,242,65,15,16,4,199,252,242,15,94,4,252,234,255,65,221,4,199,220, 495 255,65,221,4,199,220,36,252,234,255,252,242,15,16,4,252,234,252,242,15,92,
501 52,252,234,255,252,242,15,16,4,252,234,252,242,15,94,4,194,255,221,4,252, 496 4,194,255,221,4,252,234,220,36,194,255,252,242,15,16,4,252,234,252,242,65,
502 234,220,52,194,255,252,242,15,16,4,252,234,252,242,65,15,16,12,199,255,221, 497 15,89,4,199,255,221,4,252,234,65,220,12,199,255,252,242,65,15,16,4,199,252,
503 4,252,234,65,221,4,199,255,252,242,65,15,16,4,199,252,242,15,16,12,252,234, 498 242,15,89,4,252,234,255,65,221,4,199,220,12,252,234,255,252,242,15,16,4,252,
504 255,65,221,4,199,221,4,252,234,255,252,242,15,16,4,252,234,252,242,15,16, 499 234,252,242,15,89,4,194,255,221,4,252,234,220,12,194,255,252,242,15,16,4,
505 12,194,255,221,4,252,234,221,4,194,255,248,155,232,244,147,255,252,233,244, 500 252,234,252,242,65,15,94,4,199,255,221,4,252,234,65,220,52,199,255,252,242,
506 155,255,232,244,107,255,15,182,252,236,15,182,192,139,124,36,16,137,151,233, 501 65,15,16,4,199,252,242,15,94,4,252,234,255,65,221,4,199,220,52,252,234,255,
507 141,52,194,137,194,41,252,234,248,33,137,252,253,137,92,36,20,232,251,1,22, 502 252,242,15,16,4,252,234,252,242,15,94,4,194,255,221,4,252,234,220,52,194,
508 139,149,233,133,192,15,133,244,42,15,182,107,252,255,15,182,75,252,253,139, 503 255,252,242,15,16,4,252,234,252,242,65,15,16,12,199,255,221,4,252,234,65,
509 68,252,234,4,139,44,252,234,137,68,202,4,137,44,202,139,3,15,182,204,15,182, 504 221,4,199,255,252,242,65,15,16,4,199,252,242,15,16,12,252,234,255,65,221,
510 232,131,195,4,193,232,16,65,252,255,36,252,238,255,72,252,247,208,65,139, 505 4,199,221,4,252,234,255,252,242,15,16,4,252,234,252,242,15,16,12,194,255,
511 4,135,199,68,202,4,237,137,4,202,139,3,15,182,204,15,182,232,131,195,4,193, 506 221,4,252,234,221,4,194,255,248,156,232,244,148,255,252,233,244,156,255,232,
512 232,16,65,252,255,36,252,238,255,15,191,192,252,242,15,42,192,252,242,15, 507 244,107,255,15,182,252,236,15,182,192,139,124,36,16,137,151,233,141,52,194,
513 17,4,202,255,223,67,252,254,221,28,202,255,252,242,65,15,16,4,199,252,242, 508 137,194,41,252,234,248,33,137,252,253,137,92,36,20,232,251,1,22,139,149,233,
514 15,17,4,202,255,65,221,4,199,221,28,202,255,72,252,247,208,137,68,202,4,139, 509 133,192,15,133,244,42,15,182,107,252,255,15,182,75,252,253,139,68,252,234,
510 4,139,44,252,234,137,68,202,4,137,44,202,139,3,15,182,204,15,182,232,131,
511 195,4,193,232,16,65,252,255,36,252,238,255,72,252,247,208,65,139,4,135,199,
512 68,202,4,237,137,4,202,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,
513 252,255,36,252,238,255,15,191,192,252,242,15,42,192,252,242,15,17,4,202,255,
514 223,67,252,254,221,28,202,255,252,242,65,15,16,4,199,252,242,15,17,4,202,
515 255,65,221,4,199,221,28,202,255,72,252,247,208,137,68,202,4,139,3,15,182,
516 204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,141,76,202,
517 12,141,68,194,4,189,237,137,105,252,248,248,1,137,41,131,193,8,57,193,15,
518 134,244,1,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,
519 252,238,255,139,106,252,248,139,172,253,133,233,139,173,233,139,69,4,139,
520 109,0,137,68,202,4,137,44,202,139,3,15,182,204,15,182,232,131,195,4,193,232,
521 16,65,252,255,36,252,238,255,139,106,252,248,139,172,253,141,233,128,189,
522 233,0,139,173,233,139,12,194,139,68,194,4,137,77,0,137,69,4,15,132,244,247,
523 252,246,133,233,235,15,133,244,248,248,1,139,3,15,182,204,15,182,232,131,
524 195,4,193,232,16,65,252,255,36,252,238,248,2,129,232,239,129,252,248,239,
525 15,134,244,1,252,246,129,233,235,15,132,244,1,137,252,238,137,213,65,141,
526 190,233,255,232,251,1,23,137,252,234,252,233,244,1,255,72,252,247,208,139,
527 106,252,248,139,172,253,141,233,65,139,12,135,139,133,233,137,8,199,64,4,
528 237,252,246,133,233,235,15,133,244,248,248,1,139,3,15,182,204,15,182,232,
529 131,195,4,193,232,16,65,252,255,36,252,238,248,2,252,246,129,233,235,15,132,
530 244,1,128,189,233,0,15,132,244,1,137,213,137,198,65,141,190,233,232,251,1,
531 23,137,252,234,252,233,244,1,255,139,106,252,248,255,252,242,65,15,16,4,199,
532 255,139,172,253,141,233,139,141,233,255,252,242,15,17,1,255,221,25,255,72,
533 252,247,208,139,106,252,248,139,172,253,141,233,139,141,233,137,65,4,139,
515 3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,141, 534 3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,141,
516 76,202,12,141,68,194,4,189,237,137,105,252,248,248,1,137,41,131,193,8,57, 535 156,253,131,233,139,108,36,16,131,189,233,0,15,132,244,247,137,149,233,141,
517 193,15,134,244,1,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252, 536 52,202,137,252,239,232,251,1,24,139,149,233,248,1,139,3,15,182,204,15,182,
518 255,36,252,238,255,139,106,252,248,139,172,253,133,233,139,173,233,139,69, 537 232,131,195,4,193,232,16,65,252,255,36,252,238,255,72,252,247,208,139,108,
519 4,139,109,0,137,68,202,4,137,44,202,139,3,15,182,204,15,182,232,131,195,4, 538 36,16,137,149,233,139,82,252,248,65,139,52,135,137,252,239,137,92,36,20,232,
520 193,232,16,65,252,255,36,252,238,255,139,106,252,248,139,172,253,141,233, 539 251,1,25,139,149,233,15,182,75,252,253,137,4,202,199,68,202,4,237,139,3,15,
521 128,189,233,0,139,173,233,139,12,194,139,68,194,4,137,77,0,137,69,4,15,132, 540 182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,139,124,
522 244,247,252,246,133,233,235,15,133,244,248,248,1,139,3,15,182,204,15,182, 541 36,16,137,151,233,248,1,137,194,37,252,255,7,0,0,193,252,234,11,61,252,255,
523 232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,129,232,239,129,252, 542 7,0,0,15,132,244,249,248,2,137,198,65,139,134,233,137,252,253,65,59,134,233,
524 248,239,15,134,244,1,252,246,129,233,235,15,132,244,1,137,252,238,137,213, 543 137,92,36,20,15,131,244,251,232,251,1,26,139,149,233,15,182,75,252,253,137,
525 65,141,190,233,255,232,251,1,23,137,252,234,252,233,244,1,255,72,252,247, 544 4,202,199,68,202,4,237,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,
526 208,139,106,252,248,139,172,253,141,233,65,139,12,135,139,133,233,137,8,199, 545 252,255,36,252,238,248,3,184,1,8,0,0,252,233,244,2,248,5,232,251,1,27,15,
527 64,4,237,252,246,133,233,235,15,133,244,248,248,1,139,3,15,182,204,15,182, 546 183,67,252,254,137,252,239,252,233,244,1,255,72,252,247,208,139,108,36,16,
528 232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,252,246,129,233,235, 547 65,139,142,233,137,92,36,20,65,59,142,233,137,149,233,15,131,244,249,248,
529 15,132,244,1,128,189,233,0,15,132,244,1,137,213,137,198,65,141,190,233,232, 548 2,65,139,52,135,137,252,239,232,251,1,28,139,149,233,15,182,75,252,253,137,
530 251,1,23,137,252,234,252,233,244,1,255,139,106,252,248,255,252,242,65,15, 549 4,202,199,68,202,4,237,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,
531 16,4,199,255,139,172,253,141,233,139,141,233,255,252,242,15,17,1,255,221, 550 252,255,36,252,238,248,3,137,252,239,232,251,1,27,15,183,67,252,254,72,252,
532 25,255,72,252,247,208,139,106,252,248,139,172,253,141,233,139,141,233,137, 551 247,208,252,233,244,2,255,72,252,247,208,139,106,252,248,139,173,233,65,139,
533 65,4,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238, 552 4,135,252,233,244,157,255,72,252,247,208,139,106,252,248,139,173,233,65,139,
534 255,141,156,253,131,233,139,108,36,16,131,189,233,0,15,132,244,247,137,149, 553 4,135,252,233,244,158,255,15,182,252,236,15,182,192,129,124,253,252,234,4,
535 233,141,52,202,137,252,239,232,251,1,24,139,149,233,248,1,139,3,15,182,204, 554 239,15,133,244,36,139,44,252,234,129,124,253,194,4,239,15,135,244,251,255,
536 15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,72,252,247,208, 555 252,242,15,16,4,194,252,242,15,45,192,252,242,15,42,200,102,15,46,193,255,
537 139,108,36,16,137,149,233,139,82,252,248,65,139,52,135,137,252,239,137,92, 556 15,133,244,36,59,133,233,15,131,244,36,193,224,3,3,133,233,129,120,253,4,
538 36,20,232,251,1,25,139,149,233,15,182,75,252,253,137,4,202,199,68,202,4,237, 557 239,15,132,244,248,248,1,139,40,139,64,4,137,44,202,137,68,202,4,139,3,15,
539 139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255, 558 182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,131,189,
540 139,124,36,16,137,151,233,248,1,137,194,37,252,255,7,0,0,193,252,234,11,61, 559 233,0,15,132,244,1,139,141,233,252,246,129,233,235,15,132,244,36,15,182,75,
541 252,255,7,0,0,15,132,244,249,248,2,137,198,65,139,134,233,137,252,253,65, 560 252,253,252,233,244,1,248,5,255,129,124,253,194,4,239,15,133,244,36,139,4,
542 59,134,233,137,92,36,20,15,131,244,251,232,251,1,26,139,149,233,15,182,75, 561 194,252,233,244,157,255,15,182,252,236,15,182,192,72,252,247,208,65,139,4,
543 252,253,137,4,202,199,68,202,4,237,139,3,15,182,204,15,182,232,131,195,4, 562 135,129,124,253,252,234,4,239,15,133,244,34,139,44,252,234,248,157,139,141,
544 193,232,16,65,252,255,36,252,238,248,3,184,1,8,0,0,252,233,244,2,248,5,232, 563 233,35,136,233,105,201,239,3,141,233,248,1,129,185,233,239,15,133,244,250,
545 251,1,27,15,183,67,252,254,137,252,239,252,233,244,1,255,72,252,247,208,139, 564 57,129,233,15,133,244,250,129,121,253,4,239,15,132,244,251,15,182,67,252,
546 108,36,16,65,139,142,233,137,92,36,20,65,59,142,233,137,149,233,15,131,244, 565 253,139,41,139,73,4,137,44,194,248,2,255,137,76,194,4,139,3,15,182,204,15,
547 249,248,2,65,139,52,135,137,252,239,232,251,1,28,139,149,233,15,182,75,252, 566 182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,15,182,67,252,253,
548 253,137,4,202,199,68,202,4,237,139,3,15,182,204,15,182,232,131,195,4,193, 567 185,237,252,233,244,2,248,4,139,137,233,133,201,15,133,244,1,248,5,139,141,
549 232,16,65,252,255,36,252,238,248,3,137,252,239,232,251,1,27,15,183,67,252, 568 233,133,201,15,132,244,3,252,246,129,233,235,15,133,244,3,252,233,244,34,
550 254,72,252,247,208,252,233,244,2,255,72,252,247,208,139,106,252,248,139,173, 569 255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,35,139,
551 233,65,139,4,135,252,233,244,156,255,72,252,247,208,139,106,252,248,139,173, 570 44,252,234,59,133,233,15,131,244,35,193,224,3,3,133,233,129,120,253,4,239,
552 233,65,139,4,135,252,233,244,157,255,15,182,252,236,15,182,192,129,124,253, 571 15,132,244,248,248,1,139,40,139,64,4,137,44,202,137,68,202,4,139,3,15,182,
553 252,234,4,239,15,133,244,36,139,44,252,234,129,124,253,194,4,239,15,135,244, 572 204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,131,189,233,
554 251,255,252,242,15,16,4,194,252,242,15,45,192,252,242,15,42,200,102,15,46, 573 0,15,132,244,1,139,141,233,252,246,129,233,235,15,132,244,35,255,15,182,252,
555 193,255,15,133,244,36,59,133,233,15,131,244,36,193,224,3,3,133,233,129,120, 574 236,15,182,192,129,124,253,252,234,4,239,15,133,244,39,139,44,252,234,129,
556 253,4,239,15,132,244,248,248,1,139,40,139,64,4,137,44,202,137,68,202,4,139, 575 124,253,194,4,239,15,135,244,251,255,15,133,244,39,59,133,233,15,131,244,
557 3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,2, 576 39,193,224,3,3,133,233,129,120,253,4,239,15,132,244,249,248,1,252,246,133,
558 131,189,233,0,15,132,244,1,139,141,233,252,246,129,233,235,15,132,244,36, 577 233,235,15,133,244,253,248,2,139,108,202,4,139,12,202,137,104,4,137,8,139,
559 15,182,75,252,253,252,233,244,1,248,5,255,129,124,253,194,4,239,15,133,244, 578 3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,
560 36,139,4,194,252,233,244,156,255,15,182,252,236,15,182,192,72,252,247,208, 579 131,189,233,0,15,132,244,1,139,141,233,255,252,246,129,233,235,15,132,244,
561 65,139,4,135,129,124,253,252,234,4,239,15,133,244,34,139,44,252,234,248,156, 580 39,15,182,75,252,253,252,233,244,1,248,5,129,124,253,194,4,239,15,133,244,
562 139,141,233,35,136,233,105,201,239,3,141,233,248,1,129,185,233,239,15,133, 581 39,139,4,194,252,233,244,158,248,7,128,165,233,235,65,139,142,233,65,137,
563 244,250,57,129,233,15,133,244,250,129,121,253,4,239,15,132,244,251,15,182, 582 174,233,137,141,233,15,182,75,252,253,252,233,244,2,255,15,182,252,236,15,
564 67,252,253,139,41,139,73,4,137,44,194,248,2,255,137,76,194,4,139,3,15,182, 583 182,192,72,252,247,208,65,139,4,135,129,124,253,252,234,4,239,15,133,244,
565 204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,15,182,67, 584 37,139,44,252,234,248,158,139,141,233,35,136,233,105,201,239,198,133,233,
566 252,253,185,237,252,233,244,2,248,4,139,137,233,133,201,15,133,244,1,248, 585 0,3,141,233,248,1,129,185,233,239,15,133,244,251,57,129,233,15,133,244,251,
567 5,139,141,233,133,201,15,132,244,3,252,246,129,233,235,15,133,244,3,252,233, 586 129,121,253,4,239,15,132,244,250,248,2,255,252,246,133,233,235,15,133,244,
568 244,34,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244, 587 253,248,3,15,182,67,252,253,139,108,194,4,139,4,194,137,105,4,137,1,139,3,
569 35,139,44,252,234,59,133,233,15,131,244,35,193,224,3,3,133,233,129,120,253, 588 15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,4,131,
570 4,239,15,132,244,248,248,1,139,40,139,64,4,137,44,202,137,68,202,4,139,3, 589 189,233,0,15,132,244,2,137,12,36,139,141,233,252,246,129,233,235,15,132,244,
571 15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,131, 590 37,139,12,36,252,233,244,2,248,5,139,137,233,133,201,15,133,244,1,255,139,
572 189,233,0,15,132,244,1,139,141,233,252,246,129,233,235,15,132,244,35,255, 591 141,233,133,201,15,132,244,252,252,246,129,233,235,15,132,244,37,248,6,137,
573 15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,39,139,44, 592 4,36,199,68,36,4,237,137,108,36,24,139,124,36,16,137,151,233,72,141,20,36,
574 252,234,129,124,253,194,4,239,15,135,244,251,255,15,133,244,39,59,133,233, 593 137,252,238,137,252,253,137,92,36,20,232,251,1,29,139,149,233,139,108,36,
575 15,131,244,39,193,224,3,3,133,233,129,120,253,4,239,15,132,244,249,248,1, 594 24,137,193,252,233,244,2,248,7,128,165,233,235,65,139,134,233,65,137,174,
576 252,246,133,233,235,15,133,244,253,248,2,139,108,202,4,139,12,202,137,104, 595 233,137,133,233,252,233,244,3,255,15,182,252,236,15,182,192,129,124,253,252,
577 4,137,8,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252, 596 234,4,239,15,133,244,38,139,44,252,234,59,133,233,15,131,244,38,193,224,3,
578 238,248,3,131,189,233,0,15,132,244,1,139,141,233,255,252,246,129,233,235, 597 3,133,233,129,120,253,4,239,15,132,244,249,248,1,252,246,133,233,235,15,133,
579 15,132,244,39,15,182,75,252,253,252,233,244,1,248,5,129,124,253,194,4,239, 598 244,253,248,2,139,108,202,4,139,12,202,137,104,4,137,8,139,3,15,182,204,15,
580 15,133,244,39,139,4,194,252,233,244,157,248,7,128,165,233,235,65,139,142, 599 182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,131,189,233,0,15,
581 233,65,137,174,233,137,141,233,15,182,75,252,253,252,233,244,2,255,15,182, 600 132,244,1,255,139,141,233,252,246,129,233,235,15,132,244,38,15,182,75,252,
582 252,236,15,182,192,72,252,247,208,65,139,4,135,129,124,253,252,234,4,239, 601 253,252,233,244,1,248,7,128,165,233,235,65,139,142,233,65,137,174,233,137,
583 15,133,244,37,139,44,252,234,248,157,139,141,233,35,136,233,105,201,239,198, 602 141,233,15,182,75,252,253,252,233,244,2,255,68,137,60,36,255,248,1,141,12,
584 133,233,0,3,141,233,248,1,129,185,233,239,15,133,244,251,57,129,233,15,133, 603 202,139,105,252,248,252,246,133,233,235,15,133,244,253,248,2,139,68,36,4,
585 244,251,129,121,253,4,239,15,132,244,250,248,2,255,252,246,133,233,235,15, 604 255,252,242,68,15,45,252,248,255,131,232,1,15,132,244,250,68,1,252,248,59,
586 133,244,253,248,3,15,182,67,252,253,139,108,194,4,139,4,194,137,105,4,137, 605 133,233,15,131,244,251,68,41,252,248,65,193,231,3,68,3,189,233,248,3,139,
587 1,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,
588 248,4,131,189,233,0,15,132,244,2,137,12,36,139,141,233,252,246,129,233,235,
589 15,132,244,37,139,12,36,252,233,244,2,248,5,139,137,233,133,201,15,133,244,
590 1,255,139,141,233,133,201,15,132,244,252,252,246,129,233,235,15,132,244,37,
591 248,6,137,4,36,199,68,36,4,237,137,108,36,24,139,124,36,16,137,151,233,72,
592 141,20,36,137,252,238,137,252,253,137,92,36,20,232,251,1,29,139,149,233,139,
593 108,36,24,137,193,252,233,244,2,248,7,128,165,233,235,65,139,134,233,65,137,
594 174,233,137,133,233,252,233,244,3,255,15,182,252,236,15,182,192,129,124,253,
595 252,234,4,239,15,133,244,38,139,44,252,234,59,133,233,15,131,244,38,193,224,
596 3,3,133,233,129,120,253,4,239,15,132,244,249,248,1,252,246,133,233,235,15,
597 133,244,253,248,2,139,108,202,4,139,12,202,137,104,4,137,8,139,3,15,182,204,
598 15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,131,189,233,0,
599 15,132,244,1,255,139,141,233,252,246,129,233,235,15,132,244,38,15,182,75,
600 252,253,252,233,244,1,248,7,128,165,233,235,65,139,142,233,65,137,174,233,
601 137,141,233,15,182,75,252,253,252,233,244,2,255,68,137,60,36,255,248,1,141,
602 12,202,139,105,252,248,252,246,133,233,235,15,133,244,253,248,2,139,68,36,
603 4,255,252,242,68,15,45,252,248,255,131,232,1,15,132,244,250,68,1,252,248,
604 59,133,233,15,131,244,251,68,41,252,248,65,193,231,3,68,3,189,233,248,3,139,
605 41,65,137,47,139,105,4,131,193,8,65,137,111,4,65,131,199,8,131,232,1,15,133, 606 41,65,137,47,139,105,4,131,193,8,65,137,111,4,65,131,199,8,131,232,1,15,133,
606 244,3,248,4,68,139,60,36,139,3,15,182,204,15,182,232,131,195,4,193,232,16, 607 244,3,248,4,68,139,60,36,139,3,15,182,204,15,182,232,131,195,4,193,232,16,
607 65,252,255,36,252,238,248,5,139,124,36,16,137,151,233,137,252,238,137,194, 608 65,252,255,36,252,238,248,5,139,124,36,16,137,151,233,137,252,238,137,194,
@@ -645,7 +646,7 @@ static const unsigned char build_actionlist[13665] = {
645 255,36,252,238,248,6,255,65,199,71,252,252,237,65,131,199,8,255,199,68,194, 646 255,36,252,238,248,6,255,65,199,71,252,252,237,65,131,199,8,255,199,68,194,
646 252,244,237,255,131,192,1,252,233,244,5,248,7,15,139,244,14,131,227,252,248, 647 252,244,237,255,131,192,1,252,233,244,5,248,7,15,139,244,14,131,227,252,248,
647 41,218,255,1,217,255,137,221,209,252,237,129,229,239,102,65,131,172,253,46, 648 41,218,255,1,217,255,137,221,209,252,237,129,229,239,102,65,131,172,253,46,
648 233,1,15,132,244,139,255,141,12,202,255,129,121,253,4,239,15,135,244,53,129, 649 233,1,15,132,244,140,255,141,12,202,255,129,121,253,4,239,15,135,244,53,129,
649 121,253,12,239,15,135,244,53,255,139,105,20,255,129,252,253,239,15,135,244, 650 121,253,12,239,15,135,244,53,255,139,105,20,255,129,252,253,239,15,135,244,
650 53,255,252,242,15,16,1,252,242,15,16,73,8,255,252,242,15,88,65,16,252,242, 651 53,255,252,242,15,16,1,252,242,15,16,73,8,255,252,242,15,88,65,16,252,242,
651 15,17,1,133,252,237,15,136,244,249,255,15,140,244,249,255,102,15,46,200,248, 652 15,17,1,133,252,237,15,136,244,249,255,15,140,244,249,255,102,15,46,200,248,
@@ -804,7 +805,8 @@ enum {
804 GLOB_ff_bit_rol, 805 GLOB_ff_bit_rol,
805 GLOB_ff_bit_ror, 806 GLOB_ff_bit_ror,
806 GLOB_vm_record, 807 GLOB_vm_record,
807 GLOB_vm_hook, 808 GLOB_vm_rethook,
809 GLOB_vm_inshook,
808 GLOB_cont_hook, 810 GLOB_cont_hook,
809 GLOB_vm_hotloop, 811 GLOB_vm_hotloop,
810 GLOB_vm_callhook, 812 GLOB_vm_callhook,
@@ -955,7 +957,8 @@ static const char *const globnames[] = {
955 "ff_bit_rol", 957 "ff_bit_rol",
956 "ff_bit_ror", 958 "ff_bit_ror",
957 "vm_record", 959 "vm_record",
958 "vm_hook", 960 "vm_rethook",
961 "vm_inshook",
959 "cont_hook", 962 "cont_hook",
960 "vm_hotloop", 963 "vm_hotloop",
961 "vm_callhook", 964 "vm_callhook",
@@ -1322,84 +1325,84 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse)
1322#if LJ_HASJIT 1325#if LJ_HASJIT
1323 dasm_put(Dst, 7009, DISPATCH_GL(hookmask), HOOK_VMEVENT, HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount)); 1326 dasm_put(Dst, 7009, DISPATCH_GL(hookmask), HOOK_VMEVENT, HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount));
1324#endif 1327#endif
1325 dasm_put(Dst, 7042, DISPATCH_GL(hookmask), HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount), LUA_MASKLINE, Dt1(->base), Dt1(->base)); 1328 dasm_put(Dst, 7042, DISPATCH_GL(hookmask), HOOK_ACTIVE, DISPATCH_GL(hookmask), HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount), LUA_MASKLINE);
1326 dasm_put(Dst, 7109, GG_DISP2STATIC); 1329 dasm_put(Dst, 7096, Dt1(->base), Dt1(->base), GG_DISP2STATIC);
1327#if LJ_HASJIT 1330#if LJ_HASJIT
1328 dasm_put(Dst, 7146); 1331 dasm_put(Dst, 7163);
1329#endif 1332#endif
1330 dasm_put(Dst, 7148); 1333 dasm_put(Dst, 7165);
1331#if LJ_HASJIT 1334#if LJ_HASJIT
1332 dasm_put(Dst, 7151, DISPATCH_J(L)); 1335 dasm_put(Dst, 7168, DISPATCH_J(L));
1333#endif 1336#endif
1334 dasm_put(Dst, 7164); 1337 dasm_put(Dst, 7181);
1335#if LJ_HASJIT 1338#if LJ_HASJIT
1336 dasm_put(Dst, 7167, DISPATCH_J(L)); 1339 dasm_put(Dst, 7184, DISPATCH_J(L));
1337#endif 1340#endif
1338 dasm_put(Dst, 7174, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); 1341 dasm_put(Dst, 7191, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top));
1339#if LJ_HASJIT 1342#if LJ_HASJIT
1340 dasm_put(Dst, 7146); 1343 dasm_put(Dst, 7163);
1341#endif 1344#endif
1342 dasm_put(Dst, 7241); 1345 dasm_put(Dst, 7258);
1343#if LJ_HASJIT 1346#if LJ_HASJIT
1344 dasm_put(Dst, 7244, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP); 1347 dasm_put(Dst, 7261, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP);
1345#endif 1348#endif
1346 dasm_put(Dst, 7291); 1349 dasm_put(Dst, 7308);
1347 if (!sse) { 1350 if (!sse) {
1348 dasm_put(Dst, 7294); 1351 dasm_put(Dst, 7311);
1349 } 1352 }
1350 dasm_put(Dst, 7339, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); 1353 dasm_put(Dst, 7356, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32));
1351 if (!sse) { 1354 if (!sse) {
1352 dasm_put(Dst, 7425); 1355 dasm_put(Dst, 7442);
1353 } 1356 }
1354 dasm_put(Dst, 7470, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(bff00000,00000000)), (unsigned int)((U64x(bff00000,00000000))>>32)); 1357 dasm_put(Dst, 7487, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(bff00000,00000000)), (unsigned int)((U64x(bff00000,00000000))>>32));
1355 if (!sse) { 1358 if (!sse) {
1356 dasm_put(Dst, 7556); 1359 dasm_put(Dst, 7573);
1357 } 1360 }
1358 dasm_put(Dst, 7595, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); 1361 dasm_put(Dst, 7612, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32));
1359 if (sse) { 1362 if (sse) {
1360 dasm_put(Dst, 7684, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); 1363 dasm_put(Dst, 7701, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32));
1361 } else { 1364 } else {
1362 dasm_put(Dst, 7798); 1365 dasm_put(Dst, 7815);
1363 } 1366 }
1364 dasm_put(Dst, 7845); 1367 dasm_put(Dst, 7862);
1365 if (!sse) { 1368 if (!sse) {
1366 } else { 1369 } else {
1367 dasm_put(Dst, 7922); 1370 dasm_put(Dst, 7939);
1368 } 1371 }
1369 dasm_put(Dst, 7925); 1372 dasm_put(Dst, 7942);
1370 dasm_put(Dst, 8010, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); 1373 dasm_put(Dst, 8027, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32));
1371 dasm_put(Dst, 8111, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(7ff00000,00000000)), (unsigned int)((U64x(7ff00000,00000000))>>32)); 1374 dasm_put(Dst, 8128, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(7ff00000,00000000)), (unsigned int)((U64x(7ff00000,00000000))>>32));
1372 dasm_put(Dst, 8285); 1375 dasm_put(Dst, 8302);
1373 if (sse) { 1376 if (sse) {
1374 dasm_put(Dst, 8326); 1377 dasm_put(Dst, 8343);
1375 dasm_put(Dst, 8396); 1378 dasm_put(Dst, 8413);
1376 dasm_put(Dst, 8468); 1379 dasm_put(Dst, 8485);
1377 } else { 1380 } else {
1378 dasm_put(Dst, 8520); 1381 dasm_put(Dst, 8537);
1379 dasm_put(Dst, 8612); 1382 dasm_put(Dst, 8629);
1380 } 1383 }
1381 dasm_put(Dst, 8658); 1384 dasm_put(Dst, 8675);
1382 if (sse) { 1385 if (sse) {
1383 dasm_put(Dst, 8664, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); 1386 dasm_put(Dst, 8681, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32));
1384 dasm_put(Dst, 8749, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); 1387 dasm_put(Dst, 8766, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32));
1385 } else { 1388 } else {
1386 dasm_put(Dst, 8877); 1389 dasm_put(Dst, 8894);
1387 dasm_put(Dst, 8960); 1390 dasm_put(Dst, 8977);
1388 if (cmov) { 1391 if (cmov) {
1389 dasm_put(Dst, 9015); 1392 dasm_put(Dst, 9032);
1390 } else { 1393 } else {
1391 dasm_put(Dst, 9034); 1394 dasm_put(Dst, 9051);
1392 } 1395 }
1393 dasm_put(Dst, 8873); 1396 dasm_put(Dst, 8890);
1394 } 1397 }
1395 dasm_put(Dst, 9075); 1398 dasm_put(Dst, 9092);
1396} 1399}
1397 1400
1398/* Generate the code for a single instruction. */ 1401/* Generate the code for a single instruction. */
1399static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) 1402static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
1400{ 1403{
1401 int vk = 0; 1404 int vk = 0;
1402 dasm_put(Dst, 9097, defop); 1405 dasm_put(Dst, 9114, defop);
1403 1406
1404 switch (op) { 1407 switch (op) {
1405 1408
@@ -1408,600 +1411,600 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
1408 /* Remember: all ops branch for a true comparison, fall through otherwise. */ 1411 /* Remember: all ops branch for a true comparison, fall through otherwise. */
1409 1412
1410 case BC_ISLT: case BC_ISGE: case BC_ISLE: case BC_ISGT: 1413 case BC_ISLT: case BC_ISGE: case BC_ISLE: case BC_ISGT:
1411 dasm_put(Dst, 9099, LJ_TISNUM, LJ_TISNUM); 1414 dasm_put(Dst, 9116, LJ_TISNUM, LJ_TISNUM);
1412 if (sse) { 1415 if (sse) {
1413 dasm_put(Dst, 9120); 1416 dasm_put(Dst, 9137);
1414 } else { 1417 } else {
1415 dasm_put(Dst, 9135); 1418 dasm_put(Dst, 9152);
1416 if (cmov) { 1419 if (cmov) {
1417 dasm_put(Dst, 9145); 1420 dasm_put(Dst, 9162);
1418 } else { 1421 } else {
1419 dasm_put(Dst, 9151); 1422 dasm_put(Dst, 9168);
1420 } 1423 }
1421 } 1424 }
1422 switch (op) { 1425 switch (op) {
1423 case BC_ISLT: 1426 case BC_ISLT:
1424 dasm_put(Dst, 9158); 1427 dasm_put(Dst, 9175);
1425 break; 1428 break;
1426 case BC_ISGE: 1429 case BC_ISGE:
1427 dasm_put(Dst, 8955); 1430 dasm_put(Dst, 8972);
1428 break; 1431 break;
1429 case BC_ISLE: 1432 case BC_ISLE:
1430 dasm_put(Dst, 5914); 1433 dasm_put(Dst, 5914);
1431 break; 1434 break;
1432 case BC_ISGT: 1435 case BC_ISGT:
1433 dasm_put(Dst, 9163); 1436 dasm_put(Dst, 9180);
1434 break; 1437 break;
1435 default: break; /* Shut up GCC. */ 1438 default: break; /* Shut up GCC. */
1436 } 1439 }
1437 dasm_put(Dst, 9168, -BCBIAS_J*4); 1440 dasm_put(Dst, 9185, -BCBIAS_J*4);
1438 break; 1441 break;
1439 1442
1440 case BC_ISEQV: case BC_ISNEV: 1443 case BC_ISEQV: case BC_ISNEV:
1441 vk = op == BC_ISEQV; 1444 vk = op == BC_ISEQV;
1442 dasm_put(Dst, 9203, LJ_TISNUM, LJ_TISNUM); 1445 dasm_put(Dst, 9220, LJ_TISNUM, LJ_TISNUM);
1443 if (sse) { 1446 if (sse) {
1444 dasm_put(Dst, 9229); 1447 dasm_put(Dst, 9246);
1445 } else { 1448 } else {
1446 dasm_put(Dst, 9241); 1449 dasm_put(Dst, 9258);
1447 if (cmov) { 1450 if (cmov) {
1448 dasm_put(Dst, 9145); 1451 dasm_put(Dst, 9162);
1449 } else { 1452 } else {
1450 dasm_put(Dst, 9151); 1453 dasm_put(Dst, 9168);
1451 } 1454 }
1452 } 1455 }
1453 iseqne_fp: 1456 iseqne_fp:
1454 if (vk) { 1457 if (vk) {
1455 dasm_put(Dst, 9248); 1458 dasm_put(Dst, 9265);
1456 } else { 1459 } else {
1457 dasm_put(Dst, 9257); 1460 dasm_put(Dst, 9274);
1458 } 1461 }
1459 iseqne_end: 1462 iseqne_end:
1460 if (vk) { 1463 if (vk) {
1461 dasm_put(Dst, 9266, -BCBIAS_J*4); 1464 dasm_put(Dst, 9283, -BCBIAS_J*4);
1462 } else { 1465 } else {
1463 dasm_put(Dst, 9281, -BCBIAS_J*4); 1466 dasm_put(Dst, 9298, -BCBIAS_J*4);
1464 } 1467 }
1465 dasm_put(Dst, 7270); 1468 dasm_put(Dst, 7287);
1466 if (op == BC_ISEQV || op == BC_ISNEV) { 1469 if (op == BC_ISEQV || op == BC_ISNEV) {
1467 dasm_put(Dst, 9296, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<<MM_eq); 1470 dasm_put(Dst, 9313, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<<MM_eq);
1468 if (vk) { 1471 if (vk) {
1469 dasm_put(Dst, 9354); 1472 dasm_put(Dst, 9371);
1470 } else { 1473 } else {
1471 dasm_put(Dst, 9358); 1474 dasm_put(Dst, 9375);
1472 } 1475 }
1473 dasm_put(Dst, 9364); 1476 dasm_put(Dst, 9381);
1474 } 1477 }
1475 break; 1478 break;
1476 case BC_ISEQS: case BC_ISNES: 1479 case BC_ISEQS: case BC_ISNES:
1477 vk = op == BC_ISEQS; 1480 vk = op == BC_ISEQS;
1478 dasm_put(Dst, 9369, LJ_TSTR); 1481 dasm_put(Dst, 9386, LJ_TSTR);
1479 iseqne_test: 1482 iseqne_test:
1480 if (vk) { 1483 if (vk) {
1481 dasm_put(Dst, 9252); 1484 dasm_put(Dst, 9269);
1482 } else { 1485 } else {
1483 dasm_put(Dst, 2805); 1486 dasm_put(Dst, 2805);
1484 } 1487 }
1485 goto iseqne_end; 1488 goto iseqne_end;
1486 case BC_ISEQN: case BC_ISNEN: 1489 case BC_ISEQN: case BC_ISNEN:
1487 vk = op == BC_ISEQN; 1490 vk = op == BC_ISEQN;
1488 dasm_put(Dst, 9394, LJ_TISNUM); 1491 dasm_put(Dst, 9411, LJ_TISNUM);
1489 if (sse) { 1492 if (sse) {
1490 dasm_put(Dst, 9408); 1493 dasm_put(Dst, 9425);
1491 } else { 1494 } else {
1492 dasm_put(Dst, 9421); 1495 dasm_put(Dst, 9438);
1493 if (cmov) { 1496 if (cmov) {
1494 dasm_put(Dst, 9145); 1497 dasm_put(Dst, 9162);
1495 } else { 1498 } else {
1496 dasm_put(Dst, 9151); 1499 dasm_put(Dst, 9168);
1497 } 1500 }
1498 } 1501 }
1499 goto iseqne_fp; 1502 goto iseqne_fp;
1500 case BC_ISEQP: case BC_ISNEP: 1503 case BC_ISEQP: case BC_ISNEP:
1501 vk = op == BC_ISEQP; 1504 vk = op == BC_ISEQP;
1502 dasm_put(Dst, 9429); 1505 dasm_put(Dst, 9446);
1503 goto iseqne_test; 1506 goto iseqne_test;
1504 1507
1505 /* -- Unary test and copy ops ------------------------------------------- */ 1508 /* -- Unary test and copy ops ------------------------------------------- */
1506 1509
1507 case BC_ISTC: case BC_ISFC: case BC_IST: case BC_ISF: 1510 case BC_ISTC: case BC_ISFC: case BC_IST: case BC_ISF:
1508 dasm_put(Dst, 9441, LJ_TISTRUECOND); 1511 dasm_put(Dst, 9458, LJ_TISTRUECOND);
1509 if (op == BC_IST || op == BC_ISTC) { 1512 if (op == BC_IST || op == BC_ISTC) {
1510 dasm_put(Dst, 9453); 1513 dasm_put(Dst, 9470);
1511 } else { 1514 } else {
1512 dasm_put(Dst, 9458); 1515 dasm_put(Dst, 9475);
1513 } 1516 }
1514 if (op == BC_ISTC || op == BC_ISFC) { 1517 if (op == BC_ISTC || op == BC_ISFC) {
1515 dasm_put(Dst, 9463); 1518 dasm_put(Dst, 9480);
1516 } 1519 }
1517 dasm_put(Dst, 9474, -BCBIAS_J*4); 1520 dasm_put(Dst, 9491, -BCBIAS_J*4);
1518 break; 1521 break;
1519 1522
1520 /* -- Unary ops --------------------------------------------------------- */ 1523 /* -- Unary ops --------------------------------------------------------- */
1521 1524
1522 case BC_MOV: 1525 case BC_MOV:
1523 dasm_put(Dst, 9507); 1526 dasm_put(Dst, 9524);
1524 break; 1527 break;
1525 case BC_NOT: 1528 case BC_NOT:
1526 dasm_put(Dst, 9542, LJ_TISTRUECOND, LJ_TTRUE); 1529 dasm_put(Dst, 9559, LJ_TISTRUECOND, LJ_TTRUE);
1527 break; 1530 break;
1528 case BC_UNM: 1531 case BC_UNM:
1529 dasm_put(Dst, 9579, LJ_TISNUM); 1532 dasm_put(Dst, 9596, LJ_TISNUM);
1530 if (sse) { 1533 if (sse) {
1531 dasm_put(Dst, 9590, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); 1534 dasm_put(Dst, 9607, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32));
1532 } else { 1535 } else {
1533 dasm_put(Dst, 9615); 1536 dasm_put(Dst, 9632);
1534 } 1537 }
1535 dasm_put(Dst, 7270); 1538 dasm_put(Dst, 7287);
1536 break; 1539 break;
1537 case BC_LEN: 1540 case BC_LEN:
1538 dasm_put(Dst, 9624, LJ_TSTR); 1541 dasm_put(Dst, 9641, LJ_TSTR);
1539 if (sse) { 1542 if (sse) {
1540 dasm_put(Dst, 9638, Dt5(->len)); 1543 dasm_put(Dst, 9655, Dt5(->len));
1541 } else { 1544 } else {
1542 dasm_put(Dst, 9656, Dt5(->len)); 1545 dasm_put(Dst, 9673, Dt5(->len));
1543 } 1546 }
1544 dasm_put(Dst, 9665, LJ_TTAB); 1547 dasm_put(Dst, 9682, LJ_TTAB);
1545 if (sse) { 1548 if (sse) {
1546 dasm_put(Dst, 9707); 1549 dasm_put(Dst, 9724);
1547 } else { 1550 } else {
1548 } 1551 }
1549 dasm_put(Dst, 9716); 1552 dasm_put(Dst, 9733);
1550 break; 1553 break;
1551 1554
1552 /* -- Binary ops -------------------------------------------------------- */ 1555 /* -- Binary ops -------------------------------------------------------- */
1553 1556
1554 1557
1555 case BC_ADDVN: case BC_ADDNV: case BC_ADDVV: 1558 case BC_ADDVN: case BC_ADDNV: case BC_ADDVV:
1556 dasm_put(Dst, 9726); 1559 dasm_put(Dst, 9743);
1557 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1560 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1558 switch (vk) { 1561 switch (vk) {
1559 case 0: 1562 case 0:
1560 dasm_put(Dst, 9734, LJ_TISNUM); 1563 dasm_put(Dst, 9751, LJ_TISNUM);
1561 if (sse) { 1564 if (sse) {
1562 dasm_put(Dst, 9746); 1565 dasm_put(Dst, 9763);
1563 } else { 1566 } else {
1564 dasm_put(Dst, 9761); 1567 dasm_put(Dst, 9778);
1565 } 1568 }
1566 break; 1569 break;
1567 case 1: 1570 case 1:
1568 dasm_put(Dst, 9770, LJ_TISNUM); 1571 dasm_put(Dst, 9787, LJ_TISNUM);
1569 if (sse) { 1572 if (sse) {
1570 dasm_put(Dst, 9782); 1573 dasm_put(Dst, 9799);
1571 } else { 1574 } else {
1572 dasm_put(Dst, 9797); 1575 dasm_put(Dst, 9814);
1573 } 1576 }
1574 break; 1577 break;
1575 default: 1578 default:
1576 dasm_put(Dst, 9806, LJ_TISNUM, LJ_TISNUM); 1579 dasm_put(Dst, 9823, LJ_TISNUM, LJ_TISNUM);
1577 if (sse) { 1580 if (sse) {
1578 dasm_put(Dst, 9828); 1581 dasm_put(Dst, 9845);
1579 } else { 1582 } else {
1580 dasm_put(Dst, 9842); 1583 dasm_put(Dst, 9859);
1581 } 1584 }
1582 break; 1585 break;
1583 } 1586 }
1584 if (sse) { 1587 if (sse) {
1585 dasm_put(Dst, 9608); 1588 dasm_put(Dst, 9625);
1586 } else { 1589 } else {
1587 dasm_put(Dst, 9620); 1590 dasm_put(Dst, 9637);
1588 } 1591 }
1589 dasm_put(Dst, 7270); 1592 dasm_put(Dst, 7287);
1590 break; 1593 break;
1591 case BC_SUBVN: case BC_SUBNV: case BC_SUBVV: 1594 case BC_SUBVN: case BC_SUBNV: case BC_SUBVV:
1592 dasm_put(Dst, 9726); 1595 dasm_put(Dst, 9743);
1593 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1596 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1594 switch (vk) { 1597 switch (vk) {
1595 case 0: 1598 case 0:
1596 dasm_put(Dst, 9734, LJ_TISNUM); 1599 dasm_put(Dst, 9751, LJ_TISNUM);
1597 if (sse) { 1600 if (sse) {
1598 dasm_put(Dst, 9850); 1601 dasm_put(Dst, 9867);
1599 } else { 1602 } else {
1600 dasm_put(Dst, 9865); 1603 dasm_put(Dst, 9882);
1601 } 1604 }
1602 break; 1605 break;
1603 case 1: 1606 case 1:
1604 dasm_put(Dst, 9770, LJ_TISNUM); 1607 dasm_put(Dst, 9787, LJ_TISNUM);
1605 if (sse) { 1608 if (sse) {
1606 dasm_put(Dst, 9874); 1609 dasm_put(Dst, 9891);
1607 } else { 1610 } else {
1608 dasm_put(Dst, 9889); 1611 dasm_put(Dst, 9906);
1609 } 1612 }
1610 break; 1613 break;
1611 default: 1614 default:
1612 dasm_put(Dst, 9806, LJ_TISNUM, LJ_TISNUM); 1615 dasm_put(Dst, 9823, LJ_TISNUM, LJ_TISNUM);
1613 if (sse) { 1616 if (sse) {
1614 dasm_put(Dst, 9898); 1617 dasm_put(Dst, 9915);
1615 } else { 1618 } else {
1616 dasm_put(Dst, 9912); 1619 dasm_put(Dst, 9929);
1617 } 1620 }
1618 break; 1621 break;
1619 } 1622 }
1620 if (sse) { 1623 if (sse) {
1621 dasm_put(Dst, 9608); 1624 dasm_put(Dst, 9625);
1622 } else { 1625 } else {
1623 dasm_put(Dst, 9620); 1626 dasm_put(Dst, 9637);
1624 } 1627 }
1625 dasm_put(Dst, 7270); 1628 dasm_put(Dst, 7287);
1626 break; 1629 break;
1627 case BC_MULVN: case BC_MULNV: case BC_MULVV: 1630 case BC_MULVN: case BC_MULNV: case BC_MULVV:
1628 dasm_put(Dst, 9726); 1631 dasm_put(Dst, 9743);
1629 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1632 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1630 switch (vk) { 1633 switch (vk) {
1631 case 0: 1634 case 0:
1632 dasm_put(Dst, 9734, LJ_TISNUM); 1635 dasm_put(Dst, 9751, LJ_TISNUM);
1633 if (sse) { 1636 if (sse) {
1634 dasm_put(Dst, 9920); 1637 dasm_put(Dst, 9937);
1635 } else { 1638 } else {
1636 dasm_put(Dst, 9935); 1639 dasm_put(Dst, 9952);
1637 } 1640 }
1638 break; 1641 break;
1639 case 1: 1642 case 1:
1640 dasm_put(Dst, 9770, LJ_TISNUM); 1643 dasm_put(Dst, 9787, LJ_TISNUM);
1641 if (sse) { 1644 if (sse) {
1642 dasm_put(Dst, 9944); 1645 dasm_put(Dst, 9961);
1643 } else { 1646 } else {
1644 dasm_put(Dst, 9959); 1647 dasm_put(Dst, 9976);
1645 } 1648 }
1646 break; 1649 break;
1647 default: 1650 default:
1648 dasm_put(Dst, 9806, LJ_TISNUM, LJ_TISNUM); 1651 dasm_put(Dst, 9823, LJ_TISNUM, LJ_TISNUM);
1649 if (sse) { 1652 if (sse) {
1650 dasm_put(Dst, 9968); 1653 dasm_put(Dst, 9985);
1651 } else { 1654 } else {
1652 dasm_put(Dst, 9982); 1655 dasm_put(Dst, 9999);
1653 } 1656 }
1654 break; 1657 break;
1655 } 1658 }
1656 if (sse) { 1659 if (sse) {
1657 dasm_put(Dst, 9608); 1660 dasm_put(Dst, 9625);
1658 } else { 1661 } else {
1659 dasm_put(Dst, 9620); 1662 dasm_put(Dst, 9637);
1660 } 1663 }
1661 dasm_put(Dst, 7270); 1664 dasm_put(Dst, 7287);
1662 break; 1665 break;
1663 case BC_DIVVN: case BC_DIVNV: case BC_DIVVV: 1666 case BC_DIVVN: case BC_DIVNV: case BC_DIVVV:
1664 dasm_put(Dst, 9726); 1667 dasm_put(Dst, 9743);
1665 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1668 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1666 switch (vk) { 1669 switch (vk) {
1667 case 0: 1670 case 0:
1668 dasm_put(Dst, 9734, LJ_TISNUM); 1671 dasm_put(Dst, 9751, LJ_TISNUM);
1669 if (sse) { 1672 if (sse) {
1670 dasm_put(Dst, 9990); 1673 dasm_put(Dst, 10007);
1671 } else { 1674 } else {
1672 dasm_put(Dst, 10005); 1675 dasm_put(Dst, 10022);
1673 } 1676 }
1674 break; 1677 break;
1675 case 1: 1678 case 1:
1676 dasm_put(Dst, 9770, LJ_TISNUM); 1679 dasm_put(Dst, 9787, LJ_TISNUM);
1677 if (sse) { 1680 if (sse) {
1678 dasm_put(Dst, 10014); 1681 dasm_put(Dst, 10031);
1679 } else { 1682 } else {
1680 dasm_put(Dst, 10029); 1683 dasm_put(Dst, 10046);
1681 } 1684 }
1682 break; 1685 break;
1683 default: 1686 default:
1684 dasm_put(Dst, 9806, LJ_TISNUM, LJ_TISNUM); 1687 dasm_put(Dst, 9823, LJ_TISNUM, LJ_TISNUM);
1685 if (sse) { 1688 if (sse) {
1686 dasm_put(Dst, 10038); 1689 dasm_put(Dst, 10055);
1687 } else { 1690 } else {
1688 dasm_put(Dst, 10052); 1691 dasm_put(Dst, 10069);
1689 } 1692 }
1690 break; 1693 break;
1691 } 1694 }
1692 if (sse) { 1695 if (sse) {
1693 dasm_put(Dst, 9608); 1696 dasm_put(Dst, 9625);
1694 } else { 1697 } else {
1695 dasm_put(Dst, 9620); 1698 dasm_put(Dst, 9637);
1696 } 1699 }
1697 dasm_put(Dst, 7270); 1700 dasm_put(Dst, 7287);
1698 break; 1701 break;
1699 case BC_MODVN: 1702 case BC_MODVN:
1700 dasm_put(Dst, 9726); 1703 dasm_put(Dst, 9743);
1701 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1704 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1702 switch (vk) { 1705 switch (vk) {
1703 case 0: 1706 case 0:
1704 dasm_put(Dst, 9734, LJ_TISNUM); 1707 dasm_put(Dst, 9751, LJ_TISNUM);
1705 if (sse) { 1708 if (sse) {
1706 dasm_put(Dst, 10060); 1709 dasm_put(Dst, 10077);
1707 } else { 1710 } else {
1708 dasm_put(Dst, 10075); 1711 dasm_put(Dst, 10092);
1709 } 1712 }
1710 break; 1713 break;
1711 case 1: 1714 case 1:
1712 dasm_put(Dst, 9770, LJ_TISNUM); 1715 dasm_put(Dst, 9787, LJ_TISNUM);
1713 if (sse) { 1716 if (sse) {
1714 dasm_put(Dst, 10084); 1717 dasm_put(Dst, 10101);
1715 } else { 1718 } else {
1716 dasm_put(Dst, 10099); 1719 dasm_put(Dst, 10116);
1717 } 1720 }
1718 break; 1721 break;
1719 default: 1722 default:
1720 dasm_put(Dst, 9806, LJ_TISNUM, LJ_TISNUM); 1723 dasm_put(Dst, 9823, LJ_TISNUM, LJ_TISNUM);
1721 if (sse) { 1724 if (sse) {
1722 dasm_put(Dst, 10108); 1725 dasm_put(Dst, 10125);
1723 } else { 1726 } else {
1724 dasm_put(Dst, 10122); 1727 dasm_put(Dst, 10139);
1725 } 1728 }
1726 break; 1729 break;
1727 } 1730 }
1728 dasm_put(Dst, 10130); 1731 dasm_put(Dst, 10147);
1729 if (sse) { 1732 if (sse) {
1730 dasm_put(Dst, 9608); 1733 dasm_put(Dst, 9625);
1731 } else { 1734 } else {
1732 dasm_put(Dst, 9620); 1735 dasm_put(Dst, 9637);
1733 } 1736 }
1734 dasm_put(Dst, 7270); 1737 dasm_put(Dst, 7287);
1735 break; 1738 break;
1736 case BC_MODNV: case BC_MODVV: 1739 case BC_MODNV: case BC_MODVV:
1737 dasm_put(Dst, 9726); 1740 dasm_put(Dst, 9743);
1738 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1741 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1739 switch (vk) { 1742 switch (vk) {
1740 case 0: 1743 case 0:
1741 dasm_put(Dst, 9734, LJ_TISNUM); 1744 dasm_put(Dst, 9751, LJ_TISNUM);
1742 if (sse) { 1745 if (sse) {
1743 dasm_put(Dst, 10060); 1746 dasm_put(Dst, 10077);
1744 } else { 1747 } else {
1745 dasm_put(Dst, 10075); 1748 dasm_put(Dst, 10092);
1746 } 1749 }
1747 break; 1750 break;
1748 case 1: 1751 case 1:
1749 dasm_put(Dst, 9770, LJ_TISNUM); 1752 dasm_put(Dst, 9787, LJ_TISNUM);
1750 if (sse) { 1753 if (sse) {
1751 dasm_put(Dst, 10084); 1754 dasm_put(Dst, 10101);
1752 } else { 1755 } else {
1753 dasm_put(Dst, 10099); 1756 dasm_put(Dst, 10116);
1754 } 1757 }
1755 break; 1758 break;
1756 default: 1759 default:
1757 dasm_put(Dst, 9806, LJ_TISNUM, LJ_TISNUM); 1760 dasm_put(Dst, 9823, LJ_TISNUM, LJ_TISNUM);
1758 if (sse) { 1761 if (sse) {
1759 dasm_put(Dst, 10108); 1762 dasm_put(Dst, 10125);
1760 } else { 1763 } else {
1761 dasm_put(Dst, 10122); 1764 dasm_put(Dst, 10139);
1762 } 1765 }
1763 break; 1766 break;
1764 } 1767 }
1765 dasm_put(Dst, 10136); 1768 dasm_put(Dst, 10153);
1766 break; 1769 break;
1767 case BC_POW: 1770 case BC_POW:
1768 dasm_put(Dst, 9726); 1771 dasm_put(Dst, 9743);
1769 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1772 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1770 switch (vk) { 1773 switch (vk) {
1771 case 0: 1774 case 0:
1772 dasm_put(Dst, 9734, LJ_TISNUM); 1775 dasm_put(Dst, 9751, LJ_TISNUM);
1773 if (sse) { 1776 if (sse) {
1774 dasm_put(Dst, 10060); 1777 dasm_put(Dst, 10077);
1775 } else { 1778 } else {
1776 dasm_put(Dst, 10075); 1779 dasm_put(Dst, 10092);
1777 } 1780 }
1778 break; 1781 break;
1779 case 1: 1782 case 1:
1780 dasm_put(Dst, 9770, LJ_TISNUM); 1783 dasm_put(Dst, 9787, LJ_TISNUM);
1781 if (sse) { 1784 if (sse) {
1782 dasm_put(Dst, 10084); 1785 dasm_put(Dst, 10101);
1783 } else { 1786 } else {
1784 dasm_put(Dst, 10099); 1787 dasm_put(Dst, 10116);
1785 } 1788 }
1786 break; 1789 break;
1787 default: 1790 default:
1788 dasm_put(Dst, 9806, LJ_TISNUM, LJ_TISNUM); 1791 dasm_put(Dst, 9823, LJ_TISNUM, LJ_TISNUM);
1789 if (sse) { 1792 if (sse) {
1790 dasm_put(Dst, 10108); 1793 dasm_put(Dst, 10125);
1791 } else { 1794 } else {
1792 dasm_put(Dst, 10122); 1795 dasm_put(Dst, 10139);
1793 } 1796 }
1794 break; 1797 break;
1795 } 1798 }
1796 dasm_put(Dst, 10141); 1799 dasm_put(Dst, 10158);
1797 if (sse) { 1800 if (sse) {
1798 dasm_put(Dst, 9608); 1801 dasm_put(Dst, 9625);
1799 } else { 1802 } else {
1800 dasm_put(Dst, 9620); 1803 dasm_put(Dst, 9637);
1801 } 1804 }
1802 dasm_put(Dst, 7270); 1805 dasm_put(Dst, 7287);
1803 break; 1806 break;
1804 1807
1805 case BC_CAT: 1808 case BC_CAT:
1806 dasm_put(Dst, 10145, Dt1(->base), Dt1(->base)); 1809 dasm_put(Dst, 10162, Dt1(->base), Dt1(->base));
1807 break; 1810 break;
1808 1811
1809 /* -- Constant ops ------------------------------------------------------ */ 1812 /* -- Constant ops ------------------------------------------------------ */
1810 1813
1811 case BC_KSTR: 1814 case BC_KSTR:
1812 dasm_put(Dst, 10236, LJ_TSTR); 1815 dasm_put(Dst, 10253, LJ_TSTR);
1813 break; 1816 break;
1814 case BC_KSHORT: 1817 case BC_KSHORT:
1815 if (sse) { 1818 if (sse) {
1816 dasm_put(Dst, 10273); 1819 dasm_put(Dst, 10290);
1817 } else { 1820 } else {
1818 dasm_put(Dst, 10288); 1821 dasm_put(Dst, 10305);
1819 } 1822 }
1820 dasm_put(Dst, 7270); 1823 dasm_put(Dst, 7287);
1821 break; 1824 break;
1822 case BC_KNUM: 1825 case BC_KNUM:
1823 if (sse) { 1826 if (sse) {
1824 dasm_put(Dst, 10296); 1827 dasm_put(Dst, 10313);
1825 } else { 1828 } else {
1826 dasm_put(Dst, 10310); 1829 dasm_put(Dst, 10327);
1827 } 1830 }
1828 dasm_put(Dst, 7270); 1831 dasm_put(Dst, 7287);
1829 break; 1832 break;
1830 case BC_KPRI: 1833 case BC_KPRI:
1831 dasm_put(Dst, 10318); 1834 dasm_put(Dst, 10335);
1832 break; 1835 break;
1833 case BC_KNIL: 1836 case BC_KNIL:
1834 dasm_put(Dst, 10347, LJ_TNIL); 1837 dasm_put(Dst, 10364, LJ_TNIL);
1835 break; 1838 break;
1836 1839
1837 /* -- Upvalue and function ops ------------------------------------------ */ 1840 /* -- Upvalue and function ops ------------------------------------------ */
1838 1841
1839 case BC_UGET: 1842 case BC_UGET:
1840 dasm_put(Dst, 10395, offsetof(GCfuncL, uvptr), DtA(->v)); 1843 dasm_put(Dst, 10412, offsetof(GCfuncL, uvptr), DtA(->v));
1841 break; 1844 break;
1842 case BC_USETV: 1845 case BC_USETV:
1843#define TV2MARKOFS \ 1846#define TV2MARKOFS \
1844 ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv)) 1847 ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv))
1845 dasm_put(Dst, 10441, offsetof(GCfuncL, uvptr), DtA(->closed), DtA(->v), TV2MARKOFS, LJ_GC_BLACK, LJ_TISGCV, LJ_TISNUM - LJ_TISGCV, Dt4(->gch.marked), LJ_GC_WHITES, GG_DISP2G); 1848 dasm_put(Dst, 10458, offsetof(GCfuncL, uvptr), DtA(->closed), DtA(->v), TV2MARKOFS, LJ_GC_BLACK, LJ_TISGCV, LJ_TISNUM - LJ_TISGCV, Dt4(->gch.marked), LJ_GC_WHITES, GG_DISP2G);
1846 dasm_put(Dst, 10537); 1849 dasm_put(Dst, 10554);
1847 break; 1850 break;
1848#undef TV2MARKOFS 1851#undef TV2MARKOFS
1849 case BC_USETS: 1852 case BC_USETS:
1850 dasm_put(Dst, 10549, offsetof(GCfuncL, uvptr), DtA(->v), LJ_TSTR, DtA(->marked), LJ_GC_BLACK, Dt4(->gch.marked), LJ_GC_WHITES, DtA(->closed), GG_DISP2G); 1853 dasm_put(Dst, 10566, offsetof(GCfuncL, uvptr), DtA(->v), LJ_TSTR, DtA(->marked), LJ_GC_BLACK, Dt4(->gch.marked), LJ_GC_WHITES, DtA(->closed), GG_DISP2G);
1851 break; 1854 break;
1852 case BC_USETN: 1855 case BC_USETN:
1853 dasm_put(Dst, 10645); 1856 dasm_put(Dst, 10662);
1854 if (sse) { 1857 if (sse) {
1855 dasm_put(Dst, 10650); 1858 dasm_put(Dst, 10667);
1856 } else { 1859 } else {
1857 dasm_put(Dst, 9424); 1860 dasm_put(Dst, 9441);
1858 } 1861 }
1859 dasm_put(Dst, 10658, offsetof(GCfuncL, uvptr), DtA(->v)); 1862 dasm_put(Dst, 10675, offsetof(GCfuncL, uvptr), DtA(->v));
1860 if (sse) { 1863 if (sse) {
1861 dasm_put(Dst, 10667); 1864 dasm_put(Dst, 10684);
1862 } else { 1865 } else {
1863 dasm_put(Dst, 10673); 1866 dasm_put(Dst, 10690);
1864 } 1867 }
1865 dasm_put(Dst, 7270); 1868 dasm_put(Dst, 7287);
1866 break; 1869 break;
1867 case BC_USETP: 1870 case BC_USETP:
1868 dasm_put(Dst, 10676, offsetof(GCfuncL, uvptr), DtA(->v)); 1871 dasm_put(Dst, 10693, offsetof(GCfuncL, uvptr), DtA(->v));
1869 break; 1872 break;
1870 case BC_UCLO: 1873 case BC_UCLO:
1871 dasm_put(Dst, 10716, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); 1874 dasm_put(Dst, 10733, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base));
1872 break; 1875 break;
1873 1876
1874 case BC_FNEW: 1877 case BC_FNEW:
1875 dasm_put(Dst, 10772, Dt1(->base), Dt1(->base), LJ_TFUNC); 1878 dasm_put(Dst, 10789, Dt1(->base), Dt1(->base), LJ_TFUNC);
1876 break; 1879 break;
1877 1880
1878 /* -- Table ops --------------------------------------------------------- */ 1881 /* -- Table ops --------------------------------------------------------- */
1879 1882
1880 case BC_TNEW: 1883 case BC_TNEW:
1881 dasm_put(Dst, 10839, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); 1884 dasm_put(Dst, 10856, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB);
1882 break; 1885 break;
1883 case BC_TDUP: 1886 case BC_TDUP:
1884 dasm_put(Dst, 10963, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); 1887 dasm_put(Dst, 10980, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB);
1885 break; 1888 break;
1886 1889
1887 case BC_GGET: 1890 case BC_GGET:
1888 dasm_put(Dst, 11062, Dt7(->env)); 1891 dasm_put(Dst, 11079, Dt7(->env));
1889 break; 1892 break;
1890 case BC_GSET: 1893 case BC_GSET:
1891 dasm_put(Dst, 11082, Dt7(->env)); 1894 dasm_put(Dst, 11099, Dt7(->env));
1892 break; 1895 break;
1893 1896
1894 case BC_TGETV: 1897 case BC_TGETV:
1895 dasm_put(Dst, 11102, LJ_TTAB, LJ_TISNUM); 1898 dasm_put(Dst, 11119, LJ_TTAB, LJ_TISNUM);
1896 if (sse) { 1899 if (sse) {
1897 dasm_put(Dst, 11135); 1900 dasm_put(Dst, 11152);
1898 } else { 1901 } else {
1899 } 1902 }
1900 dasm_put(Dst, 11156, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index); 1903 dasm_put(Dst, 11173, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
1901 dasm_put(Dst, 11250, LJ_TSTR); 1904 dasm_put(Dst, 11267, LJ_TSTR);
1902 break; 1905 break;
1903 case BC_TGETS: 1906 case BC_TGETS:
1904 dasm_put(Dst, 11268, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); 1907 dasm_put(Dst, 11285, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL);
1905 dasm_put(Dst, 11354, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<<MM_index); 1908 dasm_put(Dst, 11371, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
1906 break; 1909 break;
1907 case BC_TGETB: 1910 case BC_TGETB:
1908 dasm_put(Dst, 11427, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index); 1911 dasm_put(Dst, 11444, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
1909 dasm_put(Dst, 9716); 1912 dasm_put(Dst, 9733);
1910 break; 1913 break;
1911 1914
1912 case BC_TSETV: 1915 case BC_TSETV:
1913 dasm_put(Dst, 11528, LJ_TTAB, LJ_TISNUM); 1916 dasm_put(Dst, 11545, LJ_TTAB, LJ_TISNUM);
1914 if (sse) { 1917 if (sse) {
1915 dasm_put(Dst, 11135); 1918 dasm_put(Dst, 11152);
1916 } else { 1919 } else {
1917 } 1920 }
1918 dasm_put(Dst, 11561, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable)); 1921 dasm_put(Dst, 11578, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable));
1919 dasm_put(Dst, 11646, Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); 1922 dasm_put(Dst, 11663, Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
1920 break; 1923 break;
1921 case BC_TSETS: 1924 case BC_TSETS:
1922 dasm_put(Dst, 11710, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->nomm), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); 1925 dasm_put(Dst, 11727, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->nomm), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL);
1923 dasm_put(Dst, 11787, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, DtB(->next)); 1926 dasm_put(Dst, 11804, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, DtB(->next));
1924 dasm_put(Dst, 11879, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); 1927 dasm_put(Dst, 11896, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
1925 break; 1928 break;
1926 case BC_TSETB: 1929 case BC_TSETB:
1927 dasm_put(Dst, 11971, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); 1930 dasm_put(Dst, 11988, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable));
1928 dasm_put(Dst, 12071, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); 1931 dasm_put(Dst, 12088, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
1929 break; 1932 break;
1930 1933
1931 case BC_TSETM: 1934 case BC_TSETM:
1932 dasm_put(Dst, 12119); 1935 dasm_put(Dst, 12136);
1933 if (sse) { 1936 if (sse) {
1934 dasm_put(Dst, 10650); 1937 dasm_put(Dst, 10667);
1935 } else { 1938 } else {
1936 } 1939 }
1937 dasm_put(Dst, 12124, Dt6(->marked), LJ_GC_BLACK); 1940 dasm_put(Dst, 12141, Dt6(->marked), LJ_GC_BLACK);
1938 if (sse) { 1941 if (sse) {
1939 dasm_put(Dst, 12149); 1942 dasm_put(Dst, 12166);
1940 } else { 1943 } else {
1941 } 1944 }
1942 dasm_put(Dst, 12157, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain)); 1945 dasm_put(Dst, 12174, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain));
1943 dasm_put(Dst, 12293, Dt6(->gclist)); 1946 dasm_put(Dst, 12310, Dt6(->gclist));
1944 break; 1947 break;
1945 1948
1946 /* -- Calls and vararg handling ----------------------------------------- */ 1949 /* -- Calls and vararg handling ----------------------------------------- */
1947 1950
1948 case BC_CALL: case BC_CALLM: 1951 case BC_CALL: case BC_CALLM:
1949 dasm_put(Dst, 9730); 1952 dasm_put(Dst, 9747);
1950 if (op == BC_CALLM) { 1953 if (op == BC_CALLM) {
1951 dasm_put(Dst, 12301); 1954 dasm_put(Dst, 12318);
1952 } 1955 }
1953 dasm_put(Dst, 12306, LJ_TFUNC, Dt7(->pc)); 1956 dasm_put(Dst, 12323, LJ_TFUNC, Dt7(->pc));
1954 break; 1957 break;
1955 1958
1956 case BC_CALLMT: 1959 case BC_CALLMT:
1957 dasm_put(Dst, 12301); 1960 dasm_put(Dst, 12318);
1958 break; 1961 break;
1959 case BC_CALLT: 1962 case BC_CALLT:
1960 dasm_put(Dst, 12349, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); 1963 dasm_put(Dst, 12366, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc));
1961 dasm_put(Dst, 12473, FRAME_TYPE, Dt7(->pc), PC2PROTO(k)); 1964 dasm_put(Dst, 12490, FRAME_TYPE, Dt7(->pc), PC2PROTO(k));
1962 break; 1965 break;
1963 1966
1964 case BC_ITERC: 1967 case BC_ITERC:
1965 dasm_put(Dst, 12534, LJ_TFUNC, 2+1, Dt7(->pc)); 1968 dasm_put(Dst, 12551, LJ_TFUNC, 2+1, Dt7(->pc));
1966 break; 1969 break;
1967 1970
1968 case BC_VARG: 1971 case BC_VARG:
1969 dasm_put(Dst, 12616, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL); 1972 dasm_put(Dst, 12633, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL);
1970 dasm_put(Dst, 12770, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); 1973 dasm_put(Dst, 12787, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top));
1971 break; 1974 break;
1972 1975
1973 /* -- Returns ----------------------------------------------------------- */ 1976 /* -- Returns ----------------------------------------------------------- */
1974 1977
1975 case BC_RETM: 1978 case BC_RETM:
1976 dasm_put(Dst, 12301); 1979 dasm_put(Dst, 12318);
1977 break; 1980 break;
1978 1981
1979 case BC_RET: case BC_RET0: case BC_RET1: 1982 case BC_RET: case BC_RET0: case BC_RET1:
1980 if (op != BC_RET0) { 1983 if (op != BC_RET0) {
1981 dasm_put(Dst, 12875); 1984 dasm_put(Dst, 12892);
1982 } 1985 }
1983 dasm_put(Dst, 12879, FRAME_TYPE); 1986 dasm_put(Dst, 12896, FRAME_TYPE);
1984 switch (op) { 1987 switch (op) {
1985 case BC_RET: 1988 case BC_RET:
1986 dasm_put(Dst, 12898); 1989 dasm_put(Dst, 12915);
1987 break; 1990 break;
1988 case BC_RET1: 1991 case BC_RET1:
1989 dasm_put(Dst, 12962); 1992 dasm_put(Dst, 12979);
1990 /* fallthrough */ 1993 /* fallthrough */
1991 case BC_RET0: 1994 case BC_RET0:
1992 dasm_put(Dst, 12978); 1995 dasm_put(Dst, 12995);
1993 default: 1996 default:
1994 break; 1997 break;
1995 } 1998 }
1996 dasm_put(Dst, 12989, Dt7(->pc), PC2PROTO(k)); 1999 dasm_put(Dst, 13006, Dt7(->pc), PC2PROTO(k));
1997 if (op == BC_RET) { 2000 if (op == BC_RET) {
1998 dasm_put(Dst, 13037, LJ_TNIL); 2001 dasm_put(Dst, 13054, LJ_TNIL);
1999 } else { 2002 } else {
2000 dasm_put(Dst, 13048, LJ_TNIL); 2003 dasm_put(Dst, 13065, LJ_TNIL);
2001 } 2004 }
2002 dasm_put(Dst, 13055); 2005 dasm_put(Dst, 13072);
2003 if (op != BC_RET0) { 2006 if (op != BC_RET0) {
2004 dasm_put(Dst, 13075); 2007 dasm_put(Dst, 13092);
2005 } 2008 }
2006 dasm_put(Dst, 4568); 2009 dasm_put(Dst, 4568);
2007 break; 2010 break;
@@ -2011,7 +2014,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
2011 2014
2012 case BC_FORL: 2015 case BC_FORL:
2013#if LJ_HASJIT 2016#if LJ_HASJIT
2014 dasm_put(Dst, 13078, HOTCOUNT_PCMASK, GG_DISP2HOT); 2017 dasm_put(Dst, 13095, HOTCOUNT_PCMASK, GG_DISP2HOT);
2015#endif 2018#endif
2016 break; 2019 break;
2017 2020
@@ -2023,57 +2026,57 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
2023 case BC_FORI: 2026 case BC_FORI:
2024 case BC_IFORL: 2027 case BC_IFORL:
2025 vk = (op == BC_IFORL || op == BC_JFORL); 2028 vk = (op == BC_IFORL || op == BC_JFORL);
2026 dasm_put(Dst, 13099); 2029 dasm_put(Dst, 13116);
2027 if (!vk) { 2030 if (!vk) {
2028 dasm_put(Dst, 13103, LJ_TISNUM, LJ_TISNUM); 2031 dasm_put(Dst, 13120, LJ_TISNUM, LJ_TISNUM);
2029 } 2032 }
2030 dasm_put(Dst, 13122); 2033 dasm_put(Dst, 13139);
2031 if (!vk) { 2034 if (!vk) {
2032 dasm_put(Dst, 13126, LJ_TISNUM); 2035 dasm_put(Dst, 13143, LJ_TISNUM);
2033 } 2036 }
2034 if (sse) { 2037 if (sse) {
2035 dasm_put(Dst, 13135); 2038 dasm_put(Dst, 13152);
2036 if (vk) { 2039 if (vk) {
2037 dasm_put(Dst, 13147); 2040 dasm_put(Dst, 13164);
2038 } else { 2041 } else {
2039 dasm_put(Dst, 13166); 2042 dasm_put(Dst, 13183);
2040 } 2043 }
2041 dasm_put(Dst, 13171); 2044 dasm_put(Dst, 13188);
2042 } else { 2045 } else {
2043 dasm_put(Dst, 13184); 2046 dasm_put(Dst, 13201);
2044 if (vk) { 2047 if (vk) {
2045 dasm_put(Dst, 13190); 2048 dasm_put(Dst, 13207);
2046 } else { 2049 } else {
2047 dasm_put(Dst, 13206); 2050 dasm_put(Dst, 13223);
2048 } 2051 }
2049 dasm_put(Dst, 13214); 2052 dasm_put(Dst, 13231);
2050 if (cmov) { 2053 if (cmov) {
2051 dasm_put(Dst, 9145); 2054 dasm_put(Dst, 9162);
2052 } else { 2055 } else {
2053 dasm_put(Dst, 9151); 2056 dasm_put(Dst, 9168);
2054 } 2057 }
2055 if (!cmov) { 2058 if (!cmov) {
2056 dasm_put(Dst, 13219); 2059 dasm_put(Dst, 13236);
2057 } 2060 }
2058 } 2061 }
2059 if (op == BC_FORI) { 2062 if (op == BC_FORI) {
2060 dasm_put(Dst, 13225, -BCBIAS_J*4); 2063 dasm_put(Dst, 13242, -BCBIAS_J*4);
2061 } else if (op == BC_JFORI) { 2064 } else if (op == BC_JFORI) {
2062 dasm_put(Dst, 13235, -BCBIAS_J*4, BC_JLOOP); 2065 dasm_put(Dst, 13252, -BCBIAS_J*4, BC_JLOOP);
2063 } else if (op == BC_IFORL) { 2066 } else if (op == BC_IFORL) {
2064 dasm_put(Dst, 13249, -BCBIAS_J*4); 2067 dasm_put(Dst, 13266, -BCBIAS_J*4);
2065 } else { 2068 } else {
2066 dasm_put(Dst, 13245, BC_JLOOP); 2069 dasm_put(Dst, 13262, BC_JLOOP);
2067 } 2070 }
2068 dasm_put(Dst, 9180); 2071 dasm_put(Dst, 9197);
2069 if (sse) { 2072 if (sse) {
2070 dasm_put(Dst, 13259); 2073 dasm_put(Dst, 13276);
2071 } 2074 }
2072 break; 2075 break;
2073 2076
2074 case BC_ITERL: 2077 case BC_ITERL:
2075#if LJ_HASJIT 2078#if LJ_HASJIT
2076 dasm_put(Dst, 13078, HOTCOUNT_PCMASK, GG_DISP2HOT); 2079 dasm_put(Dst, 13095, HOTCOUNT_PCMASK, GG_DISP2HOT);
2077#endif 2080#endif
2078 break; 2081 break;
2079 2082
@@ -2082,33 +2085,33 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
2082 break; 2085 break;
2083#endif 2086#endif
2084 case BC_IITERL: 2087 case BC_IITERL:
2085 dasm_put(Dst, 13270, LJ_TNIL); 2088 dasm_put(Dst, 13287, LJ_TNIL);
2086 if (op == BC_JITERL) { 2089 if (op == BC_JITERL) {
2087 dasm_put(Dst, 13285, BC_JLOOP); 2090 dasm_put(Dst, 13302, BC_JLOOP);
2088 } else { 2091 } else {
2089 dasm_put(Dst, 13299, -BCBIAS_J*4); 2092 dasm_put(Dst, 13316, -BCBIAS_J*4);
2090 } 2093 }
2091 dasm_put(Dst, 9484); 2094 dasm_put(Dst, 9501);
2092 break; 2095 break;
2093 2096
2094 case BC_LOOP: 2097 case BC_LOOP:
2095#if LJ_HASJIT 2098#if LJ_HASJIT
2096 dasm_put(Dst, 13078, HOTCOUNT_PCMASK, GG_DISP2HOT); 2099 dasm_put(Dst, 13095, HOTCOUNT_PCMASK, GG_DISP2HOT);
2097#endif 2100#endif
2098 break; 2101 break;
2099 2102
2100 case BC_ILOOP: 2103 case BC_ILOOP:
2101 dasm_put(Dst, 7270); 2104 dasm_put(Dst, 7287);
2102 break; 2105 break;
2103 2106
2104 case BC_JLOOP: 2107 case BC_JLOOP:
2105#if LJ_HASJIT 2108#if LJ_HASJIT
2106 dasm_put(Dst, 13315, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); 2109 dasm_put(Dst, 13332, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L));
2107#endif 2110#endif
2108 break; 2111 break;
2109 2112
2110 case BC_JMP: 2113 case BC_JMP:
2111 dasm_put(Dst, 13342, -BCBIAS_J*4); 2114 dasm_put(Dst, 13359, -BCBIAS_J*4);
2112 break; 2115 break;
2113 2116
2114 /* -- Function headers -------------------------------------------------- */ 2117 /* -- Function headers -------------------------------------------------- */
@@ -2131,47 +2134,47 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
2131 break; 2134 break;
2132#endif 2135#endif
2133 case BC_IFUNCF: 2136 case BC_IFUNCF:
2134 dasm_put(Dst, 13368, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); 2137 dasm_put(Dst, 13385, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams));
2135 if (op == BC_JFUNCF) { 2138 if (op == BC_JFUNCF) {
2136 dasm_put(Dst, 13399, BC_JLOOP); 2139 dasm_put(Dst, 13416, BC_JLOOP);
2137 } else { 2140 } else {
2138 dasm_put(Dst, 7270); 2141 dasm_put(Dst, 7287);
2139 } 2142 }
2140 dasm_put(Dst, 13408, LJ_TNIL); 2143 dasm_put(Dst, 13425, LJ_TNIL);
2141 break; 2144 break;
2142 2145
2143 case BC_JFUNCV: 2146 case BC_JFUNCV:
2144#if !LJ_HASJIT 2147#if !LJ_HASJIT
2145 break; 2148 break;
2146#endif 2149#endif
2147 dasm_put(Dst, 7146); 2150 dasm_put(Dst, 7163);
2148 break; /* NYI: compiled vararg functions. */ 2151 break; /* NYI: compiled vararg functions. */
2149 2152
2150 case BC_IFUNCV: 2153 case BC_IFUNCV:
2151 dasm_put(Dst, 13430, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); 2154 dasm_put(Dst, 13447, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL);
2152 if (op == BC_JFUNCV) { 2155 if (op == BC_JFUNCV) {
2153 dasm_put(Dst, 13399, BC_JLOOP); 2156 dasm_put(Dst, 13416, BC_JLOOP);
2154 } else { 2157 } else {
2155 dasm_put(Dst, 13527, -4+PC2PROTO(k)); 2158 dasm_put(Dst, 13544, -4+PC2PROTO(k));
2156 } 2159 }
2157 dasm_put(Dst, 13552, LJ_TNIL); 2160 dasm_put(Dst, 13569, LJ_TNIL);
2158 break; 2161 break;
2159 2162
2160 case BC_FUNCC: 2163 case BC_FUNCC:
2161 case BC_FUNCCW: 2164 case BC_FUNCCW:
2162 dasm_put(Dst, 13574, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); 2165 dasm_put(Dst, 13591, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top));
2163 if (op == BC_FUNCC) { 2166 if (op == BC_FUNCC) {
2164 dasm_put(Dst, 13604); 2167 dasm_put(Dst, 13621);
2165 } else { 2168 } else {
2166 dasm_put(Dst, 13608); 2169 dasm_put(Dst, 13625);
2167 } 2170 }
2168 dasm_put(Dst, 13616, DISPATCH_GL(vmstate), ~LJ_VMST_C); 2171 dasm_put(Dst, 13633, DISPATCH_GL(vmstate), ~LJ_VMST_C);
2169 if (op == BC_FUNCC) { 2172 if (op == BC_FUNCC) {
2170 dasm_put(Dst, 13626); 2173 dasm_put(Dst, 13643);
2171 } else { 2174 } else {
2172 dasm_put(Dst, 13631, DISPATCH_GL(wrapf)); 2175 dasm_put(Dst, 13648, DISPATCH_GL(wrapf));
2173 } 2176 }
2174 dasm_put(Dst, 13637, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); 2177 dasm_put(Dst, 13654, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top));
2175 break; 2178 break;
2176 2179
2177 /* ---------------------------------------------------------------------- */ 2180 /* ---------------------------------------------------------------------- */
@@ -2199,7 +2202,7 @@ static int build_backend(BuildCtx *ctx)
2199 2202
2200 build_subroutines(ctx, cmov, sse); 2203 build_subroutines(ctx, cmov, sse);
2201 2204
2202 dasm_put(Dst, 13663); 2205 dasm_put(Dst, 13680);
2203 for (op = 0; op < BC__MAX; op++) 2206 for (op = 0; op < BC__MAX; op++)
2204 build_ins(ctx, (BCOp)op, op, cmov, sse); 2207 build_ins(ctx, (BCOp)op, op, cmov, sse);
2205 2208
diff --git a/src/buildvm_x64win.h b/src/buildvm_x64win.h
index 772660d9..093b5fa0 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
15static const unsigned char build_actionlist[13478] = { 15static const unsigned char build_actionlist[13494] = {
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,
@@ -354,71 +354,72 @@ static const unsigned char build_actionlist[13478] = {
354 149,233,139,133,233,41,208,193,232,3,131,192,1,72,139,108,36,32,85,195,248, 354 149,233,139,133,233,41,208,193,232,3,131,192,1,72,139,108,36,32,85,195,248,
355 136,255,15,182,131,233,168,235,15,133,244,251,168,235,15,133,244,247,168, 355 136,255,15,182,131,233,168,235,15,133,244,251,168,235,15,133,244,247,168,
356 235,15,132,244,247,252,255,139,233,252,233,244,247,255,248,137,15,182,131, 356 235,15,132,244,247,252,255,139,233,252,233,244,247,255,248,137,15,182,131,
357 233,168,235,15,133,244,251,168,235,15,132,244,251,252,255,139,233,15,132, 357 233,168,235,15,133,244,251,252,233,244,247,248,138,15,182,131,233,168,235,
358 244,247,168,235,15,132,244,251,248,1,139,108,36,96,137,149,233,137,252,242, 358 15,133,244,251,168,235,15,132,244,251,252,255,139,233,15,132,244,247,168,
359 137,252,233,232,251,1,20,248,3,139,149,233,248,4,15,182,78,252,253,248,5, 359 235,15,132,244,251,248,1,255,139,108,36,96,137,149,233,137,252,242,137,252,
360 255,15,182,110,252,252,15,183,70,252,254,252,255,164,253,252,235,233,248, 360 233,232,251,1,20,248,3,139,149,233,248,4,15,182,78,252,253,248,5,15,182,110,
361 138,131,198,4,139,77,232,137,76,36,84,252,233,244,4,248,139,255,204,255,248, 361 252,252,15,183,70,252,254,252,255,164,253,252,235,233,248,139,131,198,4,139,
362 140,255,72,199,131,233,0,0,0,0,252,233,244,247,255,248,141,255,72,137,171, 362 77,232,137,76,36,84,252,233,244,4,248,140,255,204,255,248,141,255,72,199,
363 233,248,1,255,141,68,194,252,248,139,108,36,96,137,149,233,137,133,233,137, 363 131,233,0,0,0,0,252,233,244,247,255,248,142,255,72,137,171,233,248,1,255,
364 252,242,137,252,233,137,116,36,100,232,251,1,21,199,68,36,100,0,0,0,0,139, 364 141,68,194,252,248,139,108,36,96,137,149,233,137,133,233,137,252,242,137,
365 149,233,72,137,193,139,133,233,41,208,72,137,205,15,182,78,252,253,193,232, 365 252,233,137,116,36,100,232,251,1,21,199,68,36,100,0,0,0,0,139,149,233,72,
366 3,131,192,1,252,255,229,248,142,255,248,143,255,139,122,252,248,139,191,233, 366 137,193,139,133,233,41,208,72,137,205,15,182,78,252,253,193,232,3,131,192,
367 139,191,233,199,131,233,0,0,0,0,199,131,233,237,139,6,15,182,204,15,182,232, 367 1,252,255,229,248,143,255,248,144,255,139,122,252,248,139,191,233,139,191,
368 131,198,4,193,232,16,252,255,36,252,235,255,248,82,255,217,124,36,4,137,68, 368 233,199,131,233,0,0,0,0,199,131,233,237,139,6,15,182,204,15,182,232,131,198,
369 36,8,102,184,0,4,102,11,68,36,4,102,37,252,255,252,247,102,137,68,36,6,217, 369 4,193,232,16,252,255,36,252,235,255,248,82,255,217,124,36,4,137,68,36,8,102,
370 108,36,6,217,252,252,217,108,36,4,139,68,36,8,195,255,248,144,72,184,237, 370 184,0,4,102,11,68,36,4,102,37,252,255,252,247,102,137,68,36,6,217,108,36,
371 237,102,72,15,110,208,72,184,237,237,102,72,15,110,216,15,40,200,102,15,84, 371 6,217,252,252,217,108,36,4,139,68,36,8,195,255,248,145,72,184,237,237,102,
372 202,102,15,46,217,15,134,244,247,102,15,85,208,252,242,15,88,203,252,242, 372 72,15,110,208,72,184,237,237,102,72,15,110,216,15,40,200,102,15,84,202,102,
373 15,92,203,102,15,86,202,72,184,237,237,102,72,15,110,208,252,242,15,194,193, 373 15,46,217,15,134,244,247,102,15,85,208,252,242,15,88,203,252,242,15,92,203,
374 1,102,15,84,194,252,242,15,92,200,15,40,193,248,1,195,248,84,255,217,124, 374 102,15,86,202,72,184,237,237,102,72,15,110,208,252,242,15,194,193,1,102,15,
375 36,4,137,68,36,8,102,184,0,8,102,11,68,36,4,102,37,252,255,252,251,102,137, 375 84,194,252,242,15,92,200,15,40,193,248,1,195,248,84,255,217,124,36,4,137,
376 68,36,6,217,108,36,6,217,252,252,217,108,36,4,139,68,36,8,195,255,248,145, 376 68,36,8,102,184,0,8,102,11,68,36,4,102,37,252,255,252,251,102,137,68,36,6,
377 72,184,237,237,102,72,15,110,208,72,184,237,237,102,72,15,110,216,15,40,200,
378 102,15,84,202,102,15,46,217,15,134,244,247,102,15,85,208,252,242,15,88,203,
379 252,242,15,92,203,102,15,86,202,72,184,237,237,102,72,15,110,208,252,242,
380 15,194,193,6,102,15,84,194,252,242,15,92,200,15,40,193,248,1,195,248,104,
381 255,217,124,36,4,137,68,36,8,102,184,0,12,102,11,68,36,4,102,137,68,36,6,
382 217,108,36,6,217,252,252,217,108,36,4,139,68,36,8,195,255,248,146,72,184, 377 217,108,36,6,217,252,252,217,108,36,4,139,68,36,8,195,255,248,146,72,184,
383 237,237,102,72,15,110,208,72,184,237,237,102,72,15,110,216,15,40,200,102, 378 237,237,102,72,15,110,208,72,184,237,237,102,72,15,110,216,15,40,200,102,
384 15,84,202,102,15,46,217,15,134,244,247,102,15,85,208,15,40,193,252,242,15, 379 15,84,202,102,15,46,217,15,134,244,247,102,15,85,208,252,242,15,88,203,252,
385 88,203,252,242,15,92,203,72,184,237,237,102,72,15,110,216,252,242,15,194, 380 242,15,92,203,102,15,86,202,72,184,237,237,102,72,15,110,208,252,242,15,194,
386 193,1,102,15,84,195,252,242,15,92,200,102,15,86,202,15,40,193,248,1,195,248, 381 193,6,102,15,84,194,252,242,15,92,200,15,40,193,248,1,195,248,104,255,217,
387 147,255,15,40,232,252,242,15,94,193,72,184,237,237,102,72,15,110,208,72,184, 382 124,36,4,137,68,36,8,102,184,0,12,102,11,68,36,4,102,137,68,36,6,217,108,
388 237,237,102,72,15,110,216,15,40,224,102,15,84,226,102,15,46,220,15,134,244, 383 36,6,217,252,252,217,108,36,4,139,68,36,8,195,255,248,147,72,184,237,237,
389 247,102,15,85,208,252,242,15,88,227,252,242,15,92,227,102,15,86,226,72,184, 384 102,72,15,110,208,72,184,237,237,102,72,15,110,216,15,40,200,102,15,84,202,
390 237,237,102,72,15,110,208,252,242,15,194,196,1,102,15,84,194,252,242,15,92, 385 102,15,46,217,15,134,244,247,102,15,85,208,15,40,193,252,242,15,88,203,252,
391 224,15,40,197,252,242,15,89,204,252,242,15,92,193,195,248,1,252,242,15,89, 386 242,15,92,203,72,184,237,237,102,72,15,110,216,252,242,15,194,193,1,102,15,
392 200,15,40,197,252,242,15,92,193,195,255,217,193,216,252,241,217,124,36,4, 387 84,195,252,242,15,92,200,102,15,86,202,15,40,193,248,1,195,248,148,255,15,
393 102,184,0,4,102,11,68,36,4,102,37,252,255,252,247,102,137,68,36,6,217,108, 388 40,232,252,242,15,94,193,72,184,237,237,102,72,15,110,208,72,184,237,237,
394 36,6,217,252,252,217,108,36,4,222,201,222,252,233,195,255,248,88,217,252, 389 102,72,15,110,216,15,40,224,102,15,84,226,102,15,46,220,15,134,244,247,102,
395 234,222,201,248,148,217,84,36,8,129,124,36,8,0,0,128,127,15,132,244,247,129, 390 15,85,208,252,242,15,88,227,252,242,15,92,227,102,15,86,226,72,184,237,237,
396 124,36,8,0,0,128,252,255,15,132,244,248,248,149,217,192,217,252,252,220,252, 391 102,72,15,110,208,252,242,15,194,196,1,102,15,84,194,252,242,15,92,224,15,
397 233,217,201,217,252,240,217,232,222,193,217,252,253,221,217,248,1,195,248, 392 40,197,252,242,15,89,204,252,242,15,92,193,195,248,1,252,242,15,89,200,15,
398 2,221,216,217,252,238,195,255,248,107,255,248,150,252,242,15,45,193,252,242, 393 40,197,252,242,15,92,193,195,255,217,193,216,252,241,217,124,36,4,102,184,
399 15,42,208,102,15,46,202,15,133,244,254,15,138,244,255,248,151,131,252,248, 394 0,4,102,11,68,36,4,102,37,252,255,252,247,102,137,68,36,6,217,108,36,6,217,
400 1,15,142,244,252,248,1,169,1,0,0,0,15,133,244,248,252,242,15,89,192,209,232, 395 252,252,217,108,36,4,222,201,222,252,233,195,255,248,88,217,252,234,222,201,
401 252,233,244,1,248,2,209,232,15,132,244,251,15,40,200,248,3,252,242,15,89, 396 248,149,217,84,36,8,129,124,36,8,0,0,128,127,15,132,244,247,129,124,36,8,
402 192,209,232,15,132,244,250,15,131,244,3,255,252,242,15,89,200,252,233,244, 397 0,0,128,252,255,15,132,244,248,248,150,217,192,217,252,252,220,252,233,217,
403 3,248,4,252,242,15,89,193,248,5,195,248,6,15,132,244,5,15,130,244,253,80, 398 201,217,252,240,217,232,222,193,217,252,253,221,217,248,1,195,248,2,221,216,
404 72,184,237,237,102,72,15,110,200,252,242,15,94,200,88,15,40,193,252,247,216, 399 217,252,238,195,255,248,107,255,248,151,252,242,15,45,193,252,242,15,42,208,
405 131,252,248,1,15,132,244,5,252,233,244,1,248,7,72,184,237,237,102,72,15,110, 400 102,15,46,202,15,133,244,254,15,138,244,255,248,152,131,252,248,1,15,142,
406 192,195,248,8,102,72,15,126,200,72,209,224,72,193,192,12,72,61,252,254,15, 401 244,252,248,1,169,1,0,0,0,15,133,244,248,252,242,15,89,192,209,232,252,233,
407 0,0,15,132,244,248,255,102,72,15,126,192,72,209,224,15,132,244,250,72,193, 402 244,1,248,2,209,232,15,132,244,251,15,40,200,248,3,252,242,15,89,192,209,
408 192,12,72,61,252,254,15,0,0,15,132,244,251,252,242,15,17,76,36,16,252,242, 403 232,15,132,244,250,15,131,244,3,255,252,242,15,89,200,252,233,244,3,248,4,
409 15,17,68,36,8,221,68,36,16,221,68,36,8,217,252,241,217,192,217,252,252,220, 404 252,242,15,89,193,248,5,195,248,6,15,132,244,5,15,130,244,253,80,72,184,237,
410 252,233,217,201,217,252,240,217,232,222,193,217,252,253,221,217,221,92,36, 405 237,102,72,15,110,200,252,242,15,94,200,88,15,40,193,252,247,216,131,252,
411 8,252,242,15,16,68,36,8,195,248,9,72,184,237,237,102,72,15,110,208,102,15, 406 248,1,15,132,244,5,252,233,244,1,248,7,72,184,237,237,102,72,15,110,192,195,
412 46,194,15,132,244,247,15,40,193,248,1,195,248,2,72,184,237,237,102,72,15, 407 248,8,102,72,15,126,200,72,209,224,72,193,192,12,72,61,252,254,15,0,0,15,
413 110,208,102,15,84,194,72,184,237,237,102,72,15,110,208,102,15,46,194,15,132, 408 132,244,248,255,102,72,15,126,192,72,209,224,15,132,244,250,72,193,192,12,
414 244,1,102,15,80,193,15,87,192,136,196,15,146,208,48,224,15,133,244,1,248, 409 72,61,252,254,15,0,0,15,132,244,251,252,242,15,17,76,36,16,252,242,15,17,
415 3,72,184,237,237,255,102,72,15,110,192,195,248,4,102,15,80,193,133,192,15, 410 68,36,8,221,68,36,16,221,68,36,8,217,252,241,217,192,217,252,252,220,252,
416 133,244,3,15,87,192,195,248,5,102,15,80,193,133,192,15,132,244,3,15,87,192, 411 233,217,201,217,252,240,217,232,222,193,217,252,253,221,217,221,92,36,8,252,
417 195,248,152,255,131,252,250,1,15,130,244,82,15,132,244,84,131,252,250,3,15, 412 242,15,16,68,36,8,195,248,9,72,184,237,237,102,72,15,110,208,102,15,46,194,
418 130,244,104,15,135,244,248,252,242,15,81,192,195,248,2,252,242,15,17,68,36, 413 15,132,244,247,15,40,193,248,1,195,248,2,72,184,237,237,102,72,15,110,208,
419 8,221,68,36,8,131,252,250,5,15,135,244,248,88,15,132,244,247,232,244,88,80, 414 102,15,84,194,72,184,237,237,102,72,15,110,208,102,15,46,194,15,132,244,1,
420 252,233,244,253,248,1,232,244,148,255,80,252,233,244,253,248,2,131,252,250, 415 102,15,80,193,15,87,192,136,196,15,146,208,48,224,15,133,244,1,248,3,72,184,
421 7,15,132,244,247,15,135,244,248,217,252,237,217,201,217,252,241,252,233,244, 416 237,237,255,102,72,15,110,192,195,248,4,102,15,80,193,133,192,15,133,244,
417 3,15,87,192,195,248,5,102,15,80,193,133,192,15,132,244,3,15,87,192,195,248,
418 153,255,131,252,250,1,15,130,244,82,15,132,244,84,131,252,250,3,15,130,244,
419 104,15,135,244,248,252,242,15,81,192,195,248,2,252,242,15,17,68,36,8,221,
420 68,36,8,131,252,250,5,15,135,244,248,88,15,132,244,247,232,244,88,80,252,
421 233,244,253,248,1,232,244,149,255,80,252,233,244,253,248,2,131,252,250,7,
422 15,132,244,247,15,135,244,248,217,252,237,217,201,217,252,241,252,233,244,
422 253,248,1,217,232,217,201,217,252,241,252,233,244,253,248,2,131,252,250,9, 423 253,248,1,217,232,217,201,217,252,241,252,233,244,253,248,2,131,252,250,9,
423 15,132,244,247,15,135,244,248,217,252,236,217,201,217,252,241,252,233,244, 424 15,132,244,247,15,135,244,248,217,252,236,217,201,217,252,241,252,233,244,
424 253,248,1,255,217,252,254,252,233,244,253,248,2,131,252,250,11,15,132,244, 425 253,248,1,255,217,252,254,252,233,244,253,248,2,131,252,250,11,15,132,244,
@@ -426,14 +427,14 @@ static const unsigned char build_actionlist[13478] = {
426 248,7,221,92,36,8,252,242,15,16,68,36,8,195,255,139,84,36,12,221,68,36,4, 427 248,7,221,92,36,8,252,242,15,16,68,36,8,195,255,139,84,36,12,221,68,36,4,
427 131,252,250,1,15,130,244,82,15,132,244,84,131,252,250,3,15,130,244,104,15, 428 131,252,250,1,15,130,244,82,15,132,244,84,131,252,250,3,15,130,244,104,15,
428 135,244,248,217,252,250,195,248,2,131,252,250,5,15,130,244,88,15,132,244, 429 135,244,248,217,252,250,195,248,2,131,252,250,5,15,130,244,88,15,132,244,
429 148,131,252,250,7,15,132,244,247,15,135,244,248,217,252,237,217,201,217,252, 430 149,131,252,250,7,15,132,244,247,15,135,244,248,217,252,237,217,201,217,252,
430 241,195,248,1,217,232,217,201,217,252,241,195,248,2,131,252,250,9,15,132, 431 241,195,248,1,217,232,217,201,217,252,241,195,248,2,131,252,250,9,15,132,
431 244,247,255,15,135,244,248,217,252,236,217,201,217,252,241,195,248,1,217, 432 244,247,255,15,135,244,248,217,252,236,217,201,217,252,241,195,248,1,217,
432 252,254,195,248,2,131,252,250,11,15,132,244,247,15,135,244,255,217,252,255, 433 252,254,195,248,2,131,252,250,11,15,132,244,247,15,135,244,255,217,252,255,
433 195,248,1,217,252,242,221,216,195,255,248,9,204,248,153,255,65,131,252,248, 434 195,248,1,217,252,242,221,216,195,255,248,9,204,248,154,255,65,131,252,248,
434 1,15,132,244,247,15,135,244,248,252,242,15,88,193,195,248,1,252,242,15,92, 435 1,15,132,244,247,15,135,244,248,252,242,15,88,193,195,248,1,252,242,15,92,
435 193,195,248,2,65,131,252,248,3,15,132,244,247,15,135,244,248,252,242,15,89, 436 193,195,248,2,65,131,252,248,3,15,132,244,247,15,135,244,248,252,242,15,89,
436 193,195,248,1,252,242,15,94,193,195,248,2,65,131,252,248,5,15,130,244,147, 437 193,195,248,1,252,242,15,94,193,195,248,2,65,131,252,248,5,15,130,244,148,
437 15,132,244,107,65,131,252,248,7,15,132,244,247,15,135,244,248,72,184,237, 438 15,132,244,107,65,131,252,248,7,15,132,244,247,15,135,244,248,72,184,237,
438 237,255,102,72,15,110,200,15,87,193,195,248,1,72,184,237,237,102,72,15,110, 439 237,255,102,72,15,110,200,15,87,193,195,248,1,72,184,237,237,102,72,15,110,
439 200,15,84,193,195,248,2,65,131,252,248,9,15,135,244,248,252,242,15,17,68, 440 200,15,84,193,195,248,2,65,131,252,248,9,15,135,244,248,252,242,15,17,68,
@@ -443,14 +444,14 @@ static const unsigned char build_actionlist[13478] = {
443 252,242,15,93,193,195,248,1,252,242,15,95,193,195,248,9,204,255,139,68,36, 444 252,242,15,93,193,195,248,1,252,242,15,95,193,195,248,9,204,255,139,68,36,
444 20,221,68,36,4,221,68,36,12,131,252,248,1,15,132,244,247,15,135,244,248,222, 445 20,221,68,36,4,221,68,36,12,131,252,248,1,15,132,244,247,15,135,244,248,222,
445 193,195,248,1,222,252,233,195,248,2,131,252,248,3,15,132,244,247,15,135,244, 446 193,195,248,1,222,252,233,195,248,2,131,252,248,3,15,132,244,247,15,135,244,
446 248,222,201,195,248,1,222,252,249,195,248,2,131,252,248,5,15,130,244,147, 447 248,222,201,195,248,1,222,252,249,195,248,2,131,252,248,5,15,130,244,148,
447 15,132,244,107,131,252,248,7,15,132,244,247,15,135,244,248,255,221,216,217, 448 15,132,244,107,131,252,248,7,15,132,244,247,15,135,244,248,255,221,216,217,
448 224,195,248,1,221,216,217,225,195,248,2,131,252,248,9,15,132,244,247,15,135, 449 224,195,248,1,221,216,217,225,195,248,2,131,252,248,9,15,132,244,247,15,135,
449 244,248,217,252,243,195,248,1,217,201,217,252,253,221,217,195,248,2,131,252, 450 244,248,217,252,243,195,248,1,217,201,217,252,253,221,217,195,248,2,131,252,
450 248,11,15,132,244,247,15,135,244,255,255,219,252,233,219,209,221,217,195, 451 248,11,15,132,244,247,15,135,244,255,255,219,252,233,219,209,221,217,195,
451 248,1,219,252,233,218,209,221,217,195,255,221,225,223,224,252,246,196,1,15, 452 248,1,219,252,233,218,209,221,217,195,255,221,225,223,224,252,246,196,1,15,
452 132,244,248,217,201,248,2,221,216,195,248,1,221,225,223,224,252,246,196,1, 453 132,244,248,217,201,248,2,221,216,195,248,1,221,225,223,224,252,246,196,1,
453 15,133,244,248,217,201,248,2,221,216,195,255,248,154,137,200,86,72,137,214, 454 15,133,244,248,217,201,248,2,221,216,195,255,248,155,137,200,86,72,137,214,
454 83,15,162,137,6,137,94,4,137,78,8,137,86,12,91,94,195,255,249,255,129,124, 455 83,15,162,137,6,137,94,4,137,78,8,137,86,12,91,94,195,255,249,255,129,124,
455 253,202,4,239,15,135,244,41,129,124,253,194,4,239,15,135,244,41,255,252,242, 456 253,202,4,239,15,135,244,41,129,124,253,194,4,239,15,135,244,41,255,252,242,
456 15,16,4,194,131,198,4,102,15,46,4,202,255,221,4,202,221,4,194,131,198,4,255, 457 15,16,4,194,131,198,4,102,15,46,4,202,255,221,4,202,221,4,194,131,198,4,255,
@@ -499,8 +500,8 @@ static const unsigned char build_actionlist[13478] = {
499 234,252,242,15,94,4,194,255,221,4,252,234,220,52,194,255,252,242,15,16,4, 500 234,252,242,15,94,4,194,255,221,4,252,234,220,52,194,255,252,242,15,16,4,
500 252,234,252,242,15,16,12,199,255,221,4,252,234,221,4,199,255,252,242,15,16, 501 252,234,252,242,15,16,12,199,255,221,4,252,234,221,4,199,255,252,242,15,16,
501 4,199,252,242,15,16,12,252,234,255,221,4,199,221,4,252,234,255,252,242,15, 502 4,199,252,242,15,16,12,252,234,255,221,4,199,221,4,252,234,255,252,242,15,
502 16,4,252,234,252,242,15,16,12,194,255,221,4,252,234,221,4,194,255,248,155, 503 16,4,252,234,252,242,15,16,12,194,255,221,4,252,234,221,4,194,255,248,156,
503 232,244,147,255,252,233,244,155,255,232,244,107,255,15,182,252,236,15,182, 504 232,244,148,255,252,233,244,156,255,232,244,107,255,15,182,252,236,15,182,
504 192,139,76,36,96,137,145,233,141,20,194,65,137,192,65,41,232,248,33,137,205, 505 192,139,76,36,96,137,145,233,141,20,194,65,137,192,65,41,232,248,33,137,205,
505 137,116,36,100,232,251,1,22,139,149,233,133,192,15,133,244,42,15,182,110, 506 137,116,36,100,232,251,1,22,139,149,233,133,192,15,133,244,42,15,182,110,
506 252,255,15,182,78,252,253,139,68,252,234,4,139,44,252,234,137,68,202,4,137, 507 252,255,15,182,78,252,253,139,68,252,234,4,139,44,252,234,137,68,202,4,137,
@@ -544,8 +545,8 @@ static const unsigned char build_actionlist[13478] = {
544 28,139,149,233,15,182,78,252,253,137,4,202,199,68,202,4,237,139,6,15,182, 545 28,139,149,233,15,182,78,252,253,137,4,202,199,68,202,4,237,139,6,15,182,
545 204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,3,137,252,233, 546 204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,3,137,252,233,
546 232,251,1,27,15,183,70,252,254,72,252,247,208,252,233,244,2,255,72,252,247, 547 232,251,1,27,15,183,70,252,254,72,252,247,208,252,233,244,2,255,72,252,247,
547 208,139,106,252,248,139,173,233,139,4,135,252,233,244,156,255,72,252,247, 548 208,139,106,252,248,139,173,233,139,4,135,252,233,244,157,255,72,252,247,
548 208,139,106,252,248,139,173,233,139,4,135,252,233,244,157,255,15,182,252, 549 208,139,106,252,248,139,173,233,139,4,135,252,233,244,158,255,15,182,252,
549 236,15,182,192,129,124,253,252,234,4,239,15,133,244,36,139,44,252,234,129, 550 236,15,182,192,129,124,253,252,234,4,239,15,133,244,36,139,44,252,234,129,
550 124,253,194,4,239,15,135,244,251,255,252,242,15,16,4,194,252,242,15,45,192, 551 124,253,194,4,239,15,135,244,251,255,252,242,15,16,4,194,252,242,15,45,192,
551 252,242,15,42,200,102,15,46,193,255,15,133,244,36,59,133,233,15,131,244,36, 552 252,242,15,42,200,102,15,46,193,255,15,133,244,36,59,133,233,15,131,244,36,
@@ -553,9 +554,9 @@ static const unsigned char build_actionlist[13478] = {
553 4,137,44,202,137,68,202,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16, 554 4,137,44,202,137,68,202,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,
554 252,255,36,252,235,248,2,131,189,233,0,15,132,244,1,139,141,233,252,246,129, 555 252,255,36,252,235,248,2,131,189,233,0,15,132,244,1,139,141,233,252,246,129,
555 233,235,15,132,244,36,15,182,78,252,253,252,233,244,1,248,5,255,129,124,253, 556 233,235,15,132,244,36,15,182,78,252,253,252,233,244,1,248,5,255,129,124,253,
556 194,4,239,15,133,244,36,139,4,194,252,233,244,156,255,15,182,252,236,15,182, 557 194,4,239,15,133,244,36,139,4,194,252,233,244,157,255,15,182,252,236,15,182,
557 192,72,252,247,208,139,4,135,129,124,253,252,234,4,239,15,133,244,34,139, 558 192,72,252,247,208,139,4,135,129,124,253,252,234,4,239,15,133,244,34,139,
558 44,252,234,248,156,139,141,233,35,136,233,105,201,239,3,141,233,248,1,129, 559 44,252,234,248,157,139,141,233,35,136,233,105,201,239,3,141,233,248,1,129,
559 185,233,239,15,133,244,250,57,129,233,15,133,244,250,129,121,253,4,239,15, 560 185,233,239,15,133,244,250,57,129,233,15,133,244,250,129,121,253,4,239,15,
560 132,244,251,15,182,70,252,253,139,41,139,73,4,137,44,194,248,2,255,137,76, 561 132,244,251,15,182,70,252,253,139,41,139,73,4,137,44,194,248,2,255,137,76,
561 194,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235, 562 194,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,
@@ -573,10 +574,10 @@ static const unsigned char build_actionlist[13478] = {
573 137,104,4,137,8,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255, 574 137,104,4,137,8,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,
574 36,252,235,248,3,131,189,233,0,15,132,244,1,139,141,233,255,252,246,129,233, 575 36,252,235,248,3,131,189,233,0,15,132,244,1,139,141,233,255,252,246,129,233,
575 235,15,132,244,39,15,182,78,252,253,252,233,244,1,248,5,129,124,253,194,4, 576 235,15,132,244,39,15,182,78,252,253,252,233,244,1,248,5,129,124,253,194,4,
576 239,15,133,244,39,139,4,194,252,233,244,157,248,7,128,165,233,235,139,139, 577 239,15,133,244,39,139,4,194,252,233,244,158,248,7,128,165,233,235,139,139,
577 233,137,171,233,137,141,233,15,182,78,252,253,252,233,244,2,255,15,182,252, 578 233,137,171,233,137,141,233,15,182,78,252,253,252,233,244,2,255,15,182,252,
578 236,15,182,192,72,252,247,208,139,4,135,129,124,253,252,234,4,239,15,133, 579 236,15,182,192,72,252,247,208,139,4,135,129,124,253,252,234,4,239,15,133,
579 244,37,139,44,252,234,248,157,139,141,233,35,136,233,105,201,239,198,133, 580 244,37,139,44,252,234,248,158,139,141,233,35,136,233,105,201,239,198,133,
580 233,0,3,141,233,248,1,129,185,233,239,15,133,244,251,57,129,233,15,133,244, 581 233,0,3,141,233,248,1,129,185,233,239,15,133,244,251,57,129,233,15,133,244,
581 251,129,121,253,4,239,15,132,244,250,248,2,255,252,246,133,233,235,15,133, 582 251,129,121,253,4,239,15,132,244,250,248,2,255,252,246,133,233,235,15,133,
582 244,253,248,3,15,182,70,252,253,139,108,194,4,139,4,194,137,105,4,137,1,139, 583 244,253,248,3,15,182,70,252,253,139,108,194,4,139,4,194,137,105,4,137,1,139,
@@ -639,7 +640,7 @@ static const unsigned char build_actionlist[13478] = {
639 198,4,193,232,16,252,255,36,252,235,248,6,255,199,71,252,252,237,131,199, 640 198,4,193,232,16,252,255,36,252,235,248,6,255,199,71,252,252,237,131,199,
640 8,255,199,68,194,252,244,237,255,131,192,1,252,233,244,5,248,7,15,139,244, 641 8,255,199,68,194,252,244,237,255,131,192,1,252,233,244,5,248,7,15,139,244,
641 14,131,230,252,248,41,252,242,255,1,252,241,255,137,252,245,209,252,237,129, 642 14,131,230,252,248,41,252,242,255,1,252,241,255,137,252,245,209,252,237,129,
642 229,239,102,131,172,253,43,233,1,15,132,244,139,255,141,12,202,255,129,121, 643 229,239,102,131,172,253,43,233,1,15,132,244,140,255,141,12,202,255,129,121,
643 253,4,239,15,135,244,53,129,121,253,12,239,15,135,244,53,255,139,105,20,255, 644 253,4,239,15,135,244,53,129,121,253,12,239,15,135,244,53,255,139,105,20,255,
644 129,252,253,239,15,135,244,53,255,252,242,15,16,1,252,242,15,16,73,8,255, 645 129,252,253,239,15,135,244,53,255,252,242,15,16,1,252,242,15,16,73,8,255,
645 252,242,15,88,65,16,252,242,15,17,1,133,252,237,15,136,244,249,255,15,140, 646 252,242,15,88,65,16,252,242,15,17,1,133,252,237,15,136,244,249,255,15,140,
@@ -797,7 +798,8 @@ enum {
797 GLOB_ff_bit_rol, 798 GLOB_ff_bit_rol,
798 GLOB_ff_bit_ror, 799 GLOB_ff_bit_ror,
799 GLOB_vm_record, 800 GLOB_vm_record,
800 GLOB_vm_hook, 801 GLOB_vm_rethook,
802 GLOB_vm_inshook,
801 GLOB_cont_hook, 803 GLOB_cont_hook,
802 GLOB_vm_hotloop, 804 GLOB_vm_hotloop,
803 GLOB_vm_callhook, 805 GLOB_vm_callhook,
@@ -948,7 +950,8 @@ static const char *const globnames[] = {
948 "ff_bit_rol", 950 "ff_bit_rol",
949 "ff_bit_ror", 951 "ff_bit_ror",
950 "vm_record", 952 "vm_record",
951 "vm_hook", 953 "vm_rethook",
954 "vm_inshook",
952 "cont_hook", 955 "cont_hook",
953 "vm_hotloop", 956 "vm_hotloop",
954 "vm_callhook", 957 "vm_callhook",
@@ -1315,84 +1318,84 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse)
1315#if LJ_HASJIT 1318#if LJ_HASJIT
1316 dasm_put(Dst, 6968, DISPATCH_GL(hookmask), HOOK_VMEVENT, HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount)); 1319 dasm_put(Dst, 6968, DISPATCH_GL(hookmask), HOOK_VMEVENT, HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount));
1317#endif 1320#endif
1318 dasm_put(Dst, 6999, DISPATCH_GL(hookmask), HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount), LUA_MASKLINE, Dt1(->base), Dt1(->base)); 1321 dasm_put(Dst, 6999, DISPATCH_GL(hookmask), HOOK_ACTIVE, DISPATCH_GL(hookmask), HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount), LUA_MASKLINE);
1319 dasm_put(Dst, 7065, GG_DISP2STATIC); 1322 dasm_put(Dst, 7050, Dt1(->base), Dt1(->base), GG_DISP2STATIC);
1320#if LJ_HASJIT 1323#if LJ_HASJIT
1321 dasm_put(Dst, 7101); 1324 dasm_put(Dst, 7117);
1322#endif
1323 dasm_put(Dst, 7103);
1324#if LJ_HASJIT
1325 dasm_put(Dst, 7106, DISPATCH_J(L));
1326#endif 1325#endif
1327 dasm_put(Dst, 7119); 1326 dasm_put(Dst, 7119);
1328#if LJ_HASJIT 1327#if LJ_HASJIT
1329 dasm_put(Dst, 7122, DISPATCH_J(L)); 1328 dasm_put(Dst, 7122, DISPATCH_J(L));
1330#endif 1329#endif
1331 dasm_put(Dst, 7129, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); 1330 dasm_put(Dst, 7135);
1332#if LJ_HASJIT 1331#if LJ_HASJIT
1333 dasm_put(Dst, 7101); 1332 dasm_put(Dst, 7138, DISPATCH_J(L));
1334#endif 1333#endif
1335 dasm_put(Dst, 7197); 1334 dasm_put(Dst, 7145, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top));
1336#if LJ_HASJIT 1335#if LJ_HASJIT
1337 dasm_put(Dst, 7200, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP); 1336 dasm_put(Dst, 7117);
1338#endif 1337#endif
1339 dasm_put(Dst, 7241); 1338 dasm_put(Dst, 7213);
1339#if LJ_HASJIT
1340 dasm_put(Dst, 7216, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP);
1341#endif
1342 dasm_put(Dst, 7257);
1340 if (!sse) { 1343 if (!sse) {
1341 dasm_put(Dst, 7244); 1344 dasm_put(Dst, 7260);
1342 } 1345 }
1343 dasm_put(Dst, 7289, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); 1346 dasm_put(Dst, 7305, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32));
1344 if (!sse) { 1347 if (!sse) {
1345 dasm_put(Dst, 7375); 1348 dasm_put(Dst, 7391);
1346 } 1349 }
1347 dasm_put(Dst, 7420, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(bff00000,00000000)), (unsigned int)((U64x(bff00000,00000000))>>32)); 1350 dasm_put(Dst, 7436, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(bff00000,00000000)), (unsigned int)((U64x(bff00000,00000000))>>32));
1348 if (!sse) { 1351 if (!sse) {
1349 dasm_put(Dst, 7506); 1352 dasm_put(Dst, 7522);
1350 } 1353 }
1351 dasm_put(Dst, 7545, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); 1354 dasm_put(Dst, 7561, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32));
1352 if (sse) { 1355 if (sse) {
1353 dasm_put(Dst, 7634, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); 1356 dasm_put(Dst, 7650, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32));
1354 } else { 1357 } else {
1355 dasm_put(Dst, 7748); 1358 dasm_put(Dst, 7764);
1356 } 1359 }
1357 dasm_put(Dst, 7795); 1360 dasm_put(Dst, 7811);
1358 if (!sse) { 1361 if (!sse) {
1359 } else { 1362 } else {
1360 dasm_put(Dst, 7869); 1363 dasm_put(Dst, 7885);
1361 } 1364 }
1362 dasm_put(Dst, 7872); 1365 dasm_put(Dst, 7888);
1363 dasm_put(Dst, 7957, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); 1366 dasm_put(Dst, 7973, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32));
1364 dasm_put(Dst, 8058, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(7ff00000,00000000)), (unsigned int)((U64x(7ff00000,00000000))>>32)); 1367 dasm_put(Dst, 8074, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(7ff00000,00000000)), (unsigned int)((U64x(7ff00000,00000000))>>32));
1365 dasm_put(Dst, 8226); 1368 dasm_put(Dst, 8242);
1366 if (sse) { 1369 if (sse) {
1367 dasm_put(Dst, 8267); 1370 dasm_put(Dst, 8283);
1368 dasm_put(Dst, 8337); 1371 dasm_put(Dst, 8353);
1369 dasm_put(Dst, 8410); 1372 dasm_put(Dst, 8426);
1370 } else { 1373 } else {
1371 dasm_put(Dst, 8460); 1374 dasm_put(Dst, 8476);
1372 dasm_put(Dst, 8552); 1375 dasm_put(Dst, 8568);
1373 } 1376 }
1374 dasm_put(Dst, 8598); 1377 dasm_put(Dst, 8614);
1375 if (sse) { 1378 if (sse) {
1376 dasm_put(Dst, 8604, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); 1379 dasm_put(Dst, 8620, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32));
1377 dasm_put(Dst, 8693, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); 1380 dasm_put(Dst, 8709, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32));
1378 } else { 1381 } else {
1379 dasm_put(Dst, 8817); 1382 dasm_put(Dst, 8833);
1380 dasm_put(Dst, 8900); 1383 dasm_put(Dst, 8916);
1381 if (cmov) { 1384 if (cmov) {
1382 dasm_put(Dst, 8955); 1385 dasm_put(Dst, 8971);
1383 } else { 1386 } else {
1384 dasm_put(Dst, 8974); 1387 dasm_put(Dst, 8990);
1385 } 1388 }
1386 dasm_put(Dst, 8813); 1389 dasm_put(Dst, 8829);
1387 } 1390 }
1388 dasm_put(Dst, 9015); 1391 dasm_put(Dst, 9031);
1389} 1392}
1390 1393
1391/* Generate the code for a single instruction. */ 1394/* Generate the code for a single instruction. */
1392static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) 1395static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
1393{ 1396{
1394 int vk = 0; 1397 int vk = 0;
1395 dasm_put(Dst, 9041, defop); 1398 dasm_put(Dst, 9057, defop);
1396 1399
1397 switch (op) { 1400 switch (op) {
1398 1401
@@ -1401,600 +1404,600 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
1401 /* Remember: all ops branch for a true comparison, fall through otherwise. */ 1404 /* Remember: all ops branch for a true comparison, fall through otherwise. */
1402 1405
1403 case BC_ISLT: case BC_ISGE: case BC_ISLE: case BC_ISGT: 1406 case BC_ISLT: case BC_ISGE: case BC_ISLE: case BC_ISGT:
1404 dasm_put(Dst, 9043, LJ_TISNUM, LJ_TISNUM); 1407 dasm_put(Dst, 9059, LJ_TISNUM, LJ_TISNUM);
1405 if (sse) { 1408 if (sse) {
1406 dasm_put(Dst, 9064); 1409 dasm_put(Dst, 9080);
1407 } else { 1410 } else {
1408 dasm_put(Dst, 9079); 1411 dasm_put(Dst, 9095);
1409 if (cmov) { 1412 if (cmov) {
1410 dasm_put(Dst, 9089); 1413 dasm_put(Dst, 9105);
1411 } else { 1414 } else {
1412 dasm_put(Dst, 9095); 1415 dasm_put(Dst, 9111);
1413 } 1416 }
1414 } 1417 }
1415 switch (op) { 1418 switch (op) {
1416 case BC_ISLT: 1419 case BC_ISLT:
1417 dasm_put(Dst, 9102); 1420 dasm_put(Dst, 9118);
1418 break; 1421 break;
1419 case BC_ISGE: 1422 case BC_ISGE:
1420 dasm_put(Dst, 8895); 1423 dasm_put(Dst, 8911);
1421 break; 1424 break;
1422 case BC_ISLE: 1425 case BC_ISLE:
1423 dasm_put(Dst, 5872); 1426 dasm_put(Dst, 5872);
1424 break; 1427 break;
1425 case BC_ISGT: 1428 case BC_ISGT:
1426 dasm_put(Dst, 9107); 1429 dasm_put(Dst, 9123);
1427 break; 1430 break;
1428 default: break; /* Shut up GCC. */ 1431 default: break; /* Shut up GCC. */
1429 } 1432 }
1430 dasm_put(Dst, 9112, -BCBIAS_J*4); 1433 dasm_put(Dst, 9128, -BCBIAS_J*4);
1431 break; 1434 break;
1432 1435
1433 case BC_ISEQV: case BC_ISNEV: 1436 case BC_ISEQV: case BC_ISNEV:
1434 vk = op == BC_ISEQV; 1437 vk = op == BC_ISEQV;
1435 dasm_put(Dst, 9146, LJ_TISNUM, LJ_TISNUM); 1438 dasm_put(Dst, 9162, LJ_TISNUM, LJ_TISNUM);
1436 if (sse) { 1439 if (sse) {
1437 dasm_put(Dst, 9172); 1440 dasm_put(Dst, 9188);
1438 } else { 1441 } else {
1439 dasm_put(Dst, 9184); 1442 dasm_put(Dst, 9200);
1440 if (cmov) { 1443 if (cmov) {
1441 dasm_put(Dst, 9089); 1444 dasm_put(Dst, 9105);
1442 } else { 1445 } else {
1443 dasm_put(Dst, 9095); 1446 dasm_put(Dst, 9111);
1444 } 1447 }
1445 } 1448 }
1446 iseqne_fp: 1449 iseqne_fp:
1447 if (vk) { 1450 if (vk) {
1448 dasm_put(Dst, 9191); 1451 dasm_put(Dst, 9207);
1449 } else { 1452 } else {
1450 dasm_put(Dst, 9200); 1453 dasm_put(Dst, 9216);
1451 } 1454 }
1452 iseqne_end: 1455 iseqne_end:
1453 if (vk) { 1456 if (vk) {
1454 dasm_put(Dst, 9209, -BCBIAS_J*4); 1457 dasm_put(Dst, 9225, -BCBIAS_J*4);
1455 } else { 1458 } else {
1456 dasm_put(Dst, 9224, -BCBIAS_J*4); 1459 dasm_put(Dst, 9240, -BCBIAS_J*4);
1457 } 1460 }
1458 dasm_put(Dst, 7221); 1461 dasm_put(Dst, 7237);
1459 if (op == BC_ISEQV || op == BC_ISNEV) { 1462 if (op == BC_ISEQV || op == BC_ISNEV) {
1460 dasm_put(Dst, 9239, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<<MM_eq); 1463 dasm_put(Dst, 9255, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<<MM_eq);
1461 if (vk) { 1464 if (vk) {
1462 dasm_put(Dst, 9297); 1465 dasm_put(Dst, 9313);
1463 } else { 1466 } else {
1464 dasm_put(Dst, 9301); 1467 dasm_put(Dst, 9317);
1465 } 1468 }
1466 dasm_put(Dst, 9307); 1469 dasm_put(Dst, 9323);
1467 } 1470 }
1468 break; 1471 break;
1469 case BC_ISEQS: case BC_ISNES: 1472 case BC_ISEQS: case BC_ISNES:
1470 vk = op == BC_ISEQS; 1473 vk = op == BC_ISEQS;
1471 dasm_put(Dst, 9312, LJ_TSTR); 1474 dasm_put(Dst, 9328, LJ_TSTR);
1472 iseqne_test: 1475 iseqne_test:
1473 if (vk) { 1476 if (vk) {
1474 dasm_put(Dst, 9195); 1477 dasm_put(Dst, 9211);
1475 } else { 1478 } else {
1476 dasm_put(Dst, 2774); 1479 dasm_put(Dst, 2774);
1477 } 1480 }
1478 goto iseqne_end; 1481 goto iseqne_end;
1479 case BC_ISEQN: case BC_ISNEN: 1482 case BC_ISEQN: case BC_ISNEN:
1480 vk = op == BC_ISEQN; 1483 vk = op == BC_ISEQN;
1481 dasm_put(Dst, 9336, LJ_TISNUM); 1484 dasm_put(Dst, 9352, LJ_TISNUM);
1482 if (sse) { 1485 if (sse) {
1483 dasm_put(Dst, 9350); 1486 dasm_put(Dst, 9366);
1484 } else { 1487 } else {
1485 dasm_put(Dst, 9362); 1488 dasm_put(Dst, 9378);
1486 if (cmov) { 1489 if (cmov) {
1487 dasm_put(Dst, 9089); 1490 dasm_put(Dst, 9105);
1488 } else { 1491 } else {
1489 dasm_put(Dst, 9095); 1492 dasm_put(Dst, 9111);
1490 } 1493 }
1491 } 1494 }
1492 goto iseqne_fp; 1495 goto iseqne_fp;
1493 case BC_ISEQP: case BC_ISNEP: 1496 case BC_ISEQP: case BC_ISNEP:
1494 vk = op == BC_ISEQP; 1497 vk = op == BC_ISEQP;
1495 dasm_put(Dst, 9369); 1498 dasm_put(Dst, 9385);
1496 goto iseqne_test; 1499 goto iseqne_test;
1497 1500
1498 /* -- Unary test and copy ops ------------------------------------------- */ 1501 /* -- Unary test and copy ops ------------------------------------------- */
1499 1502
1500 case BC_ISTC: case BC_ISFC: case BC_IST: case BC_ISF: 1503 case BC_ISTC: case BC_ISFC: case BC_IST: case BC_ISF:
1501 dasm_put(Dst, 9381, LJ_TISTRUECOND); 1504 dasm_put(Dst, 9397, LJ_TISTRUECOND);
1502 if (op == BC_IST || op == BC_ISTC) { 1505 if (op == BC_IST || op == BC_ISTC) {
1503 dasm_put(Dst, 9393); 1506 dasm_put(Dst, 9409);
1504 } else { 1507 } else {
1505 dasm_put(Dst, 9398); 1508 dasm_put(Dst, 9414);
1506 } 1509 }
1507 if (op == BC_ISTC || op == BC_ISFC) { 1510 if (op == BC_ISTC || op == BC_ISFC) {
1508 dasm_put(Dst, 9403); 1511 dasm_put(Dst, 9419);
1509 } 1512 }
1510 dasm_put(Dst, 9414, -BCBIAS_J*4); 1513 dasm_put(Dst, 9430, -BCBIAS_J*4);
1511 break; 1514 break;
1512 1515
1513 /* -- Unary ops --------------------------------------------------------- */ 1516 /* -- Unary ops --------------------------------------------------------- */
1514 1517
1515 case BC_MOV: 1518 case BC_MOV:
1516 dasm_put(Dst, 9446); 1519 dasm_put(Dst, 9462);
1517 break; 1520 break;
1518 case BC_NOT: 1521 case BC_NOT:
1519 dasm_put(Dst, 9480, LJ_TISTRUECOND, LJ_TTRUE); 1522 dasm_put(Dst, 9496, LJ_TISTRUECOND, LJ_TTRUE);
1520 break; 1523 break;
1521 case BC_UNM: 1524 case BC_UNM:
1522 dasm_put(Dst, 9516, LJ_TISNUM); 1525 dasm_put(Dst, 9532, LJ_TISNUM);
1523 if (sse) { 1526 if (sse) {
1524 dasm_put(Dst, 9527, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); 1527 dasm_put(Dst, 9543, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32));
1525 } else { 1528 } else {
1526 dasm_put(Dst, 9552); 1529 dasm_put(Dst, 9568);
1527 } 1530 }
1528 dasm_put(Dst, 7221); 1531 dasm_put(Dst, 7237);
1529 break; 1532 break;
1530 case BC_LEN: 1533 case BC_LEN:
1531 dasm_put(Dst, 9561, LJ_TSTR); 1534 dasm_put(Dst, 9577, LJ_TSTR);
1532 if (sse) { 1535 if (sse) {
1533 dasm_put(Dst, 9575, Dt5(->len)); 1536 dasm_put(Dst, 9591, Dt5(->len));
1534 } else { 1537 } else {
1535 dasm_put(Dst, 9593, Dt5(->len)); 1538 dasm_put(Dst, 9609, Dt5(->len));
1536 } 1539 }
1537 dasm_put(Dst, 9602, LJ_TTAB); 1540 dasm_put(Dst, 9618, LJ_TTAB);
1538 if (sse) { 1541 if (sse) {
1539 dasm_put(Dst, 9643); 1542 dasm_put(Dst, 9659);
1540 } else { 1543 } else {
1541 } 1544 }
1542 dasm_put(Dst, 9652); 1545 dasm_put(Dst, 9668);
1543 break; 1546 break;
1544 1547
1545 /* -- Binary ops -------------------------------------------------------- */ 1548 /* -- Binary ops -------------------------------------------------------- */
1546 1549
1547 1550
1548 case BC_ADDVN: case BC_ADDNV: case BC_ADDVV: 1551 case BC_ADDVN: case BC_ADDNV: case BC_ADDVV:
1549 dasm_put(Dst, 9662); 1552 dasm_put(Dst, 9678);
1550 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1553 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1551 switch (vk) { 1554 switch (vk) {
1552 case 0: 1555 case 0:
1553 dasm_put(Dst, 9670, LJ_TISNUM); 1556 dasm_put(Dst, 9686, LJ_TISNUM);
1554 if (sse) { 1557 if (sse) {
1555 dasm_put(Dst, 9682); 1558 dasm_put(Dst, 9698);
1556 } else { 1559 } else {
1557 dasm_put(Dst, 9696); 1560 dasm_put(Dst, 9712);
1558 } 1561 }
1559 break; 1562 break;
1560 case 1: 1563 case 1:
1561 dasm_put(Dst, 9704, LJ_TISNUM); 1564 dasm_put(Dst, 9720, LJ_TISNUM);
1562 if (sse) { 1565 if (sse) {
1563 dasm_put(Dst, 9716); 1566 dasm_put(Dst, 9732);
1564 } else { 1567 } else {
1565 dasm_put(Dst, 9730); 1568 dasm_put(Dst, 9746);
1566 } 1569 }
1567 break; 1570 break;
1568 default: 1571 default:
1569 dasm_put(Dst, 9738, LJ_TISNUM, LJ_TISNUM); 1572 dasm_put(Dst, 9754, LJ_TISNUM, LJ_TISNUM);
1570 if (sse) { 1573 if (sse) {
1571 dasm_put(Dst, 9760); 1574 dasm_put(Dst, 9776);
1572 } else { 1575 } else {
1573 dasm_put(Dst, 9774); 1576 dasm_put(Dst, 9790);
1574 } 1577 }
1575 break; 1578 break;
1576 } 1579 }
1577 if (sse) { 1580 if (sse) {
1578 dasm_put(Dst, 9545); 1581 dasm_put(Dst, 9561);
1579 } else { 1582 } else {
1580 dasm_put(Dst, 9557); 1583 dasm_put(Dst, 9573);
1581 } 1584 }
1582 dasm_put(Dst, 7221); 1585 dasm_put(Dst, 7237);
1583 break; 1586 break;
1584 case BC_SUBVN: case BC_SUBNV: case BC_SUBVV: 1587 case BC_SUBVN: case BC_SUBNV: case BC_SUBVV:
1585 dasm_put(Dst, 9662); 1588 dasm_put(Dst, 9678);
1586 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1589 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1587 switch (vk) { 1590 switch (vk) {
1588 case 0: 1591 case 0:
1589 dasm_put(Dst, 9670, LJ_TISNUM); 1592 dasm_put(Dst, 9686, LJ_TISNUM);
1590 if (sse) { 1593 if (sse) {
1591 dasm_put(Dst, 9782); 1594 dasm_put(Dst, 9798);
1592 } else { 1595 } else {
1593 dasm_put(Dst, 9796); 1596 dasm_put(Dst, 9812);
1594 } 1597 }
1595 break; 1598 break;
1596 case 1: 1599 case 1:
1597 dasm_put(Dst, 9704, LJ_TISNUM); 1600 dasm_put(Dst, 9720, LJ_TISNUM);
1598 if (sse) { 1601 if (sse) {
1599 dasm_put(Dst, 9804); 1602 dasm_put(Dst, 9820);
1600 } else { 1603 } else {
1601 dasm_put(Dst, 9818); 1604 dasm_put(Dst, 9834);
1602 } 1605 }
1603 break; 1606 break;
1604 default: 1607 default:
1605 dasm_put(Dst, 9738, LJ_TISNUM, LJ_TISNUM); 1608 dasm_put(Dst, 9754, LJ_TISNUM, LJ_TISNUM);
1606 if (sse) { 1609 if (sse) {
1607 dasm_put(Dst, 9826); 1610 dasm_put(Dst, 9842);
1608 } else { 1611 } else {
1609 dasm_put(Dst, 9840); 1612 dasm_put(Dst, 9856);
1610 } 1613 }
1611 break; 1614 break;
1612 } 1615 }
1613 if (sse) { 1616 if (sse) {
1614 dasm_put(Dst, 9545); 1617 dasm_put(Dst, 9561);
1615 } else { 1618 } else {
1616 dasm_put(Dst, 9557); 1619 dasm_put(Dst, 9573);
1617 } 1620 }
1618 dasm_put(Dst, 7221); 1621 dasm_put(Dst, 7237);
1619 break; 1622 break;
1620 case BC_MULVN: case BC_MULNV: case BC_MULVV: 1623 case BC_MULVN: case BC_MULNV: case BC_MULVV:
1621 dasm_put(Dst, 9662); 1624 dasm_put(Dst, 9678);
1622 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1625 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1623 switch (vk) { 1626 switch (vk) {
1624 case 0: 1627 case 0:
1625 dasm_put(Dst, 9670, LJ_TISNUM); 1628 dasm_put(Dst, 9686, LJ_TISNUM);
1626 if (sse) { 1629 if (sse) {
1627 dasm_put(Dst, 9848); 1630 dasm_put(Dst, 9864);
1628 } else { 1631 } else {
1629 dasm_put(Dst, 9862); 1632 dasm_put(Dst, 9878);
1630 } 1633 }
1631 break; 1634 break;
1632 case 1: 1635 case 1:
1633 dasm_put(Dst, 9704, LJ_TISNUM); 1636 dasm_put(Dst, 9720, LJ_TISNUM);
1634 if (sse) { 1637 if (sse) {
1635 dasm_put(Dst, 9870); 1638 dasm_put(Dst, 9886);
1636 } else { 1639 } else {
1637 dasm_put(Dst, 9884); 1640 dasm_put(Dst, 9900);
1638 } 1641 }
1639 break; 1642 break;
1640 default: 1643 default:
1641 dasm_put(Dst, 9738, LJ_TISNUM, LJ_TISNUM); 1644 dasm_put(Dst, 9754, LJ_TISNUM, LJ_TISNUM);
1642 if (sse) { 1645 if (sse) {
1643 dasm_put(Dst, 9892); 1646 dasm_put(Dst, 9908);
1644 } else { 1647 } else {
1645 dasm_put(Dst, 9906); 1648 dasm_put(Dst, 9922);
1646 } 1649 }
1647 break; 1650 break;
1648 } 1651 }
1649 if (sse) { 1652 if (sse) {
1650 dasm_put(Dst, 9545); 1653 dasm_put(Dst, 9561);
1651 } else { 1654 } else {
1652 dasm_put(Dst, 9557); 1655 dasm_put(Dst, 9573);
1653 } 1656 }
1654 dasm_put(Dst, 7221); 1657 dasm_put(Dst, 7237);
1655 break; 1658 break;
1656 case BC_DIVVN: case BC_DIVNV: case BC_DIVVV: 1659 case BC_DIVVN: case BC_DIVNV: case BC_DIVVV:
1657 dasm_put(Dst, 9662); 1660 dasm_put(Dst, 9678);
1658 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1661 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1659 switch (vk) { 1662 switch (vk) {
1660 case 0: 1663 case 0:
1661 dasm_put(Dst, 9670, LJ_TISNUM); 1664 dasm_put(Dst, 9686, LJ_TISNUM);
1662 if (sse) { 1665 if (sse) {
1663 dasm_put(Dst, 9914); 1666 dasm_put(Dst, 9930);
1664 } else { 1667 } else {
1665 dasm_put(Dst, 9928); 1668 dasm_put(Dst, 9944);
1666 } 1669 }
1667 break; 1670 break;
1668 case 1: 1671 case 1:
1669 dasm_put(Dst, 9704, LJ_TISNUM); 1672 dasm_put(Dst, 9720, LJ_TISNUM);
1670 if (sse) { 1673 if (sse) {
1671 dasm_put(Dst, 9936); 1674 dasm_put(Dst, 9952);
1672 } else { 1675 } else {
1673 dasm_put(Dst, 9950); 1676 dasm_put(Dst, 9966);
1674 } 1677 }
1675 break; 1678 break;
1676 default: 1679 default:
1677 dasm_put(Dst, 9738, LJ_TISNUM, LJ_TISNUM); 1680 dasm_put(Dst, 9754, LJ_TISNUM, LJ_TISNUM);
1678 if (sse) { 1681 if (sse) {
1679 dasm_put(Dst, 9958); 1682 dasm_put(Dst, 9974);
1680 } else { 1683 } else {
1681 dasm_put(Dst, 9972); 1684 dasm_put(Dst, 9988);
1682 } 1685 }
1683 break; 1686 break;
1684 } 1687 }
1685 if (sse) { 1688 if (sse) {
1686 dasm_put(Dst, 9545); 1689 dasm_put(Dst, 9561);
1687 } else { 1690 } else {
1688 dasm_put(Dst, 9557); 1691 dasm_put(Dst, 9573);
1689 } 1692 }
1690 dasm_put(Dst, 7221); 1693 dasm_put(Dst, 7237);
1691 break; 1694 break;
1692 case BC_MODVN: 1695 case BC_MODVN:
1693 dasm_put(Dst, 9662); 1696 dasm_put(Dst, 9678);
1694 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1697 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1695 switch (vk) { 1698 switch (vk) {
1696 case 0: 1699 case 0:
1697 dasm_put(Dst, 9670, LJ_TISNUM); 1700 dasm_put(Dst, 9686, LJ_TISNUM);
1698 if (sse) { 1701 if (sse) {
1699 dasm_put(Dst, 9980); 1702 dasm_put(Dst, 9996);
1700 } else { 1703 } else {
1701 dasm_put(Dst, 9994); 1704 dasm_put(Dst, 10010);
1702 } 1705 }
1703 break; 1706 break;
1704 case 1: 1707 case 1:
1705 dasm_put(Dst, 9704, LJ_TISNUM); 1708 dasm_put(Dst, 9720, LJ_TISNUM);
1706 if (sse) { 1709 if (sse) {
1707 dasm_put(Dst, 10002); 1710 dasm_put(Dst, 10018);
1708 } else { 1711 } else {
1709 dasm_put(Dst, 10016); 1712 dasm_put(Dst, 10032);
1710 } 1713 }
1711 break; 1714 break;
1712 default: 1715 default:
1713 dasm_put(Dst, 9738, LJ_TISNUM, LJ_TISNUM); 1716 dasm_put(Dst, 9754, LJ_TISNUM, LJ_TISNUM);
1714 if (sse) { 1717 if (sse) {
1715 dasm_put(Dst, 10024); 1718 dasm_put(Dst, 10040);
1716 } else { 1719 } else {
1717 dasm_put(Dst, 10038); 1720 dasm_put(Dst, 10054);
1718 } 1721 }
1719 break; 1722 break;
1720 } 1723 }
1721 dasm_put(Dst, 10046); 1724 dasm_put(Dst, 10062);
1722 if (sse) { 1725 if (sse) {
1723 dasm_put(Dst, 9545); 1726 dasm_put(Dst, 9561);
1724 } else { 1727 } else {
1725 dasm_put(Dst, 9557); 1728 dasm_put(Dst, 9573);
1726 } 1729 }
1727 dasm_put(Dst, 7221); 1730 dasm_put(Dst, 7237);
1728 break; 1731 break;
1729 case BC_MODNV: case BC_MODVV: 1732 case BC_MODNV: case BC_MODVV:
1730 dasm_put(Dst, 9662); 1733 dasm_put(Dst, 9678);
1731 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1734 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1732 switch (vk) { 1735 switch (vk) {
1733 case 0: 1736 case 0:
1734 dasm_put(Dst, 9670, LJ_TISNUM); 1737 dasm_put(Dst, 9686, LJ_TISNUM);
1735 if (sse) { 1738 if (sse) {
1736 dasm_put(Dst, 9980); 1739 dasm_put(Dst, 9996);
1737 } else { 1740 } else {
1738 dasm_put(Dst, 9994); 1741 dasm_put(Dst, 10010);
1739 } 1742 }
1740 break; 1743 break;
1741 case 1: 1744 case 1:
1742 dasm_put(Dst, 9704, LJ_TISNUM); 1745 dasm_put(Dst, 9720, LJ_TISNUM);
1743 if (sse) { 1746 if (sse) {
1744 dasm_put(Dst, 10002); 1747 dasm_put(Dst, 10018);
1745 } else { 1748 } else {
1746 dasm_put(Dst, 10016); 1749 dasm_put(Dst, 10032);
1747 } 1750 }
1748 break; 1751 break;
1749 default: 1752 default:
1750 dasm_put(Dst, 9738, LJ_TISNUM, LJ_TISNUM); 1753 dasm_put(Dst, 9754, LJ_TISNUM, LJ_TISNUM);
1751 if (sse) { 1754 if (sse) {
1752 dasm_put(Dst, 10024); 1755 dasm_put(Dst, 10040);
1753 } else { 1756 } else {
1754 dasm_put(Dst, 10038); 1757 dasm_put(Dst, 10054);
1755 } 1758 }
1756 break; 1759 break;
1757 } 1760 }
1758 dasm_put(Dst, 10052); 1761 dasm_put(Dst, 10068);
1759 break; 1762 break;
1760 case BC_POW: 1763 case BC_POW:
1761 dasm_put(Dst, 9662); 1764 dasm_put(Dst, 9678);
1762 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1765 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1763 switch (vk) { 1766 switch (vk) {
1764 case 0: 1767 case 0:
1765 dasm_put(Dst, 9670, LJ_TISNUM); 1768 dasm_put(Dst, 9686, LJ_TISNUM);
1766 if (sse) { 1769 if (sse) {
1767 dasm_put(Dst, 9980); 1770 dasm_put(Dst, 9996);
1768 } else { 1771 } else {
1769 dasm_put(Dst, 9994); 1772 dasm_put(Dst, 10010);
1770 } 1773 }
1771 break; 1774 break;
1772 case 1: 1775 case 1:
1773 dasm_put(Dst, 9704, LJ_TISNUM); 1776 dasm_put(Dst, 9720, LJ_TISNUM);
1774 if (sse) { 1777 if (sse) {
1775 dasm_put(Dst, 10002); 1778 dasm_put(Dst, 10018);
1776 } else { 1779 } else {
1777 dasm_put(Dst, 10016); 1780 dasm_put(Dst, 10032);
1778 } 1781 }
1779 break; 1782 break;
1780 default: 1783 default:
1781 dasm_put(Dst, 9738, LJ_TISNUM, LJ_TISNUM); 1784 dasm_put(Dst, 9754, LJ_TISNUM, LJ_TISNUM);
1782 if (sse) { 1785 if (sse) {
1783 dasm_put(Dst, 10024); 1786 dasm_put(Dst, 10040);
1784 } else { 1787 } else {
1785 dasm_put(Dst, 10038); 1788 dasm_put(Dst, 10054);
1786 } 1789 }
1787 break; 1790 break;
1788 } 1791 }
1789 dasm_put(Dst, 10057); 1792 dasm_put(Dst, 10073);
1790 if (sse) { 1793 if (sse) {
1791 dasm_put(Dst, 9545); 1794 dasm_put(Dst, 9561);
1792 } else { 1795 } else {
1793 dasm_put(Dst, 9557); 1796 dasm_put(Dst, 9573);
1794 } 1797 }
1795 dasm_put(Dst, 7221); 1798 dasm_put(Dst, 7237);
1796 break; 1799 break;
1797 1800
1798 case BC_CAT: 1801 case BC_CAT:
1799 dasm_put(Dst, 10061, Dt1(->base), Dt1(->base)); 1802 dasm_put(Dst, 10077, Dt1(->base), Dt1(->base));
1800 break; 1803 break;
1801 1804
1802 /* -- Constant ops ------------------------------------------------------ */ 1805 /* -- Constant ops ------------------------------------------------------ */
1803 1806
1804 case BC_KSTR: 1807 case BC_KSTR:
1805 dasm_put(Dst, 10151, LJ_TSTR); 1808 dasm_put(Dst, 10167, LJ_TSTR);
1806 break; 1809 break;
1807 case BC_KSHORT: 1810 case BC_KSHORT:
1808 if (sse) { 1811 if (sse) {
1809 dasm_put(Dst, 10186); 1812 dasm_put(Dst, 10202);
1810 } else { 1813 } else {
1811 dasm_put(Dst, 10201); 1814 dasm_put(Dst, 10217);
1812 } 1815 }
1813 dasm_put(Dst, 7221); 1816 dasm_put(Dst, 7237);
1814 break; 1817 break;
1815 case BC_KNUM: 1818 case BC_KNUM:
1816 if (sse) { 1819 if (sse) {
1817 dasm_put(Dst, 10209); 1820 dasm_put(Dst, 10225);
1818 } else { 1821 } else {
1819 dasm_put(Dst, 10222); 1822 dasm_put(Dst, 10238);
1820 } 1823 }
1821 dasm_put(Dst, 7221); 1824 dasm_put(Dst, 7237);
1822 break; 1825 break;
1823 case BC_KPRI: 1826 case BC_KPRI:
1824 dasm_put(Dst, 10229); 1827 dasm_put(Dst, 10245);
1825 break; 1828 break;
1826 case BC_KNIL: 1829 case BC_KNIL:
1827 dasm_put(Dst, 10257, LJ_TNIL); 1830 dasm_put(Dst, 10273, LJ_TNIL);
1828 break; 1831 break;
1829 1832
1830 /* -- Upvalue and function ops ------------------------------------------ */ 1833 /* -- Upvalue and function ops ------------------------------------------ */
1831 1834
1832 case BC_UGET: 1835 case BC_UGET:
1833 dasm_put(Dst, 10304, offsetof(GCfuncL, uvptr), DtA(->v)); 1836 dasm_put(Dst, 10320, offsetof(GCfuncL, uvptr), DtA(->v));
1834 break; 1837 break;
1835 case BC_USETV: 1838 case BC_USETV:
1836#define TV2MARKOFS \ 1839#define TV2MARKOFS \
1837 ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv)) 1840 ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv))
1838 dasm_put(Dst, 10349, offsetof(GCfuncL, uvptr), DtA(->closed), DtA(->v), TV2MARKOFS, LJ_GC_BLACK, LJ_TISGCV, LJ_TISNUM - LJ_TISGCV, Dt4(->gch.marked), LJ_GC_WHITES, GG_DISP2G); 1841 dasm_put(Dst, 10365, offsetof(GCfuncL, uvptr), DtA(->closed), DtA(->v), TV2MARKOFS, LJ_GC_BLACK, LJ_TISGCV, LJ_TISNUM - LJ_TISGCV, Dt4(->gch.marked), LJ_GC_WHITES, GG_DISP2G);
1839 dasm_put(Dst, 10440); 1842 dasm_put(Dst, 10456);
1840 break; 1843 break;
1841#undef TV2MARKOFS 1844#undef TV2MARKOFS
1842 case BC_USETS: 1845 case BC_USETS:
1843 dasm_put(Dst, 10452, offsetof(GCfuncL, uvptr), DtA(->v), LJ_TSTR, DtA(->marked), LJ_GC_BLACK, Dt4(->gch.marked), LJ_GC_WHITES, DtA(->closed), GG_DISP2G); 1846 dasm_put(Dst, 10468, offsetof(GCfuncL, uvptr), DtA(->v), LJ_TSTR, DtA(->marked), LJ_GC_BLACK, Dt4(->gch.marked), LJ_GC_WHITES, DtA(->closed), GG_DISP2G);
1844 break; 1847 break;
1845 case BC_USETN: 1848 case BC_USETN:
1846 dasm_put(Dst, 10545); 1849 dasm_put(Dst, 10561);
1847 if (sse) { 1850 if (sse) {
1848 dasm_put(Dst, 10550); 1851 dasm_put(Dst, 10566);
1849 } else { 1852 } else {
1850 dasm_put(Dst, 9365); 1853 dasm_put(Dst, 9381);
1851 } 1854 }
1852 dasm_put(Dst, 10557, offsetof(GCfuncL, uvptr), DtA(->v)); 1855 dasm_put(Dst, 10573, offsetof(GCfuncL, uvptr), DtA(->v));
1853 if (sse) { 1856 if (sse) {
1854 dasm_put(Dst, 10566); 1857 dasm_put(Dst, 10582);
1855 } else { 1858 } else {
1856 dasm_put(Dst, 10572); 1859 dasm_put(Dst, 10588);
1857 } 1860 }
1858 dasm_put(Dst, 7221); 1861 dasm_put(Dst, 7237);
1859 break; 1862 break;
1860 case BC_USETP: 1863 case BC_USETP:
1861 dasm_put(Dst, 10575, offsetof(GCfuncL, uvptr), DtA(->v)); 1864 dasm_put(Dst, 10591, offsetof(GCfuncL, uvptr), DtA(->v));
1862 break; 1865 break;
1863 case BC_UCLO: 1866 case BC_UCLO:
1864 dasm_put(Dst, 10614, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); 1867 dasm_put(Dst, 10630, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base));
1865 break; 1868 break;
1866 1869
1867 case BC_FNEW: 1870 case BC_FNEW:
1868 dasm_put(Dst, 10669, Dt1(->base), Dt1(->base), LJ_TFUNC); 1871 dasm_put(Dst, 10685, Dt1(->base), Dt1(->base), LJ_TFUNC);
1869 break; 1872 break;
1870 1873
1871 /* -- Table ops --------------------------------------------------------- */ 1874 /* -- Table ops --------------------------------------------------------- */
1872 1875
1873 case BC_TNEW: 1876 case BC_TNEW:
1874 dasm_put(Dst, 10735, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); 1877 dasm_put(Dst, 10751, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB);
1875 break; 1878 break;
1876 case BC_TDUP: 1879 case BC_TDUP:
1877 dasm_put(Dst, 10856, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); 1880 dasm_put(Dst, 10872, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB);
1878 break; 1881 break;
1879 1882
1880 case BC_GGET: 1883 case BC_GGET:
1881 dasm_put(Dst, 10951, Dt7(->env)); 1884 dasm_put(Dst, 10967, Dt7(->env));
1882 break; 1885 break;
1883 case BC_GSET: 1886 case BC_GSET:
1884 dasm_put(Dst, 10970, Dt7(->env)); 1887 dasm_put(Dst, 10986, Dt7(->env));
1885 break; 1888 break;
1886 1889
1887 case BC_TGETV: 1890 case BC_TGETV:
1888 dasm_put(Dst, 10989, LJ_TTAB, LJ_TISNUM); 1891 dasm_put(Dst, 11005, LJ_TTAB, LJ_TISNUM);
1889 if (sse) { 1892 if (sse) {
1890 dasm_put(Dst, 11022); 1893 dasm_put(Dst, 11038);
1891 } else { 1894 } else {
1892 } 1895 }
1893 dasm_put(Dst, 11043, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index); 1896 dasm_put(Dst, 11059, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
1894 dasm_put(Dst, 11136, LJ_TSTR); 1897 dasm_put(Dst, 11152, LJ_TSTR);
1895 break; 1898 break;
1896 case BC_TGETS: 1899 case BC_TGETS:
1897 dasm_put(Dst, 11154, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); 1900 dasm_put(Dst, 11170, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL);
1898 dasm_put(Dst, 11239, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<<MM_index); 1901 dasm_put(Dst, 11255, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
1899 break; 1902 break;
1900 case BC_TGETB: 1903 case BC_TGETB:
1901 dasm_put(Dst, 11311, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index); 1904 dasm_put(Dst, 11327, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
1902 dasm_put(Dst, 9652); 1905 dasm_put(Dst, 9668);
1903 break; 1906 break;
1904 1907
1905 case BC_TSETV: 1908 case BC_TSETV:
1906 dasm_put(Dst, 11411, LJ_TTAB, LJ_TISNUM); 1909 dasm_put(Dst, 11427, LJ_TTAB, LJ_TISNUM);
1907 if (sse) { 1910 if (sse) {
1908 dasm_put(Dst, 11022); 1911 dasm_put(Dst, 11038);
1909 } else { 1912 } else {
1910 } 1913 }
1911 dasm_put(Dst, 11444, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable)); 1914 dasm_put(Dst, 11460, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable));
1912 dasm_put(Dst, 11528, Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); 1915 dasm_put(Dst, 11544, Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
1913 break; 1916 break;
1914 case BC_TSETS: 1917 case BC_TSETS:
1915 dasm_put(Dst, 11590, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->nomm), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); 1918 dasm_put(Dst, 11606, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->nomm), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL);
1916 dasm_put(Dst, 11666, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, DtB(->next)); 1919 dasm_put(Dst, 11682, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, DtB(->next));
1917 dasm_put(Dst, 11759, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); 1920 dasm_put(Dst, 11775, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
1918 break; 1921 break;
1919 case BC_TSETB: 1922 case BC_TSETB:
1920 dasm_put(Dst, 11850, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); 1923 dasm_put(Dst, 11866, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable));
1921 dasm_put(Dst, 11949, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); 1924 dasm_put(Dst, 11965, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
1922 break; 1925 break;
1923 1926
1924 case BC_TSETM: 1927 case BC_TSETM:
1925 dasm_put(Dst, 11995); 1928 dasm_put(Dst, 12011);
1926 if (sse) { 1929 if (sse) {
1927 dasm_put(Dst, 10550); 1930 dasm_put(Dst, 10566);
1928 } else { 1931 } else {
1929 } 1932 }
1930 dasm_put(Dst, 12000, Dt6(->marked), LJ_GC_BLACK); 1933 dasm_put(Dst, 12016, Dt6(->marked), LJ_GC_BLACK);
1931 if (sse) { 1934 if (sse) {
1932 dasm_put(Dst, 12025); 1935 dasm_put(Dst, 12041);
1933 } else { 1936 } else {
1934 } 1937 }
1935 dasm_put(Dst, 12032, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain)); 1938 dasm_put(Dst, 12048, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain));
1936 dasm_put(Dst, 12158, Dt6(->gclist)); 1939 dasm_put(Dst, 12174, Dt6(->gclist));
1937 break; 1940 break;
1938 1941
1939 /* -- Calls and vararg handling ----------------------------------------- */ 1942 /* -- Calls and vararg handling ----------------------------------------- */
1940 1943
1941 case BC_CALL: case BC_CALLM: 1944 case BC_CALL: case BC_CALLM:
1942 dasm_put(Dst, 9666); 1945 dasm_put(Dst, 9682);
1943 if (op == BC_CALLM) { 1946 if (op == BC_CALLM) {
1944 dasm_put(Dst, 12166); 1947 dasm_put(Dst, 12182);
1945 } 1948 }
1946 dasm_put(Dst, 12171, LJ_TFUNC, Dt7(->pc)); 1949 dasm_put(Dst, 12187, LJ_TFUNC, Dt7(->pc));
1947 break; 1950 break;
1948 1951
1949 case BC_CALLMT: 1952 case BC_CALLMT:
1950 dasm_put(Dst, 12166); 1953 dasm_put(Dst, 12182);
1951 break; 1954 break;
1952 case BC_CALLT: 1955 case BC_CALLT:
1953 dasm_put(Dst, 12213, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); 1956 dasm_put(Dst, 12229, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc));
1954 dasm_put(Dst, 12332, FRAME_TYPE, Dt7(->pc), PC2PROTO(k)); 1957 dasm_put(Dst, 12348, FRAME_TYPE, Dt7(->pc), PC2PROTO(k));
1955 break; 1958 break;
1956 1959
1957 case BC_ITERC: 1960 case BC_ITERC:
1958 dasm_put(Dst, 12390, LJ_TFUNC, 2+1, Dt7(->pc)); 1961 dasm_put(Dst, 12406, LJ_TFUNC, 2+1, Dt7(->pc));
1959 break; 1962 break;
1960 1963
1961 case BC_VARG: 1964 case BC_VARG:
1962 dasm_put(Dst, 12471, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL); 1965 dasm_put(Dst, 12487, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL);
1963 dasm_put(Dst, 12616, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); 1966 dasm_put(Dst, 12632, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top));
1964 break; 1967 break;
1965 1968
1966 /* -- Returns ----------------------------------------------------------- */ 1969 /* -- Returns ----------------------------------------------------------- */
1967 1970
1968 case BC_RETM: 1971 case BC_RETM:
1969 dasm_put(Dst, 12166); 1972 dasm_put(Dst, 12182);
1970 break; 1973 break;
1971 1974
1972 case BC_RET: case BC_RET0: case BC_RET1: 1975 case BC_RET: case BC_RET0: case BC_RET1:
1973 if (op != BC_RET0) { 1976 if (op != BC_RET0) {
1974 dasm_put(Dst, 12715); 1977 dasm_put(Dst, 12731);
1975 } 1978 }
1976 dasm_put(Dst, 12719, FRAME_TYPE); 1979 dasm_put(Dst, 12735, FRAME_TYPE);
1977 switch (op) { 1980 switch (op) {
1978 case BC_RET: 1981 case BC_RET:
1979 dasm_put(Dst, 12738); 1982 dasm_put(Dst, 12754);
1980 break; 1983 break;
1981 case BC_RET1: 1984 case BC_RET1:
1982 dasm_put(Dst, 12796); 1985 dasm_put(Dst, 12812);
1983 /* fallthrough */ 1986 /* fallthrough */
1984 case BC_RET0: 1987 case BC_RET0:
1985 dasm_put(Dst, 12812); 1988 dasm_put(Dst, 12828);
1986 default: 1989 default:
1987 break; 1990 break;
1988 } 1991 }
1989 dasm_put(Dst, 12823, Dt7(->pc), PC2PROTO(k)); 1992 dasm_put(Dst, 12839, Dt7(->pc), PC2PROTO(k));
1990 if (op == BC_RET) { 1993 if (op == BC_RET) {
1991 dasm_put(Dst, 12867, LJ_TNIL); 1994 dasm_put(Dst, 12883, LJ_TNIL);
1992 } else { 1995 } else {
1993 dasm_put(Dst, 12876, LJ_TNIL); 1996 dasm_put(Dst, 12892, LJ_TNIL);
1994 } 1997 }
1995 dasm_put(Dst, 12883); 1998 dasm_put(Dst, 12899);
1996 if (op != BC_RET0) { 1999 if (op != BC_RET0) {
1997 dasm_put(Dst, 12904); 2000 dasm_put(Dst, 12920);
1998 } 2001 }
1999 dasm_put(Dst, 4542); 2002 dasm_put(Dst, 4542);
2000 break; 2003 break;
@@ -2004,7 +2007,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
2004 2007
2005 case BC_FORL: 2008 case BC_FORL:
2006#if LJ_HASJIT 2009#if LJ_HASJIT
2007 dasm_put(Dst, 12908, HOTCOUNT_PCMASK, GG_DISP2HOT); 2010 dasm_put(Dst, 12924, HOTCOUNT_PCMASK, GG_DISP2HOT);
2008#endif 2011#endif
2009 break; 2012 break;
2010 2013
@@ -2016,57 +2019,57 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
2016 case BC_FORI: 2019 case BC_FORI:
2017 case BC_IFORL: 2020 case BC_IFORL:
2018 vk = (op == BC_IFORL || op == BC_JFORL); 2021 vk = (op == BC_IFORL || op == BC_JFORL);
2019 dasm_put(Dst, 12929); 2022 dasm_put(Dst, 12945);
2020 if (!vk) { 2023 if (!vk) {
2021 dasm_put(Dst, 12933, LJ_TISNUM, LJ_TISNUM); 2024 dasm_put(Dst, 12949, LJ_TISNUM, LJ_TISNUM);
2022 } 2025 }
2023 dasm_put(Dst, 12952); 2026 dasm_put(Dst, 12968);
2024 if (!vk) { 2027 if (!vk) {
2025 dasm_put(Dst, 12956, LJ_TISNUM); 2028 dasm_put(Dst, 12972, LJ_TISNUM);
2026 } 2029 }
2027 if (sse) { 2030 if (sse) {
2028 dasm_put(Dst, 12965); 2031 dasm_put(Dst, 12981);
2029 if (vk) { 2032 if (vk) {
2030 dasm_put(Dst, 12977); 2033 dasm_put(Dst, 12993);
2031 } else { 2034 } else {
2032 dasm_put(Dst, 12996); 2035 dasm_put(Dst, 13012);
2033 } 2036 }
2034 dasm_put(Dst, 13001); 2037 dasm_put(Dst, 13017);
2035 } else { 2038 } else {
2036 dasm_put(Dst, 13014); 2039 dasm_put(Dst, 13030);
2037 if (vk) { 2040 if (vk) {
2038 dasm_put(Dst, 13020);
2039 } else {
2040 dasm_put(Dst, 13036); 2041 dasm_put(Dst, 13036);
2042 } else {
2043 dasm_put(Dst, 13052);
2041 } 2044 }
2042 dasm_put(Dst, 13044); 2045 dasm_put(Dst, 13060);
2043 if (cmov) { 2046 if (cmov) {
2044 dasm_put(Dst, 9089); 2047 dasm_put(Dst, 9105);
2045 } else { 2048 } else {
2046 dasm_put(Dst, 9095); 2049 dasm_put(Dst, 9111);
2047 } 2050 }
2048 if (!cmov) { 2051 if (!cmov) {
2049 dasm_put(Dst, 13049); 2052 dasm_put(Dst, 13065);
2050 } 2053 }
2051 } 2054 }
2052 if (op == BC_FORI) { 2055 if (op == BC_FORI) {
2053 dasm_put(Dst, 13055, -BCBIAS_J*4); 2056 dasm_put(Dst, 13071, -BCBIAS_J*4);
2054 } else if (op == BC_JFORI) { 2057 } else if (op == BC_JFORI) {
2055 dasm_put(Dst, 13065, -BCBIAS_J*4, BC_JLOOP); 2058 dasm_put(Dst, 13081, -BCBIAS_J*4, BC_JLOOP);
2056 } else if (op == BC_IFORL) { 2059 } else if (op == BC_IFORL) {
2057 dasm_put(Dst, 13079, -BCBIAS_J*4); 2060 dasm_put(Dst, 13095, -BCBIAS_J*4);
2058 } else { 2061 } else {
2059 dasm_put(Dst, 13075, BC_JLOOP); 2062 dasm_put(Dst, 13091, BC_JLOOP);
2060 } 2063 }
2061 dasm_put(Dst, 9124); 2064 dasm_put(Dst, 9140);
2062 if (sse) { 2065 if (sse) {
2063 dasm_put(Dst, 13089); 2066 dasm_put(Dst, 13105);
2064 } 2067 }
2065 break; 2068 break;
2066 2069
2067 case BC_ITERL: 2070 case BC_ITERL:
2068#if LJ_HASJIT 2071#if LJ_HASJIT
2069 dasm_put(Dst, 12908, HOTCOUNT_PCMASK, GG_DISP2HOT); 2072 dasm_put(Dst, 12924, HOTCOUNT_PCMASK, GG_DISP2HOT);
2070#endif 2073#endif
2071 break; 2074 break;
2072 2075
@@ -2075,33 +2078,33 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
2075 break; 2078 break;
2076#endif 2079#endif
2077 case BC_IITERL: 2080 case BC_IITERL:
2078 dasm_put(Dst, 13100, LJ_TNIL); 2081 dasm_put(Dst, 13116, LJ_TNIL);
2079 if (op == BC_JITERL) { 2082 if (op == BC_JITERL) {
2080 dasm_put(Dst, 13115, BC_JLOOP); 2083 dasm_put(Dst, 13131, BC_JLOOP);
2081 } else { 2084 } else {
2082 dasm_put(Dst, 13129, -BCBIAS_J*4); 2085 dasm_put(Dst, 13145, -BCBIAS_J*4);
2083 } 2086 }
2084 dasm_put(Dst, 9424); 2087 dasm_put(Dst, 9440);
2085 break; 2088 break;
2086 2089
2087 case BC_LOOP: 2090 case BC_LOOP:
2088#if LJ_HASJIT 2091#if LJ_HASJIT
2089 dasm_put(Dst, 12908, HOTCOUNT_PCMASK, GG_DISP2HOT); 2092 dasm_put(Dst, 12924, HOTCOUNT_PCMASK, GG_DISP2HOT);
2090#endif 2093#endif
2091 break; 2094 break;
2092 2095
2093 case BC_ILOOP: 2096 case BC_ILOOP:
2094 dasm_put(Dst, 7221); 2097 dasm_put(Dst, 7237);
2095 break; 2098 break;
2096 2099
2097 case BC_JLOOP: 2100 case BC_JLOOP:
2098#if LJ_HASJIT 2101#if LJ_HASJIT
2099 dasm_put(Dst, 13145, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); 2102 dasm_put(Dst, 13161, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L));
2100#endif 2103#endif
2101 break; 2104 break;
2102 2105
2103 case BC_JMP: 2106 case BC_JMP:
2104 dasm_put(Dst, 13169, -BCBIAS_J*4); 2107 dasm_put(Dst, 13185, -BCBIAS_J*4);
2105 break; 2108 break;
2106 2109
2107 /* -- Function headers -------------------------------------------------- */ 2110 /* -- Function headers -------------------------------------------------- */
@@ -2124,47 +2127,47 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
2124 break; 2127 break;
2125#endif 2128#endif
2126 case BC_IFUNCF: 2129 case BC_IFUNCF:
2127 dasm_put(Dst, 13194, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); 2130 dasm_put(Dst, 13210, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams));
2128 if (op == BC_JFUNCF) { 2131 if (op == BC_JFUNCF) {
2129 dasm_put(Dst, 13224, BC_JLOOP); 2132 dasm_put(Dst, 13240, BC_JLOOP);
2130 } else { 2133 } else {
2131 dasm_put(Dst, 7221); 2134 dasm_put(Dst, 7237);
2132 } 2135 }
2133 dasm_put(Dst, 13233, LJ_TNIL); 2136 dasm_put(Dst, 13249, LJ_TNIL);
2134 break; 2137 break;
2135 2138
2136 case BC_JFUNCV: 2139 case BC_JFUNCV:
2137#if !LJ_HASJIT 2140#if !LJ_HASJIT
2138 break; 2141 break;
2139#endif 2142#endif
2140 dasm_put(Dst, 7101); 2143 dasm_put(Dst, 7117);
2141 break; /* NYI: compiled vararg functions. */ 2144 break; /* NYI: compiled vararg functions. */
2142 2145
2143 case BC_IFUNCV: 2146 case BC_IFUNCV:
2144 dasm_put(Dst, 13255, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); 2147 dasm_put(Dst, 13271, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL);
2145 if (op == BC_JFUNCV) { 2148 if (op == BC_JFUNCV) {
2146 dasm_put(Dst, 13224, BC_JLOOP); 2149 dasm_put(Dst, 13240, BC_JLOOP);
2147 } else { 2150 } else {
2148 dasm_put(Dst, 13346, -4+PC2PROTO(k)); 2151 dasm_put(Dst, 13362, -4+PC2PROTO(k));
2149 } 2152 }
2150 dasm_put(Dst, 13369, LJ_TNIL); 2153 dasm_put(Dst, 13385, LJ_TNIL);
2151 break; 2154 break;
2152 2155
2153 case BC_FUNCC: 2156 case BC_FUNCC:
2154 case BC_FUNCCW: 2157 case BC_FUNCCW:
2155 dasm_put(Dst, 13391, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); 2158 dasm_put(Dst, 13407, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top));
2156 if (op == BC_FUNCC) { 2159 if (op == BC_FUNCC) {
2157 dasm_put(Dst, 13421); 2160 dasm_put(Dst, 13437);
2158 } else { 2161 } else {
2159 dasm_put(Dst, 13425); 2162 dasm_put(Dst, 13441);
2160 } 2163 }
2161 dasm_put(Dst, 13433, DISPATCH_GL(vmstate), ~LJ_VMST_C); 2164 dasm_put(Dst, 13449, DISPATCH_GL(vmstate), ~LJ_VMST_C);
2162 if (op == BC_FUNCC) { 2165 if (op == BC_FUNCC) {
2163 dasm_put(Dst, 13442); 2166 dasm_put(Dst, 13458);
2164 } else { 2167 } else {
2165 dasm_put(Dst, 13446, DISPATCH_GL(wrapf)); 2168 dasm_put(Dst, 13462, DISPATCH_GL(wrapf));
2166 } 2169 }
2167 dasm_put(Dst, 13451, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); 2170 dasm_put(Dst, 13467, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top));
2168 break; 2171 break;
2169 2172
2170 /* ---------------------------------------------------------------------- */ 2173 /* ---------------------------------------------------------------------- */
@@ -2192,7 +2195,7 @@ static int build_backend(BuildCtx *ctx)
2192 2195
2193 build_subroutines(ctx, cmov, sse); 2196 build_subroutines(ctx, cmov, sse);
2194 2197
2195 dasm_put(Dst, 13476); 2198 dasm_put(Dst, 13492);
2196 for (op = 0; op < BC__MAX; op++) 2199 for (op = 0; op < BC__MAX; op++)
2197 build_ins(ctx, (BCOp)op, op, cmov, sse); 2200 build_ins(ctx, (BCOp)op, op, cmov, sse);
2198 2201
diff --git a/src/buildvm_x86.dasc b/src/buildvm_x86.dasc
index b9036273..9d201f91 100644
--- a/src/buildvm_x86.dasc
+++ b/src/buildvm_x86.dasc
@@ -2453,7 +2453,13 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse)
2453 | jmp >1 2453 | jmp >1
2454#endif 2454#endif
2455 | 2455 |
2456 |->vm_hook: // Dispatch target with enabled hooks. 2456 |->vm_rethook: // Dispatch target for return hooks.
2457 | movzx RD, byte [DISPATCH+DISPATCH_GL(hookmask)]
2458 | test RDL, HOOK_ACTIVE // Hook already active?
2459 | jnz >5
2460 | jmp >1
2461 |
2462 |->vm_inshook: // Dispatch target for instr/line hooks.
2457 | movzx RD, byte [DISPATCH+DISPATCH_GL(hookmask)] 2463 | movzx RD, byte [DISPATCH+DISPATCH_GL(hookmask)]
2458 | test RDL, HOOK_ACTIVE // Hook already active? 2464 | test RDL, HOOK_ACTIVE // Hook already active?
2459 | jnz >5 2465 | jnz >5
diff --git a/src/buildvm_x86.h b/src/buildvm_x86.h
index dc7e64c6..cc1ac38d 100644
--- a/src/buildvm_x86.h
+++ b/src/buildvm_x86.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
15static const unsigned char build_actionlist[15151] = { 15static const unsigned char build_actionlist[15167] = {
16 254,1,248,10,252,247,198,237,15,132,244,11,131,230,252,248,41,252,242,141, 16 254,1,248,10,252,247,198,237,15,132,244,11,131,230,252,248,41,252,242,141,
17 76,49,252,248,139,114,252,252,199,68,10,4,237,248,12,131,192,1,137,68,36, 17 76,49,252,248,139,114,252,252,199,68,10,4,237,248,12,131,192,1,137,68,36,
18 20,252,247,198,237,15,132,244,13,248,14,252,247,198,237,15,132,244,10,199, 18 20,252,247,198,237,15,132,244,13,248,14,252,247,198,237,15,132,244,10,199,
@@ -399,187 +399,188 @@ static const unsigned char build_actionlist[15151] = {
399 139,133,233,41,208,193,232,3,131,192,1,139,108,36,16,85,195,248,136,255,15, 399 139,133,233,41,208,193,232,3,131,192,1,139,108,36,16,85,195,248,136,255,15,
400 182,131,233,168,235,15,133,244,251,168,235,15,133,244,247,168,235,15,132, 400 182,131,233,168,235,15,133,244,251,168,235,15,133,244,247,168,235,15,132,
401 244,247,252,255,139,233,252,233,244,247,255,248,137,15,182,131,233,168,235, 401 244,247,252,255,139,233,252,233,244,247,255,248,137,15,182,131,233,168,235,
402 15,133,244,251,168,235,15,132,244,251,252,255,139,233,15,132,244,247,168, 402 15,133,244,251,252,233,244,247,248,138,15,182,131,233,168,235,15,133,244,
403 235,15,132,244,251,248,1,139,108,36,48,137,149,233,137,252,242,137,252,233, 403 251,168,235,15,132,244,251,252,255,139,233,15,132,244,247,168,235,15,132,
404 232,251,1,20,248,3,139,149,233,248,4,15,182,78,252,253,248,5,255,15,182,110, 404 244,251,248,1,255,139,108,36,48,137,149,233,137,252,242,137,252,233,232,251,
405 252,252,15,183,70,252,254,252,255,164,253,171,233,248,138,131,198,4,139,77, 405 1,20,248,3,139,149,233,248,4,15,182,78,252,253,248,5,15,182,110,252,252,15,
406 232,137,76,36,20,252,233,244,4,248,139,255,139,106,252,248,139,173,233,15, 406 183,70,252,254,252,255,164,253,171,233,248,139,131,198,4,139,77,232,137,76,
407 182,133,233,141,4,194,139,108,36,48,137,149,233,137,133,233,137,252,242,141, 407 36,20,252,233,244,4,248,140,255,139,106,252,248,139,173,233,15,182,133,233,
408 139,233,137,171,233,137,116,36,24,232,251,1,21,252,233,244,3,255,248,140, 408 141,4,194,139,108,36,48,137,149,233,137,133,233,137,252,242,141,139,233,137,
409 255,199,131,233,0,0,0,0,252,233,244,247,255,248,141,255,137,171,233,248,1, 409 171,233,137,116,36,24,232,251,1,21,252,233,244,3,255,248,141,255,199,131,
410 255,141,68,194,252,248,139,108,36,48,137,149,233,137,133,233,137,252,242, 410 233,0,0,0,0,252,233,244,247,255,248,142,255,137,171,233,248,1,255,141,68,
411 137,252,233,137,116,36,24,232,251,1,22,199,68,36,24,0,0,0,0,139,149,233,137, 411 194,252,248,139,108,36,48,137,149,233,137,133,233,137,252,242,137,252,233,
412 193,139,133,233,41,208,137,205,15,182,78,252,253,193,232,3,131,192,1,252, 412 137,116,36,24,232,251,1,22,199,68,36,24,0,0,0,0,139,149,233,137,193,139,133,
413 255,229,248,142,255,85,141,108,36,12,85,83,82,81,80,15,182,69,252,252,138, 413 233,41,208,137,205,15,182,78,252,253,193,232,3,131,192,1,252,255,229,248,
414 101,252,248,137,125,252,252,137,117,252,248,139,93,0,139,139,233,199,131, 414 143,255,85,141,108,36,12,85,83,82,81,80,15,182,69,252,252,138,101,252,248,
415 233,237,137,131,233,137,139,233,129,252,236,239,252,247,131,233,237,15,132, 415 137,125,252,252,137,117,252,248,139,93,0,139,139,233,199,131,233,237,137,
416 244,247,252,242,15,17,125,216,252,242,15,17,117,208,252,242,15,17,109,200, 416 131,233,137,139,233,129,252,236,239,252,247,131,233,237,15,132,244,247,252,
417 252,242,15,17,101,192,252,242,15,17,93,184,252,242,15,17,85,176,252,242,15, 417 242,15,17,125,216,252,242,15,17,117,208,252,242,15,17,109,200,252,242,15,
418 17,77,168,252,242,15,17,69,160,248,1,139,171,233,139,147,233,137,171,233, 418 17,101,192,252,242,15,17,93,184,252,242,15,17,85,176,252,242,15,17,77,168,
419 137,149,233,141,84,36,16,141,139,233,232,251,1,23,137,196,139,149,233,139, 419 252,242,15,17,69,160,248,1,139,171,233,139,147,233,137,171,233,137,149,233,
420 116,36,24,137,108,36,48,255,248,143,255,139,122,252,248,139,191,233,139,191, 420 141,84,36,16,141,139,233,232,251,1,23,137,196,139,149,233,139,116,36,24,137,
421 233,199,131,233,0,0,0,0,199,131,233,237,139,6,15,182,204,15,182,232,131,198, 421 108,36,48,255,248,144,255,139,122,252,248,139,191,233,139,191,233,199,131,
422 4,193,232,16,252,255,36,171,255,248,82,255,217,124,36,4,137,68,36,8,102,184, 422 233,0,0,0,0,199,131,233,237,139,6,15,182,204,15,182,232,131,198,4,193,232,
423 0,4,102,11,68,36,4,102,37,252,255,252,247,102,137,68,36,6,217,108,36,6,217, 423 16,252,255,36,171,255,248,82,255,217,124,36,4,137,68,36,8,102,184,0,4,102,
424 252,252,217,108,36,4,139,68,36,8,195,255,248,144,102,15,252,239,210,102,15, 424 11,68,36,4,102,37,252,255,252,247,102,137,68,36,6,217,108,36,6,217,252,252,
425 118,210,102,15,115,210,1,184,0,0,48,67,102,15,110,216,102,15,112,219,81,15, 425 217,108,36,4,139,68,36,8,195,255,248,145,102,15,252,239,210,102,15,118,210,
426 40,200,102,15,84,202,102,15,46,217,15,134,244,247,102,15,85,208,252,242,15, 426 102,15,115,210,1,184,0,0,48,67,102,15,110,216,102,15,112,219,81,15,40,200,
427 88,203,252,242,15,92,203,102,15,86,202,184,0,0,252,240,63,102,15,110,208, 427 102,15,84,202,102,15,46,217,15,134,244,247,102,15,85,208,252,242,15,88,203,
428 102,15,112,210,81,252,242,15,194,193,1,102,15,84,194,252,242,15,92,200,15, 428 252,242,15,92,203,102,15,86,202,184,0,0,252,240,63,102,15,110,208,102,15,
429 40,193,248,1,195,248,84,255,217,124,36,4,137,68,36,8,102,184,0,8,102,11,68, 429 112,210,81,252,242,15,194,193,1,102,15,84,194,252,242,15,92,200,15,40,193,
430 36,4,102,37,252,255,252,251,102,137,68,36,6,217,108,36,6,217,252,252,217, 430 248,1,195,248,84,255,217,124,36,4,137,68,36,8,102,184,0,8,102,11,68,36,4,
431 108,36,4,139,68,36,8,195,255,248,145,102,15,252,239,210,102,15,118,210,102, 431 102,37,252,255,252,251,102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,
432 15,115,210,1,184,0,0,48,67,102,15,110,216,102,15,112,219,81,15,40,200,102, 432 4,139,68,36,8,195,255,248,146,102,15,252,239,210,102,15,118,210,102,15,115,
433 15,84,202,102,15,46,217,15,134,244,247,102,15,85,208,252,242,15,88,203,252, 433 210,1,184,0,0,48,67,102,15,110,216,102,15,112,219,81,15,40,200,102,15,84,
434 242,15,92,203,102,15,86,202,184,0,0,252,240,191,102,15,110,208,102,15,112, 434 202,102,15,46,217,15,134,244,247,102,15,85,208,252,242,15,88,203,252,242,
435 210,81,252,242,15,194,193,6,102,15,84,194,252,242,15,92,200,15,40,193,248, 435 15,92,203,102,15,86,202,184,0,0,252,240,191,102,15,110,208,102,15,112,210,
436 1,195,248,104,255,217,124,36,4,137,68,36,8,102,184,0,12,102,11,68,36,4,102, 436 81,252,242,15,194,193,6,102,15,84,194,252,242,15,92,200,15,40,193,248,1,195,
437 137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,139,68,36,8,195,255,248, 437 248,104,255,217,124,36,4,137,68,36,8,102,184,0,12,102,11,68,36,4,102,137,
438 146,102,15,252,239,210,102,15,118,210,102,15,115,210,1,184,0,0,48,67,102, 438 68,36,6,217,108,36,6,217,252,252,217,108,36,4,139,68,36,8,195,255,248,147,
439 15,110,216,102,15,112,219,81,15,40,200,102,15,84,202,102,15,46,217,15,134, 439 102,15,252,239,210,102,15,118,210,102,15,115,210,1,184,0,0,48,67,102,15,110,
440 244,247,102,15,85,208,15,40,193,252,242,15,88,203,252,242,15,92,203,184,0, 440 216,102,15,112,219,81,15,40,200,102,15,84,202,102,15,46,217,15,134,244,247,
441 0,252,240,63,102,15,110,216,102,15,112,219,81,252,242,15,194,193,1,102,15, 441 102,15,85,208,15,40,193,252,242,15,88,203,252,242,15,92,203,184,0,0,252,240,
442 84,195,252,242,15,92,200,102,15,86,202,15,40,193,248,1,195,248,147,255,15, 442 63,102,15,110,216,102,15,112,219,81,252,242,15,194,193,1,102,15,84,195,252,
443 40,232,252,242,15,94,193,102,15,252,239,210,102,15,118,210,102,15,115,210, 443 242,15,92,200,102,15,86,202,15,40,193,248,1,195,248,148,255,15,40,232,252,
444 1,184,0,0,48,67,102,15,110,216,102,15,112,219,81,15,40,224,102,15,84,226, 444 242,15,94,193,102,15,252,239,210,102,15,118,210,102,15,115,210,1,184,0,0,
445 102,15,46,220,15,134,244,247,102,15,85,208,252,242,15,88,227,252,242,15,92, 445 48,67,102,15,110,216,102,15,112,219,81,15,40,224,102,15,84,226,102,15,46,
446 227,102,15,86,226,184,0,0,252,240,63,102,15,110,208,102,15,112,210,81,252, 446 220,15,134,244,247,102,15,85,208,252,242,15,88,227,252,242,15,92,227,102,
447 242,15,194,196,1,102,15,84,194,252,242,15,92,224,15,40,197,252,242,15,89, 447 15,86,226,184,0,0,252,240,63,102,15,110,208,102,15,112,210,81,252,242,15,
448 204,252,242,15,92,193,195,248,1,252,242,15,89,200,15,40,197,252,242,15,92, 448 194,196,1,102,15,84,194,252,242,15,92,224,15,40,197,252,242,15,89,204,252,
449 193,195,255,217,193,216,252,241,217,124,36,4,102,184,0,4,102,11,68,36,4,102, 449 242,15,92,193,195,248,1,252,242,15,89,200,15,40,197,252,242,15,92,193,195,
450 37,252,255,252,247,102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,4, 450 255,217,193,216,252,241,217,124,36,4,102,184,0,4,102,11,68,36,4,102,37,252,
451 222,201,222,252,233,195,255,248,88,217,252,234,222,201,248,148,217,84,36, 451 255,252,247,102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,222,201,
452 4,129,124,36,4,0,0,128,127,15,132,244,247,129,124,36,4,0,0,128,252,255,15, 452 222,252,233,195,255,248,88,217,252,234,222,201,248,149,217,84,36,4,129,124,
453 132,244,248,248,149,217,192,217,252,252,220,252,233,217,201,217,252,240,217, 453 36,4,0,0,128,127,15,132,244,247,129,124,36,4,0,0,128,252,255,15,132,244,248,
454 232,222,193,217,252,253,221,217,248,1,195,248,2,221,216,217,252,238,195,255, 454 248,150,217,192,217,252,252,220,252,233,217,201,217,252,240,217,232,222,193,
455 248,107,219,84,36,4,219,68,36,4,255,223,252,233,255,221,252,233,223,224,158, 455 217,252,253,221,217,248,1,195,248,2,221,216,217,252,238,195,255,248,107,219,
456 255,15,133,244,254,15,138,244,255,221,216,139,68,36,4,131,252,248,1,15,142, 456 84,36,4,219,68,36,4,255,223,252,233,255,221,252,233,223,224,158,255,15,133,
457 244,252,248,1,169,1,0,0,0,15,133,244,248,216,200,209,232,252,233,244,1,248, 457 244,254,15,138,244,255,221,216,139,68,36,4,131,252,248,1,15,142,244,252,248,
458 2,209,232,15,132,244,251,217,192,248,3,216,200,209,232,15,132,244,250,15, 458 1,169,1,0,0,0,15,133,244,248,216,200,209,232,252,233,244,1,248,2,209,232,
459 131,244,3,220,201,252,233,244,3,248,4,255,222,201,248,5,195,248,6,15,132, 459 15,132,244,251,217,192,248,3,216,200,209,232,15,132,244,250,15,131,244,3,
460 244,5,15,130,244,253,217,232,222,252,241,252,247,216,131,252,248,1,15,132, 460 220,201,252,233,244,3,248,4,255,222,201,248,5,195,248,6,15,132,244,5,15,130,
461 244,5,252,233,244,1,248,7,221,216,217,232,195,248,8,217,84,36,4,217,201,217, 461 244,253,217,232,222,252,241,252,247,216,131,252,248,1,15,132,244,5,252,233,
462 84,36,8,139,68,36,4,209,224,61,0,0,0,252,255,15,132,244,248,139,68,36,8,209, 462 244,1,248,7,221,216,217,232,195,248,8,217,84,36,4,217,201,217,84,36,8,139,
463 224,15,132,244,250,61,0,0,0,252,255,15,132,244,250,217,252,241,252,233,244, 463 68,36,4,209,224,61,0,0,0,252,255,15,132,244,248,139,68,36,8,209,224,15,132,
464 149,248,9,255,217,232,255,223,252,234,255,221,252,234,223,224,158,255,15, 464 244,250,61,0,0,0,252,255,15,132,244,250,217,252,241,252,233,244,150,248,9,
465 132,244,247,217,201,248,1,221,216,195,248,2,217,225,217,232,255,15,132,244, 465 255,217,232,255,223,252,234,255,221,252,234,223,224,158,255,15,132,244,247,
466 249,221,216,217,225,217,252,238,184,0,0,0,0,15,146,208,209,200,51,68,36,4, 466 217,201,248,1,221,216,195,248,2,217,225,217,232,255,15,132,244,249,221,216,
467 15,137,244,249,217,201,248,3,221,217,217,225,195,248,4,131,124,36,4,0,15, 467 217,225,217,252,238,184,0,0,0,0,15,146,208,209,200,51,68,36,4,15,137,244,
468 141,244,3,221,216,221,216,133,192,15,132,244,251,217,252,238,195,248,5,199, 468 249,217,201,248,3,221,217,217,225,195,248,4,131,124,36,4,0,15,141,244,3,221,
469 68,36,4,0,0,128,127,217,68,36,4,195,255,248,107,255,248,150,252,242,15,45, 469 216,221,216,133,192,15,132,244,251,217,252,238,195,248,5,199,68,36,4,0,0,
470 193,252,242,15,42,208,102,15,46,202,15,133,244,254,15,138,244,255,248,151, 470 128,127,217,68,36,4,195,255,248,107,255,248,151,252,242,15,45,193,252,242,
471 131,252,248,1,15,142,244,252,248,1,169,1,0,0,0,15,133,244,248,252,242,15, 471 15,42,208,102,15,46,202,15,133,244,254,15,138,244,255,248,152,131,252,248,
472 89,192,209,232,252,233,244,1,248,2,209,232,15,132,244,251,15,40,200,248,3, 472 1,15,142,244,252,248,1,169,1,0,0,0,15,133,244,248,252,242,15,89,192,209,232,
473 252,242,15,89,192,209,232,15,132,244,250,15,131,244,3,255,252,242,15,89,200, 473 252,233,244,1,248,2,209,232,15,132,244,251,15,40,200,248,3,252,242,15,89,
474 252,233,244,3,248,4,252,242,15,89,193,248,5,195,248,6,15,132,244,5,15,130, 474 192,209,232,15,132,244,250,15,131,244,3,255,252,242,15,89,200,252,233,244,
475 244,253,80,184,0,0,252,240,63,102,15,110,200,102,15,112,201,81,252,242,15, 475 3,248,4,252,242,15,89,193,248,5,195,248,6,15,132,244,5,15,130,244,253,80,
476 94,200,88,15,40,193,252,247,216,131,252,248,1,15,132,244,5,252,233,244,1, 476 184,0,0,252,240,63,102,15,110,200,102,15,112,201,81,252,242,15,94,200,88,
477 248,7,184,0,0,252,240,63,102,15,110,192,102,15,112,192,81,195,248,8,252,242, 477 15,40,193,252,247,216,131,252,248,1,15,132,244,5,252,233,244,1,248,7,184,
478 15,17,76,36,12,252,242,15,17,68,36,4,131,124,36,12,0,15,133,244,247,139,68, 478 0,0,252,240,63,102,15,110,192,102,15,112,192,81,195,248,8,252,242,15,17,76,
479 36,16,209,224,61,0,0,224,252,255,15,132,244,248,248,1,255,131,124,36,4,0, 479 36,12,252,242,15,17,68,36,4,131,124,36,12,0,15,133,244,247,139,68,36,16,209,
480 15,133,244,247,139,68,36,8,209,224,15,132,244,250,61,0,0,224,252,255,15,132, 480 224,61,0,0,224,252,255,15,132,244,248,248,1,255,131,124,36,4,0,15,133,244,
481 244,251,248,1,221,68,36,12,221,68,36,4,217,252,241,217,192,217,252,252,220, 481 247,139,68,36,8,209,224,15,132,244,250,61,0,0,224,252,255,15,132,244,251,
482 252,233,217,201,217,252,240,217,232,222,193,217,252,253,221,217,221,92,36, 482 248,1,221,68,36,12,221,68,36,4,217,252,241,217,192,217,252,252,220,252,233,
483 4,252,242,15,16,68,36,4,195,248,9,184,0,0,252,240,63,102,15,110,208,102,15, 483 217,201,217,252,240,217,232,222,193,217,252,253,221,217,221,92,36,4,252,242,
484 112,210,81,102,15,46,194,15,132,244,247,15,40,193,248,1,195,248,2,102,15, 484 15,16,68,36,4,195,248,9,184,0,0,252,240,63,102,15,110,208,102,15,112,210,
485 252,239,210,102,15,118,210,102,15,115,210,1,102,15,84,194,184,0,0,252,240, 485 81,102,15,46,194,15,132,244,247,15,40,193,248,1,195,248,2,102,15,252,239,
486 63,102,15,110,208,102,15,112,210,81,102,15,46,194,15,132,244,1,102,15,80, 486 210,102,15,118,210,102,15,115,210,1,102,15,84,194,184,0,0,252,240,63,102,
487 193,15,87,192,136,196,15,146,208,48,224,15,133,244,1,248,3,184,0,0,252,240, 487 15,110,208,102,15,112,210,81,102,15,46,194,15,132,244,1,102,15,80,193,15,
488 127,102,15,110,192,102,15,112,192,81,195,248,4,102,15,80,193,133,192,15,133, 488 87,192,136,196,15,146,208,48,224,15,133,244,1,248,3,184,0,0,252,240,127,102,
489 244,3,255,15,87,192,195,248,5,102,15,80,193,133,192,15,132,244,3,15,87,192, 489 15,110,192,102,15,112,192,81,195,248,4,102,15,80,193,133,192,15,133,244,3,
490 195,248,152,255,139,68,36,12,252,242,15,16,68,36,4,131,252,248,1,15,132,244, 490 255,15,87,192,195,248,5,102,15,80,193,133,192,15,132,244,3,15,87,192,195,
491 247,15,135,244,248,232,244,82,252,233,244,253,248,1,232,244,84,252,233,244, 491 248,153,255,139,68,36,12,252,242,15,16,68,36,4,131,252,248,1,15,132,244,247,
492 253,248,2,131,252,248,3,15,132,244,247,15,135,244,248,232,244,104,255,252, 492 15,135,244,248,232,244,82,252,233,244,253,248,1,232,244,84,252,233,244,253,
493 233,244,253,248,1,252,242,15,81,192,248,7,252,242,15,17,68,36,4,221,68,36, 493 248,2,131,252,248,3,15,132,244,247,15,135,244,248,232,244,104,255,252,233,
494 4,195,248,2,221,68,36,4,131,252,248,5,15,130,244,88,15,132,244,148,248,2, 494 244,253,248,1,252,242,15,81,192,248,7,252,242,15,17,68,36,4,221,68,36,4,195,
495 131,252,248,7,15,132,244,247,15,135,244,248,217,252,237,217,201,217,252,241, 495 248,2,221,68,36,4,131,252,248,5,15,130,244,88,15,132,244,149,248,2,131,252,
496 195,248,1,217,232,217,201,217,252,241,195,248,2,131,252,248,9,15,132,244, 496 248,7,15,132,244,247,15,135,244,248,217,252,237,217,201,217,252,241,195,248,
497 247,15,135,244,248,255,217,252,236,217,201,217,252,241,195,248,1,217,252, 497 1,217,232,217,201,217,252,241,195,248,2,131,252,248,9,15,132,244,247,15,135,
498 254,195,248,2,131,252,248,11,15,132,244,247,15,135,244,255,217,252,255,195, 498 244,248,255,217,252,236,217,201,217,252,241,195,248,1,217,252,254,195,248,
499 248,1,217,252,242,221,216,195,255,139,68,36,12,221,68,36,4,131,252,248,1,
500 15,130,244,82,15,132,244,84,131,252,248,3,15,130,244,104,15,135,244,248,217,
501 252,250,195,248,2,131,252,248,5,15,130,244,88,15,132,244,148,131,252,248,
502 7,15,132,244,247,15,135,244,248,217,252,237,217,201,217,252,241,195,248,1,
503 217,232,217,201,217,252,241,195,248,2,131,252,248,9,15,132,244,247,255,15,
504 135,244,248,217,252,236,217,201,217,252,241,195,248,1,217,252,254,195,248,
505 2,131,252,248,11,15,132,244,247,15,135,244,255,217,252,255,195,248,1,217, 499 2,131,252,248,11,15,132,244,247,15,135,244,255,217,252,255,195,248,1,217,
506 252,242,221,216,195,255,248,9,204,248,153,255,139,68,36,20,252,242,15,16, 500 252,242,221,216,195,255,139,68,36,12,221,68,36,4,131,252,248,1,15,130,244,
507 68,36,4,252,242,15,16,76,36,12,131,252,248,1,15,132,244,247,15,135,244,248, 501 82,15,132,244,84,131,252,248,3,15,130,244,104,15,135,244,248,217,252,250,
508 252,242,15,88,193,248,7,252,242,15,17,68,36,4,221,68,36,4,195,248,1,252,242, 502 195,248,2,131,252,248,5,15,130,244,88,15,132,244,149,131,252,248,7,15,132,
509 15,92,193,252,233,244,7,248,2,131,252,248,3,15,132,244,247,15,135,244,248, 503 244,247,15,135,244,248,217,252,237,217,201,217,252,241,195,248,1,217,232,
510 252,242,15,89,193,252,233,244,7,248,1,252,242,15,94,193,252,233,244,7,248, 504 217,201,217,252,241,195,248,2,131,252,248,9,15,132,244,247,255,15,135,244,
511 2,131,252,248,5,15,132,244,247,255,15,135,244,248,232,244,147,252,233,244, 505 248,217,252,236,217,201,217,252,241,195,248,1,217,252,254,195,248,2,131,252,
512 7,248,1,90,232,244,107,82,252,233,244,7,248,2,131,252,248,7,15,132,244,247, 506 248,11,15,132,244,247,15,135,244,255,217,252,255,195,248,1,217,252,242,221,
513 15,135,244,248,184,0,0,0,128,102,15,110,200,102,15,112,201,81,15,87,193,252, 507 216,195,255,248,9,204,248,154,255,139,68,36,20,252,242,15,16,68,36,4,252,
514 233,244,7,248,1,102,15,252,239,201,102,15,118,201,102,15,115,209,1,15,84, 508 242,15,16,76,36,12,131,252,248,1,15,132,244,247,15,135,244,248,252,242,15,
515 193,252,233,244,7,248,2,255,131,252,248,9,15,135,244,248,221,68,36,4,221, 509 88,193,248,7,252,242,15,17,68,36,4,221,68,36,4,195,248,1,252,242,15,92,193,
516 68,36,12,15,132,244,247,217,252,243,195,248,1,217,201,217,252,253,221,217, 510 252,233,244,7,248,2,131,252,248,3,15,132,244,247,15,135,244,248,252,242,15,
517 195,248,2,131,252,248,11,15,132,244,247,15,135,244,255,252,242,15,93,193, 511 89,193,252,233,244,7,248,1,252,242,15,94,193,252,233,244,7,248,2,131,252,
518 252,233,244,7,248,1,252,242,15,95,193,252,233,244,7,248,9,204,255,139,68, 512 248,5,15,132,244,247,255,15,135,244,248,232,244,148,252,233,244,7,248,1,90,
519 36,20,221,68,36,4,221,68,36,12,131,252,248,1,15,132,244,247,15,135,244,248, 513 232,244,107,82,252,233,244,7,248,2,131,252,248,7,15,132,244,247,15,135,244,
520 222,193,195,248,1,222,252,233,195,248,2,131,252,248,3,15,132,244,247,15,135, 514 248,184,0,0,0,128,102,15,110,200,102,15,112,201,81,15,87,193,252,233,244,
521 244,248,222,201,195,248,1,222,252,249,195,248,2,131,252,248,5,15,130,244, 515 7,248,1,102,15,252,239,201,102,15,118,201,102,15,115,209,1,15,84,193,252,
522 147,15,132,244,107,131,252,248,7,15,132,244,247,15,135,244,248,255,221,216, 516 233,244,7,248,2,255,131,252,248,9,15,135,244,248,221,68,36,4,221,68,36,12,
523 217,224,195,248,1,221,216,217,225,195,248,2,131,252,248,9,15,132,244,247, 517 15,132,244,247,217,252,243,195,248,1,217,201,217,252,253,221,217,195,248,
524 15,135,244,248,217,252,243,195,248,1,217,201,217,252,253,221,217,195,248, 518 2,131,252,248,11,15,132,244,247,15,135,244,255,252,242,15,93,193,252,233,
525 2,131,252,248,11,15,132,244,247,15,135,244,255,255,219,252,233,219,209,221, 519 244,7,248,1,252,242,15,95,193,252,233,244,7,248,9,204,255,139,68,36,20,221,
526 217,195,248,1,219,252,233,218,209,221,217,195,255,221,225,223,224,252,246, 520 68,36,4,221,68,36,12,131,252,248,1,15,132,244,247,15,135,244,248,222,193,
527 196,1,15,132,244,248,217,201,248,2,221,216,195,248,1,221,225,223,224,252, 521 195,248,1,222,252,233,195,248,2,131,252,248,3,15,132,244,247,15,135,244,248,
528 246,196,1,15,133,244,248,217,201,248,2,221,216,195,255,248,154,156,90,137, 522 222,201,195,248,1,222,252,249,195,248,2,131,252,248,5,15,130,244,148,15,132,
529 209,129,252,242,0,0,32,0,82,157,156,90,49,192,57,209,15,132,244,247,139,68, 523 244,107,131,252,248,7,15,132,244,247,15,135,244,248,255,221,216,217,224,195,
530 36,4,87,83,15,162,139,124,36,16,137,7,137,95,4,137,79,8,137,87,12,91,95,248, 524 248,1,221,216,217,225,195,248,2,131,252,248,9,15,132,244,247,15,135,244,248,
531 1,195,255,249,255,129,124,253,202,4,239,15,135,244,41,129,124,253,194,4,239, 525 217,252,243,195,248,1,217,201,217,252,253,221,217,195,248,2,131,252,248,11,
532 15,135,244,41,255,252,242,15,16,4,194,131,198,4,102,15,46,4,202,255,221,4, 526 15,132,244,247,15,135,244,255,255,219,252,233,219,209,221,217,195,248,1,219,
533 202,221,4,194,131,198,4,255,223,252,233,221,216,255,218,252,233,223,224,158, 527 252,233,218,209,221,217,195,255,221,225,223,224,252,246,196,1,15,132,244,
534 255,15,134,244,248,255,15,131,244,248,255,248,1,15,183,70,252,254,141,180, 528 248,217,201,248,2,221,216,195,248,1,221,225,223,224,252,246,196,1,15,133,
535 253,134,233,248,2,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255, 529 244,248,217,201,248,2,221,216,195,255,248,155,156,90,137,209,129,252,242,
536 36,171,255,139,108,194,4,131,198,4,129,252,253,239,15,135,244,251,129,124, 530 0,0,32,0,82,157,156,90,49,192,57,209,15,132,244,247,139,68,36,4,87,83,15,
537 253,202,4,239,15,135,244,251,255,252,242,15,16,4,194,102,15,46,4,202,255, 531 162,139,124,36,16,137,7,137,95,4,137,79,8,137,87,12,91,95,248,1,195,255,249,
538 221,4,202,221,4,194,255,15,138,244,248,15,133,244,248,255,15,138,244,248, 532 255,129,124,253,202,4,239,15,135,244,41,129,124,253,194,4,239,15,135,244,
539 15,132,244,247,255,248,1,15,183,70,252,254,141,180,253,134,233,248,2,255, 533 41,255,252,242,15,16,4,194,131,198,4,102,15,46,4,202,255,221,4,202,221,4,
540 248,2,15,183,70,252,254,141,180,253,134,233,248,1,255,248,5,57,108,202,4, 534 194,131,198,4,255,223,252,233,221,216,255,218,252,233,223,224,158,255,15,
541 15,133,244,2,129,252,253,239,15,131,244,1,139,12,202,139,4,194,57,193,15, 535 134,244,248,255,15,131,244,248,255,248,1,15,183,70,252,254,141,180,253,134,
542 132,244,1,129,252,253,239,15,135,244,2,139,169,233,133,252,237,15,132,244, 536 233,248,2,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,
543 2,252,246,133,233,235,15,133,244,2,255,49,252,237,255,189,1,0,0,0,255,252, 537 255,139,108,194,4,131,198,4,129,252,253,239,15,135,244,251,129,124,253,202,
544 233,244,45,255,252,247,208,131,198,4,129,124,253,202,4,239,15,133,244,248, 538 4,239,15,135,244,251,255,252,242,15,16,4,194,102,15,46,4,202,255,221,4,202,
545 139,12,202,59,12,135,255,131,198,4,129,124,253,202,4,239,15,135,244,248,255, 539 221,4,194,255,15,138,244,248,15,133,244,248,255,15,138,244,248,15,132,244,
546 252,242,15,16,4,199,102,15,46,4,202,255,221,4,202,221,4,199,255,252,247,208, 540 247,255,248,1,15,183,70,252,254,141,180,253,134,233,248,2,255,248,2,15,183,
547 131,198,4,57,68,202,4,255,139,108,194,4,131,198,4,129,252,253,239,255,15, 541 70,252,254,141,180,253,134,233,248,1,255,248,5,57,108,202,4,15,133,244,2,
548 131,244,247,255,15,130,244,247,255,137,108,202,4,139,44,194,137,44,202,255, 542 129,252,253,239,15,131,244,1,139,12,202,139,4,194,57,193,15,132,244,1,129,
549 15,183,70,252,254,141,180,253,134,233,248,1,139,6,15,182,204,15,182,232,131, 543 252,253,239,15,135,244,2,139,169,233,133,252,237,15,132,244,2,252,246,133,
550 198,4,193,232,16,252,255,36,171,255,139,108,194,4,139,4,194,137,108,202,4, 544 233,235,15,133,244,2,255,49,252,237,255,189,1,0,0,0,255,252,233,244,45,255,
551 137,4,202,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171, 545 252,247,208,131,198,4,129,124,253,202,4,239,15,133,244,248,139,12,202,59,
552 255,49,252,237,129,124,253,194,4,239,129,213,239,137,108,202,4,139,6,15,182, 546 12,135,255,131,198,4,129,124,253,202,4,239,15,135,244,248,255,252,242,15,
553 204,15,182,232,131,198,4,193,232,16,252,255,36,171,255,129,124,253,194,4, 547 16,4,199,102,15,46,4,202,255,221,4,202,221,4,199,255,252,247,208,131,198,
554 239,15,135,244,48,255,252,242,15,16,4,194,184,0,0,0,128,102,15,110,200,102, 548 4,57,68,202,4,255,139,108,194,4,131,198,4,129,252,253,239,255,15,131,244,
555 15,112,201,81,15,87,193,252,242,15,17,4,202,255,221,4,194,217,224,221,28, 549 247,255,15,130,244,247,255,137,108,202,4,139,44,194,137,44,202,255,15,183,
556 202,255,129,124,253,194,4,239,15,133,244,248,139,4,194,255,15,87,192,252, 550 70,252,254,141,180,253,134,233,248,1,139,6,15,182,204,15,182,232,131,198,
557 242,15,42,128,233,248,1,252,242,15,17,4,202,255,219,128,233,248,1,221,28, 551 4,193,232,16,252,255,36,171,255,139,108,194,4,139,4,194,137,108,202,4,137,
558 202,255,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248, 552 4,202,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,255,
559 2,129,124,253,194,4,239,15,133,244,50,139,12,194,137,213,232,251,1,18,255, 553 49,252,237,129,124,253,194,4,239,129,213,239,137,108,202,4,139,6,15,182,204,
560 252,242,15,42,192,137,252,234,255,137,4,36,137,252,234,219,4,36,255,15,182, 554 15,182,232,131,198,4,193,232,16,252,255,36,171,255,129,124,253,194,4,239,
561 78,252,253,252,233,244,1,255,15,182,252,236,15,182,192,255,129,124,253,252, 555 15,135,244,48,255,252,242,15,16,4,194,184,0,0,0,128,102,15,110,200,102,15,
562 234,4,239,15,135,244,46,255,252,242,15,16,4,252,234,252,242,15,88,4,199,255, 556 112,201,81,15,87,193,252,242,15,17,4,202,255,221,4,194,217,224,221,28,202,
563 221,4,252,234,220,4,199,255,129,124,253,252,234,4,239,15,135,244,47,255,252, 557 255,129,124,253,194,4,239,15,133,244,248,139,4,194,255,15,87,192,252,242,
564 242,15,16,4,199,252,242,15,88,4,252,234,255,221,4,199,220,4,252,234,255,129, 558 15,42,128,233,248,1,252,242,15,17,4,202,255,219,128,233,248,1,221,28,202,
565 124,253,252,234,4,239,15,135,244,49,129,124,253,194,4,239,15,135,244,49,255, 559 255,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,2,
566 252,242,15,16,4,252,234,252,242,15,88,4,194,255,221,4,252,234,220,4,194,255, 560 129,124,253,194,4,239,15,133,244,50,139,12,194,137,213,232,251,1,18,255,252,
567 252,242,15,16,4,252,234,252,242,15,92,4,199,255,221,4,252,234,220,36,199, 561 242,15,42,192,137,252,234,255,137,4,36,137,252,234,219,4,36,255,15,182,78,
568 255,252,242,15,16,4,199,252,242,15,92,4,252,234,255,221,4,199,220,36,252, 562 252,253,252,233,244,1,255,15,182,252,236,15,182,192,255,129,124,253,252,234,
569 234,255,252,242,15,16,4,252,234,252,242,15,92,4,194,255,221,4,252,234,220, 563 4,239,15,135,244,46,255,252,242,15,16,4,252,234,252,242,15,88,4,199,255,221,
570 36,194,255,252,242,15,16,4,252,234,252,242,15,89,4,199,255,221,4,252,234, 564 4,252,234,220,4,199,255,129,124,253,252,234,4,239,15,135,244,47,255,252,242,
571 220,12,199,255,252,242,15,16,4,199,252,242,15,89,4,252,234,255,221,4,199, 565 15,16,4,199,252,242,15,88,4,252,234,255,221,4,199,220,4,252,234,255,129,124,
572 220,12,252,234,255,252,242,15,16,4,252,234,252,242,15,89,4,194,255,221,4, 566 253,252,234,4,239,15,135,244,49,129,124,253,194,4,239,15,135,244,49,255,252,
573 252,234,220,12,194,255,252,242,15,16,4,252,234,252,242,15,94,4,199,255,221, 567 242,15,16,4,252,234,252,242,15,88,4,194,255,221,4,252,234,220,4,194,255,252,
574 4,252,234,220,52,199,255,252,242,15,16,4,199,252,242,15,94,4,252,234,255, 568 242,15,16,4,252,234,252,242,15,92,4,199,255,221,4,252,234,220,36,199,255,
575 221,4,199,220,52,252,234,255,252,242,15,16,4,252,234,252,242,15,94,4,194, 569 252,242,15,16,4,199,252,242,15,92,4,252,234,255,221,4,199,220,36,252,234,
576 255,221,4,252,234,220,52,194,255,252,242,15,16,4,252,234,252,242,15,16,12, 570 255,252,242,15,16,4,252,234,252,242,15,92,4,194,255,221,4,252,234,220,36,
577 199,255,221,4,252,234,221,4,199,255,252,242,15,16,4,199,252,242,15,16,12, 571 194,255,252,242,15,16,4,252,234,252,242,15,89,4,199,255,221,4,252,234,220,
578 252,234,255,221,4,199,221,4,252,234,255,252,242,15,16,4,252,234,252,242,15, 572 12,199,255,252,242,15,16,4,199,252,242,15,89,4,252,234,255,221,4,199,220,
579 16,12,194,255,221,4,252,234,221,4,194,255,248,155,232,244,147,255,252,233, 573 12,252,234,255,252,242,15,16,4,252,234,252,242,15,89,4,194,255,221,4,252,
580 244,155,255,232,244,107,255,15,182,252,236,15,182,192,141,12,194,41,232,137, 574 234,220,12,194,255,252,242,15,16,4,252,234,252,242,15,94,4,199,255,221,4,
581 76,36,4,137,68,36,8,248,33,139,108,36,48,137,44,36,137,149,233,137,116,36, 575 252,234,220,52,199,255,252,242,15,16,4,199,252,242,15,94,4,252,234,255,221,
582 24,232,251,1,24,139,149,233,133,192,15,133,244,42,15,182,110,252,255,15,182, 576 4,199,220,52,252,234,255,252,242,15,16,4,252,234,252,242,15,94,4,194,255,
577 221,4,252,234,220,52,194,255,252,242,15,16,4,252,234,252,242,15,16,12,199,
578 255,221,4,252,234,221,4,199,255,252,242,15,16,4,199,252,242,15,16,12,252,
579 234,255,221,4,199,221,4,252,234,255,252,242,15,16,4,252,234,252,242,15,16,
580 12,194,255,221,4,252,234,221,4,194,255,248,156,232,244,148,255,252,233,244,
581 156,255,232,244,107,255,15,182,252,236,15,182,192,141,12,194,41,232,137,76,
582 36,4,137,68,36,8,248,33,139,108,36,48,137,44,36,137,149,233,137,116,36,24,
583 232,251,1,24,139,149,233,133,192,15,133,244,42,15,182,110,252,255,15,182,
583 78,252,253,139,68,252,234,4,139,44,252,234,137,68,202,4,137,44,202,139,6, 584 78,252,253,139,68,252,234,4,139,44,252,234,137,68,202,4,137,44,202,139,6,
584 15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,255,252,247,208, 585 15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,255,252,247,208,
585 139,4,135,199,68,202,4,237,137,4,202,139,6,15,182,204,15,182,232,131,198, 586 139,4,135,199,68,202,4,237,137,4,202,139,6,15,182,204,15,182,232,131,198,
@@ -620,8 +621,8 @@ static const unsigned char build_actionlist[15151] = {
620 252,233,232,251,1,30,139,149,233,15,182,78,252,253,137,4,202,199,68,202,4, 621 252,233,232,251,1,30,139,149,233,15,182,78,252,253,137,4,202,199,68,202,4,
621 237,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,3, 622 237,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,3,
622 137,252,233,232,251,1,29,15,183,70,252,254,252,247,208,252,233,244,2,255, 623 137,252,233,232,251,1,29,15,183,70,252,254,252,247,208,252,233,244,2,255,
623 252,247,208,139,106,252,248,139,173,233,139,4,135,252,233,244,156,255,252, 624 252,247,208,139,106,252,248,139,173,233,139,4,135,252,233,244,157,255,252,
624 247,208,139,106,252,248,139,173,233,139,4,135,252,233,244,157,255,15,182, 625 247,208,139,106,252,248,139,173,233,139,4,135,252,233,244,158,255,15,182,
625 252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,36,139,44,252,234, 626 252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,36,139,44,252,234,
626 129,124,253,194,4,239,15,135,244,251,255,252,242,15,16,4,194,252,242,15,45, 627 129,124,253,194,4,239,15,135,244,251,255,252,242,15,16,4,194,252,242,15,45,
627 192,252,242,15,42,200,102,15,46,193,255,221,4,194,219,20,36,219,4,36,255, 628 192,252,242,15,42,200,102,15,46,193,255,221,4,194,219,20,36,219,4,36,255,
@@ -630,8 +631,8 @@ static const unsigned char build_actionlist[15151] = {
630 182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,2,131,189,233, 631 182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,2,131,189,233,
631 0,15,132,244,1,139,141,233,252,246,129,233,235,15,132,244,36,15,182,78,252, 632 0,15,132,244,1,139,141,233,252,246,129,233,235,15,132,244,36,15,182,78,252,
632 253,252,233,244,1,248,5,255,129,124,253,194,4,239,15,133,244,36,139,4,194, 633 253,252,233,244,1,248,5,255,129,124,253,194,4,239,15,133,244,36,139,4,194,
633 252,233,244,156,255,15,182,252,236,15,182,192,252,247,208,139,4,135,129,124, 634 252,233,244,157,255,15,182,252,236,15,182,192,252,247,208,139,4,135,129,124,
634 253,252,234,4,239,15,133,244,34,139,44,252,234,248,156,139,141,233,35,136, 635 253,252,234,4,239,15,133,244,34,139,44,252,234,248,157,139,141,233,35,136,
635 233,105,201,239,3,141,233,248,1,129,185,233,239,15,133,244,250,57,129,233, 636 233,105,201,239,3,141,233,248,1,129,185,233,239,15,133,244,250,57,129,233,
636 15,133,244,250,129,121,253,4,239,15,132,244,251,15,182,70,252,253,139,41, 637 15,133,244,250,129,121,253,4,239,15,132,244,251,15,182,70,252,253,139,41,
637 139,73,4,137,44,194,248,2,255,137,76,194,4,139,6,15,182,204,15,182,232,131, 638 139,73,4,137,44,194,248,2,255,137,76,194,4,139,6,15,182,204,15,182,232,131,
@@ -649,10 +650,10 @@ static const unsigned char build_actionlist[15151] = {
649 2,139,108,202,4,139,12,202,137,104,4,137,8,139,6,15,182,204,15,182,232,131, 650 2,139,108,202,4,139,12,202,137,104,4,137,8,139,6,15,182,204,15,182,232,131,
650 198,4,193,232,16,252,255,36,171,248,3,131,189,233,0,15,132,244,1,139,141, 651 198,4,193,232,16,252,255,36,171,248,3,131,189,233,0,15,132,244,1,139,141,
651 233,255,252,246,129,233,235,15,132,244,39,15,182,78,252,253,252,233,244,1, 652 233,255,252,246,129,233,235,15,132,244,39,15,182,78,252,253,252,233,244,1,
652 248,5,129,124,253,194,4,239,15,133,244,39,139,4,194,252,233,244,157,248,7, 653 248,5,129,124,253,194,4,239,15,133,244,39,139,4,194,252,233,244,158,248,7,
653 128,165,233,235,139,139,233,137,171,233,137,141,233,15,182,78,252,253,252, 654 128,165,233,235,139,139,233,137,171,233,137,141,233,15,182,78,252,253,252,
654 233,244,2,255,15,182,252,236,15,182,192,252,247,208,139,4,135,129,124,253, 655 233,244,2,255,15,182,252,236,15,182,192,252,247,208,139,4,135,129,124,253,
655 252,234,4,239,15,133,244,37,139,44,252,234,248,157,139,141,233,35,136,233, 656 252,234,4,239,15,133,244,37,139,44,252,234,248,158,139,141,233,35,136,233,
656 105,201,239,198,133,233,0,3,141,233,248,1,129,185,233,239,15,133,244,251, 657 105,201,239,198,133,233,0,3,141,233,248,1,129,185,233,239,15,133,244,251,
657 57,129,233,15,133,244,251,129,121,253,4,239,15,132,244,250,248,2,255,252, 658 57,129,233,15,133,244,251,129,121,253,4,239,15,132,244,250,248,2,255,252,
658 246,133,233,235,15,133,244,253,248,3,15,182,70,252,253,139,108,194,4,139, 659 246,133,233,235,15,133,244,253,248,3,15,182,70,252,253,139,108,194,4,139,
@@ -716,7 +717,7 @@ static const unsigned char build_actionlist[15151] = {
716 248,6,255,199,71,252,252,237,131,199,8,255,199,68,194,252,244,237,255,131, 717 248,6,255,199,71,252,252,237,131,199,8,255,199,68,194,252,244,237,255,131,
717 192,1,252,233,244,5,248,7,15,139,244,14,131,230,252,248,41,252,242,255,1, 718 192,1,252,233,244,5,248,7,15,139,244,14,131,230,252,248,41,252,242,255,1,
718 252,241,255,137,252,245,209,252,237,129,229,239,102,131,172,253,43,233,1, 719 252,241,255,137,252,245,209,252,237,129,229,239,102,131,172,253,43,233,1,
719 15,132,244,139,255,141,12,202,255,129,121,253,4,239,15,135,244,53,129,121, 720 15,132,244,140,255,141,12,202,255,129,121,253,4,239,15,135,244,53,129,121,
720 253,12,239,15,135,244,53,255,139,105,20,255,129,252,253,239,15,135,244,53, 721 253,12,239,15,135,244,53,255,139,105,20,255,129,252,253,239,15,135,244,53,
721 255,252,242,15,16,1,252,242,15,16,73,8,255,252,242,15,88,65,16,252,242,15, 722 255,252,242,15,16,1,252,242,15,16,73,8,255,252,242,15,88,65,16,252,242,15,
722 17,1,133,252,237,15,136,244,249,255,15,140,244,249,255,102,15,46,200,248, 723 17,1,133,252,237,15,136,244,249,255,15,140,244,249,255,102,15,46,200,248,
@@ -874,7 +875,8 @@ enum {
874 GLOB_ff_bit_rol, 875 GLOB_ff_bit_rol,
875 GLOB_ff_bit_ror, 876 GLOB_ff_bit_ror,
876 GLOB_vm_record, 877 GLOB_vm_record,
877 GLOB_vm_hook, 878 GLOB_vm_rethook,
879 GLOB_vm_inshook,
878 GLOB_cont_hook, 880 GLOB_cont_hook,
879 GLOB_vm_hotloop, 881 GLOB_vm_hotloop,
880 GLOB_vm_callhook, 882 GLOB_vm_callhook,
@@ -1025,7 +1027,8 @@ static const char *const globnames[] = {
1025 "ff_bit_rol", 1027 "ff_bit_rol",
1026 "ff_bit_ror", 1028 "ff_bit_ror",
1027 "vm_record", 1029 "vm_record",
1028 "vm_hook", 1030 "vm_rethook",
1031 "vm_inshook",
1029 "cont_hook", 1032 "cont_hook",
1030 "vm_hotloop", 1033 "vm_hotloop",
1031 "vm_callhook", 1034 "vm_callhook",
@@ -1431,106 +1434,106 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse)
1431#if LJ_HASJIT 1434#if LJ_HASJIT
1432 dasm_put(Dst, 7963, DISPATCH_GL(hookmask), HOOK_VMEVENT, HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount)); 1435 dasm_put(Dst, 7963, DISPATCH_GL(hookmask), HOOK_VMEVENT, HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount));
1433#endif 1436#endif
1434 dasm_put(Dst, 7994, DISPATCH_GL(hookmask), HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount), LUA_MASKLINE, Dt1(->base), Dt1(->base)); 1437 dasm_put(Dst, 7994, DISPATCH_GL(hookmask), HOOK_ACTIVE, DISPATCH_GL(hookmask), HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount), LUA_MASKLINE);
1435 dasm_put(Dst, 8060, GG_DISP2STATIC); 1438 dasm_put(Dst, 8045, Dt1(->base), Dt1(->base), GG_DISP2STATIC);
1436#if LJ_HASJIT 1439#if LJ_HASJIT
1437 dasm_put(Dst, 8095, Dt7(->pc), PC2PROTO(framesize), Dt1(->base), Dt1(->top), GG_DISP2J, DISPATCH_J(L)); 1440 dasm_put(Dst, 8111, Dt7(->pc), PC2PROTO(framesize), Dt1(->base), Dt1(->top), GG_DISP2J, DISPATCH_J(L));
1438#endif 1441#endif
1439 dasm_put(Dst, 8141); 1442 dasm_put(Dst, 8157);
1440#if LJ_HASJIT 1443#if LJ_HASJIT
1441 dasm_put(Dst, 8144, DISPATCH_J(L)); 1444 dasm_put(Dst, 8160, DISPATCH_J(L));
1442#endif 1445#endif
1443 dasm_put(Dst, 8156); 1446 dasm_put(Dst, 8172);
1444#if LJ_HASJIT 1447#if LJ_HASJIT
1445 dasm_put(Dst, 8159, DISPATCH_J(L)); 1448 dasm_put(Dst, 8175, DISPATCH_J(L));
1446#endif 1449#endif
1447 dasm_put(Dst, 8165, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); 1450 dasm_put(Dst, 8181, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top));
1448#if LJ_HASJIT 1451#if LJ_HASJIT
1449 dasm_put(Dst, 8231, DISPATCH_GL(vmstate), DISPATCH_GL(vmstate), ~LJ_VMST_EXIT, DISPATCH_J(exitno), DISPATCH_J(parent), 8*8+16, DISPATCH_J(flags), JIT_F_SSE2, DISPATCH_GL(jit_L), DISPATCH_GL(jit_base), DISPATCH_J(L), Dt1(->base), GG_DISP2J, Dt1(->base)); 1452 dasm_put(Dst, 8247, DISPATCH_GL(vmstate), DISPATCH_GL(vmstate), ~LJ_VMST_EXIT, DISPATCH_J(exitno), DISPATCH_J(parent), 8*8+16, DISPATCH_J(flags), JIT_F_SSE2, DISPATCH_GL(jit_L), DISPATCH_GL(jit_base), DISPATCH_J(L), Dt1(->base), GG_DISP2J, Dt1(->base));
1450#endif 1453#endif
1451 dasm_put(Dst, 8374); 1454 dasm_put(Dst, 8390);
1452#if LJ_HASJIT 1455#if LJ_HASJIT
1453 dasm_put(Dst, 8377, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP); 1456 dasm_put(Dst, 8393, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP);
1454#endif 1457#endif
1455 dasm_put(Dst, 8417); 1458 dasm_put(Dst, 8433);
1456 if (!sse) { 1459 if (!sse) {
1457 dasm_put(Dst, 8420); 1460 dasm_put(Dst, 8436);
1458 } 1461 }
1459 dasm_put(Dst, 8465); 1462 dasm_put(Dst, 8481);
1460 if (!sse) { 1463 if (!sse) {
1461 dasm_put(Dst, 8567); 1464 dasm_put(Dst, 8583);
1462 } 1465 }
1463 dasm_put(Dst, 8612); 1466 dasm_put(Dst, 8628);
1464 if (!sse) { 1467 if (!sse) {
1465 dasm_put(Dst, 8714); 1468 dasm_put(Dst, 8730);
1466 } 1469 }
1467 dasm_put(Dst, 8753); 1470 dasm_put(Dst, 8769);
1468 if (sse) { 1471 if (sse) {
1469 dasm_put(Dst, 8858); 1472 dasm_put(Dst, 8874);
1470 } else { 1473 } else {
1471 dasm_put(Dst, 8988); 1474 dasm_put(Dst, 9004);
1472 } 1475 }
1473 dasm_put(Dst, 9035); 1476 dasm_put(Dst, 9051);
1474 if (!sse) { 1477 if (!sse) {
1475 dasm_put(Dst, 9109); 1478 dasm_put(Dst, 9125);
1476 if (cmov) { 1479 if (cmov) {
1477 dasm_put(Dst, 9120); 1480 dasm_put(Dst, 9136);
1478 } else { 1481 } else {
1479 dasm_put(Dst, 9124); 1482 dasm_put(Dst, 9140);
1480 } 1483 }
1481 dasm_put(Dst, 9131); 1484 dasm_put(Dst, 9147);
1482 dasm_put(Dst, 9205); 1485 dasm_put(Dst, 9221);
1483 dasm_put(Dst, 9305); 1486 dasm_put(Dst, 9321);
1484 if (cmov) { 1487 if (cmov) {
1485 dasm_put(Dst, 9308); 1488 dasm_put(Dst, 9324);
1486 } else { 1489 } else {
1487 dasm_put(Dst, 9312); 1490 dasm_put(Dst, 9328);
1488 } 1491 }
1489 dasm_put(Dst, 9319); 1492 dasm_put(Dst, 9335);
1490 if (cmov) { 1493 if (cmov) {
1491 dasm_put(Dst, 9120); 1494 dasm_put(Dst, 9136);
1492 } else { 1495 } else {
1493 dasm_put(Dst, 9124); 1496 dasm_put(Dst, 9140);
1494 } 1497 }
1495 dasm_put(Dst, 9337); 1498 dasm_put(Dst, 9353);
1496 } else { 1499 } else {
1497 dasm_put(Dst, 9416); 1500 dasm_put(Dst, 9432);
1498 } 1501 }
1499 dasm_put(Dst, 9419); 1502 dasm_put(Dst, 9435);
1500 dasm_put(Dst, 9504); 1503 dasm_put(Dst, 9520);
1501 dasm_put(Dst, 9635); 1504 dasm_put(Dst, 9651);
1502 dasm_put(Dst, 9834); 1505 dasm_put(Dst, 9850);
1503 if (sse) { 1506 if (sse) {
1504 dasm_put(Dst, 9857); 1507 dasm_put(Dst, 9873);
1505 dasm_put(Dst, 9914); 1508 dasm_put(Dst, 9930);
1506 dasm_put(Dst, 10005); 1509 dasm_put(Dst, 10021);
1507 } else { 1510 } else {
1508 dasm_put(Dst, 10047); 1511 dasm_put(Dst, 10063);
1509 dasm_put(Dst, 10139); 1512 dasm_put(Dst, 10155);
1510 } 1513 }
1511 dasm_put(Dst, 10185); 1514 dasm_put(Dst, 10201);
1512 if (sse) { 1515 if (sse) {
1513 dasm_put(Dst, 10191); 1516 dasm_put(Dst, 10207);
1514 dasm_put(Dst, 10296); 1517 dasm_put(Dst, 10312);
1515 dasm_put(Dst, 10379); 1518 dasm_put(Dst, 10395);
1516 } else { 1519 } else {
1517 dasm_put(Dst, 10451); 1520 dasm_put(Dst, 10467);
1518 dasm_put(Dst, 10534); 1521 dasm_put(Dst, 10550);
1519 if (cmov) { 1522 if (cmov) {
1520 dasm_put(Dst, 10589); 1523 dasm_put(Dst, 10605);
1521 } else { 1524 } else {
1522 dasm_put(Dst, 10608); 1525 dasm_put(Dst, 10624);
1523 } 1526 }
1524 dasm_put(Dst, 10447); 1527 dasm_put(Dst, 10463);
1525 } 1528 }
1526 dasm_put(Dst, 10649); 1529 dasm_put(Dst, 10665);
1527} 1530}
1528 1531
1529/* Generate the code for a single instruction. */ 1532/* Generate the code for a single instruction. */
1530static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) 1533static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
1531{ 1534{
1532 int vk = 0; 1535 int vk = 0;
1533 dasm_put(Dst, 10703, defop); 1536 dasm_put(Dst, 10719, defop);
1534 1537
1535 switch (op) { 1538 switch (op) {
1536 1539
@@ -1539,617 +1542,617 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
1539 /* Remember: all ops branch for a true comparison, fall through otherwise. */ 1542 /* Remember: all ops branch for a true comparison, fall through otherwise. */
1540 1543
1541 case BC_ISLT: case BC_ISGE: case BC_ISLE: case BC_ISGT: 1544 case BC_ISLT: case BC_ISGE: case BC_ISLE: case BC_ISGT:
1542 dasm_put(Dst, 10705, LJ_TISNUM, LJ_TISNUM); 1545 dasm_put(Dst, 10721, LJ_TISNUM, LJ_TISNUM);
1543 if (sse) { 1546 if (sse) {
1544 dasm_put(Dst, 10726); 1547 dasm_put(Dst, 10742);
1545 } else { 1548 } else {
1546 dasm_put(Dst, 10741); 1549 dasm_put(Dst, 10757);
1547 if (cmov) { 1550 if (cmov) {
1548 dasm_put(Dst, 10751); 1551 dasm_put(Dst, 10767);
1549 } else { 1552 } else {
1550 dasm_put(Dst, 10757); 1553 dasm_put(Dst, 10773);
1551 } 1554 }
1552 } 1555 }
1553 switch (op) { 1556 switch (op) {
1554 case BC_ISLT: 1557 case BC_ISLT:
1555 dasm_put(Dst, 10764); 1558 dasm_put(Dst, 10780);
1556 break; 1559 break;
1557 case BC_ISGE: 1560 case BC_ISGE:
1558 dasm_put(Dst, 10000); 1561 dasm_put(Dst, 10016);
1559 break; 1562 break;
1560 case BC_ISLE: 1563 case BC_ISLE:
1561 dasm_put(Dst, 6179); 1564 dasm_put(Dst, 6179);
1562 break; 1565 break;
1563 case BC_ISGT: 1566 case BC_ISGT:
1564 dasm_put(Dst, 10769); 1567 dasm_put(Dst, 10785);
1565 break; 1568 break;
1566 default: break; /* Shut up GCC. */ 1569 default: break; /* Shut up GCC. */
1567 } 1570 }
1568 dasm_put(Dst, 10774, -BCBIAS_J*4); 1571 dasm_put(Dst, 10790, -BCBIAS_J*4);
1569 break; 1572 break;
1570 1573
1571 case BC_ISEQV: case BC_ISNEV: 1574 case BC_ISEQV: case BC_ISNEV:
1572 vk = op == BC_ISEQV; 1575 vk = op == BC_ISEQV;
1573 dasm_put(Dst, 10807, LJ_TISNUM, LJ_TISNUM); 1576 dasm_put(Dst, 10823, LJ_TISNUM, LJ_TISNUM);
1574 if (sse) { 1577 if (sse) {
1575 dasm_put(Dst, 10833); 1578 dasm_put(Dst, 10849);
1576 } else { 1579 } else {
1577 dasm_put(Dst, 10845); 1580 dasm_put(Dst, 10861);
1578 if (cmov) { 1581 if (cmov) {
1579 dasm_put(Dst, 10751); 1582 dasm_put(Dst, 10767);
1580 } else { 1583 } else {
1581 dasm_put(Dst, 10757); 1584 dasm_put(Dst, 10773);
1582 } 1585 }
1583 } 1586 }
1584 iseqne_fp: 1587 iseqne_fp:
1585 if (vk) { 1588 if (vk) {
1586 dasm_put(Dst, 10852); 1589 dasm_put(Dst, 10868);
1587 } else { 1590 } else {
1588 dasm_put(Dst, 10861); 1591 dasm_put(Dst, 10877);
1589 } 1592 }
1590 iseqne_end: 1593 iseqne_end:
1591 if (vk) { 1594 if (vk) {
1592 dasm_put(Dst, 10870, -BCBIAS_J*4); 1595 dasm_put(Dst, 10886, -BCBIAS_J*4);
1593 } else { 1596 } else {
1594 dasm_put(Dst, 10885, -BCBIAS_J*4); 1597 dasm_put(Dst, 10901, -BCBIAS_J*4);
1595 } 1598 }
1596 dasm_put(Dst, 8398); 1599 dasm_put(Dst, 8414);
1597 if (op == BC_ISEQV || op == BC_ISNEV) { 1600 if (op == BC_ISEQV || op == BC_ISNEV) {
1598 dasm_put(Dst, 10900, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<<MM_eq); 1601 dasm_put(Dst, 10916, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<<MM_eq);
1599 if (vk) { 1602 if (vk) {
1600 dasm_put(Dst, 10958); 1603 dasm_put(Dst, 10974);
1601 } else { 1604 } else {
1602 dasm_put(Dst, 10962); 1605 dasm_put(Dst, 10978);
1603 } 1606 }
1604 dasm_put(Dst, 10968); 1607 dasm_put(Dst, 10984);
1605 } 1608 }
1606 break; 1609 break;
1607 case BC_ISEQS: case BC_ISNES: 1610 case BC_ISEQS: case BC_ISNES:
1608 vk = op == BC_ISEQS; 1611 vk = op == BC_ISEQS;
1609 dasm_put(Dst, 10973, LJ_TSTR); 1612 dasm_put(Dst, 10989, LJ_TSTR);
1610 iseqne_test: 1613 iseqne_test:
1611 if (vk) { 1614 if (vk) {
1612 dasm_put(Dst, 10856); 1615 dasm_put(Dst, 10872);
1613 } else { 1616 } else {
1614 dasm_put(Dst, 2809); 1617 dasm_put(Dst, 2809);
1615 } 1618 }
1616 goto iseqne_end; 1619 goto iseqne_end;
1617 case BC_ISEQN: case BC_ISNEN: 1620 case BC_ISEQN: case BC_ISNEN:
1618 vk = op == BC_ISEQN; 1621 vk = op == BC_ISEQN;
1619 dasm_put(Dst, 10996, LJ_TISNUM); 1622 dasm_put(Dst, 11012, LJ_TISNUM);
1620 if (sse) { 1623 if (sse) {
1621 dasm_put(Dst, 11010); 1624 dasm_put(Dst, 11026);
1622 } else { 1625 } else {
1623 dasm_put(Dst, 11022); 1626 dasm_put(Dst, 11038);
1624 if (cmov) { 1627 if (cmov) {
1625 dasm_put(Dst, 10751); 1628 dasm_put(Dst, 10767);
1626 } else { 1629 } else {
1627 dasm_put(Dst, 10757); 1630 dasm_put(Dst, 10773);
1628 } 1631 }
1629 } 1632 }
1630 goto iseqne_fp; 1633 goto iseqne_fp;
1631 case BC_ISEQP: case BC_ISNEP: 1634 case BC_ISEQP: case BC_ISNEP:
1632 vk = op == BC_ISEQP; 1635 vk = op == BC_ISEQP;
1633 dasm_put(Dst, 11029); 1636 dasm_put(Dst, 11045);
1634 goto iseqne_test; 1637 goto iseqne_test;
1635 1638
1636 /* -- Unary test and copy ops ------------------------------------------- */ 1639 /* -- Unary test and copy ops ------------------------------------------- */
1637 1640
1638 case BC_ISTC: case BC_ISFC: case BC_IST: case BC_ISF: 1641 case BC_ISTC: case BC_ISFC: case BC_IST: case BC_ISF:
1639 dasm_put(Dst, 11040, LJ_TISTRUECOND); 1642 dasm_put(Dst, 11056, LJ_TISTRUECOND);
1640 if (op == BC_IST || op == BC_ISTC) { 1643 if (op == BC_IST || op == BC_ISTC) {
1641 dasm_put(Dst, 11052); 1644 dasm_put(Dst, 11068);
1642 } else { 1645 } else {
1643 dasm_put(Dst, 11057); 1646 dasm_put(Dst, 11073);
1644 } 1647 }
1645 if (op == BC_ISTC || op == BC_ISFC) { 1648 if (op == BC_ISTC || op == BC_ISFC) {
1646 dasm_put(Dst, 11062); 1649 dasm_put(Dst, 11078);
1647 } 1650 }
1648 dasm_put(Dst, 11073, -BCBIAS_J*4); 1651 dasm_put(Dst, 11089, -BCBIAS_J*4);
1649 break; 1652 break;
1650 1653
1651 /* -- Unary ops --------------------------------------------------------- */ 1654 /* -- Unary ops --------------------------------------------------------- */
1652 1655
1653 case BC_MOV: 1656 case BC_MOV:
1654 dasm_put(Dst, 11104); 1657 dasm_put(Dst, 11120);
1655 break; 1658 break;
1656 case BC_NOT: 1659 case BC_NOT:
1657 dasm_put(Dst, 11137, LJ_TISTRUECOND, LJ_TTRUE); 1660 dasm_put(Dst, 11153, LJ_TISTRUECOND, LJ_TTRUE);
1658 break; 1661 break;
1659 case BC_UNM: 1662 case BC_UNM:
1660 dasm_put(Dst, 11172, LJ_TISNUM); 1663 dasm_put(Dst, 11188, LJ_TISNUM);
1661 if (sse) { 1664 if (sse) {
1662 dasm_put(Dst, 11183); 1665 dasm_put(Dst, 11199);
1663 } else { 1666 } else {
1664 dasm_put(Dst, 11213); 1667 dasm_put(Dst, 11229);
1665 } 1668 }
1666 dasm_put(Dst, 8398); 1669 dasm_put(Dst, 8414);
1667 break; 1670 break;
1668 case BC_LEN: 1671 case BC_LEN:
1669 dasm_put(Dst, 11222, LJ_TSTR); 1672 dasm_put(Dst, 11238, LJ_TSTR);
1670 if (sse) { 1673 if (sse) {
1671 dasm_put(Dst, 11236, Dt5(->len)); 1674 dasm_put(Dst, 11252, Dt5(->len));
1672 } else { 1675 } else {
1673 dasm_put(Dst, 11254, Dt5(->len)); 1676 dasm_put(Dst, 11270, Dt5(->len));
1674 } 1677 }
1675 dasm_put(Dst, 11263, LJ_TTAB); 1678 dasm_put(Dst, 11279, LJ_TTAB);
1676 if (sse) { 1679 if (sse) {
1677 dasm_put(Dst, 11303); 1680 dasm_put(Dst, 11319);
1678 } else { 1681 } else {
1679 dasm_put(Dst, 11312); 1682 dasm_put(Dst, 11328);
1680 } 1683 }
1681 dasm_put(Dst, 11322); 1684 dasm_put(Dst, 11338);
1682 break; 1685 break;
1683 1686
1684 /* -- Binary ops -------------------------------------------------------- */ 1687 /* -- Binary ops -------------------------------------------------------- */
1685 1688
1686 1689
1687 case BC_ADDVN: case BC_ADDNV: case BC_ADDVV: 1690 case BC_ADDVN: case BC_ADDNV: case BC_ADDVV:
1688 dasm_put(Dst, 11332); 1691 dasm_put(Dst, 11348);
1689 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1692 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1690 switch (vk) { 1693 switch (vk) {
1691 case 0: 1694 case 0:
1692 dasm_put(Dst, 11340, LJ_TISNUM); 1695 dasm_put(Dst, 11356, LJ_TISNUM);
1693 if (sse) { 1696 if (sse) {
1694 dasm_put(Dst, 11352); 1697 dasm_put(Dst, 11368);
1695 } else { 1698 } else {
1696 dasm_put(Dst, 11366); 1699 dasm_put(Dst, 11382);
1697 } 1700 }
1698 break; 1701 break;
1699 case 1: 1702 case 1:
1700 dasm_put(Dst, 11374, LJ_TISNUM); 1703 dasm_put(Dst, 11390, LJ_TISNUM);
1701 if (sse) { 1704 if (sse) {
1702 dasm_put(Dst, 11386); 1705 dasm_put(Dst, 11402);
1703 } else { 1706 } else {
1704 dasm_put(Dst, 11400); 1707 dasm_put(Dst, 11416);
1705 } 1708 }
1706 break; 1709 break;
1707 default: 1710 default:
1708 dasm_put(Dst, 11408, LJ_TISNUM, LJ_TISNUM); 1711 dasm_put(Dst, 11424, LJ_TISNUM, LJ_TISNUM);
1709 if (sse) { 1712 if (sse) {
1710 dasm_put(Dst, 11430); 1713 dasm_put(Dst, 11446);
1711 } else { 1714 } else {
1712 dasm_put(Dst, 11444); 1715 dasm_put(Dst, 11460);
1713 } 1716 }
1714 break; 1717 break;
1715 } 1718 }
1716 if (sse) { 1719 if (sse) {
1717 dasm_put(Dst, 11206); 1720 dasm_put(Dst, 11222);
1718 } else { 1721 } else {
1719 dasm_put(Dst, 11218); 1722 dasm_put(Dst, 11234);
1720 } 1723 }
1721 dasm_put(Dst, 8398); 1724 dasm_put(Dst, 8414);
1722 break; 1725 break;
1723 case BC_SUBVN: case BC_SUBNV: case BC_SUBVV: 1726 case BC_SUBVN: case BC_SUBNV: case BC_SUBVV:
1724 dasm_put(Dst, 11332); 1727 dasm_put(Dst, 11348);
1725 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1728 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1726 switch (vk) { 1729 switch (vk) {
1727 case 0: 1730 case 0:
1728 dasm_put(Dst, 11340, LJ_TISNUM); 1731 dasm_put(Dst, 11356, LJ_TISNUM);
1729 if (sse) { 1732 if (sse) {
1730 dasm_put(Dst, 11452); 1733 dasm_put(Dst, 11468);
1731 } else { 1734 } else {
1732 dasm_put(Dst, 11466); 1735 dasm_put(Dst, 11482);
1733 } 1736 }
1734 break; 1737 break;
1735 case 1: 1738 case 1:
1736 dasm_put(Dst, 11374, LJ_TISNUM); 1739 dasm_put(Dst, 11390, LJ_TISNUM);
1737 if (sse) { 1740 if (sse) {
1738 dasm_put(Dst, 11474); 1741 dasm_put(Dst, 11490);
1739 } else { 1742 } else {
1740 dasm_put(Dst, 11488); 1743 dasm_put(Dst, 11504);
1741 } 1744 }
1742 break; 1745 break;
1743 default: 1746 default:
1744 dasm_put(Dst, 11408, LJ_TISNUM, LJ_TISNUM); 1747 dasm_put(Dst, 11424, LJ_TISNUM, LJ_TISNUM);
1745 if (sse) { 1748 if (sse) {
1746 dasm_put(Dst, 11496); 1749 dasm_put(Dst, 11512);
1747 } else { 1750 } else {
1748 dasm_put(Dst, 11510); 1751 dasm_put(Dst, 11526);
1749 } 1752 }
1750 break; 1753 break;
1751 } 1754 }
1752 if (sse) { 1755 if (sse) {
1753 dasm_put(Dst, 11206); 1756 dasm_put(Dst, 11222);
1754 } else { 1757 } else {
1755 dasm_put(Dst, 11218); 1758 dasm_put(Dst, 11234);
1756 } 1759 }
1757 dasm_put(Dst, 8398); 1760 dasm_put(Dst, 8414);
1758 break; 1761 break;
1759 case BC_MULVN: case BC_MULNV: case BC_MULVV: 1762 case BC_MULVN: case BC_MULNV: case BC_MULVV:
1760 dasm_put(Dst, 11332); 1763 dasm_put(Dst, 11348);
1761 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1764 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1762 switch (vk) { 1765 switch (vk) {
1763 case 0: 1766 case 0:
1764 dasm_put(Dst, 11340, LJ_TISNUM); 1767 dasm_put(Dst, 11356, LJ_TISNUM);
1765 if (sse) { 1768 if (sse) {
1766 dasm_put(Dst, 11518); 1769 dasm_put(Dst, 11534);
1767 } else { 1770 } else {
1768 dasm_put(Dst, 11532); 1771 dasm_put(Dst, 11548);
1769 } 1772 }
1770 break; 1773 break;
1771 case 1: 1774 case 1:
1772 dasm_put(Dst, 11374, LJ_TISNUM); 1775 dasm_put(Dst, 11390, LJ_TISNUM);
1773 if (sse) { 1776 if (sse) {
1774 dasm_put(Dst, 11540); 1777 dasm_put(Dst, 11556);
1775 } else { 1778 } else {
1776 dasm_put(Dst, 11554); 1779 dasm_put(Dst, 11570);
1777 } 1780 }
1778 break; 1781 break;
1779 default: 1782 default:
1780 dasm_put(Dst, 11408, LJ_TISNUM, LJ_TISNUM); 1783 dasm_put(Dst, 11424, LJ_TISNUM, LJ_TISNUM);
1781 if (sse) { 1784 if (sse) {
1782 dasm_put(Dst, 11562); 1785 dasm_put(Dst, 11578);
1783 } else { 1786 } else {
1784 dasm_put(Dst, 11576); 1787 dasm_put(Dst, 11592);
1785 } 1788 }
1786 break; 1789 break;
1787 } 1790 }
1788 if (sse) { 1791 if (sse) {
1789 dasm_put(Dst, 11206); 1792 dasm_put(Dst, 11222);
1790 } else { 1793 } else {
1791 dasm_put(Dst, 11218); 1794 dasm_put(Dst, 11234);
1792 } 1795 }
1793 dasm_put(Dst, 8398); 1796 dasm_put(Dst, 8414);
1794 break; 1797 break;
1795 case BC_DIVVN: case BC_DIVNV: case BC_DIVVV: 1798 case BC_DIVVN: case BC_DIVNV: case BC_DIVVV:
1796 dasm_put(Dst, 11332); 1799 dasm_put(Dst, 11348);
1797 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1800 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1798 switch (vk) { 1801 switch (vk) {
1799 case 0: 1802 case 0:
1800 dasm_put(Dst, 11340, LJ_TISNUM); 1803 dasm_put(Dst, 11356, LJ_TISNUM);
1801 if (sse) { 1804 if (sse) {
1802 dasm_put(Dst, 11584); 1805 dasm_put(Dst, 11600);
1803 } else { 1806 } else {
1804 dasm_put(Dst, 11598); 1807 dasm_put(Dst, 11614);
1805 } 1808 }
1806 break; 1809 break;
1807 case 1: 1810 case 1:
1808 dasm_put(Dst, 11374, LJ_TISNUM); 1811 dasm_put(Dst, 11390, LJ_TISNUM);
1809 if (sse) { 1812 if (sse) {
1810 dasm_put(Dst, 11606); 1813 dasm_put(Dst, 11622);
1811 } else { 1814 } else {
1812 dasm_put(Dst, 11620); 1815 dasm_put(Dst, 11636);
1813 } 1816 }
1814 break; 1817 break;
1815 default: 1818 default:
1816 dasm_put(Dst, 11408, LJ_TISNUM, LJ_TISNUM); 1819 dasm_put(Dst, 11424, LJ_TISNUM, LJ_TISNUM);
1817 if (sse) { 1820 if (sse) {
1818 dasm_put(Dst, 11628); 1821 dasm_put(Dst, 11644);
1819 } else { 1822 } else {
1820 dasm_put(Dst, 11642); 1823 dasm_put(Dst, 11658);
1821 } 1824 }
1822 break; 1825 break;
1823 } 1826 }
1824 if (sse) { 1827 if (sse) {
1825 dasm_put(Dst, 11206); 1828 dasm_put(Dst, 11222);
1826 } else { 1829 } else {
1827 dasm_put(Dst, 11218); 1830 dasm_put(Dst, 11234);
1828 } 1831 }
1829 dasm_put(Dst, 8398); 1832 dasm_put(Dst, 8414);
1830 break; 1833 break;
1831 case BC_MODVN: 1834 case BC_MODVN:
1832 dasm_put(Dst, 11332); 1835 dasm_put(Dst, 11348);
1833 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1836 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1834 switch (vk) { 1837 switch (vk) {
1835 case 0: 1838 case 0:
1836 dasm_put(Dst, 11340, LJ_TISNUM); 1839 dasm_put(Dst, 11356, LJ_TISNUM);
1837 if (sse) { 1840 if (sse) {
1838 dasm_put(Dst, 11650); 1841 dasm_put(Dst, 11666);
1839 } else { 1842 } else {
1840 dasm_put(Dst, 11664); 1843 dasm_put(Dst, 11680);
1841 } 1844 }
1842 break; 1845 break;
1843 case 1: 1846 case 1:
1844 dasm_put(Dst, 11374, LJ_TISNUM); 1847 dasm_put(Dst, 11390, LJ_TISNUM);
1845 if (sse) { 1848 if (sse) {
1846 dasm_put(Dst, 11672); 1849 dasm_put(Dst, 11688);
1847 } else { 1850 } else {
1848 dasm_put(Dst, 11686); 1851 dasm_put(Dst, 11702);
1849 } 1852 }
1850 break; 1853 break;
1851 default: 1854 default:
1852 dasm_put(Dst, 11408, LJ_TISNUM, LJ_TISNUM); 1855 dasm_put(Dst, 11424, LJ_TISNUM, LJ_TISNUM);
1853 if (sse) { 1856 if (sse) {
1854 dasm_put(Dst, 11694); 1857 dasm_put(Dst, 11710);
1855 } else { 1858 } else {
1856 dasm_put(Dst, 11708); 1859 dasm_put(Dst, 11724);
1857 } 1860 }
1858 break; 1861 break;
1859 } 1862 }
1860 dasm_put(Dst, 11716); 1863 dasm_put(Dst, 11732);
1861 if (sse) { 1864 if (sse) {
1862 dasm_put(Dst, 11206); 1865 dasm_put(Dst, 11222);
1863 } else { 1866 } else {
1864 dasm_put(Dst, 11218); 1867 dasm_put(Dst, 11234);
1865 } 1868 }
1866 dasm_put(Dst, 8398); 1869 dasm_put(Dst, 8414);
1867 break; 1870 break;
1868 case BC_MODNV: case BC_MODVV: 1871 case BC_MODNV: case BC_MODVV:
1869 dasm_put(Dst, 11332); 1872 dasm_put(Dst, 11348);
1870 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1873 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1871 switch (vk) { 1874 switch (vk) {
1872 case 0: 1875 case 0:
1873 dasm_put(Dst, 11340, LJ_TISNUM); 1876 dasm_put(Dst, 11356, LJ_TISNUM);
1874 if (sse) { 1877 if (sse) {
1875 dasm_put(Dst, 11650); 1878 dasm_put(Dst, 11666);
1876 } else { 1879 } else {
1877 dasm_put(Dst, 11664); 1880 dasm_put(Dst, 11680);
1878 } 1881 }
1879 break; 1882 break;
1880 case 1: 1883 case 1:
1881 dasm_put(Dst, 11374, LJ_TISNUM); 1884 dasm_put(Dst, 11390, LJ_TISNUM);
1882 if (sse) { 1885 if (sse) {
1883 dasm_put(Dst, 11672); 1886 dasm_put(Dst, 11688);
1884 } else { 1887 } else {
1885 dasm_put(Dst, 11686); 1888 dasm_put(Dst, 11702);
1886 } 1889 }
1887 break; 1890 break;
1888 default: 1891 default:
1889 dasm_put(Dst, 11408, LJ_TISNUM, LJ_TISNUM); 1892 dasm_put(Dst, 11424, LJ_TISNUM, LJ_TISNUM);
1890 if (sse) { 1893 if (sse) {
1891 dasm_put(Dst, 11694); 1894 dasm_put(Dst, 11710);
1892 } else { 1895 } else {
1893 dasm_put(Dst, 11708); 1896 dasm_put(Dst, 11724);
1894 } 1897 }
1895 break; 1898 break;
1896 } 1899 }
1897 dasm_put(Dst, 11722); 1900 dasm_put(Dst, 11738);
1898 break; 1901 break;
1899 case BC_POW: 1902 case BC_POW:
1900 dasm_put(Dst, 11332); 1903 dasm_put(Dst, 11348);
1901 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1904 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1902 switch (vk) { 1905 switch (vk) {
1903 case 0: 1906 case 0:
1904 dasm_put(Dst, 11340, LJ_TISNUM); 1907 dasm_put(Dst, 11356, LJ_TISNUM);
1905 if (sse) { 1908 if (sse) {
1906 dasm_put(Dst, 11650); 1909 dasm_put(Dst, 11666);
1907 } else { 1910 } else {
1908 dasm_put(Dst, 11664); 1911 dasm_put(Dst, 11680);
1909 } 1912 }
1910 break; 1913 break;
1911 case 1: 1914 case 1:
1912 dasm_put(Dst, 11374, LJ_TISNUM); 1915 dasm_put(Dst, 11390, LJ_TISNUM);
1913 if (sse) { 1916 if (sse) {
1914 dasm_put(Dst, 11672); 1917 dasm_put(Dst, 11688);
1915 } else { 1918 } else {
1916 dasm_put(Dst, 11686); 1919 dasm_put(Dst, 11702);
1917 } 1920 }
1918 break; 1921 break;
1919 default: 1922 default:
1920 dasm_put(Dst, 11408, LJ_TISNUM, LJ_TISNUM); 1923 dasm_put(Dst, 11424, LJ_TISNUM, LJ_TISNUM);
1921 if (sse) { 1924 if (sse) {
1922 dasm_put(Dst, 11694); 1925 dasm_put(Dst, 11710);
1923 } else { 1926 } else {
1924 dasm_put(Dst, 11708); 1927 dasm_put(Dst, 11724);
1925 } 1928 }
1926 break; 1929 break;
1927 } 1930 }
1928 dasm_put(Dst, 11727); 1931 dasm_put(Dst, 11743);
1929 if (sse) { 1932 if (sse) {
1930 dasm_put(Dst, 11206); 1933 dasm_put(Dst, 11222);
1931 } else { 1934 } else {
1932 dasm_put(Dst, 11218); 1935 dasm_put(Dst, 11234);
1933 } 1936 }
1934 dasm_put(Dst, 8398); 1937 dasm_put(Dst, 8414);
1935 break; 1938 break;
1936 1939
1937 case BC_CAT: 1940 case BC_CAT:
1938 dasm_put(Dst, 11731, Dt1(->base), Dt1(->base)); 1941 dasm_put(Dst, 11747, Dt1(->base), Dt1(->base));
1939 break; 1942 break;
1940 1943
1941 /* -- Constant ops ------------------------------------------------------ */ 1944 /* -- Constant ops ------------------------------------------------------ */
1942 1945
1943 case BC_KSTR: 1946 case BC_KSTR:
1944 dasm_put(Dst, 11825, LJ_TSTR); 1947 dasm_put(Dst, 11841, LJ_TSTR);
1945 break; 1948 break;
1946 case BC_KSHORT: 1949 case BC_KSHORT:
1947 if (sse) { 1950 if (sse) {
1948 dasm_put(Dst, 11858); 1951 dasm_put(Dst, 11874);
1949 } else { 1952 } else {
1950 dasm_put(Dst, 11873); 1953 dasm_put(Dst, 11889);
1951 } 1954 }
1952 dasm_put(Dst, 8398); 1955 dasm_put(Dst, 8414);
1953 break; 1956 break;
1954 case BC_KNUM: 1957 case BC_KNUM:
1955 if (sse) { 1958 if (sse) {
1956 dasm_put(Dst, 11881); 1959 dasm_put(Dst, 11897);
1957 } else { 1960 } else {
1958 dasm_put(Dst, 11894); 1961 dasm_put(Dst, 11910);
1959 } 1962 }
1960 dasm_put(Dst, 8398); 1963 dasm_put(Dst, 8414);
1961 break; 1964 break;
1962 case BC_KPRI: 1965 case BC_KPRI:
1963 dasm_put(Dst, 11901); 1966 dasm_put(Dst, 11917);
1964 break; 1967 break;
1965 case BC_KNIL: 1968 case BC_KNIL:
1966 dasm_put(Dst, 11927, LJ_TNIL); 1969 dasm_put(Dst, 11943, LJ_TNIL);
1967 break; 1970 break;
1968 1971
1969 /* -- Upvalue and function ops ------------------------------------------ */ 1972 /* -- Upvalue and function ops ------------------------------------------ */
1970 1973
1971 case BC_UGET: 1974 case BC_UGET:
1972 dasm_put(Dst, 11973, offsetof(GCfuncL, uvptr), DtA(->v)); 1975 dasm_put(Dst, 11989, offsetof(GCfuncL, uvptr), DtA(->v));
1973 break; 1976 break;
1974 case BC_USETV: 1977 case BC_USETV:
1975#define TV2MARKOFS \ 1978#define TV2MARKOFS \
1976 ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv)) 1979 ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv))
1977 dasm_put(Dst, 12017, offsetof(GCfuncL, uvptr), DtA(->closed), DtA(->v), TV2MARKOFS, LJ_GC_BLACK, LJ_TISGCV, LJ_TISNUM - LJ_TISGCV, Dt4(->gch.marked), LJ_GC_WHITES, GG_DISP2G); 1980 dasm_put(Dst, 12033, offsetof(GCfuncL, uvptr), DtA(->closed), DtA(->v), TV2MARKOFS, LJ_GC_BLACK, LJ_TISGCV, LJ_TISNUM - LJ_TISGCV, Dt4(->gch.marked), LJ_GC_WHITES, GG_DISP2G);
1978 dasm_put(Dst, 12107); 1981 dasm_put(Dst, 12123);
1979 break; 1982 break;
1980#undef TV2MARKOFS 1983#undef TV2MARKOFS
1981 case BC_USETS: 1984 case BC_USETS:
1982 dasm_put(Dst, 12119, offsetof(GCfuncL, uvptr), DtA(->v), LJ_TSTR, DtA(->marked), LJ_GC_BLACK, Dt4(->gch.marked), LJ_GC_WHITES, DtA(->closed), GG_DISP2G); 1985 dasm_put(Dst, 12135, offsetof(GCfuncL, uvptr), DtA(->v), LJ_TSTR, DtA(->marked), LJ_GC_BLACK, Dt4(->gch.marked), LJ_GC_WHITES, DtA(->closed), GG_DISP2G);
1983 break; 1986 break;
1984 case BC_USETN: 1987 case BC_USETN:
1985 dasm_put(Dst, 12210); 1988 dasm_put(Dst, 12226);
1986 if (sse) { 1989 if (sse) {
1987 dasm_put(Dst, 12215); 1990 dasm_put(Dst, 12231);
1988 } else { 1991 } else {
1989 dasm_put(Dst, 11025); 1992 dasm_put(Dst, 11041);
1990 } 1993 }
1991 dasm_put(Dst, 12222, offsetof(GCfuncL, uvptr), DtA(->v)); 1994 dasm_put(Dst, 12238, offsetof(GCfuncL, uvptr), DtA(->v));
1992 if (sse) { 1995 if (sse) {
1993 dasm_put(Dst, 12231); 1996 dasm_put(Dst, 12247);
1994 } else { 1997 } else {
1995 dasm_put(Dst, 12237); 1998 dasm_put(Dst, 12253);
1996 } 1999 }
1997 dasm_put(Dst, 8398); 2000 dasm_put(Dst, 8414);
1998 break; 2001 break;
1999 case BC_USETP: 2002 case BC_USETP:
2000 dasm_put(Dst, 12240, offsetof(GCfuncL, uvptr), DtA(->v)); 2003 dasm_put(Dst, 12256, offsetof(GCfuncL, uvptr), DtA(->v));
2001 break; 2004 break;
2002 case BC_UCLO: 2005 case BC_UCLO:
2003 dasm_put(Dst, 12277, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); 2006 dasm_put(Dst, 12293, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base));
2004 break; 2007 break;
2005 2008
2006 case BC_FNEW: 2009 case BC_FNEW:
2007 dasm_put(Dst, 12331, Dt1(->base), Dt1(->base), LJ_TFUNC); 2010 dasm_put(Dst, 12347, Dt1(->base), Dt1(->base), LJ_TFUNC);
2008 break; 2011 break;
2009 2012
2010 /* -- Table ops --------------------------------------------------------- */ 2013 /* -- Table ops --------------------------------------------------------- */
2011 2014
2012 case BC_TNEW: 2015 case BC_TNEW:
2013 dasm_put(Dst, 12402, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); 2016 dasm_put(Dst, 12418, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB);
2014 break; 2017 break;
2015 case BC_TDUP: 2018 case BC_TDUP:
2016 dasm_put(Dst, 12523, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); 2019 dasm_put(Dst, 12539, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB);
2017 break; 2020 break;
2018 2021
2019 case BC_GGET: 2022 case BC_GGET:
2020 dasm_put(Dst, 12615, Dt7(->env)); 2023 dasm_put(Dst, 12631, Dt7(->env));
2021 break; 2024 break;
2022 case BC_GSET: 2025 case BC_GSET:
2023 dasm_put(Dst, 12633, Dt7(->env)); 2026 dasm_put(Dst, 12649, Dt7(->env));
2024 break; 2027 break;
2025 2028
2026 case BC_TGETV: 2029 case BC_TGETV:
2027 dasm_put(Dst, 12651, LJ_TTAB, LJ_TISNUM); 2030 dasm_put(Dst, 12667, LJ_TTAB, LJ_TISNUM);
2028 if (sse) { 2031 if (sse) {
2029 dasm_put(Dst, 12684); 2032 dasm_put(Dst, 12700);
2030 } else { 2033 } else {
2031 dasm_put(Dst, 12705); 2034 dasm_put(Dst, 12721);
2032 if (cmov) { 2035 if (cmov) {
2033 dasm_put(Dst, 10751); 2036 dasm_put(Dst, 10767);
2034 } else { 2037 } else {
2035 dasm_put(Dst, 10757); 2038 dasm_put(Dst, 10773);
2036 } 2039 }
2037 dasm_put(Dst, 2522); 2040 dasm_put(Dst, 2522);
2038 } 2041 }
2039 dasm_put(Dst, 12715, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index); 2042 dasm_put(Dst, 12731, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
2040 dasm_put(Dst, 12807, LJ_TSTR); 2043 dasm_put(Dst, 12823, LJ_TSTR);
2041 break; 2044 break;
2042 case BC_TGETS: 2045 case BC_TGETS:
2043 dasm_put(Dst, 12825, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); 2046 dasm_put(Dst, 12841, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL);
2044 dasm_put(Dst, 12909, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<<MM_index); 2047 dasm_put(Dst, 12925, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
2045 break; 2048 break;
2046 case BC_TGETB: 2049 case BC_TGETB:
2047 dasm_put(Dst, 12980, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index); 2050 dasm_put(Dst, 12996, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
2048 dasm_put(Dst, 11322); 2051 dasm_put(Dst, 11338);
2049 break; 2052 break;
2050 2053
2051 case BC_TSETV: 2054 case BC_TSETV:
2052 dasm_put(Dst, 13079, LJ_TTAB, LJ_TISNUM); 2055 dasm_put(Dst, 13095, LJ_TTAB, LJ_TISNUM);
2053 if (sse) { 2056 if (sse) {
2054 dasm_put(Dst, 12684); 2057 dasm_put(Dst, 12700);
2055 } else { 2058 } else {
2056 dasm_put(Dst, 12705); 2059 dasm_put(Dst, 12721);
2057 if (cmov) { 2060 if (cmov) {
2058 dasm_put(Dst, 10751); 2061 dasm_put(Dst, 10767);
2059 } else { 2062 } else {
2060 dasm_put(Dst, 10757); 2063 dasm_put(Dst, 10773);
2061 } 2064 }
2062 dasm_put(Dst, 2522); 2065 dasm_put(Dst, 2522);
2063 } 2066 }
2064 dasm_put(Dst, 13112, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable)); 2067 dasm_put(Dst, 13128, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable));
2065 dasm_put(Dst, 13195, Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); 2068 dasm_put(Dst, 13211, Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
2066 break; 2069 break;
2067 case BC_TSETS: 2070 case BC_TSETS:
2068 dasm_put(Dst, 13257, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->nomm), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); 2071 dasm_put(Dst, 13273, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->nomm), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL);
2069 dasm_put(Dst, 13332, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, DtB(->next)); 2072 dasm_put(Dst, 13348, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, DtB(->next));
2070 dasm_put(Dst, 13424, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); 2073 dasm_put(Dst, 13440, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
2071 break; 2074 break;
2072 case BC_TSETB: 2075 case BC_TSETB:
2073 dasm_put(Dst, 13520, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); 2076 dasm_put(Dst, 13536, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable));
2074 dasm_put(Dst, 13618, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); 2077 dasm_put(Dst, 13634, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
2075 break; 2078 break;
2076 2079
2077 case BC_TSETM: 2080 case BC_TSETM:
2078 dasm_put(Dst, 13664); 2081 dasm_put(Dst, 13680);
2079 if (sse) { 2082 if (sse) {
2080 dasm_put(Dst, 12215); 2083 dasm_put(Dst, 12231);
2081 } else { 2084 } else {
2082 dasm_put(Dst, 13669); 2085 dasm_put(Dst, 13685);
2083 } 2086 }
2084 dasm_put(Dst, 13677, Dt6(->marked), LJ_GC_BLACK); 2087 dasm_put(Dst, 13693, Dt6(->marked), LJ_GC_BLACK);
2085 if (sse) { 2088 if (sse) {
2086 dasm_put(Dst, 13702); 2089 dasm_put(Dst, 13718);
2087 } else { 2090 } else {
2088 dasm_put(Dst, 13709); 2091 dasm_put(Dst, 13725);
2089 } 2092 }
2090 dasm_put(Dst, 13714, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain)); 2093 dasm_put(Dst, 13730, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain));
2091 dasm_put(Dst, 13842, Dt6(->gclist)); 2094 dasm_put(Dst, 13858, Dt6(->gclist));
2092 break; 2095 break;
2093 2096
2094 /* -- Calls and vararg handling ----------------------------------------- */ 2097 /* -- Calls and vararg handling ----------------------------------------- */
2095 2098
2096 case BC_CALL: case BC_CALLM: 2099 case BC_CALL: case BC_CALLM:
2097 dasm_put(Dst, 11336); 2100 dasm_put(Dst, 11352);
2098 if (op == BC_CALLM) { 2101 if (op == BC_CALLM) {
2099 dasm_put(Dst, 13850); 2102 dasm_put(Dst, 13866);
2100 } 2103 }
2101 dasm_put(Dst, 13855, LJ_TFUNC, Dt7(->pc)); 2104 dasm_put(Dst, 13871, LJ_TFUNC, Dt7(->pc));
2102 break; 2105 break;
2103 2106
2104 case BC_CALLMT: 2107 case BC_CALLMT:
2105 dasm_put(Dst, 13850); 2108 dasm_put(Dst, 13866);
2106 break; 2109 break;
2107 case BC_CALLT: 2110 case BC_CALLT:
2108 dasm_put(Dst, 13896, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); 2111 dasm_put(Dst, 13912, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc));
2109 dasm_put(Dst, 14014, FRAME_TYPE, Dt7(->pc), PC2PROTO(k)); 2112 dasm_put(Dst, 14030, FRAME_TYPE, Dt7(->pc), PC2PROTO(k));
2110 break; 2113 break;
2111 2114
2112 case BC_ITERC: 2115 case BC_ITERC:
2113 dasm_put(Dst, 14071, LJ_TFUNC, 2+1, Dt7(->pc)); 2116 dasm_put(Dst, 14087, LJ_TFUNC, 2+1, Dt7(->pc));
2114 break; 2117 break;
2115 2118
2116 case BC_VARG: 2119 case BC_VARG:
2117 dasm_put(Dst, 14151, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL); 2120 dasm_put(Dst, 14167, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL);
2118 dasm_put(Dst, 14295, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); 2121 dasm_put(Dst, 14311, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top));
2119 break; 2122 break;
2120 2123
2121 /* -- Returns ----------------------------------------------------------- */ 2124 /* -- Returns ----------------------------------------------------------- */
2122 2125
2123 case BC_RETM: 2126 case BC_RETM:
2124 dasm_put(Dst, 13850); 2127 dasm_put(Dst, 13866);
2125 break; 2128 break;
2126 2129
2127 case BC_RET: case BC_RET0: case BC_RET1: 2130 case BC_RET: case BC_RET0: case BC_RET1:
2128 if (op != BC_RET0) { 2131 if (op != BC_RET0) {
2129 dasm_put(Dst, 14394); 2132 dasm_put(Dst, 14410);
2130 } 2133 }
2131 dasm_put(Dst, 14398, FRAME_TYPE); 2134 dasm_put(Dst, 14414, FRAME_TYPE);
2132 switch (op) { 2135 switch (op) {
2133 case BC_RET: 2136 case BC_RET:
2134 dasm_put(Dst, 14417); 2137 dasm_put(Dst, 14433);
2135 break; 2138 break;
2136 case BC_RET1: 2139 case BC_RET1:
2137 dasm_put(Dst, 14475); 2140 dasm_put(Dst, 14491);
2138 /* fallthrough */ 2141 /* fallthrough */
2139 case BC_RET0: 2142 case BC_RET0:
2140 dasm_put(Dst, 14491); 2143 dasm_put(Dst, 14507);
2141 default: 2144 default:
2142 break; 2145 break;
2143 } 2146 }
2144 dasm_put(Dst, 14502, Dt7(->pc), PC2PROTO(k)); 2147 dasm_put(Dst, 14518, Dt7(->pc), PC2PROTO(k));
2145 if (op == BC_RET) { 2148 if (op == BC_RET) {
2146 dasm_put(Dst, 14544, LJ_TNIL); 2149 dasm_put(Dst, 14560, LJ_TNIL);
2147 } else { 2150 } else {
2148 dasm_put(Dst, 14553, LJ_TNIL); 2151 dasm_put(Dst, 14569, LJ_TNIL);
2149 } 2152 }
2150 dasm_put(Dst, 14560); 2153 dasm_put(Dst, 14576);
2151 if (op != BC_RET0) { 2154 if (op != BC_RET0) {
2152 dasm_put(Dst, 14581); 2155 dasm_put(Dst, 14597);
2153 } 2156 }
2154 dasm_put(Dst, 4678); 2157 dasm_put(Dst, 4678);
2155 break; 2158 break;
@@ -2159,7 +2162,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
2159 2162
2160 case BC_FORL: 2163 case BC_FORL:
2161#if LJ_HASJIT 2164#if LJ_HASJIT
2162 dasm_put(Dst, 14585, HOTCOUNT_PCMASK, GG_DISP2HOT); 2165 dasm_put(Dst, 14601, HOTCOUNT_PCMASK, GG_DISP2HOT);
2163#endif 2166#endif
2164 break; 2167 break;
2165 2168
@@ -2171,57 +2174,57 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
2171 case BC_FORI: 2174 case BC_FORI:
2172 case BC_IFORL: 2175 case BC_IFORL:
2173 vk = (op == BC_IFORL || op == BC_JFORL); 2176 vk = (op == BC_IFORL || op == BC_JFORL);
2174 dasm_put(Dst, 14606); 2177 dasm_put(Dst, 14622);
2175 if (!vk) { 2178 if (!vk) {
2176 dasm_put(Dst, 14610, LJ_TISNUM, LJ_TISNUM); 2179 dasm_put(Dst, 14626, LJ_TISNUM, LJ_TISNUM);
2177 } 2180 }
2178 dasm_put(Dst, 14629); 2181 dasm_put(Dst, 14645);
2179 if (!vk) { 2182 if (!vk) {
2180 dasm_put(Dst, 14633, LJ_TISNUM); 2183 dasm_put(Dst, 14649, LJ_TISNUM);
2181 } 2184 }
2182 if (sse) { 2185 if (sse) {
2183 dasm_put(Dst, 14642); 2186 dasm_put(Dst, 14658);
2184 if (vk) { 2187 if (vk) {
2185 dasm_put(Dst, 14654); 2188 dasm_put(Dst, 14670);
2186 } else { 2189 } else {
2187 dasm_put(Dst, 14673); 2190 dasm_put(Dst, 14689);
2188 } 2191 }
2189 dasm_put(Dst, 14678); 2192 dasm_put(Dst, 14694);
2190 } else { 2193 } else {
2191 dasm_put(Dst, 14691); 2194 dasm_put(Dst, 14707);
2192 if (vk) { 2195 if (vk) {
2193 dasm_put(Dst, 14697);
2194 } else {
2195 dasm_put(Dst, 14713); 2196 dasm_put(Dst, 14713);
2197 } else {
2198 dasm_put(Dst, 14729);
2196 } 2199 }
2197 dasm_put(Dst, 14721); 2200 dasm_put(Dst, 14737);
2198 if (cmov) { 2201 if (cmov) {
2199 dasm_put(Dst, 10751); 2202 dasm_put(Dst, 10767);
2200 } else { 2203 } else {
2201 dasm_put(Dst, 10757); 2204 dasm_put(Dst, 10773);
2202 } 2205 }
2203 if (!cmov) { 2206 if (!cmov) {
2204 dasm_put(Dst, 14726); 2207 dasm_put(Dst, 14742);
2205 } 2208 }
2206 } 2209 }
2207 if (op == BC_FORI) { 2210 if (op == BC_FORI) {
2208 dasm_put(Dst, 14732, -BCBIAS_J*4); 2211 dasm_put(Dst, 14748, -BCBIAS_J*4);
2209 } else if (op == BC_JFORI) { 2212 } else if (op == BC_JFORI) {
2210 dasm_put(Dst, 14742, -BCBIAS_J*4, BC_JLOOP); 2213 dasm_put(Dst, 14758, -BCBIAS_J*4, BC_JLOOP);
2211 } else if (op == BC_IFORL) { 2214 } else if (op == BC_IFORL) {
2212 dasm_put(Dst, 14756, -BCBIAS_J*4); 2215 dasm_put(Dst, 14772, -BCBIAS_J*4);
2213 } else { 2216 } else {
2214 dasm_put(Dst, 14752, BC_JLOOP); 2217 dasm_put(Dst, 14768, BC_JLOOP);
2215 } 2218 }
2216 dasm_put(Dst, 10786); 2219 dasm_put(Dst, 10802);
2217 if (sse) { 2220 if (sse) {
2218 dasm_put(Dst, 14766); 2221 dasm_put(Dst, 14782);
2219 } 2222 }
2220 break; 2223 break;
2221 2224
2222 case BC_ITERL: 2225 case BC_ITERL:
2223#if LJ_HASJIT 2226#if LJ_HASJIT
2224 dasm_put(Dst, 14585, HOTCOUNT_PCMASK, GG_DISP2HOT); 2227 dasm_put(Dst, 14601, HOTCOUNT_PCMASK, GG_DISP2HOT);
2225#endif 2228#endif
2226 break; 2229 break;
2227 2230
@@ -2230,33 +2233,33 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
2230 break; 2233 break;
2231#endif 2234#endif
2232 case BC_IITERL: 2235 case BC_IITERL:
2233 dasm_put(Dst, 14777, LJ_TNIL); 2236 dasm_put(Dst, 14793, LJ_TNIL);
2234 if (op == BC_JITERL) { 2237 if (op == BC_JITERL) {
2235 dasm_put(Dst, 14792, BC_JLOOP); 2238 dasm_put(Dst, 14808, BC_JLOOP);
2236 } else { 2239 } else {
2237 dasm_put(Dst, 14806, -BCBIAS_J*4); 2240 dasm_put(Dst, 14822, -BCBIAS_J*4);
2238 } 2241 }
2239 dasm_put(Dst, 11083); 2242 dasm_put(Dst, 11099);
2240 break; 2243 break;
2241 2244
2242 case BC_LOOP: 2245 case BC_LOOP:
2243#if LJ_HASJIT 2246#if LJ_HASJIT
2244 dasm_put(Dst, 14585, HOTCOUNT_PCMASK, GG_DISP2HOT); 2247 dasm_put(Dst, 14601, HOTCOUNT_PCMASK, GG_DISP2HOT);
2245#endif 2248#endif
2246 break; 2249 break;
2247 2250
2248 case BC_ILOOP: 2251 case BC_ILOOP:
2249 dasm_put(Dst, 8398); 2252 dasm_put(Dst, 8414);
2250 break; 2253 break;
2251 2254
2252 case BC_JLOOP: 2255 case BC_JLOOP:
2253#if LJ_HASJIT 2256#if LJ_HASJIT
2254 dasm_put(Dst, 14822, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); 2257 dasm_put(Dst, 14838, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L));
2255#endif 2258#endif
2256 break; 2259 break;
2257 2260
2258 case BC_JMP: 2261 case BC_JMP:
2259 dasm_put(Dst, 14845, -BCBIAS_J*4); 2262 dasm_put(Dst, 14861, -BCBIAS_J*4);
2260 break; 2263 break;
2261 2264
2262 /* -- Function headers -------------------------------------------------- */ 2265 /* -- Function headers -------------------------------------------------- */
@@ -2279,47 +2282,47 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
2279 break; 2282 break;
2280#endif 2283#endif
2281 case BC_IFUNCF: 2284 case BC_IFUNCF:
2282 dasm_put(Dst, 14869, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); 2285 dasm_put(Dst, 14885, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams));
2283 if (op == BC_JFUNCF) { 2286 if (op == BC_JFUNCF) {
2284 dasm_put(Dst, 14899, BC_JLOOP); 2287 dasm_put(Dst, 14915, BC_JLOOP);
2285 } else { 2288 } else {
2286 dasm_put(Dst, 8398); 2289 dasm_put(Dst, 8414);
2287 } 2290 }
2288 dasm_put(Dst, 14908, LJ_TNIL); 2291 dasm_put(Dst, 14924, LJ_TNIL);
2289 break; 2292 break;
2290 2293
2291 case BC_JFUNCV: 2294 case BC_JFUNCV:
2292#if !LJ_HASJIT 2295#if !LJ_HASJIT
2293 break; 2296 break;
2294#endif 2297#endif
2295 dasm_put(Dst, 10449); 2298 dasm_put(Dst, 10465);
2296 break; /* NYI: compiled vararg functions. */ 2299 break; /* NYI: compiled vararg functions. */
2297 2300
2298 case BC_IFUNCV: 2301 case BC_IFUNCV:
2299 dasm_put(Dst, 14930, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); 2302 dasm_put(Dst, 14946, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL);
2300 if (op == BC_JFUNCV) { 2303 if (op == BC_JFUNCV) {
2301 dasm_put(Dst, 14899, BC_JLOOP); 2304 dasm_put(Dst, 14915, BC_JLOOP);
2302 } else { 2305 } else {
2303 dasm_put(Dst, 15021, -4+PC2PROTO(k)); 2306 dasm_put(Dst, 15037, -4+PC2PROTO(k));
2304 } 2307 }
2305 dasm_put(Dst, 15043, LJ_TNIL); 2308 dasm_put(Dst, 15059, LJ_TNIL);
2306 break; 2309 break;
2307 2310
2308 case BC_FUNCC: 2311 case BC_FUNCC:
2309 case BC_FUNCCW: 2312 case BC_FUNCCW:
2310 dasm_put(Dst, 15065, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); 2313 dasm_put(Dst, 15081, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top));
2311 if (op == BC_FUNCC) { 2314 if (op == BC_FUNCC) {
2312 dasm_put(Dst, 15094); 2315 dasm_put(Dst, 15110);
2313 } else { 2316 } else {
2314 dasm_put(Dst, 15098); 2317 dasm_put(Dst, 15114);
2315 } 2318 }
2316 dasm_put(Dst, 15106, DISPATCH_GL(vmstate), ~LJ_VMST_C); 2319 dasm_put(Dst, 15122, DISPATCH_GL(vmstate), ~LJ_VMST_C);
2317 if (op == BC_FUNCC) { 2320 if (op == BC_FUNCC) {
2318 dasm_put(Dst, 15115); 2321 dasm_put(Dst, 15131);
2319 } else { 2322 } else {
2320 dasm_put(Dst, 15119, DISPATCH_GL(wrapf)); 2323 dasm_put(Dst, 15135, DISPATCH_GL(wrapf));
2321 } 2324 }
2322 dasm_put(Dst, 15124, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); 2325 dasm_put(Dst, 15140, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top));
2323 break; 2326 break;
2324 2327
2325 /* ---------------------------------------------------------------------- */ 2328 /* ---------------------------------------------------------------------- */
@@ -2347,7 +2350,7 @@ static int build_backend(BuildCtx *ctx)
2347 2350
2348 build_subroutines(ctx, cmov, sse); 2351 build_subroutines(ctx, cmov, sse);
2349 2352
2350 dasm_put(Dst, 15149); 2353 dasm_put(Dst, 15165);
2351 for (op = 0; op < BC__MAX; op++) 2354 for (op = 0; op < BC__MAX; op++)
2352 build_ins(ctx, (BCOp)op, op, cmov, sse); 2355 build_ins(ctx, (BCOp)op, op, cmov, sse);
2353 2356
diff --git a/src/lj_dispatch.c b/src/lj_dispatch.c
index 42ffd2b8..b83912c5 100644
--- a/src/lj_dispatch.c
+++ b/src/lj_dispatch.c
@@ -62,6 +62,7 @@ void lj_dispatch_init_hotcount(global_State *g)
62#define DISPMODE_REC 0x02 /* Recording active. */ 62#define DISPMODE_REC 0x02 /* Recording active. */
63#define DISPMODE_INS 0x04 /* Override instruction dispatch. */ 63#define DISPMODE_INS 0x04 /* Override instruction dispatch. */
64#define DISPMODE_CALL 0x08 /* Override call dispatch. */ 64#define DISPMODE_CALL 0x08 /* Override call dispatch. */
65#define DISPMODE_RET 0x08 /* Override return dispatch. */
65 66
66/* Update dispatch table depending on various flags. */ 67/* Update dispatch table depending on various flags. */
67void lj_dispatch_update(global_State *g) 68void lj_dispatch_update(global_State *g)
@@ -74,6 +75,7 @@ void lj_dispatch_update(global_State *g)
74#endif 75#endif
75 mode |= (g->hookmask & (LUA_MASKLINE|LUA_MASKCOUNT)) ? DISPMODE_INS : 0; 76 mode |= (g->hookmask & (LUA_MASKLINE|LUA_MASKCOUNT)) ? DISPMODE_INS : 0;
76 mode |= (g->hookmask & LUA_MASKCALL) ? DISPMODE_CALL : 0; 77 mode |= (g->hookmask & LUA_MASKCALL) ? DISPMODE_CALL : 0;
78 mode |= (g->hookmask & LUA_MASKRET) ? DISPMODE_RET : 0;
77 if (oldmode != mode) { /* Mode changed? */ 79 if (oldmode != mode) { /* Mode changed? */
78 ASMFunction *disp = G2GG(g)->dispatch; 80 ASMFunction *disp = G2GG(g)->dispatch;
79 ASMFunction f_forl, f_iterl, f_loop, f_funcf, f_funcv; 81 ASMFunction f_forl, f_iterl, f_loop, f_funcf, f_funcv;
@@ -104,18 +106,37 @@ void lj_dispatch_update(global_State *g)
104 if (!(mode & (DISPMODE_REC|DISPMODE_INS))) { /* No ins dispatch? */ 106 if (!(mode & (DISPMODE_REC|DISPMODE_INS))) { /* No ins dispatch? */
105 /* Copy static dispatch table to dynamic dispatch table. */ 107 /* Copy static dispatch table to dynamic dispatch table. */
106 memcpy(&disp[0], &disp[GG_LEN_DDISP], GG_LEN_SDISP*sizeof(ASMFunction)); 108 memcpy(&disp[0], &disp[GG_LEN_DDISP], GG_LEN_SDISP*sizeof(ASMFunction));
109 /* Overwrite with dynamic return dispatch. */
110 if ((mode & DISPMODE_RET)) {
111 disp[BC_RETM] = lj_vm_rethook;
112 disp[BC_RET] = lj_vm_rethook;
113 disp[BC_RET0] = lj_vm_rethook;
114 disp[BC_RET1] = lj_vm_rethook;
115 }
107 } else { 116 } else {
108 /* The recording dispatch also checks for hooks. */ 117 /* The recording dispatch also checks for hooks. */
109 ASMFunction f = (mode & DISPMODE_REC) ? lj_vm_record : lj_vm_hook; 118 ASMFunction f = (mode & DISPMODE_REC) ? lj_vm_record : lj_vm_inshook;
110 uint32_t i; 119 uint32_t i;
111 for (i = 0; i < GG_LEN_SDISP; i++) 120 for (i = 0; i < GG_LEN_SDISP; i++)
112 disp[i] = f; 121 disp[i] = f;
113 } 122 }
114 } else if (!(mode & (DISPMODE_REC|DISPMODE_INS))) { 123 } else if (!(mode & (DISPMODE_REC|DISPMODE_INS))) {
115 /* Otherwise only set dynamic counting ins. */ 124 /* Otherwise set dynamic counting ins. */
116 disp[BC_FORL] = f_forl; 125 disp[BC_FORL] = f_forl;
117 disp[BC_ITERL] = f_iterl; 126 disp[BC_ITERL] = f_iterl;
118 disp[BC_LOOP] = f_loop; 127 disp[BC_LOOP] = f_loop;
128 /* Set dynamic return dispatch. */
129 if ((mode & DISPMODE_RET)) {
130 disp[BC_RETM] = lj_vm_rethook;
131 disp[BC_RET] = lj_vm_rethook;
132 disp[BC_RET0] = lj_vm_rethook;
133 disp[BC_RET1] = lj_vm_rethook;
134 } else {
135 disp[BC_RETM] = disp[GG_LEN_DDISP+BC_RETM];
136 disp[BC_RET] = disp[GG_LEN_DDISP+BC_RET];
137 disp[BC_RET0] = disp[GG_LEN_DDISP+BC_RET0];
138 disp[BC_RET1] = disp[GG_LEN_DDISP+BC_RET1];
139 }
119 } 140 }
120 141
121 /* Set dynamic call dispatch. */ 142 /* Set dynamic call dispatch. */
@@ -321,7 +342,7 @@ static BCReg cur_topslot(GCproto *pt, const BCIns *pc, uint32_t nres)
321 } 342 }
322} 343}
323 344
324/* Instruction dispatch. Used by instr/line hooks or when recording. */ 345/* Instruction dispatch. Used by instr/line/return hooks or when recording. */
325void LJ_FASTCALL lj_dispatch_ins(lua_State *L, const BCIns *pc) 346void LJ_FASTCALL lj_dispatch_ins(lua_State *L, const BCIns *pc)
326{ 347{
327 GCfunc *fn = curr_func(L); 348 GCfunc *fn = curr_func(L);
@@ -348,17 +369,22 @@ void LJ_FASTCALL lj_dispatch_ins(lua_State *L, const BCIns *pc)
348 if ((g->hookmask & LUA_MASKCOUNT) && g->hookcount == 0) { 369 if ((g->hookmask & LUA_MASKCOUNT) && g->hookcount == 0) {
349 g->hookcount = g->hookcstart; 370 g->hookcount = g->hookcstart;
350 callhook(L, LUA_HOOKCOUNT, -1); 371 callhook(L, LUA_HOOKCOUNT, -1);
372 L->top = L->base + slots; /* Fix top again. */
351 } 373 }
352 if ((g->hookmask & LUA_MASKLINE)) { 374 if ((g->hookmask & LUA_MASKLINE)) {
353 BCPos npc = proto_bcpos(pt, pc) - 1; 375 BCPos npc = proto_bcpos(pt, pc) - 1;
354 BCPos opc = proto_bcpos(pt, oldpc) - 1; 376 BCPos opc = proto_bcpos(pt, oldpc) - 1;
355 BCLine line = proto_line(pt, npc); 377 BCLine line = proto_line(pt, npc);
356 if (npc == 0 || pc <= oldpc || 378 if (pc <= oldpc || opc >= pt->sizebc || line != proto_line(pt, opc)) {
357 opc >= pt->sizebc || line != proto_line(pt, opc)) {
358 L->top = L->base + slots; /* Fix top again after instruction hook. */
359 callhook(L, LUA_HOOKLINE, line); 379 callhook(L, LUA_HOOKLINE, line);
380 L->top = L->base + slots; /* Fix top again. */
360 } 381 }
361 } 382 }
383 if ((g->hookmask & LUA_MASKRET)) {
384 BCOp op = bc_op(pc[-1]);
385 if (op == BC_RETM || op == BC_RET || op == BC_RET0 || op == BC_RET1)
386 callhook(L, LUA_HOOKRET, -1);
387 }
362} 388}
363 389
364/* Initialize call. Ensure stack space and clear missing parameters. */ 390/* Initialize call. Ensure stack space and clear missing parameters. */
diff --git a/src/lj_dispatch.h b/src/lj_dispatch.h
index 935fa821..1aa7dae0 100644
--- a/src/lj_dispatch.h
+++ b/src/lj_dispatch.h
@@ -66,6 +66,7 @@ LJ_FUNC void lj_dispatch_update(global_State *g);
66 66
67/* Instruction dispatch callback for hooks or when recording. */ 67/* Instruction dispatch callback for hooks or when recording. */
68LJ_FUNCA void LJ_FASTCALL lj_dispatch_ins(lua_State *L, const BCIns *pc); 68LJ_FUNCA void LJ_FASTCALL lj_dispatch_ins(lua_State *L, const BCIns *pc);
69LJ_FUNCA ASMFunction LJ_FASTCALL lj_dispatch_call(lua_State *L, const BCIns *pc); 69LJ_FUNCA ASMFunction LJ_FASTCALL lj_dispatch_call(lua_State *L, const BCIns*pc);
70LJ_FUNCA void LJ_FASTCALL lj_dispatch_return(lua_State *L, const BCIns *pc);
70 71
71#endif 72#endif
diff --git a/src/lj_vm.h b/src/lj_vm.h
index f6ae498f..01667711 100644
--- a/src/lj_vm.h
+++ b/src/lj_vm.h
@@ -29,7 +29,8 @@ LJ_ASMF double lj_vm_foldfpm(double x, int op);
29 29
30/* Dispatch targets for recording and hooks. */ 30/* Dispatch targets for recording and hooks. */
31LJ_ASMF void lj_vm_record(void); 31LJ_ASMF void lj_vm_record(void);
32LJ_ASMF void lj_vm_hook(void); 32LJ_ASMF void lj_vm_inshook(void);
33LJ_ASMF void lj_vm_rethook(void);
33LJ_ASMF void lj_vm_callhook(void); 34LJ_ASMF void lj_vm_callhook(void);
34 35
35/* Trace exit handling. */ 36/* Trace exit handling. */
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2026-01-13 18:51:18 +0000