aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Pall <mike>2010-02-19 03:13:48 +0100
committerMike Pall <mike>2010-02-19 03:13:48 +0100
commitc52da1f2da4963762e7743419d58e372e1c9ac06 (patch)
tree17c5d88b4c36c9b369ef9ad1dcd913431e019136 /src
parentbbe7d818d9d9d47c48f255104166a58e7f65d3ec (diff)
downloadluajit-c52da1f2da4963762e7743419d58e372e1c9ac06.tar.gz
luajit-c52da1f2da4963762e7743419d58e372e1c9ac06.tar.bz2
luajit-c52da1f2da4963762e7743419d58e372e1c9ac06.zip
Rethrow errors from trace exit handling from the right C frame.
Diffstat (limited to 'src')
-rw-r--r--src/buildvm_x64.h1191
-rw-r--r--src/buildvm_x64win.h1174
-rw-r--r--src/buildvm_x86.dasc14
-rw-r--r--src/buildvm_x86.h973
-rw-r--r--src/lj_err.c2
-rw-r--r--src/lj_err.h2
-rw-r--r--src/lj_snap.c6
-rw-r--r--src/lj_trace.c34
-rw-r--r--src/lj_trace.h2
9 files changed, 1719 insertions, 1679 deletions
diff --git a/src/buildvm_x64.h b/src/buildvm_x64.h
index 7632f70b..bdf85282 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[13678] = { 15static const unsigned char build_actionlist[13689] = {
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,
@@ -366,315 +366,315 @@ static const unsigned char build_actionlist[13678] = {
366 72,137,193,139,133,233,41,208,72,137,205,15,182,75,252,253,193,232,3,131, 366 72,137,193,139,133,233,41,208,72,137,205,15,182,75,252,253,193,232,3,131,
367 192,1,252,255,229,248,143,255,248,144,255,68,139,122,252,248,69,139,191,233, 367 192,1,252,255,229,248,143,255,248,144,255,68,139,122,252,248,69,139,191,233,
368 69,139,191,233,65,199,134,233,0,0,0,0,65,199,134,233,237,139,3,15,182,204, 368 69,139,191,233,65,199,134,233,0,0,0,0,65,199,134,233,237,139,3,15,182,204,
369 15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,248,82,255,217, 369 15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,1,137,252,239,137,
370 124,36,4,137,68,36,8,102,184,0,4,102,11,68,36,4,102,37,252,255,252,247,102, 370 198,232,251,1,22,255,248,82,255,217,124,36,4,137,68,36,8,102,184,0,4,102,
371 137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,139,68,36,8,195,255,248, 371 11,68,36,4,102,37,252,255,252,247,102,137,68,36,6,217,108,36,6,217,252,252,
372 145,72,184,237,237,102,72,15,110,208,72,184,237,237,102,72,15,110,216,15, 372 217,108,36,4,139,68,36,8,195,255,248,145,72,184,237,237,102,72,15,110,208,
373 40,200,102,15,84,202,102,15,46,217,15,134,244,247,102,15,85,208,252,242,15, 373 72,184,237,237,102,72,15,110,216,15,40,200,102,15,84,202,102,15,46,217,15,
374 88,203,252,242,15,92,203,102,15,86,202,72,184,237,237,102,72,15,110,208,252, 374 134,244,247,102,15,85,208,252,242,15,88,203,252,242,15,92,203,102,15,86,202,
375 242,15,194,193,1,102,15,84,194,252,242,15,92,200,15,40,193,248,1,195,248, 375 72,184,237,237,102,72,15,110,208,252,242,15,194,193,1,102,15,84,194,252,242,
376 84,255,217,124,36,4,137,68,36,8,102,184,0,8,102,11,68,36,4,102,37,252,255, 376 15,92,200,15,40,193,248,1,195,248,84,255,217,124,36,4,137,68,36,8,102,184,
377 252,251,102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,139,68,36,8, 377 0,8,102,11,68,36,4,102,37,252,255,252,251,102,137,68,36,6,217,108,36,6,217,
378 195,255,248,146,72,184,237,237,102,72,15,110,208,72,184,237,237,102,72,15, 378 252,252,217,108,36,4,139,68,36,8,195,255,248,146,72,184,237,237,102,72,15,
379 110,216,15,40,200,102,15,84,202,102,15,46,217,15,134,244,247,102,15,85,208, 379 110,208,72,184,237,237,102,72,15,110,216,15,40,200,102,15,84,202,102,15,46,
380 252,242,15,88,203,252,242,15,92,203,102,15,86,202,72,184,237,237,102,72,15, 380 217,15,134,244,247,102,15,85,208,252,242,15,88,203,252,242,15,92,203,102,
381 110,208,252,242,15,194,193,6,102,15,84,194,252,242,15,92,200,15,40,193,248, 381 15,86,202,72,184,237,237,102,72,15,110,208,252,242,15,194,193,6,102,15,84,
382 1,195,248,104,255,217,124,36,4,137,68,36,8,102,184,0,12,102,11,68,36,4,102, 382 194,252,242,15,92,200,15,40,193,248,1,195,248,104,255,217,124,36,4,137,68,
383 137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,139,68,36,8,195,255,248, 383 36,8,102,184,0,12,102,11,68,36,4,102,137,68,36,6,217,108,36,6,217,252,252,
384 147,72,184,237,237,102,72,15,110,208,72,184,237,237,102,72,15,110,216,15, 384 217,108,36,4,139,68,36,8,195,255,248,147,72,184,237,237,102,72,15,110,208,
385 40,200,102,15,84,202,102,15,46,217,15,134,244,247,102,15,85,208,15,40,193, 385 72,184,237,237,102,72,15,110,216,15,40,200,102,15,84,202,102,15,46,217,15,
386 252,242,15,88,203,252,242,15,92,203,72,184,237,237,102,72,15,110,216,252, 386 134,244,247,102,15,85,208,15,40,193,252,242,15,88,203,252,242,15,92,203,72,
387 242,15,194,193,1,102,15,84,195,252,242,15,92,200,102,15,86,202,15,40,193, 387 184,237,237,102,72,15,110,216,252,242,15,194,193,1,102,15,84,195,252,242,
388 248,1,195,248,148,255,15,40,232,252,242,15,94,193,72,184,237,237,102,72,15, 388 15,92,200,102,15,86,202,15,40,193,248,1,195,248,148,255,15,40,232,252,242,
389 110,208,72,184,237,237,102,72,15,110,216,15,40,224,102,15,84,226,102,15,46, 389 15,94,193,72,184,237,237,102,72,15,110,208,72,184,237,237,102,72,15,110,216,
390 220,15,134,244,247,102,15,85,208,252,242,15,88,227,252,242,15,92,227,102, 390 15,40,224,102,15,84,226,102,15,46,220,15,134,244,247,102,15,85,208,252,242,
391 15,86,226,72,184,237,237,102,72,15,110,208,252,242,15,194,196,1,102,15,84, 391 15,88,227,252,242,15,92,227,102,15,86,226,72,184,237,237,102,72,15,110,208,
392 194,252,242,15,92,224,15,40,197,252,242,15,89,204,252,242,15,92,193,195,248, 392 252,242,15,194,196,1,102,15,84,194,252,242,15,92,224,15,40,197,252,242,15,
393 1,252,242,15,89,200,15,40,197,252,242,15,92,193,195,255,217,193,216,252,241, 393 89,204,252,242,15,92,193,195,248,1,252,242,15,89,200,15,40,197,252,242,15,
394 217,124,36,4,102,184,0,4,102,11,68,36,4,102,37,252,255,252,247,102,137,68, 394 92,193,195,255,217,193,216,252,241,217,124,36,4,102,184,0,4,102,11,68,36,
395 36,6,217,108,36,6,217,252,252,217,108,36,4,222,201,222,252,233,195,255,248, 395 4,102,37,252,255,252,247,102,137,68,36,6,217,108,36,6,217,252,252,217,108,
396 88,217,252,234,222,201,248,149,217,84,36,252,248,129,124,36,252,248,0,0,128, 396 36,4,222,201,222,252,233,195,255,248,88,217,252,234,222,201,248,149,217,84,
397 127,15,132,244,247,129,124,36,252,248,0,0,128,252,255,15,132,244,248,248, 397 36,252,248,129,124,36,252,248,0,0,128,127,15,132,244,247,129,124,36,252,248,
398 150,217,192,217,252,252,220,252,233,217,201,217,252,240,217,232,222,193,217, 398 0,0,128,252,255,15,132,244,248,248,150,217,192,217,252,252,220,252,233,217,
399 252,253,221,217,248,1,195,248,2,221,216,217,252,238,195,255,248,107,255,248, 399 201,217,252,240,217,232,222,193,217,252,253,221,217,248,1,195,248,2,221,216,
400 151,252,242,15,45,193,252,242,15,42,208,102,15,46,202,15,133,244,254,15,138, 400 217,252,238,195,255,248,107,255,248,151,252,242,15,45,193,252,242,15,42,208,
401 244,255,248,152,131,252,248,1,15,142,244,252,248,1,169,1,0,0,0,15,133,244, 401 102,15,46,202,15,133,244,254,15,138,244,255,248,152,131,252,248,1,15,142,
402 248,252,242,15,89,192,209,232,252,233,244,1,248,2,209,232,15,132,244,251, 402 244,252,248,1,169,1,0,0,0,15,133,244,248,252,242,15,89,192,209,232,252,233,
403 15,40,200,248,3,252,242,15,89,192,209,232,15,132,244,250,15,131,244,3,255, 403 244,1,248,2,209,232,15,132,244,251,15,40,200,248,3,252,242,15,89,192,209,
404 252,242,15,89,200,252,233,244,3,248,4,252,242,15,89,193,248,5,195,248,6,15, 404 232,15,132,244,250,15,131,244,3,255,252,242,15,89,200,252,233,244,3,248,4,
405 132,244,5,15,130,244,253,80,72,184,237,237,102,72,15,110,200,252,242,15,94, 405 252,242,15,89,193,248,5,195,248,6,15,132,244,5,15,130,244,253,80,72,184,237,
406 200,88,15,40,193,252,247,216,131,252,248,1,15,132,244,5,252,233,244,1,248, 406 237,102,72,15,110,200,252,242,15,94,200,88,15,40,193,252,247,216,131,252,
407 7,72,184,237,237,102,72,15,110,192,195,248,8,102,72,15,126,200,72,209,224, 407 248,1,15,132,244,5,252,233,244,1,248,7,72,184,237,237,102,72,15,110,192,195,
408 72,193,192,12,72,61,252,254,15,0,0,15,132,244,248,255,102,72,15,126,192,72, 408 248,8,102,72,15,126,200,72,209,224,72,193,192,12,72,61,252,254,15,0,0,15,
409 209,224,15,132,244,250,72,193,192,12,72,61,252,254,15,0,0,15,132,244,251, 409 132,244,248,255,102,72,15,126,192,72,209,224,15,132,244,250,72,193,192,12,
410 252,242,15,17,76,36,252,240,252,242,15,17,68,36,252,248,221,68,36,252,240, 410 72,61,252,254,15,0,0,15,132,244,251,252,242,15,17,76,36,252,240,252,242,15,
411 221,68,36,252,248,217,252,241,217,192,217,252,252,220,252,233,217,201,217, 411 17,68,36,252,248,221,68,36,252,240,221,68,36,252,248,217,252,241,217,192,
412 252,240,217,232,222,193,217,252,253,221,217,221,92,36,252,248,252,242,15, 412 217,252,252,220,252,233,217,201,217,252,240,217,232,222,193,217,252,253,221,
413 16,68,36,252,248,195,248,9,72,184,237,237,102,72,15,110,208,102,15,46,194, 413 217,221,92,36,252,248,252,242,15,16,68,36,252,248,195,248,9,72,184,237,237,
414 15,132,244,247,15,40,193,248,1,195,248,2,72,184,237,237,102,72,15,110,208, 414 102,72,15,110,208,102,15,46,194,15,132,244,247,15,40,193,248,1,195,248,2,
415 102,15,84,194,72,184,237,237,102,72,15,110,208,102,15,46,194,15,132,244,1, 415 72,184,237,237,102,72,15,110,208,102,15,84,194,72,184,237,237,102,72,15,110,
416 102,15,80,193,15,87,192,136,196,15,146,208,48,224,15,133,244,1,248,3,72,184, 416 208,102,15,46,194,15,132,244,1,102,15,80,193,15,87,192,136,196,15,146,208,
417 237,237,255,102,72,15,110,192,195,248,4,102,15,80,193,133,192,15,133,244, 417 48,224,15,133,244,1,248,3,72,184,237,237,255,102,72,15,110,192,195,248,4,
418 3,15,87,192,195,248,5,102,15,80,193,133,192,15,132,244,3,15,87,192,195,248, 418 102,15,80,193,133,192,15,133,244,3,15,87,192,195,248,5,102,15,80,193,133,
419 153,255,131,252,255,1,15,130,244,82,15,132,244,84,131,252,255,3,15,130,244, 419 192,15,132,244,3,15,87,192,195,248,153,255,131,252,255,1,15,130,244,82,15,
420 104,15,135,244,248,252,242,15,81,192,195,248,2,252,242,15,17,68,36,252,248, 420 132,244,84,131,252,255,3,15,130,244,104,15,135,244,248,252,242,15,81,192,
421 221,68,36,252,248,131,252,255,5,15,135,244,248,15,132,244,247,232,244,88, 421 195,248,2,252,242,15,17,68,36,252,248,221,68,36,252,248,131,252,255,5,15,
422 252,233,244,253,248,1,232,244,149,255,252,233,244,253,248,2,131,252,255,7, 422 135,244,248,15,132,244,247,232,244,88,252,233,244,253,248,1,232,244,149,255,
423 15,132,244,247,15,135,244,248,217,252,237,217,201,217,252,241,252,233,244, 423 252,233,244,253,248,2,131,252,255,7,15,132,244,247,15,135,244,248,217,252,
424 253,248,1,217,232,217,201,217,252,241,252,233,244,253,248,2,131,252,255,9, 424 237,217,201,217,252,241,252,233,244,253,248,1,217,232,217,201,217,252,241,
425 15,132,244,247,15,135,244,248,217,252,236,217,201,217,252,241,252,233,244, 425 252,233,244,253,248,2,131,252,255,9,15,132,244,247,15,135,244,248,217,252,
426 253,248,1,255,217,252,254,252,233,244,253,248,2,131,252,255,11,15,132,244, 426 236,217,201,217,252,241,252,233,244,253,248,1,255,217,252,254,252,233,244,
427 247,15,135,244,255,217,252,255,252,233,244,253,248,1,217,252,242,221,216, 427 253,248,2,131,252,255,11,15,132,244,247,15,135,244,255,217,252,255,252,233,
428 248,7,221,92,36,252,248,252,242,15,16,68,36,252,248,195,255,139,124,36,12, 428 244,253,248,1,217,252,242,221,216,248,7,221,92,36,252,248,252,242,15,16,68,
429 221,68,36,4,131,252,255,1,15,130,244,82,15,132,244,84,131,252,255,3,15,130, 429 36,252,248,195,255,139,124,36,12,221,68,36,4,131,252,255,1,15,130,244,82,
430 244,104,15,135,244,248,217,252,250,195,248,2,131,252,255,5,15,130,244,88, 430 15,132,244,84,131,252,255,3,15,130,244,104,15,135,244,248,217,252,250,195,
431 15,132,244,149,131,252,255,7,15,132,244,247,15,135,244,248,217,252,237,217, 431 248,2,131,252,255,5,15,130,244,88,15,132,244,149,131,252,255,7,15,132,244,
432 201,217,252,241,195,248,1,217,232,217,201,217,252,241,195,248,2,131,252,255, 432 247,15,135,244,248,217,252,237,217,201,217,252,241,195,248,1,217,232,217,
433 9,15,132,244,247,255,15,135,244,248,217,252,236,217,201,217,252,241,195,248, 433 201,217,252,241,195,248,2,131,252,255,9,15,132,244,247,255,15,135,244,248,
434 1,217,252,254,195,248,2,131,252,255,11,15,132,244,247,15,135,244,255,217, 434 217,252,236,217,201,217,252,241,195,248,1,217,252,254,195,248,2,131,252,255,
435 252,255,195,248,1,217,252,242,221,216,195,255,248,9,204,248,154,255,131,252, 435 11,15,132,244,247,15,135,244,255,217,252,255,195,248,1,217,252,242,221,216,
436 255,1,15,132,244,247,15,135,244,248,252,242,15,88,193,195,248,1,252,242,15, 436 195,255,248,9,204,248,154,255,131,252,255,1,15,132,244,247,15,135,244,248,
437 92,193,195,248,2,131,252,255,3,15,132,244,247,15,135,244,248,252,242,15,89, 437 252,242,15,88,193,195,248,1,252,242,15,92,193,195,248,2,131,252,255,3,15,
438 193,195,248,1,252,242,15,94,193,195,248,2,131,252,255,5,15,130,244,148,15, 438 132,244,247,15,135,244,248,252,242,15,89,193,195,248,1,252,242,15,94,193,
439 132,244,107,131,252,255,7,15,132,244,247,15,135,244,248,72,184,237,237,255, 439 195,248,2,131,252,255,5,15,130,244,148,15,132,244,107,131,252,255,7,15,132,
440 102,72,15,110,200,15,87,193,195,248,1,72,184,237,237,102,72,15,110,200,15, 440 244,247,15,135,244,248,72,184,237,237,255,102,72,15,110,200,15,87,193,195,
441 84,193,195,248,2,131,252,255,9,15,135,244,248,252,242,15,17,68,36,252,248, 441 248,1,72,184,237,237,102,72,15,110,200,15,84,193,195,248,2,131,252,255,9,
442 252,242,15,17,76,36,252,240,221,68,36,252,248,221,68,36,252,240,15,132,244, 442 15,135,244,248,252,242,15,17,68,36,252,248,252,242,15,17,76,36,252,240,221,
443 247,217,252,243,248,7,221,92,36,252,248,252,242,15,16,68,36,252,248,195,248, 443 68,36,252,248,221,68,36,252,240,15,132,244,247,217,252,243,248,7,221,92,36,
444 1,217,201,217,252,253,221,217,252,233,244,7,248,2,131,252,255,11,15,132,244, 444 252,248,252,242,15,16,68,36,252,248,195,248,1,217,201,217,252,253,221,217,
445 247,15,135,244,255,252,242,15,93,193,195,248,1,252,242,15,95,193,195,248, 445 252,233,244,7,248,2,131,252,255,11,15,132,244,247,15,135,244,255,252,242,
446 9,204,255,139,68,36,20,221,68,36,4,221,68,36,12,131,252,248,1,15,132,244, 446 15,93,193,195,248,1,252,242,15,95,193,195,248,9,204,255,139,68,36,20,221,
447 247,15,135,244,248,222,193,195,248,1,222,252,233,195,248,2,131,252,248,3, 447 68,36,4,221,68,36,12,131,252,248,1,15,132,244,247,15,135,244,248,222,193,
448 15,132,244,247,15,135,244,248,222,201,195,248,1,222,252,249,195,248,2,131, 448 195,248,1,222,252,233,195,248,2,131,252,248,3,15,132,244,247,15,135,244,248,
449 252,248,5,15,130,244,148,15,132,244,107,131,252,248,7,15,132,244,247,15,135, 449 222,201,195,248,1,222,252,249,195,248,2,131,252,248,5,15,130,244,148,15,132,
450 244,248,255,221,216,217,224,195,248,1,221,216,217,225,195,248,2,131,252,248, 450 244,107,131,252,248,7,15,132,244,247,15,135,244,248,255,221,216,217,224,195,
451 9,15,132,244,247,15,135,244,248,217,252,243,195,248,1,217,201,217,252,253, 451 248,1,221,216,217,225,195,248,2,131,252,248,9,15,132,244,247,15,135,244,248,
452 221,217,195,248,2,131,252,248,11,15,132,244,247,15,135,244,255,255,219,252, 452 217,252,243,195,248,1,217,201,217,252,253,221,217,195,248,2,131,252,248,11,
453 233,219,209,221,217,195,248,1,219,252,233,218,209,221,217,195,255,221,225, 453 15,132,244,247,15,135,244,255,255,219,252,233,219,209,221,217,195,248,1,219,
454 223,224,252,246,196,1,15,132,244,248,217,201,248,2,221,216,195,248,1,221, 454 252,233,218,209,221,217,195,255,221,225,223,224,252,246,196,1,15,132,244,
455 225,223,224,252,246,196,1,15,133,244,248,217,201,248,2,221,216,195,255,248, 455 248,217,201,248,2,221,216,195,248,1,221,225,223,224,252,246,196,1,15,133,
456 155,137,252,248,83,15,162,137,6,137,94,4,137,78,8,137,86,12,91,195,255,249, 456 244,248,217,201,248,2,221,216,195,255,248,155,137,252,248,83,15,162,137,6,
457 255,129,124,253,202,4,239,15,135,244,41,129,124,253,194,4,239,15,135,244, 457 137,94,4,137,78,8,137,86,12,91,195,255,249,255,129,124,253,202,4,239,15,135,
458 41,255,252,242,15,16,4,194,131,195,4,102,15,46,4,202,255,221,4,202,221,4, 458 244,41,129,124,253,194,4,239,15,135,244,41,255,252,242,15,16,4,194,131,195,
459 194,131,195,4,255,223,252,233,221,216,255,218,252,233,223,224,158,255,15, 459 4,102,15,46,4,202,255,221,4,202,221,4,194,131,195,4,255,223,252,233,221,216,
460 134,244,248,255,15,131,244,248,255,248,1,15,183,67,252,254,141,156,253,131, 460 255,218,252,233,223,224,158,255,15,134,244,248,255,15,131,244,248,255,248,
461 233,248,2,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36, 461 1,15,183,67,252,254,141,156,253,131,233,248,2,139,3,15,182,204,15,182,232,
462 252,238,255,139,108,194,4,131,195,4,129,252,253,239,15,135,244,251,129,124, 462 131,195,4,193,232,16,65,252,255,36,252,238,255,139,108,194,4,131,195,4,129,
463 253,202,4,239,15,135,244,251,255,252,242,15,16,4,194,102,15,46,4,202,255, 463 252,253,239,15,135,244,251,129,124,253,202,4,239,15,135,244,251,255,252,242,
464 221,4,202,221,4,194,255,15,138,244,248,15,133,244,248,255,15,138,244,248, 464 15,16,4,194,102,15,46,4,202,255,221,4,202,221,4,194,255,15,138,244,248,15,
465 15,132,244,247,255,248,1,15,183,67,252,254,141,156,253,131,233,248,2,255, 465 133,244,248,255,15,138,244,248,15,132,244,247,255,248,1,15,183,67,252,254,
466 248,2,15,183,67,252,254,141,156,253,131,233,248,1,255,248,5,57,108,202,4, 466 141,156,253,131,233,248,2,255,248,2,15,183,67,252,254,141,156,253,131,233,
467 15,133,244,2,129,252,253,239,15,131,244,1,139,12,202,139,4,194,57,193,15, 467 248,1,255,248,5,57,108,202,4,15,133,244,2,129,252,253,239,15,131,244,1,139,
468 132,244,1,129,252,253,239,15,135,244,2,139,169,233,133,252,237,15,132,244, 468 12,202,139,4,194,57,193,15,132,244,1,129,252,253,239,15,135,244,2,139,169,
469 2,252,246,133,233,235,15,133,244,2,255,49,252,237,255,189,1,0,0,0,255,252, 469 233,133,252,237,15,132,244,2,252,246,133,233,235,15,133,244,2,255,49,252,
470 233,244,45,255,72,252,247,208,131,195,4,129,124,253,202,4,239,15,133,244, 470 237,255,189,1,0,0,0,255,252,233,244,45,255,72,252,247,208,131,195,4,129,124,
471 248,139,12,202,65,59,12,135,255,131,195,4,129,124,253,202,4,239,15,135,244, 471 253,202,4,239,15,133,244,248,139,12,202,65,59,12,135,255,131,195,4,129,124,
472 248,255,252,242,65,15,16,4,199,102,15,46,4,202,255,221,4,202,65,221,4,199, 472 253,202,4,239,15,135,244,248,255,252,242,65,15,16,4,199,102,15,46,4,202,255,
473 255,72,252,247,208,131,195,4,57,68,202,4,255,139,108,194,4,131,195,4,129, 473 221,4,202,65,221,4,199,255,72,252,247,208,131,195,4,57,68,202,4,255,139,108,
474 252,253,239,255,15,131,244,247,255,15,130,244,247,255,137,108,202,4,139,44, 474 194,4,131,195,4,129,252,253,239,255,15,131,244,247,255,15,130,244,247,255,
475 194,137,44,202,255,15,183,67,252,254,141,156,253,131,233,248,1,139,3,15,182, 475 137,108,202,4,139,44,194,137,44,202,255,15,183,67,252,254,141,156,253,131,
476 204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,139,108,194, 476 233,248,1,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,
477 4,139,4,194,137,108,202,4,137,4,202,139,3,15,182,204,15,182,232,131,195,4, 477 252,238,255,139,108,194,4,139,4,194,137,108,202,4,137,4,202,139,3,15,182,
478 193,232,16,65,252,255,36,252,238,255,49,252,237,129,124,253,194,4,239,129, 478 204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,49,252,237,
479 213,239,137,108,202,4,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65, 479 129,124,253,194,4,239,129,213,239,137,108,202,4,139,3,15,182,204,15,182,232,
480 252,255,36,252,238,255,129,124,253,194,4,239,15,135,244,48,255,252,242,15, 480 131,195,4,193,232,16,65,252,255,36,252,238,255,129,124,253,194,4,239,15,135,
481 16,4,194,72,184,237,237,102,72,15,110,200,15,87,193,252,242,15,17,4,202,255, 481 244,48,255,252,242,15,16,4,194,72,184,237,237,102,72,15,110,200,15,87,193,
482 221,4,194,217,224,221,28,202,255,129,124,253,194,4,239,15,133,244,248,139, 482 252,242,15,17,4,202,255,221,4,194,217,224,221,28,202,255,129,124,253,194,
483 4,194,255,15,87,192,252,242,15,42,128,233,248,1,252,242,15,17,4,202,255,219, 483 4,239,15,133,244,248,139,4,194,255,15,87,192,252,242,15,42,128,233,248,1,
484 128,233,248,1,221,28,202,255,139,3,15,182,204,15,182,232,131,195,4,193,232, 484 252,242,15,17,4,202,255,219,128,233,248,1,221,28,202,255,139,3,15,182,204,
485 16,65,252,255,36,252,238,248,2,129,124,253,194,4,239,15,133,244,50,139,60, 485 15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,129,124,253,194,
486 194,137,213,232,251,1,18,255,252,242,15,42,192,137,252,234,255,15,182,75, 486 4,239,15,133,244,50,139,60,194,137,213,232,251,1,18,255,252,242,15,42,192,
487 252,253,252,233,244,1,255,15,182,252,236,15,182,192,255,129,124,253,252,234, 487 137,252,234,255,15,182,75,252,253,252,233,244,1,255,15,182,252,236,15,182,
488 4,239,15,135,244,46,255,252,242,15,16,4,252,234,252,242,65,15,88,4,199,255, 488 192,255,129,124,253,252,234,4,239,15,135,244,46,255,252,242,15,16,4,252,234,
489 221,4,252,234,65,220,4,199,255,129,124,253,252,234,4,239,15,135,244,47,255, 489 252,242,65,15,88,4,199,255,221,4,252,234,65,220,4,199,255,129,124,253,252,
490 252,242,65,15,16,4,199,252,242,15,88,4,252,234,255,65,221,4,199,220,4,252, 490 234,4,239,15,135,244,47,255,252,242,65,15,16,4,199,252,242,15,88,4,252,234,
491 234,255,129,124,253,252,234,4,239,15,135,244,49,129,124,253,194,4,239,15, 491 255,65,221,4,199,220,4,252,234,255,129,124,253,252,234,4,239,15,135,244,49,
492 135,244,49,255,252,242,15,16,4,252,234,252,242,15,88,4,194,255,221,4,252, 492 129,124,253,194,4,239,15,135,244,49,255,252,242,15,16,4,252,234,252,242,15,
493 234,220,4,194,255,252,242,15,16,4,252,234,252,242,65,15,92,4,199,255,221, 493 88,4,194,255,221,4,252,234,220,4,194,255,252,242,15,16,4,252,234,252,242,
494 4,252,234,65,220,36,199,255,252,242,65,15,16,4,199,252,242,15,92,4,252,234, 494 65,15,92,4,199,255,221,4,252,234,65,220,36,199,255,252,242,65,15,16,4,199,
495 255,65,221,4,199,220,36,252,234,255,252,242,15,16,4,252,234,252,242,15,92, 495 252,242,15,92,4,252,234,255,65,221,4,199,220,36,252,234,255,252,242,15,16,
496 4,194,255,221,4,252,234,220,36,194,255,252,242,15,16,4,252,234,252,242,65, 496 4,252,234,252,242,15,92,4,194,255,221,4,252,234,220,36,194,255,252,242,15,
497 15,89,4,199,255,221,4,252,234,65,220,12,199,255,252,242,65,15,16,4,199,252, 497 16,4,252,234,252,242,65,15,89,4,199,255,221,4,252,234,65,220,12,199,255,252,
498 242,15,89,4,252,234,255,65,221,4,199,220,12,252,234,255,252,242,15,16,4,252, 498 242,65,15,16,4,199,252,242,15,89,4,252,234,255,65,221,4,199,220,12,252,234,
499 234,252,242,15,89,4,194,255,221,4,252,234,220,12,194,255,252,242,15,16,4, 499 255,252,242,15,16,4,252,234,252,242,15,89,4,194,255,221,4,252,234,220,12,
500 252,234,252,242,65,15,94,4,199,255,221,4,252,234,65,220,52,199,255,252,242, 500 194,255,252,242,15,16,4,252,234,252,242,65,15,94,4,199,255,221,4,252,234,
501 65,15,16,4,199,252,242,15,94,4,252,234,255,65,221,4,199,220,52,252,234,255, 501 65,220,52,199,255,252,242,65,15,16,4,199,252,242,15,94,4,252,234,255,65,221,
502 252,242,15,16,4,252,234,252,242,15,94,4,194,255,221,4,252,234,220,52,194, 502 4,199,220,52,252,234,255,252,242,15,16,4,252,234,252,242,15,94,4,194,255,
503 255,252,242,15,16,4,252,234,252,242,65,15,16,12,199,255,221,4,252,234,65, 503 221,4,252,234,220,52,194,255,252,242,15,16,4,252,234,252,242,65,15,16,12,
504 221,4,199,255,252,242,65,15,16,4,199,252,242,15,16,12,252,234,255,65,221, 504 199,255,221,4,252,234,65,221,4,199,255,252,242,65,15,16,4,199,252,242,15,
505 4,199,221,4,252,234,255,252,242,15,16,4,252,234,252,242,15,16,12,194,255, 505 16,12,252,234,255,65,221,4,199,221,4,252,234,255,252,242,15,16,4,252,234,
506 221,4,252,234,221,4,194,255,248,156,232,244,148,255,252,233,244,156,255,232, 506 252,242,15,16,12,194,255,221,4,252,234,221,4,194,255,248,156,232,244,148,
507 244,107,255,15,182,252,236,15,182,192,139,124,36,16,137,151,233,141,52,194, 507 255,252,233,244,156,255,232,244,107,255,15,182,252,236,15,182,192,139,124,
508 137,194,41,252,234,248,33,137,252,253,137,92,36,20,232,251,1,22,139,149,233, 508 36,16,137,151,233,141,52,194,137,194,41,252,234,248,33,137,252,253,137,92,
509 133,192,15,133,244,42,15,182,107,252,255,15,182,75,252,253,139,68,252,234, 509 36,20,232,251,1,23,139,149,233,133,192,15,133,244,42,15,182,107,252,255,15,
510 4,139,44,252,234,137,68,202,4,137,44,202,139,3,15,182,204,15,182,232,131, 510 182,75,252,253,139,68,252,234,4,139,44,252,234,137,68,202,4,137,44,202,139,
511 195,4,193,232,16,65,252,255,36,252,238,255,72,252,247,208,65,139,4,135,199, 511 3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,72,
512 68,202,4,237,137,4,202,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65, 512 252,247,208,65,139,4,135,199,68,202,4,237,137,4,202,139,3,15,182,204,15,182,
513 252,255,36,252,238,255,15,191,192,252,242,15,42,192,252,242,15,17,4,202,255, 513 232,131,195,4,193,232,16,65,252,255,36,252,238,255,15,191,192,252,242,15,
514 223,67,252,254,221,28,202,255,252,242,65,15,16,4,199,252,242,15,17,4,202, 514 42,192,252,242,15,17,4,202,255,223,67,252,254,221,28,202,255,252,242,65,15,
515 255,65,221,4,199,221,28,202,255,72,252,247,208,137,68,202,4,139,3,15,182, 515 16,4,199,252,242,15,17,4,202,255,65,221,4,199,221,28,202,255,72,252,247,208,
516 204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,141,76,202, 516 137,68,202,4,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,
517 12,141,68,194,4,189,237,137,105,252,248,248,1,137,41,131,193,8,57,193,15, 517 36,252,238,255,141,76,202,12,141,68,194,4,189,237,137,105,252,248,248,1,137,
518 134,244,1,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36, 518 41,131,193,8,57,193,15,134,244,1,139,3,15,182,204,15,182,232,131,195,4,193,
519 252,238,255,139,106,252,248,139,172,253,133,233,139,173,233,139,69,4,139, 519 232,16,65,252,255,36,252,238,255,139,106,252,248,139,172,253,133,233,139,
520 109,0,137,68,202,4,137,44,202,139,3,15,182,204,15,182,232,131,195,4,193,232, 520 173,233,139,69,4,139,109,0,137,68,202,4,137,44,202,139,3,15,182,204,15,182,
521 16,65,252,255,36,252,238,255,139,106,252,248,139,172,253,141,233,128,189, 521 232,131,195,4,193,232,16,65,252,255,36,252,238,255,139,106,252,248,139,172,
522 233,0,139,173,233,139,12,194,139,68,194,4,137,77,0,137,69,4,15,132,244,247, 522 253,141,233,128,189,233,0,139,173,233,139,12,194,139,68,194,4,137,77,0,137,
523 252,246,133,233,235,15,133,244,248,248,1,139,3,15,182,204,15,182,232,131, 523 69,4,15,132,244,247,252,246,133,233,235,15,133,244,248,248,1,139,3,15,182,
524 195,4,193,232,16,65,252,255,36,252,238,248,2,129,232,239,129,252,248,239, 524 204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,129,232,239,
525 15,134,244,1,252,246,129,233,235,15,132,244,1,137,252,238,137,213,65,141, 525 129,252,248,239,15,134,244,1,252,246,129,233,235,15,132,244,1,137,252,238,
526 190,233,255,232,251,1,23,137,252,234,252,233,244,1,255,72,252,247,208,139, 526 137,213,65,141,190,233,255,232,251,1,24,137,252,234,252,233,244,1,255,72,
527 106,252,248,139,172,253,141,233,65,139,12,135,139,133,233,137,8,199,64,4, 527 252,247,208,139,106,252,248,139,172,253,141,233,65,139,12,135,139,133,233,
528 237,252,246,133,233,235,15,133,244,248,248,1,139,3,15,182,204,15,182,232, 528 137,8,199,64,4,237,252,246,133,233,235,15,133,244,248,248,1,139,3,15,182,
529 131,195,4,193,232,16,65,252,255,36,252,238,248,2,252,246,129,233,235,15,132, 529 204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,252,246,129,
530 244,1,128,189,233,0,15,132,244,1,137,213,137,198,65,141,190,233,232,251,1, 530 233,235,15,132,244,1,128,189,233,0,15,132,244,1,137,213,137,198,65,141,190,
531 23,137,252,234,252,233,244,1,255,139,106,252,248,255,252,242,65,15,16,4,199, 531 233,232,251,1,24,137,252,234,252,233,244,1,255,139,106,252,248,255,252,242,
532 255,139,172,253,141,233,139,141,233,255,252,242,15,17,1,255,221,25,255,72, 532 65,15,16,4,199,255,139,172,253,141,233,139,141,233,255,252,242,15,17,1,255,
533 252,247,208,139,106,252,248,139,172,253,141,233,139,141,233,137,65,4,139, 533 221,25,255,72,252,247,208,139,106,252,248,139,172,253,141,233,139,141,233,
534 3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,141, 534 137,65,4,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,
535 156,253,131,233,139,108,36,16,131,189,233,0,15,132,244,247,137,149,233,141, 535 238,255,141,156,253,131,233,139,108,36,16,131,189,233,0,15,132,244,247,137,
536 52,202,137,252,239,232,251,1,24,139,149,233,248,1,139,3,15,182,204,15,182, 536 149,233,141,52,202,137,252,239,232,251,1,25,139,149,233,248,1,139,3,15,182,
537 232,131,195,4,193,232,16,65,252,255,36,252,238,255,72,252,247,208,139,108, 537 204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,72,252,247,
538 36,16,137,149,233,139,82,252,248,65,139,52,135,137,252,239,137,92,36,20,232, 538 208,139,108,36,16,137,149,233,139,82,252,248,65,139,52,135,137,252,239,137,
539 251,1,25,139,149,233,15,182,75,252,253,137,4,202,199,68,202,4,237,139,3,15, 539 92,36,20,232,251,1,26,139,149,233,15,182,75,252,253,137,4,202,199,68,202,
540 182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,139,124, 540 4,237,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,
541 36,16,137,151,233,248,1,137,194,37,252,255,7,0,0,193,252,234,11,61,252,255, 541 238,255,139,124,36,16,137,151,233,248,1,137,194,37,252,255,7,0,0,193,252,
542 7,0,0,15,132,244,249,248,2,137,198,65,139,134,233,137,252,253,65,59,134,233, 542 234,11,61,252,255,7,0,0,15,132,244,249,248,2,137,198,65,139,134,233,137,252,
543 137,92,36,20,15,131,244,251,232,251,1,26,139,149,233,15,182,75,252,253,137, 543 253,65,59,134,233,137,92,36,20,15,131,244,251,232,251,1,27,139,149,233,15,
544 4,202,199,68,202,4,237,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65, 544 182,75,252,253,137,4,202,199,68,202,4,237,139,3,15,182,204,15,182,232,131,
545 252,255,36,252,238,248,3,184,1,8,0,0,252,233,244,2,248,5,232,251,1,27,15, 545 195,4,193,232,16,65,252,255,36,252,238,248,3,184,1,8,0,0,252,233,244,2,248,
546 183,67,252,254,137,252,239,252,233,244,1,255,72,252,247,208,139,108,36,16, 546 5,232,251,1,28,15,183,67,252,254,137,252,239,252,233,244,1,255,72,252,247,
547 65,139,142,233,137,92,36,20,65,59,142,233,137,149,233,15,131,244,249,248, 547 208,139,108,36,16,65,139,142,233,137,92,36,20,65,59,142,233,137,149,233,15,
548 2,65,139,52,135,137,252,239,232,251,1,28,139,149,233,15,182,75,252,253,137, 548 131,244,249,248,2,65,139,52,135,137,252,239,232,251,1,29,139,149,233,15,182,
549 4,202,199,68,202,4,237,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65, 549 75,252,253,137,4,202,199,68,202,4,237,139,3,15,182,204,15,182,232,131,195,
550 252,255,36,252,238,248,3,137,252,239,232,251,1,27,15,183,67,252,254,72,252, 550 4,193,232,16,65,252,255,36,252,238,248,3,137,252,239,232,251,1,28,15,183,
551 247,208,252,233,244,2,255,72,252,247,208,139,106,252,248,139,173,233,65,139, 551 67,252,254,72,252,247,208,252,233,244,2,255,72,252,247,208,139,106,252,248,
552 4,135,252,233,244,157,255,72,252,247,208,139,106,252,248,139,173,233,65,139, 552 139,173,233,65,139,4,135,252,233,244,157,255,72,252,247,208,139,106,252,248,
553 4,135,252,233,244,158,255,15,182,252,236,15,182,192,129,124,253,252,234,4, 553 139,173,233,65,139,4,135,252,233,244,158,255,15,182,252,236,15,182,192,129,
554 239,15,133,244,36,139,44,252,234,129,124,253,194,4,239,15,135,244,251,255, 554 124,253,252,234,4,239,15,133,244,36,139,44,252,234,129,124,253,194,4,239,
555 252,242,15,16,4,194,252,242,15,45,192,252,242,15,42,200,102,15,46,193,255, 555 15,135,244,251,255,252,242,15,16,4,194,252,242,15,45,192,252,242,15,42,200,
556 15,133,244,36,59,133,233,15,131,244,36,193,224,3,3,133,233,129,120,253,4, 556 102,15,46,193,255,15,133,244,36,59,133,233,15,131,244,36,193,224,3,3,133,
557 239,15,132,244,248,248,1,139,40,139,64,4,137,44,202,137,68,202,4,139,3,15, 557 233,129,120,253,4,239,15,132,244,248,248,1,139,40,139,64,4,137,44,202,137,
558 182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,131,189, 558 68,202,4,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,
559 233,0,15,132,244,1,139,141,233,252,246,129,233,235,15,132,244,36,15,182,75, 559 238,248,2,131,189,233,0,15,132,244,1,139,141,233,252,246,129,233,235,15,132,
560 252,253,252,233,244,1,248,5,255,129,124,253,194,4,239,15,133,244,36,139,4, 560 244,36,15,182,75,252,253,252,233,244,1,248,5,255,129,124,253,194,4,239,15,
561 194,252,233,244,157,255,15,182,252,236,15,182,192,72,252,247,208,65,139,4, 561 133,244,36,139,4,194,252,233,244,157,255,15,182,252,236,15,182,192,72,252,
562 135,129,124,253,252,234,4,239,15,133,244,34,139,44,252,234,248,157,139,141, 562 247,208,65,139,4,135,129,124,253,252,234,4,239,15,133,244,34,139,44,252,234,
563 233,35,136,233,105,201,239,3,141,233,248,1,129,185,233,239,15,133,244,250, 563 248,157,139,141,233,35,136,233,105,201,239,3,141,233,248,1,129,185,233,239,
564 57,129,233,15,133,244,250,129,121,253,4,239,15,132,244,251,15,182,67,252, 564 15,133,244,250,57,129,233,15,133,244,250,129,121,253,4,239,15,132,244,251,
565 253,139,41,139,73,4,137,44,194,248,2,255,137,76,194,4,139,3,15,182,204,15, 565 15,182,67,252,253,139,41,139,73,4,137,44,194,248,2,255,137,76,194,4,139,3,
566 182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,15,182,67,252,253, 566 15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,15,
567 185,237,252,233,244,2,248,4,139,137,233,133,201,15,133,244,1,248,5,139,141, 567 182,67,252,253,185,237,252,233,244,2,248,4,139,137,233,133,201,15,133,244,
568 233,133,201,15,132,244,3,252,246,129,233,235,15,133,244,3,252,233,244,34, 568 1,248,5,139,141,233,133,201,15,132,244,3,252,246,129,233,235,15,133,244,3,
569 255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,35,139, 569 252,233,244,34,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,
570 44,252,234,59,133,233,15,131,244,35,193,224,3,3,133,233,129,120,253,4,239, 570 133,244,35,139,44,252,234,59,133,233,15,131,244,35,193,224,3,3,133,233,129,
571 15,132,244,248,248,1,139,40,139,64,4,137,44,202,137,68,202,4,139,3,15,182, 571 120,253,4,239,15,132,244,248,248,1,139,40,139,64,4,137,44,202,137,68,202,
572 204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,131,189,233, 572 4,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,
573 0,15,132,244,1,139,141,233,252,246,129,233,235,15,132,244,35,255,15,182,252, 573 248,2,131,189,233,0,15,132,244,1,139,141,233,252,246,129,233,235,15,132,244,
574 236,15,182,192,129,124,253,252,234,4,239,15,133,244,39,139,44,252,234,129, 574 35,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,39,
575 124,253,194,4,239,15,135,244,251,255,15,133,244,39,59,133,233,15,131,244, 575 139,44,252,234,129,124,253,194,4,239,15,135,244,251,255,15,133,244,39,59,
576 39,193,224,3,3,133,233,129,120,253,4,239,15,132,244,249,248,1,252,246,133, 576 133,233,15,131,244,39,193,224,3,3,133,233,129,120,253,4,239,15,132,244,249,
577 248,1,252,246,133,233,235,15,133,244,253,248,2,139,108,202,4,139,12,202,137,
578 104,4,137,8,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,
579 252,238,248,3,131,189,233,0,15,132,244,1,139,141,233,255,252,246,129,233,
580 235,15,132,244,39,15,182,75,252,253,252,233,244,1,248,5,129,124,253,194,4,
581 239,15,133,244,39,139,4,194,252,233,244,158,248,7,128,165,233,235,65,139,
582 142,233,65,137,174,233,137,141,233,15,182,75,252,253,252,233,244,2,255,15,
583 182,252,236,15,182,192,72,252,247,208,65,139,4,135,129,124,253,252,234,4,
584 239,15,133,244,37,139,44,252,234,248,158,139,141,233,35,136,233,105,201,239,
585 198,133,233,0,3,141,233,248,1,129,185,233,239,15,133,244,251,57,129,233,15,
586 133,244,251,129,121,253,4,239,15,132,244,250,248,2,255,252,246,133,233,235,
587 15,133,244,253,248,3,15,182,67,252,253,139,108,194,4,139,4,194,137,105,4,
588 137,1,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,
589 238,248,4,131,189,233,0,15,132,244,2,137,12,36,139,141,233,252,246,129,233,
590 235,15,132,244,37,139,12,36,252,233,244,2,248,5,139,137,233,133,201,15,133,
591 244,1,255,139,141,233,133,201,15,132,244,252,252,246,129,233,235,15,132,244,
592 37,248,6,137,4,36,199,68,36,4,237,137,108,36,24,139,124,36,16,137,151,233,
593 72,141,20,36,137,252,238,137,252,253,137,92,36,20,232,251,1,30,139,149,233,
594 139,108,36,24,137,193,252,233,244,2,248,7,128,165,233,235,65,139,134,233,
595 65,137,174,233,137,133,233,252,233,244,3,255,15,182,252,236,15,182,192,129,
596 124,253,252,234,4,239,15,133,244,38,139,44,252,234,59,133,233,15,131,244,
597 38,193,224,3,3,133,233,129,120,253,4,239,15,132,244,249,248,1,252,246,133,
577 233,235,15,133,244,253,248,2,139,108,202,4,139,12,202,137,104,4,137,8,139, 598 233,235,15,133,244,253,248,2,139,108,202,4,139,12,202,137,104,4,137,8,139,
578 3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,3, 599 3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,
579 131,189,233,0,15,132,244,1,139,141,233,255,252,246,129,233,235,15,132,244, 600 131,189,233,0,15,132,244,1,255,139,141,233,252,246,129,233,235,15,132,244,
580 39,15,182,75,252,253,252,233,244,1,248,5,129,124,253,194,4,239,15,133,244, 601 38,15,182,75,252,253,252,233,244,1,248,7,128,165,233,235,65,139,142,233,65,
581 39,139,4,194,252,233,244,158,248,7,128,165,233,235,65,139,142,233,65,137, 602 137,174,233,137,141,233,15,182,75,252,253,252,233,244,2,255,68,137,60,36,
582 174,233,137,141,233,15,182,75,252,253,252,233,244,2,255,15,182,252,236,15, 603 255,248,1,141,12,202,139,105,252,248,252,246,133,233,235,15,133,244,253,248,
583 182,192,72,252,247,208,65,139,4,135,129,124,253,252,234,4,239,15,133,244, 604 2,139,68,36,4,255,252,242,68,15,45,252,248,255,131,232,1,15,132,244,250,68,
584 37,139,44,252,234,248,158,139,141,233,35,136,233,105,201,239,198,133,233, 605 1,252,248,59,133,233,15,131,244,251,68,41,252,248,65,193,231,3,68,3,189,233,
585 0,3,141,233,248,1,129,185,233,239,15,133,244,251,57,129,233,15,133,244,251, 606 248,3,139,41,65,137,47,139,105,4,131,193,8,65,137,111,4,65,131,199,8,131,
586 129,121,253,4,239,15,132,244,250,248,2,255,252,246,133,233,235,15,133,244, 607 232,1,15,133,244,3,248,4,68,139,60,36,139,3,15,182,204,15,182,232,131,195,
587 253,248,3,15,182,67,252,253,139,108,194,4,139,4,194,137,105,4,137,1,139,3, 608 4,193,232,16,65,252,255,36,252,238,248,5,139,124,36,16,137,151,233,137,252,
588 15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,4,131, 609 238,137,194,137,252,253,137,92,36,20,232,251,1,31,139,149,233,15,182,75,252,
589 189,233,0,15,132,244,2,137,12,36,139,141,233,252,246,129,233,235,15,132,244, 610 253,252,233,244,1,248,7,128,165,233,235,65,139,134,233,65,137,174,233,255,
590 37,139,12,36,252,233,244,2,248,5,139,137,233,133,201,15,133,244,1,255,139, 611 137,133,233,252,233,244,2,255,3,68,36,4,255,129,124,253,202,4,239,139,44,
591 141,233,133,201,15,132,244,252,252,246,129,233,235,15,132,244,37,248,6,137, 612 202,15,133,244,51,141,84,202,8,137,90,252,252,139,157,233,139,11,15,182,252,
592 4,36,199,68,36,4,237,137,108,36,24,139,124,36,16,137,151,233,72,141,20,36, 613 233,15,182,205,131,195,4,65,252,255,36,252,238,255,141,76,202,8,65,137,215,
593 137,252,238,137,252,253,137,92,36,20,232,251,1,29,139,149,233,139,108,36, 614 139,105,252,248,129,121,253,252,252,239,15,133,244,28,248,52,139,90,252,252,
594 24,137,193,252,233,244,2,248,7,128,165,233,235,65,139,134,233,65,137,174, 615 252,247,195,237,15,133,244,253,248,1,137,106,252,248,137,68,36,4,131,232,
595 233,137,133,233,252,233,244,3,255,15,182,252,236,15,182,192,129,124,253,252, 616 1,15,132,244,249,248,2,139,41,65,137,47,139,105,4,65,137,111,4,65,131,199,
596 234,4,239,15,133,244,38,139,44,252,234,59,133,233,15,131,244,38,193,224,3, 617 8,131,193,8,131,232,1,15,133,244,2,139,106,252,248,248,3,139,68,36,4,128,
597 3,133,233,129,120,253,4,239,15,132,244,249,248,1,252,246,133,233,235,15,133, 618 189,233,1,15,135,244,251,248,4,139,157,233,139,11,15,182,252,233,15,182,205,
598 244,253,248,2,139,108,202,4,139,12,202,137,104,4,137,8,139,3,15,182,204,15, 619 131,195,4,65,252,255,36,252,238,248,5,255,252,247,195,237,15,133,244,4,15,
599 182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,131,189,233,0,15, 620 182,75,252,253,72,252,247,209,141,12,202,68,139,121,252,248,69,139,191,233,
600 132,244,1,255,139,141,233,252,246,129,233,235,15,132,244,38,15,182,75,252, 621 69,139,191,233,252,233,244,4,248,7,15,139,244,1,131,227,252,248,41,218,65,
601 253,252,233,244,1,248,7,128,165,233,235,65,139,142,233,65,137,174,233,137, 622 137,215,139,90,252,252,252,233,244,1,255,141,76,202,8,139,105,232,139,65,
602 141,233,15,182,75,252,253,252,233,244,2,255,68,137,60,36,255,248,1,141,12, 623 252,236,137,41,137,65,4,139,105,252,240,139,65,252,244,137,105,8,137,65,12,
603 202,139,105,252,248,252,246,133,233,235,15,133,244,253,248,2,139,68,36,4, 624 139,105,224,139,65,228,137,105,252,248,137,65,252,252,129,252,248,239,184,
604 255,252,242,68,15,45,252,248,255,131,232,1,15,132,244,250,68,1,252,248,59, 625 237,15,133,244,28,137,202,137,90,252,252,139,157,233,139,11,15,182,252,233,
605 133,233,15,131,244,251,68,41,252,248,65,193,231,3,68,3,189,233,248,3,139, 626 15,182,205,131,195,4,65,252,255,36,252,238,255,15,182,252,236,139,66,252,
606 41,65,137,47,139,105,4,131,193,8,65,137,111,4,65,131,199,8,131,232,1,15,133, 627 248,141,12,202,139,128,233,15,182,128,233,68,137,60,36,68,141,188,253,194,
607 244,3,248,4,68,139,60,36,139,3,15,182,204,15,182,232,131,195,4,193,232,16, 628 233,68,43,122,252,252,133,252,237,15,132,244,251,141,108,252,233,252,248,
608 65,252,255,36,252,238,248,5,139,124,36,16,137,151,233,137,252,238,137,194, 629 65,57,215,15,131,244,248,248,1,65,139,71,252,248,137,1,65,139,71,252,252,
609 137,252,253,137,92,36,20,232,251,1,30,139,149,233,15,182,75,252,253,252,233, 630 65,131,199,8,137,65,4,131,193,8,57,252,233,15,131,244,249,65,57,215,15,130,
610 244,1,248,7,128,165,233,235,65,139,134,233,65,137,174,233,255,137,133,233, 631 244,1,248,2,199,65,4,237,131,193,8,57,252,233,15,130,244,2,248,3,68,139,60,
611 252,233,244,2,255,3,68,36,4,255,129,124,253,202,4,239,139,44,202,15,133,244, 632 36,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,
612 51,141,84,202,8,137,90,252,252,139,157,233,139,11,15,182,252,233,15,182,205, 633 248,5,199,68,36,4,1,0,0,0,137,208,68,41,252,248,15,134,244,3,255,137,197,
613 131,195,4,65,252,255,36,252,238,255,141,76,202,8,65,137,215,139,105,252,248, 634 193,252,237,3,131,197,1,137,108,36,4,139,108,36,16,1,200,59,133,233,15,135,
614 129,121,253,252,252,239,15,133,244,28,248,52,139,90,252,252,252,247,195,237, 635 244,253,248,6,65,139,71,252,248,137,1,65,139,71,252,252,65,131,199,8,137,
615 15,133,244,253,248,1,137,106,252,248,137,68,36,4,131,232,1,15,132,244,249, 636 65,4,131,193,8,65,57,215,15,130,244,6,252,233,244,3,248,7,137,149,233,137,
616 248,2,139,41,65,137,47,139,105,4,65,137,111,4,65,131,199,8,131,193,8,131, 637 141,233,137,92,36,20,65,41,215,139,116,36,4,131,252,238,1,137,252,239,232,
617 232,1,15,133,244,2,139,106,252,248,248,3,139,68,36,4,128,189,233,1,15,135, 638 251,1,0,139,149,233,139,141,233,65,1,215,252,233,244,6,255,193,225,3,255,
618 244,251,248,4,139,157,233,139,11,15,182,252,233,15,182,205,131,195,4,65,252, 639 248,1,139,90,252,252,137,68,36,4,252,247,195,237,15,133,244,253,255,248,13,
619 255,36,252,238,248,5,255,252,247,195,237,15,133,244,4,15,182,75,252,253,72, 640 65,137,215,131,232,1,15,132,244,249,248,2,65,139,44,15,65,137,111,252,248,
620 252,247,209,141,12,202,68,139,121,252,248,69,139,191,233,69,139,191,233,252, 641 65,139,108,15,4,65,137,111,252,252,65,131,199,8,131,232,1,15,133,244,2,248,
621 233,244,4,248,7,15,139,244,1,131,227,252,248,41,218,65,137,215,139,90,252, 642 3,139,68,36,4,15,182,107,252,255,248,5,57,197,15,135,244,252,255,139,108,
622 252,252,233,244,1,255,141,76,202,8,139,105,232,139,65,252,236,137,41,137, 643 10,4,137,106,252,252,139,44,10,137,106,252,248,255,248,5,56,67,252,255,15,
623 65,4,139,105,252,240,139,65,252,244,137,105,8,137,65,12,139,105,224,139,65, 644 135,244,252,255,15,182,75,252,253,72,252,247,209,141,20,202,68,139,122,252,
624 228,137,105,252,248,137,65,252,252,129,252,248,239,184,237,15,133,244,28, 645 248,69,139,191,233,69,139,191,233,139,3,15,182,204,15,182,232,131,195,4,193,
625 137,202,137,90,252,252,139,157,233,139,11,15,182,252,233,15,182,205,131,195, 646 232,16,65,252,255,36,252,238,248,6,255,65,199,71,252,252,237,65,131,199,8,
626 4,65,252,255,36,252,238,255,15,182,252,236,139,66,252,248,141,12,202,139, 647 255,199,68,194,252,244,237,255,131,192,1,252,233,244,5,248,7,15,139,244,14,
627 128,233,15,182,128,233,68,137,60,36,68,141,188,253,194,233,68,43,122,252, 648 131,227,252,248,41,218,255,1,217,255,137,221,209,252,237,129,229,239,102,
628 252,133,252,237,15,132,244,251,141,108,252,233,252,248,65,57,215,15,131,244, 649 65,131,172,253,46,233,1,15,132,244,140,255,141,12,202,255,129,121,253,4,239,
629 248,248,1,65,139,71,252,248,137,1,65,139,71,252,252,65,131,199,8,137,65,4, 650 15,135,244,53,129,121,253,12,239,15,135,244,53,255,139,105,20,255,129,252,
630 131,193,8,57,252,233,15,131,244,249,65,57,215,15,130,244,1,248,2,199,65,4, 651 253,239,15,135,244,53,255,252,242,15,16,1,252,242,15,16,73,8,255,252,242,
631 237,131,193,8,57,252,233,15,130,244,2,248,3,68,139,60,36,139,3,15,182,204, 652 15,88,65,16,252,242,15,17,1,133,252,237,15,136,244,249,255,15,140,244,249,
632 15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,5,199,68,36,4,1, 653 255,102,15,46,200,248,1,252,242,15,17,65,24,255,221,65,8,221,1,255,220,65,
633 0,0,0,137,208,68,41,252,248,15,134,244,3,255,137,197,193,252,237,3,131,197, 654 16,221,17,221,81,24,133,252,237,15,136,244,247,255,221,81,24,15,140,244,247,
634 1,137,108,36,4,139,108,36,16,1,200,59,133,233,15,135,244,253,248,6,65,139, 655 255,217,201,248,1,255,15,183,67,252,254,255,15,131,244,248,141,156,253,131,
635 71,252,248,137,1,65,139,71,252,252,65,131,199,8,137,65,4,131,193,8,65,57, 656 233,255,141,156,253,131,233,15,183,67,252,254,15,131,245,255,15,130,244,248,
636 215,15,130,244,6,252,233,244,3,248,7,137,149,233,137,141,233,137,92,36,20, 657 141,156,253,131,233,255,248,3,102,15,46,193,252,233,244,1,255,141,12,202,
637 65,41,215,139,116,36,4,131,252,238,1,137,252,239,232,251,1,0,139,149,233, 658 139,105,4,129,252,253,239,15,132,244,247,255,137,105,252,252,139,41,137,105,
638 139,141,233,65,1,215,252,233,244,6,255,193,225,3,255,248,1,139,90,252,252, 659 252,248,252,233,245,255,141,156,253,131,233,139,1,137,105,252,252,137,65,
639 137,68,36,4,252,247,195,237,15,133,244,253,255,248,13,65,137,215,131,232, 660 252,248,255,65,139,142,233,139,4,129,72,139,128,233,139,108,36,16,65,137,
640 1,15,132,244,249,248,2,65,139,44,15,65,137,111,252,248,65,139,108,15,4,65, 661 150,233,65,137,174,233,252,255,224,255,141,156,253,131,233,139,3,15,182,204,
641 137,111,252,252,65,131,199,8,131,232,1,15,133,244,2,248,3,139,68,36,4,15, 662 15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,68,139,187,233,
642 182,107,252,255,248,5,57,197,15,135,244,252,255,139,108,10,4,137,106,252, 663 139,108,36,16,141,12,202,59,141,233,15,135,244,23,15,182,139,233,57,200,15,
643 252,139,44,10,137,106,252,248,255,248,5,56,67,252,255,15,135,244,252,255, 664 134,244,249,248,2,255,15,183,67,252,254,252,233,245,255,248,3,199,68,194,
644 15,182,75,252,253,72,252,247,209,141,20,202,68,139,122,252,248,69,139,191, 665 252,252,237,131,192,1,57,200,15,134,244,3,252,233,244,2,255,141,44,197,237,
645 233,69,139,191,233,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252, 666 141,4,194,68,139,122,252,248,137,104,252,252,68,137,120,252,248,139,108,36,
646 255,36,252,238,248,6,255,65,199,71,252,252,237,65,131,199,8,255,199,68,194, 667 16,141,12,200,59,141,233,15,135,244,22,137,209,137,194,15,182,171,233,133,
647 252,244,237,255,131,192,1,252,233,244,5,248,7,15,139,244,14,131,227,252,248, 668 252,237,15,132,244,248,248,1,131,193,8,57,209,15,131,244,249,68,139,121,252,
648 41,218,255,1,217,255,137,221,209,252,237,129,229,239,102,65,131,172,253,46, 669 248,68,137,56,68,139,121,252,252,68,137,120,4,131,192,8,199,65,252,252,237,
649 233,1,15,132,244,140,255,141,12,202,255,129,121,253,4,239,15,135,244,53,129, 670 131,252,237,1,15,133,244,1,248,2,255,68,139,187,233,139,3,15,182,204,15,182,
650 121,253,12,239,15,135,244,53,255,139,105,20,255,129,252,253,239,15,135,244, 671 232,131,195,4,193,232,16,65,252,255,36,252,238,255,248,3,199,64,4,237,131,
651 53,255,252,242,15,16,1,252,242,15,16,73,8,255,252,242,15,88,65,16,252,242, 672 192,8,131,252,237,1,15,133,244,3,252,233,244,2,255,139,106,252,248,76,139,
652 15,17,1,133,252,237,15,136,244,249,255,15,140,244,249,255,102,15,46,200,248, 673 189,233,139,108,36,16,141,68,194,252,248,137,149,233,141,136,233,59,141,233,
653 1,252,242,15,17,65,24,255,221,65,8,221,1,255,220,65,16,221,17,221,81,24,133, 674 137,133,233,255,137,252,239,255,76,137,252,254,137,252,239,255,15,135,244,
654 252,237,15,136,244,247,255,221,81,24,15,140,244,247,255,217,201,248,1,255, 675 21,65,199,134,233,237,255,65,252,255,215,255,65,252,255,150,233,255,65,199,
655 15,183,67,252,254,255,15,131,244,248,141,156,253,131,233,255,141,156,253, 676 134,233,237,139,149,233,141,12,194,252,247,217,3,141,233,139,90,252,252,252,
656 131,233,15,183,67,252,254,15,131,245,255,15,130,244,248,141,156,253,131,233, 677 233,244,12,255,254,0
657 255,248,3,102,15,46,193,252,233,244,1,255,141,12,202,139,105,4,129,252,253,
658 239,15,132,244,247,255,137,105,252,252,139,41,137,105,252,248,252,233,245,
659 255,141,156,253,131,233,139,1,137,105,252,252,137,65,252,248,255,65,139,142,
660 233,139,4,129,72,139,128,233,139,108,36,16,65,137,150,233,65,137,174,233,
661 252,255,224,255,141,156,253,131,233,139,3,15,182,204,15,182,232,131,195,4,
662 193,232,16,65,252,255,36,252,238,255,68,139,187,233,139,108,36,16,141,12,
663 202,59,141,233,15,135,244,23,15,182,139,233,57,200,15,134,244,249,248,2,255,
664 15,183,67,252,254,252,233,245,255,248,3,199,68,194,252,252,237,131,192,1,
665 57,200,15,134,244,3,252,233,244,2,255,141,44,197,237,141,4,194,68,139,122,
666 252,248,137,104,252,252,68,137,120,252,248,139,108,36,16,141,12,200,59,141,
667 233,15,135,244,22,137,209,137,194,15,182,171,233,133,252,237,15,132,244,248,
668 248,1,131,193,8,57,209,15,131,244,249,68,139,121,252,248,68,137,56,68,139,
669 121,252,252,68,137,120,4,131,192,8,199,65,252,252,237,131,252,237,1,15,133,
670 244,1,248,2,255,68,139,187,233,139,3,15,182,204,15,182,232,131,195,4,193,
671 232,16,65,252,255,36,252,238,255,248,3,199,64,4,237,131,192,8,131,252,237,
672 1,15,133,244,3,252,233,244,2,255,139,106,252,248,76,139,189,233,139,108,36,
673 16,141,68,194,252,248,137,149,233,141,136,233,59,141,233,137,133,233,255,
674 137,252,239,255,76,137,252,254,137,252,239,255,15,135,244,21,65,199,134,233,
675 237,255,65,252,255,215,255,65,252,255,150,233,255,65,199,134,233,237,139,
676 149,233,141,12,194,252,247,217,3,141,233,139,90,252,252,252,233,244,12,255,
677 254,0
678}; 678};
679 679
680enum { 680enum {
@@ -1004,6 +1004,7 @@ static const char *const extnames[] = {
1004 "lj_gc_step@4", 1004 "lj_gc_step@4",
1005 "lj_dispatch_ins@8", 1005 "lj_dispatch_ins@8",
1006 "lj_dispatch_call@8", 1006 "lj_dispatch_call@8",
1007 "lj_err_throw@8",
1007 "lj_meta_cat", 1008 "lj_meta_cat",
1008 "lj_gc_barrieruv@8", 1009 "lj_gc_barrieruv@8",
1009 "lj_func_closeuv@8", 1010 "lj_func_closeuv@8",
@@ -1350,63 +1351,63 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse)
1350#if LJ_HASJIT 1351#if LJ_HASJIT
1351 dasm_put(Dst, 7257, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP); 1352 dasm_put(Dst, 7257, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP);
1352#endif 1353#endif
1353 dasm_put(Dst, 7304); 1354 dasm_put(Dst, 7315);
1354 if (!sse) { 1355 if (!sse) {
1355 dasm_put(Dst, 7307); 1356 dasm_put(Dst, 7318);
1356 } 1357 }
1357 dasm_put(Dst, 7352, (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)); 1358 dasm_put(Dst, 7363, (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));
1358 if (!sse) { 1359 if (!sse) {
1359 dasm_put(Dst, 7438); 1360 dasm_put(Dst, 7449);
1360 } 1361 }
1361 dasm_put(Dst, 7483, (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)); 1362 dasm_put(Dst, 7494, (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));
1362 if (!sse) { 1363 if (!sse) {
1363 dasm_put(Dst, 7569); 1364 dasm_put(Dst, 7580);
1364 } 1365 }
1365 dasm_put(Dst, 7608, (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)); 1366 dasm_put(Dst, 7619, (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));
1366 if (sse) { 1367 if (sse) {
1367 dasm_put(Dst, 7697, (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)); 1368 dasm_put(Dst, 7708, (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));
1368 } else { 1369 } else {
1369 dasm_put(Dst, 7811); 1370 dasm_put(Dst, 7822);
1370 } 1371 }
1371 dasm_put(Dst, 7858); 1372 dasm_put(Dst, 7869);
1372 if (!sse) { 1373 if (!sse) {
1373 } else { 1374 } else {
1374 dasm_put(Dst, 7935); 1375 dasm_put(Dst, 7946);
1375 } 1376 }
1376 dasm_put(Dst, 7938); 1377 dasm_put(Dst, 7949);
1377 dasm_put(Dst, 8023, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); 1378 dasm_put(Dst, 8034, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32));
1378 dasm_put(Dst, 8124, (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)); 1379 dasm_put(Dst, 8135, (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));
1379 dasm_put(Dst, 8298); 1380 dasm_put(Dst, 8309);
1380 if (sse) { 1381 if (sse) {
1381 dasm_put(Dst, 8339); 1382 dasm_put(Dst, 8350);
1382 dasm_put(Dst, 8409); 1383 dasm_put(Dst, 8420);
1383 dasm_put(Dst, 8481); 1384 dasm_put(Dst, 8492);
1384 } else { 1385 } else {
1385 dasm_put(Dst, 8533); 1386 dasm_put(Dst, 8544);
1386 dasm_put(Dst, 8625); 1387 dasm_put(Dst, 8636);
1387 } 1388 }
1388 dasm_put(Dst, 8671); 1389 dasm_put(Dst, 8682);
1389 if (sse) { 1390 if (sse) {
1390 dasm_put(Dst, 8677, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); 1391 dasm_put(Dst, 8688, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32));
1391 dasm_put(Dst, 8762, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); 1392 dasm_put(Dst, 8773, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32));
1392 } else { 1393 } else {
1393 dasm_put(Dst, 8890); 1394 dasm_put(Dst, 8901);
1394 dasm_put(Dst, 8973); 1395 dasm_put(Dst, 8984);
1395 if (cmov) { 1396 if (cmov) {
1396 dasm_put(Dst, 9028); 1397 dasm_put(Dst, 9039);
1397 } else { 1398 } else {
1398 dasm_put(Dst, 9047); 1399 dasm_put(Dst, 9058);
1399 } 1400 }
1400 dasm_put(Dst, 8886); 1401 dasm_put(Dst, 8897);
1401 } 1402 }
1402 dasm_put(Dst, 9088); 1403 dasm_put(Dst, 9099);
1403} 1404}
1404 1405
1405/* Generate the code for a single instruction. */ 1406/* Generate the code for a single instruction. */
1406static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) 1407static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
1407{ 1408{
1408 int vk = 0; 1409 int vk = 0;
1409 dasm_put(Dst, 9110, defop); 1410 dasm_put(Dst, 9121, defop);
1410 1411
1411 switch (op) { 1412 switch (op) {
1412 1413
@@ -1415,600 +1416,600 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
1415 /* Remember: all ops branch for a true comparison, fall through otherwise. */ 1416 /* Remember: all ops branch for a true comparison, fall through otherwise. */
1416 1417
1417 case BC_ISLT: case BC_ISGE: case BC_ISLE: case BC_ISGT: 1418 case BC_ISLT: case BC_ISGE: case BC_ISLE: case BC_ISGT:
1418 dasm_put(Dst, 9112, LJ_TISNUM, LJ_TISNUM); 1419 dasm_put(Dst, 9123, LJ_TISNUM, LJ_TISNUM);
1419 if (sse) { 1420 if (sse) {
1420 dasm_put(Dst, 9133); 1421 dasm_put(Dst, 9144);
1421 } else { 1422 } else {
1422 dasm_put(Dst, 9148); 1423 dasm_put(Dst, 9159);
1423 if (cmov) { 1424 if (cmov) {
1424 dasm_put(Dst, 9158); 1425 dasm_put(Dst, 9169);
1425 } else { 1426 } else {
1426 dasm_put(Dst, 9164); 1427 dasm_put(Dst, 9175);
1427 } 1428 }
1428 } 1429 }
1429 switch (op) { 1430 switch (op) {
1430 case BC_ISLT: 1431 case BC_ISLT:
1431 dasm_put(Dst, 9171); 1432 dasm_put(Dst, 9182);
1432 break; 1433 break;
1433 case BC_ISGE: 1434 case BC_ISGE:
1434 dasm_put(Dst, 8968); 1435 dasm_put(Dst, 8979);
1435 break; 1436 break;
1436 case BC_ISLE: 1437 case BC_ISLE:
1437 dasm_put(Dst, 5914); 1438 dasm_put(Dst, 5914);
1438 break; 1439 break;
1439 case BC_ISGT: 1440 case BC_ISGT:
1440 dasm_put(Dst, 9176); 1441 dasm_put(Dst, 9187);
1441 break; 1442 break;
1442 default: break; /* Shut up GCC. */ 1443 default: break; /* Shut up GCC. */
1443 } 1444 }
1444 dasm_put(Dst, 9181, -BCBIAS_J*4); 1445 dasm_put(Dst, 9192, -BCBIAS_J*4);
1445 break; 1446 break;
1446 1447
1447 case BC_ISEQV: case BC_ISNEV: 1448 case BC_ISEQV: case BC_ISNEV:
1448 vk = op == BC_ISEQV; 1449 vk = op == BC_ISEQV;
1449 dasm_put(Dst, 9216, LJ_TISNUM, LJ_TISNUM); 1450 dasm_put(Dst, 9227, LJ_TISNUM, LJ_TISNUM);
1450 if (sse) { 1451 if (sse) {
1451 dasm_put(Dst, 9242); 1452 dasm_put(Dst, 9253);
1452 } else { 1453 } else {
1453 dasm_put(Dst, 9254); 1454 dasm_put(Dst, 9265);
1454 if (cmov) { 1455 if (cmov) {
1455 dasm_put(Dst, 9158); 1456 dasm_put(Dst, 9169);
1456 } else { 1457 } else {
1457 dasm_put(Dst, 9164); 1458 dasm_put(Dst, 9175);
1458 } 1459 }
1459 } 1460 }
1460 iseqne_fp: 1461 iseqne_fp:
1461 if (vk) { 1462 if (vk) {
1462 dasm_put(Dst, 9261); 1463 dasm_put(Dst, 9272);
1463 } else { 1464 } else {
1464 dasm_put(Dst, 9270); 1465 dasm_put(Dst, 9281);
1465 } 1466 }
1466 iseqne_end: 1467 iseqne_end:
1467 if (vk) { 1468 if (vk) {
1468 dasm_put(Dst, 9279, -BCBIAS_J*4); 1469 dasm_put(Dst, 9290, -BCBIAS_J*4);
1469 } else { 1470 } else {
1470 dasm_put(Dst, 9294, -BCBIAS_J*4); 1471 dasm_put(Dst, 9305, -BCBIAS_J*4);
1471 } 1472 }
1472 dasm_put(Dst, 7283); 1473 dasm_put(Dst, 9206);
1473 if (op == BC_ISEQV || op == BC_ISNEV) { 1474 if (op == BC_ISEQV || op == BC_ISNEV) {
1474 dasm_put(Dst, 9309, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<<MM_eq); 1475 dasm_put(Dst, 9320, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<<MM_eq);
1475 if (vk) { 1476 if (vk) {
1476 dasm_put(Dst, 9367); 1477 dasm_put(Dst, 9378);
1477 } else { 1478 } else {
1478 dasm_put(Dst, 9371); 1479 dasm_put(Dst, 9382);
1479 } 1480 }
1480 dasm_put(Dst, 9377); 1481 dasm_put(Dst, 9388);
1481 } 1482 }
1482 break; 1483 break;
1483 case BC_ISEQS: case BC_ISNES: 1484 case BC_ISEQS: case BC_ISNES:
1484 vk = op == BC_ISEQS; 1485 vk = op == BC_ISEQS;
1485 dasm_put(Dst, 9382, LJ_TSTR); 1486 dasm_put(Dst, 9393, LJ_TSTR);
1486 iseqne_test: 1487 iseqne_test:
1487 if (vk) { 1488 if (vk) {
1488 dasm_put(Dst, 9265); 1489 dasm_put(Dst, 9276);
1489 } else { 1490 } else {
1490 dasm_put(Dst, 2805); 1491 dasm_put(Dst, 2805);
1491 } 1492 }
1492 goto iseqne_end; 1493 goto iseqne_end;
1493 case BC_ISEQN: case BC_ISNEN: 1494 case BC_ISEQN: case BC_ISNEN:
1494 vk = op == BC_ISEQN; 1495 vk = op == BC_ISEQN;
1495 dasm_put(Dst, 9407, LJ_TISNUM); 1496 dasm_put(Dst, 9418, LJ_TISNUM);
1496 if (sse) { 1497 if (sse) {
1497 dasm_put(Dst, 9421); 1498 dasm_put(Dst, 9432);
1498 } else { 1499 } else {
1499 dasm_put(Dst, 9434); 1500 dasm_put(Dst, 9445);
1500 if (cmov) { 1501 if (cmov) {
1501 dasm_put(Dst, 9158); 1502 dasm_put(Dst, 9169);
1502 } else { 1503 } else {
1503 dasm_put(Dst, 9164); 1504 dasm_put(Dst, 9175);
1504 } 1505 }
1505 } 1506 }
1506 goto iseqne_fp; 1507 goto iseqne_fp;
1507 case BC_ISEQP: case BC_ISNEP: 1508 case BC_ISEQP: case BC_ISNEP:
1508 vk = op == BC_ISEQP; 1509 vk = op == BC_ISEQP;
1509 dasm_put(Dst, 9442); 1510 dasm_put(Dst, 9453);
1510 goto iseqne_test; 1511 goto iseqne_test;
1511 1512
1512 /* -- Unary test and copy ops ------------------------------------------- */ 1513 /* -- Unary test and copy ops ------------------------------------------- */
1513 1514
1514 case BC_ISTC: case BC_ISFC: case BC_IST: case BC_ISF: 1515 case BC_ISTC: case BC_ISFC: case BC_IST: case BC_ISF:
1515 dasm_put(Dst, 9454, LJ_TISTRUECOND); 1516 dasm_put(Dst, 9465, LJ_TISTRUECOND);
1516 if (op == BC_IST || op == BC_ISTC) { 1517 if (op == BC_IST || op == BC_ISTC) {
1517 dasm_put(Dst, 9466); 1518 dasm_put(Dst, 9477);
1518 } else { 1519 } else {
1519 dasm_put(Dst, 9471); 1520 dasm_put(Dst, 9482);
1520 } 1521 }
1521 if (op == BC_ISTC || op == BC_ISFC) { 1522 if (op == BC_ISTC || op == BC_ISFC) {
1522 dasm_put(Dst, 9476); 1523 dasm_put(Dst, 9487);
1523 } 1524 }
1524 dasm_put(Dst, 9487, -BCBIAS_J*4); 1525 dasm_put(Dst, 9498, -BCBIAS_J*4);
1525 break; 1526 break;
1526 1527
1527 /* -- Unary ops --------------------------------------------------------- */ 1528 /* -- Unary ops --------------------------------------------------------- */
1528 1529
1529 case BC_MOV: 1530 case BC_MOV:
1530 dasm_put(Dst, 9520); 1531 dasm_put(Dst, 9531);
1531 break; 1532 break;
1532 case BC_NOT: 1533 case BC_NOT:
1533 dasm_put(Dst, 9555, LJ_TISTRUECOND, LJ_TTRUE); 1534 dasm_put(Dst, 9566, LJ_TISTRUECOND, LJ_TTRUE);
1534 break; 1535 break;
1535 case BC_UNM: 1536 case BC_UNM:
1536 dasm_put(Dst, 9592, LJ_TISNUM); 1537 dasm_put(Dst, 9603, LJ_TISNUM);
1537 if (sse) { 1538 if (sse) {
1538 dasm_put(Dst, 9603, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); 1539 dasm_put(Dst, 9614, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32));
1539 } else { 1540 } else {
1540 dasm_put(Dst, 9628); 1541 dasm_put(Dst, 9639);
1541 } 1542 }
1542 dasm_put(Dst, 7283); 1543 dasm_put(Dst, 9206);
1543 break; 1544 break;
1544 case BC_LEN: 1545 case BC_LEN:
1545 dasm_put(Dst, 9637, LJ_TSTR); 1546 dasm_put(Dst, 9648, LJ_TSTR);
1546 if (sse) { 1547 if (sse) {
1547 dasm_put(Dst, 9651, Dt5(->len)); 1548 dasm_put(Dst, 9662, Dt5(->len));
1548 } else { 1549 } else {
1549 dasm_put(Dst, 9669, Dt5(->len)); 1550 dasm_put(Dst, 9680, Dt5(->len));
1550 } 1551 }
1551 dasm_put(Dst, 9678, LJ_TTAB); 1552 dasm_put(Dst, 9689, LJ_TTAB);
1552 if (sse) { 1553 if (sse) {
1553 dasm_put(Dst, 9720); 1554 dasm_put(Dst, 9731);
1554 } else { 1555 } else {
1555 } 1556 }
1556 dasm_put(Dst, 9729); 1557 dasm_put(Dst, 9740);
1557 break; 1558 break;
1558 1559
1559 /* -- Binary ops -------------------------------------------------------- */ 1560 /* -- Binary ops -------------------------------------------------------- */
1560 1561
1561 1562
1562 case BC_ADDVN: case BC_ADDNV: case BC_ADDVV: 1563 case BC_ADDVN: case BC_ADDNV: case BC_ADDVV:
1563 dasm_put(Dst, 9739); 1564 dasm_put(Dst, 9750);
1564 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1565 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1565 switch (vk) { 1566 switch (vk) {
1566 case 0: 1567 case 0:
1567 dasm_put(Dst, 9747, LJ_TISNUM); 1568 dasm_put(Dst, 9758, LJ_TISNUM);
1568 if (sse) { 1569 if (sse) {
1569 dasm_put(Dst, 9759); 1570 dasm_put(Dst, 9770);
1570 } else { 1571 } else {
1571 dasm_put(Dst, 9774); 1572 dasm_put(Dst, 9785);
1572 } 1573 }
1573 break; 1574 break;
1574 case 1: 1575 case 1:
1575 dasm_put(Dst, 9783, LJ_TISNUM); 1576 dasm_put(Dst, 9794, LJ_TISNUM);
1576 if (sse) { 1577 if (sse) {
1577 dasm_put(Dst, 9795); 1578 dasm_put(Dst, 9806);
1578 } else { 1579 } else {
1579 dasm_put(Dst, 9810); 1580 dasm_put(Dst, 9821);
1580 } 1581 }
1581 break; 1582 break;
1582 default: 1583 default:
1583 dasm_put(Dst, 9819, LJ_TISNUM, LJ_TISNUM); 1584 dasm_put(Dst, 9830, LJ_TISNUM, LJ_TISNUM);
1584 if (sse) { 1585 if (sse) {
1585 dasm_put(Dst, 9841); 1586 dasm_put(Dst, 9852);
1586 } else { 1587 } else {
1587 dasm_put(Dst, 9855); 1588 dasm_put(Dst, 9866);
1588 } 1589 }
1589 break; 1590 break;
1590 } 1591 }
1591 if (sse) { 1592 if (sse) {
1592 dasm_put(Dst, 9621); 1593 dasm_put(Dst, 9632);
1593 } else { 1594 } else {
1594 dasm_put(Dst, 9633); 1595 dasm_put(Dst, 9644);
1595 } 1596 }
1596 dasm_put(Dst, 7283); 1597 dasm_put(Dst, 9206);
1597 break; 1598 break;
1598 case BC_SUBVN: case BC_SUBNV: case BC_SUBVV: 1599 case BC_SUBVN: case BC_SUBNV: case BC_SUBVV:
1599 dasm_put(Dst, 9739); 1600 dasm_put(Dst, 9750);
1600 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1601 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1601 switch (vk) { 1602 switch (vk) {
1602 case 0: 1603 case 0:
1603 dasm_put(Dst, 9747, LJ_TISNUM); 1604 dasm_put(Dst, 9758, LJ_TISNUM);
1604 if (sse) { 1605 if (sse) {
1605 dasm_put(Dst, 9863); 1606 dasm_put(Dst, 9874);
1606 } else { 1607 } else {
1607 dasm_put(Dst, 9878); 1608 dasm_put(Dst, 9889);
1608 } 1609 }
1609 break; 1610 break;
1610 case 1: 1611 case 1:
1611 dasm_put(Dst, 9783, LJ_TISNUM); 1612 dasm_put(Dst, 9794, LJ_TISNUM);
1612 if (sse) { 1613 if (sse) {
1613 dasm_put(Dst, 9887); 1614 dasm_put(Dst, 9898);
1614 } else { 1615 } else {
1615 dasm_put(Dst, 9902); 1616 dasm_put(Dst, 9913);
1616 } 1617 }
1617 break; 1618 break;
1618 default: 1619 default:
1619 dasm_put(Dst, 9819, LJ_TISNUM, LJ_TISNUM); 1620 dasm_put(Dst, 9830, LJ_TISNUM, LJ_TISNUM);
1620 if (sse) { 1621 if (sse) {
1621 dasm_put(Dst, 9911); 1622 dasm_put(Dst, 9922);
1622 } else { 1623 } else {
1623 dasm_put(Dst, 9925); 1624 dasm_put(Dst, 9936);
1624 } 1625 }
1625 break; 1626 break;
1626 } 1627 }
1627 if (sse) { 1628 if (sse) {
1628 dasm_put(Dst, 9621); 1629 dasm_put(Dst, 9632);
1629 } else { 1630 } else {
1630 dasm_put(Dst, 9633); 1631 dasm_put(Dst, 9644);
1631 } 1632 }
1632 dasm_put(Dst, 7283); 1633 dasm_put(Dst, 9206);
1633 break; 1634 break;
1634 case BC_MULVN: case BC_MULNV: case BC_MULVV: 1635 case BC_MULVN: case BC_MULNV: case BC_MULVV:
1635 dasm_put(Dst, 9739); 1636 dasm_put(Dst, 9750);
1636 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1637 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1637 switch (vk) { 1638 switch (vk) {
1638 case 0: 1639 case 0:
1639 dasm_put(Dst, 9747, LJ_TISNUM); 1640 dasm_put(Dst, 9758, LJ_TISNUM);
1640 if (sse) { 1641 if (sse) {
1641 dasm_put(Dst, 9933); 1642 dasm_put(Dst, 9944);
1642 } else { 1643 } else {
1643 dasm_put(Dst, 9948); 1644 dasm_put(Dst, 9959);
1644 } 1645 }
1645 break; 1646 break;
1646 case 1: 1647 case 1:
1647 dasm_put(Dst, 9783, LJ_TISNUM); 1648 dasm_put(Dst, 9794, LJ_TISNUM);
1648 if (sse) { 1649 if (sse) {
1649 dasm_put(Dst, 9957); 1650 dasm_put(Dst, 9968);
1650 } else { 1651 } else {
1651 dasm_put(Dst, 9972); 1652 dasm_put(Dst, 9983);
1652 } 1653 }
1653 break; 1654 break;
1654 default: 1655 default:
1655 dasm_put(Dst, 9819, LJ_TISNUM, LJ_TISNUM); 1656 dasm_put(Dst, 9830, LJ_TISNUM, LJ_TISNUM);
1656 if (sse) { 1657 if (sse) {
1657 dasm_put(Dst, 9981); 1658 dasm_put(Dst, 9992);
1658 } else { 1659 } else {
1659 dasm_put(Dst, 9995); 1660 dasm_put(Dst, 10006);
1660 } 1661 }
1661 break; 1662 break;
1662 } 1663 }
1663 if (sse) { 1664 if (sse) {
1664 dasm_put(Dst, 9621); 1665 dasm_put(Dst, 9632);
1665 } else { 1666 } else {
1666 dasm_put(Dst, 9633); 1667 dasm_put(Dst, 9644);
1667 } 1668 }
1668 dasm_put(Dst, 7283); 1669 dasm_put(Dst, 9206);
1669 break; 1670 break;
1670 case BC_DIVVN: case BC_DIVNV: case BC_DIVVV: 1671 case BC_DIVVN: case BC_DIVNV: case BC_DIVVV:
1671 dasm_put(Dst, 9739); 1672 dasm_put(Dst, 9750);
1672 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1673 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1673 switch (vk) { 1674 switch (vk) {
1674 case 0: 1675 case 0:
1675 dasm_put(Dst, 9747, LJ_TISNUM); 1676 dasm_put(Dst, 9758, LJ_TISNUM);
1676 if (sse) { 1677 if (sse) {
1677 dasm_put(Dst, 10003); 1678 dasm_put(Dst, 10014);
1678 } else { 1679 } else {
1679 dasm_put(Dst, 10018); 1680 dasm_put(Dst, 10029);
1680 } 1681 }
1681 break; 1682 break;
1682 case 1: 1683 case 1:
1683 dasm_put(Dst, 9783, LJ_TISNUM); 1684 dasm_put(Dst, 9794, LJ_TISNUM);
1684 if (sse) { 1685 if (sse) {
1685 dasm_put(Dst, 10027); 1686 dasm_put(Dst, 10038);
1686 } else { 1687 } else {
1687 dasm_put(Dst, 10042); 1688 dasm_put(Dst, 10053);
1688 } 1689 }
1689 break; 1690 break;
1690 default: 1691 default:
1691 dasm_put(Dst, 9819, LJ_TISNUM, LJ_TISNUM); 1692 dasm_put(Dst, 9830, LJ_TISNUM, LJ_TISNUM);
1692 if (sse) { 1693 if (sse) {
1693 dasm_put(Dst, 10051); 1694 dasm_put(Dst, 10062);
1694 } else { 1695 } else {
1695 dasm_put(Dst, 10065); 1696 dasm_put(Dst, 10076);
1696 } 1697 }
1697 break; 1698 break;
1698 } 1699 }
1699 if (sse) { 1700 if (sse) {
1700 dasm_put(Dst, 9621); 1701 dasm_put(Dst, 9632);
1701 } else { 1702 } else {
1702 dasm_put(Dst, 9633); 1703 dasm_put(Dst, 9644);
1703 } 1704 }
1704 dasm_put(Dst, 7283); 1705 dasm_put(Dst, 9206);
1705 break; 1706 break;
1706 case BC_MODVN: 1707 case BC_MODVN:
1707 dasm_put(Dst, 9739); 1708 dasm_put(Dst, 9750);
1708 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1709 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1709 switch (vk) { 1710 switch (vk) {
1710 case 0: 1711 case 0:
1711 dasm_put(Dst, 9747, LJ_TISNUM); 1712 dasm_put(Dst, 9758, LJ_TISNUM);
1712 if (sse) { 1713 if (sse) {
1713 dasm_put(Dst, 10073); 1714 dasm_put(Dst, 10084);
1714 } else { 1715 } else {
1715 dasm_put(Dst, 10088); 1716 dasm_put(Dst, 10099);
1716 } 1717 }
1717 break; 1718 break;
1718 case 1: 1719 case 1:
1719 dasm_put(Dst, 9783, LJ_TISNUM); 1720 dasm_put(Dst, 9794, LJ_TISNUM);
1720 if (sse) { 1721 if (sse) {
1721 dasm_put(Dst, 10097); 1722 dasm_put(Dst, 10108);
1722 } else { 1723 } else {
1723 dasm_put(Dst, 10112); 1724 dasm_put(Dst, 10123);
1724 } 1725 }
1725 break; 1726 break;
1726 default: 1727 default:
1727 dasm_put(Dst, 9819, LJ_TISNUM, LJ_TISNUM); 1728 dasm_put(Dst, 9830, LJ_TISNUM, LJ_TISNUM);
1728 if (sse) { 1729 if (sse) {
1729 dasm_put(Dst, 10121); 1730 dasm_put(Dst, 10132);
1730 } else { 1731 } else {
1731 dasm_put(Dst, 10135); 1732 dasm_put(Dst, 10146);
1732 } 1733 }
1733 break; 1734 break;
1734 } 1735 }
1735 dasm_put(Dst, 10143); 1736 dasm_put(Dst, 10154);
1736 if (sse) { 1737 if (sse) {
1737 dasm_put(Dst, 9621); 1738 dasm_put(Dst, 9632);
1738 } else { 1739 } else {
1739 dasm_put(Dst, 9633); 1740 dasm_put(Dst, 9644);
1740 } 1741 }
1741 dasm_put(Dst, 7283); 1742 dasm_put(Dst, 9206);
1742 break; 1743 break;
1743 case BC_MODNV: case BC_MODVV: 1744 case BC_MODNV: case BC_MODVV:
1744 dasm_put(Dst, 9739); 1745 dasm_put(Dst, 9750);
1745 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1746 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1746 switch (vk) { 1747 switch (vk) {
1747 case 0: 1748 case 0:
1748 dasm_put(Dst, 9747, LJ_TISNUM); 1749 dasm_put(Dst, 9758, LJ_TISNUM);
1749 if (sse) { 1750 if (sse) {
1750 dasm_put(Dst, 10073); 1751 dasm_put(Dst, 10084);
1751 } else { 1752 } else {
1752 dasm_put(Dst, 10088); 1753 dasm_put(Dst, 10099);
1753 } 1754 }
1754 break; 1755 break;
1755 case 1: 1756 case 1:
1756 dasm_put(Dst, 9783, LJ_TISNUM); 1757 dasm_put(Dst, 9794, LJ_TISNUM);
1757 if (sse) { 1758 if (sse) {
1758 dasm_put(Dst, 10097); 1759 dasm_put(Dst, 10108);
1759 } else { 1760 } else {
1760 dasm_put(Dst, 10112); 1761 dasm_put(Dst, 10123);
1761 } 1762 }
1762 break; 1763 break;
1763 default: 1764 default:
1764 dasm_put(Dst, 9819, LJ_TISNUM, LJ_TISNUM); 1765 dasm_put(Dst, 9830, LJ_TISNUM, LJ_TISNUM);
1765 if (sse) { 1766 if (sse) {
1766 dasm_put(Dst, 10121); 1767 dasm_put(Dst, 10132);
1767 } else { 1768 } else {
1768 dasm_put(Dst, 10135); 1769 dasm_put(Dst, 10146);
1769 } 1770 }
1770 break; 1771 break;
1771 } 1772 }
1772 dasm_put(Dst, 10149); 1773 dasm_put(Dst, 10160);
1773 break; 1774 break;
1774 case BC_POW: 1775 case BC_POW:
1775 dasm_put(Dst, 9739); 1776 dasm_put(Dst, 9750);
1776 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1777 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1777 switch (vk) { 1778 switch (vk) {
1778 case 0: 1779 case 0:
1779 dasm_put(Dst, 9747, LJ_TISNUM); 1780 dasm_put(Dst, 9758, LJ_TISNUM);
1780 if (sse) { 1781 if (sse) {
1781 dasm_put(Dst, 10073); 1782 dasm_put(Dst, 10084);
1782 } else { 1783 } else {
1783 dasm_put(Dst, 10088); 1784 dasm_put(Dst, 10099);
1784 } 1785 }
1785 break; 1786 break;
1786 case 1: 1787 case 1:
1787 dasm_put(Dst, 9783, LJ_TISNUM); 1788 dasm_put(Dst, 9794, LJ_TISNUM);
1788 if (sse) { 1789 if (sse) {
1789 dasm_put(Dst, 10097); 1790 dasm_put(Dst, 10108);
1790 } else { 1791 } else {
1791 dasm_put(Dst, 10112); 1792 dasm_put(Dst, 10123);
1792 } 1793 }
1793 break; 1794 break;
1794 default: 1795 default:
1795 dasm_put(Dst, 9819, LJ_TISNUM, LJ_TISNUM); 1796 dasm_put(Dst, 9830, LJ_TISNUM, LJ_TISNUM);
1796 if (sse) { 1797 if (sse) {
1797 dasm_put(Dst, 10121); 1798 dasm_put(Dst, 10132);
1798 } else { 1799 } else {
1799 dasm_put(Dst, 10135); 1800 dasm_put(Dst, 10146);
1800 } 1801 }
1801 break; 1802 break;
1802 } 1803 }
1803 dasm_put(Dst, 10154); 1804 dasm_put(Dst, 10165);
1804 if (sse) { 1805 if (sse) {
1805 dasm_put(Dst, 9621); 1806 dasm_put(Dst, 9632);
1806 } else { 1807 } else {
1807 dasm_put(Dst, 9633); 1808 dasm_put(Dst, 9644);
1808 } 1809 }
1809 dasm_put(Dst, 7283); 1810 dasm_put(Dst, 9206);
1810 break; 1811 break;
1811 1812
1812 case BC_CAT: 1813 case BC_CAT:
1813 dasm_put(Dst, 10158, Dt1(->base), Dt1(->base)); 1814 dasm_put(Dst, 10169, Dt1(->base), Dt1(->base));
1814 break; 1815 break;
1815 1816
1816 /* -- Constant ops ------------------------------------------------------ */ 1817 /* -- Constant ops ------------------------------------------------------ */
1817 1818
1818 case BC_KSTR: 1819 case BC_KSTR:
1819 dasm_put(Dst, 10249, LJ_TSTR); 1820 dasm_put(Dst, 10260, LJ_TSTR);
1820 break; 1821 break;
1821 case BC_KSHORT: 1822 case BC_KSHORT:
1822 if (sse) { 1823 if (sse) {
1823 dasm_put(Dst, 10286); 1824 dasm_put(Dst, 10297);
1824 } else { 1825 } else {
1825 dasm_put(Dst, 10301); 1826 dasm_put(Dst, 10312);
1826 } 1827 }
1827 dasm_put(Dst, 7283); 1828 dasm_put(Dst, 9206);
1828 break; 1829 break;
1829 case BC_KNUM: 1830 case BC_KNUM:
1830 if (sse) { 1831 if (sse) {
1831 dasm_put(Dst, 10309); 1832 dasm_put(Dst, 10320);
1832 } else { 1833 } else {
1833 dasm_put(Dst, 10323); 1834 dasm_put(Dst, 10334);
1834 } 1835 }
1835 dasm_put(Dst, 7283); 1836 dasm_put(Dst, 9206);
1836 break; 1837 break;
1837 case BC_KPRI: 1838 case BC_KPRI:
1838 dasm_put(Dst, 10331); 1839 dasm_put(Dst, 10342);
1839 break; 1840 break;
1840 case BC_KNIL: 1841 case BC_KNIL:
1841 dasm_put(Dst, 10360, LJ_TNIL); 1842 dasm_put(Dst, 10371, LJ_TNIL);
1842 break; 1843 break;
1843 1844
1844 /* -- Upvalue and function ops ------------------------------------------ */ 1845 /* -- Upvalue and function ops ------------------------------------------ */
1845 1846
1846 case BC_UGET: 1847 case BC_UGET:
1847 dasm_put(Dst, 10408, offsetof(GCfuncL, uvptr), DtA(->v)); 1848 dasm_put(Dst, 10419, offsetof(GCfuncL, uvptr), DtA(->v));
1848 break; 1849 break;
1849 case BC_USETV: 1850 case BC_USETV:
1850#define TV2MARKOFS \ 1851#define TV2MARKOFS \
1851 ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv)) 1852 ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv))
1852 dasm_put(Dst, 10454, 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); 1853 dasm_put(Dst, 10465, 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);
1853 dasm_put(Dst, 10550); 1854 dasm_put(Dst, 10561);
1854 break; 1855 break;
1855#undef TV2MARKOFS 1856#undef TV2MARKOFS
1856 case BC_USETS: 1857 case BC_USETS:
1857 dasm_put(Dst, 10562, offsetof(GCfuncL, uvptr), DtA(->v), LJ_TSTR, DtA(->marked), LJ_GC_BLACK, Dt4(->gch.marked), LJ_GC_WHITES, DtA(->closed), GG_DISP2G); 1858 dasm_put(Dst, 10573, offsetof(GCfuncL, uvptr), DtA(->v), LJ_TSTR, DtA(->marked), LJ_GC_BLACK, Dt4(->gch.marked), LJ_GC_WHITES, DtA(->closed), GG_DISP2G);
1858 break; 1859 break;
1859 case BC_USETN: 1860 case BC_USETN:
1860 dasm_put(Dst, 10658); 1861 dasm_put(Dst, 10669);
1861 if (sse) { 1862 if (sse) {
1862 dasm_put(Dst, 10663); 1863 dasm_put(Dst, 10674);
1863 } else { 1864 } else {
1864 dasm_put(Dst, 9437); 1865 dasm_put(Dst, 9448);
1865 } 1866 }
1866 dasm_put(Dst, 10671, offsetof(GCfuncL, uvptr), DtA(->v)); 1867 dasm_put(Dst, 10682, offsetof(GCfuncL, uvptr), DtA(->v));
1867 if (sse) { 1868 if (sse) {
1868 dasm_put(Dst, 10680); 1869 dasm_put(Dst, 10691);
1869 } else { 1870 } else {
1870 dasm_put(Dst, 10686); 1871 dasm_put(Dst, 10697);
1871 } 1872 }
1872 dasm_put(Dst, 7283); 1873 dasm_put(Dst, 9206);
1873 break; 1874 break;
1874 case BC_USETP: 1875 case BC_USETP:
1875 dasm_put(Dst, 10689, offsetof(GCfuncL, uvptr), DtA(->v)); 1876 dasm_put(Dst, 10700, offsetof(GCfuncL, uvptr), DtA(->v));
1876 break; 1877 break;
1877 case BC_UCLO: 1878 case BC_UCLO:
1878 dasm_put(Dst, 10729, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); 1879 dasm_put(Dst, 10740, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base));
1879 break; 1880 break;
1880 1881
1881 case BC_FNEW: 1882 case BC_FNEW:
1882 dasm_put(Dst, 10785, Dt1(->base), Dt1(->base), LJ_TFUNC); 1883 dasm_put(Dst, 10796, Dt1(->base), Dt1(->base), LJ_TFUNC);
1883 break; 1884 break;
1884 1885
1885 /* -- Table ops --------------------------------------------------------- */ 1886 /* -- Table ops --------------------------------------------------------- */
1886 1887
1887 case BC_TNEW: 1888 case BC_TNEW:
1888 dasm_put(Dst, 10852, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); 1889 dasm_put(Dst, 10863, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB);
1889 break; 1890 break;
1890 case BC_TDUP: 1891 case BC_TDUP:
1891 dasm_put(Dst, 10976, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); 1892 dasm_put(Dst, 10987, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB);
1892 break; 1893 break;
1893 1894
1894 case BC_GGET: 1895 case BC_GGET:
1895 dasm_put(Dst, 11075, Dt7(->env)); 1896 dasm_put(Dst, 11086, Dt7(->env));
1896 break; 1897 break;
1897 case BC_GSET: 1898 case BC_GSET:
1898 dasm_put(Dst, 11095, Dt7(->env)); 1899 dasm_put(Dst, 11106, Dt7(->env));
1899 break; 1900 break;
1900 1901
1901 case BC_TGETV: 1902 case BC_TGETV:
1902 dasm_put(Dst, 11115, LJ_TTAB, LJ_TISNUM); 1903 dasm_put(Dst, 11126, LJ_TTAB, LJ_TISNUM);
1903 if (sse) { 1904 if (sse) {
1904 dasm_put(Dst, 11148); 1905 dasm_put(Dst, 11159);
1905 } else { 1906 } else {
1906 } 1907 }
1907 dasm_put(Dst, 11169, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index); 1908 dasm_put(Dst, 11180, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
1908 dasm_put(Dst, 11263, LJ_TSTR); 1909 dasm_put(Dst, 11274, LJ_TSTR);
1909 break; 1910 break;
1910 case BC_TGETS: 1911 case BC_TGETS:
1911 dasm_put(Dst, 11281, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); 1912 dasm_put(Dst, 11292, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL);
1912 dasm_put(Dst, 11367, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<<MM_index); 1913 dasm_put(Dst, 11378, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
1913 break; 1914 break;
1914 case BC_TGETB: 1915 case BC_TGETB:
1915 dasm_put(Dst, 11440, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index); 1916 dasm_put(Dst, 11451, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
1916 dasm_put(Dst, 9729); 1917 dasm_put(Dst, 9740);
1917 break; 1918 break;
1918 1919
1919 case BC_TSETV: 1920 case BC_TSETV:
1920 dasm_put(Dst, 11541, LJ_TTAB, LJ_TISNUM); 1921 dasm_put(Dst, 11552, LJ_TTAB, LJ_TISNUM);
1921 if (sse) { 1922 if (sse) {
1922 dasm_put(Dst, 11148); 1923 dasm_put(Dst, 11159);
1923 } else { 1924 } else {
1924 } 1925 }
1925 dasm_put(Dst, 11574, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable)); 1926 dasm_put(Dst, 11585, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable));
1926 dasm_put(Dst, 11659, Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); 1927 dasm_put(Dst, 11670, Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
1927 break; 1928 break;
1928 case BC_TSETS: 1929 case BC_TSETS:
1929 dasm_put(Dst, 11723, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->nomm), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); 1930 dasm_put(Dst, 11734, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->nomm), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL);
1930 dasm_put(Dst, 11800, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, DtB(->next)); 1931 dasm_put(Dst, 11811, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, DtB(->next));
1931 dasm_put(Dst, 11892, 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)); 1932 dasm_put(Dst, 11903, 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));
1932 break; 1933 break;
1933 case BC_TSETB: 1934 case BC_TSETB:
1934 dasm_put(Dst, 11984, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); 1935 dasm_put(Dst, 11995, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable));
1935 dasm_put(Dst, 12084, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); 1936 dasm_put(Dst, 12095, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
1936 break; 1937 break;
1937 1938
1938 case BC_TSETM: 1939 case BC_TSETM:
1939 dasm_put(Dst, 12132); 1940 dasm_put(Dst, 12143);
1940 if (sse) { 1941 if (sse) {
1941 dasm_put(Dst, 10663); 1942 dasm_put(Dst, 10674);
1942 } else { 1943 } else {
1943 } 1944 }
1944 dasm_put(Dst, 12137, Dt6(->marked), LJ_GC_BLACK); 1945 dasm_put(Dst, 12148, Dt6(->marked), LJ_GC_BLACK);
1945 if (sse) { 1946 if (sse) {
1946 dasm_put(Dst, 12162); 1947 dasm_put(Dst, 12173);
1947 } else { 1948 } else {
1948 } 1949 }
1949 dasm_put(Dst, 12170, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain)); 1950 dasm_put(Dst, 12181, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain));
1950 dasm_put(Dst, 12306, Dt6(->gclist)); 1951 dasm_put(Dst, 12317, Dt6(->gclist));
1951 break; 1952 break;
1952 1953
1953 /* -- Calls and vararg handling ----------------------------------------- */ 1954 /* -- Calls and vararg handling ----------------------------------------- */
1954 1955
1955 case BC_CALL: case BC_CALLM: 1956 case BC_CALL: case BC_CALLM:
1956 dasm_put(Dst, 9743); 1957 dasm_put(Dst, 9754);
1957 if (op == BC_CALLM) { 1958 if (op == BC_CALLM) {
1958 dasm_put(Dst, 12314); 1959 dasm_put(Dst, 12325);
1959 } 1960 }
1960 dasm_put(Dst, 12319, LJ_TFUNC, Dt7(->pc)); 1961 dasm_put(Dst, 12330, LJ_TFUNC, Dt7(->pc));
1961 break; 1962 break;
1962 1963
1963 case BC_CALLMT: 1964 case BC_CALLMT:
1964 dasm_put(Dst, 12314); 1965 dasm_put(Dst, 12325);
1965 break; 1966 break;
1966 case BC_CALLT: 1967 case BC_CALLT:
1967 dasm_put(Dst, 12362, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); 1968 dasm_put(Dst, 12373, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc));
1968 dasm_put(Dst, 12486, FRAME_TYPE, Dt7(->pc), PC2PROTO(k)); 1969 dasm_put(Dst, 12497, FRAME_TYPE, Dt7(->pc), PC2PROTO(k));
1969 break; 1970 break;
1970 1971
1971 case BC_ITERC: 1972 case BC_ITERC:
1972 dasm_put(Dst, 12547, LJ_TFUNC, 2+1, Dt7(->pc)); 1973 dasm_put(Dst, 12558, LJ_TFUNC, 2+1, Dt7(->pc));
1973 break; 1974 break;
1974 1975
1975 case BC_VARG: 1976 case BC_VARG:
1976 dasm_put(Dst, 12629, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL); 1977 dasm_put(Dst, 12640, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL);
1977 dasm_put(Dst, 12783, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); 1978 dasm_put(Dst, 12794, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top));
1978 break; 1979 break;
1979 1980
1980 /* -- Returns ----------------------------------------------------------- */ 1981 /* -- Returns ----------------------------------------------------------- */
1981 1982
1982 case BC_RETM: 1983 case BC_RETM:
1983 dasm_put(Dst, 12314); 1984 dasm_put(Dst, 12325);
1984 break; 1985 break;
1985 1986
1986 case BC_RET: case BC_RET0: case BC_RET1: 1987 case BC_RET: case BC_RET0: case BC_RET1:
1987 if (op != BC_RET0) { 1988 if (op != BC_RET0) {
1988 dasm_put(Dst, 12888); 1989 dasm_put(Dst, 12899);
1989 } 1990 }
1990 dasm_put(Dst, 12892, FRAME_TYPE); 1991 dasm_put(Dst, 12903, FRAME_TYPE);
1991 switch (op) { 1992 switch (op) {
1992 case BC_RET: 1993 case BC_RET:
1993 dasm_put(Dst, 12911); 1994 dasm_put(Dst, 12922);
1994 break; 1995 break;
1995 case BC_RET1: 1996 case BC_RET1:
1996 dasm_put(Dst, 12975); 1997 dasm_put(Dst, 12986);
1997 /* fallthrough */ 1998 /* fallthrough */
1998 case BC_RET0: 1999 case BC_RET0:
1999 dasm_put(Dst, 12991); 2000 dasm_put(Dst, 13002);
2000 default: 2001 default:
2001 break; 2002 break;
2002 } 2003 }
2003 dasm_put(Dst, 13002, Dt7(->pc), PC2PROTO(k)); 2004 dasm_put(Dst, 13013, Dt7(->pc), PC2PROTO(k));
2004 if (op == BC_RET) { 2005 if (op == BC_RET) {
2005 dasm_put(Dst, 13050, LJ_TNIL);
2006 } else {
2007 dasm_put(Dst, 13061, LJ_TNIL); 2006 dasm_put(Dst, 13061, LJ_TNIL);
2007 } else {
2008 dasm_put(Dst, 13072, LJ_TNIL);
2008 } 2009 }
2009 dasm_put(Dst, 13068); 2010 dasm_put(Dst, 13079);
2010 if (op != BC_RET0) { 2011 if (op != BC_RET0) {
2011 dasm_put(Dst, 13088); 2012 dasm_put(Dst, 13099);
2012 } 2013 }
2013 dasm_put(Dst, 4568); 2014 dasm_put(Dst, 4568);
2014 break; 2015 break;
@@ -2018,7 +2019,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
2018 2019
2019 case BC_FORL: 2020 case BC_FORL:
2020#if LJ_HASJIT 2021#if LJ_HASJIT
2021 dasm_put(Dst, 13091, HOTCOUNT_PCMASK, GG_DISP2HOT); 2022 dasm_put(Dst, 13102, HOTCOUNT_PCMASK, GG_DISP2HOT);
2022#endif 2023#endif
2023 break; 2024 break;
2024 2025
@@ -2030,57 +2031,57 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
2030 case BC_FORI: 2031 case BC_FORI:
2031 case BC_IFORL: 2032 case BC_IFORL:
2032 vk = (op == BC_IFORL || op == BC_JFORL); 2033 vk = (op == BC_IFORL || op == BC_JFORL);
2033 dasm_put(Dst, 13112); 2034 dasm_put(Dst, 13123);
2034 if (!vk) { 2035 if (!vk) {
2035 dasm_put(Dst, 13116, LJ_TISNUM, LJ_TISNUM); 2036 dasm_put(Dst, 13127, LJ_TISNUM, LJ_TISNUM);
2036 } 2037 }
2037 dasm_put(Dst, 13135); 2038 dasm_put(Dst, 13146);
2038 if (!vk) { 2039 if (!vk) {
2039 dasm_put(Dst, 13139, LJ_TISNUM); 2040 dasm_put(Dst, 13150, LJ_TISNUM);
2040 } 2041 }
2041 if (sse) { 2042 if (sse) {
2042 dasm_put(Dst, 13148); 2043 dasm_put(Dst, 13159);
2043 if (vk) { 2044 if (vk) {
2044 dasm_put(Dst, 13160); 2045 dasm_put(Dst, 13171);
2045 } else { 2046 } else {
2046 dasm_put(Dst, 13179); 2047 dasm_put(Dst, 13190);
2047 } 2048 }
2048 dasm_put(Dst, 13184); 2049 dasm_put(Dst, 13195);
2049 } else { 2050 } else {
2050 dasm_put(Dst, 13197); 2051 dasm_put(Dst, 13208);
2051 if (vk) { 2052 if (vk) {
2052 dasm_put(Dst, 13203); 2053 dasm_put(Dst, 13214);
2053 } else { 2054 } else {
2054 dasm_put(Dst, 13219); 2055 dasm_put(Dst, 13230);
2055 } 2056 }
2056 dasm_put(Dst, 13227); 2057 dasm_put(Dst, 13238);
2057 if (cmov) { 2058 if (cmov) {
2058 dasm_put(Dst, 9158); 2059 dasm_put(Dst, 9169);
2059 } else { 2060 } else {
2060 dasm_put(Dst, 9164); 2061 dasm_put(Dst, 9175);
2061 } 2062 }
2062 if (!cmov) { 2063 if (!cmov) {
2063 dasm_put(Dst, 13232); 2064 dasm_put(Dst, 13243);
2064 } 2065 }
2065 } 2066 }
2066 if (op == BC_FORI) { 2067 if (op == BC_FORI) {
2067 dasm_put(Dst, 13238, -BCBIAS_J*4); 2068 dasm_put(Dst, 13249, -BCBIAS_J*4);
2068 } else if (op == BC_JFORI) { 2069 } else if (op == BC_JFORI) {
2069 dasm_put(Dst, 13248, -BCBIAS_J*4, BC_JLOOP); 2070 dasm_put(Dst, 13259, -BCBIAS_J*4, BC_JLOOP);
2070 } else if (op == BC_IFORL) { 2071 } else if (op == BC_IFORL) {
2071 dasm_put(Dst, 13262, -BCBIAS_J*4); 2072 dasm_put(Dst, 13273, -BCBIAS_J*4);
2072 } else { 2073 } else {
2073 dasm_put(Dst, 13258, BC_JLOOP); 2074 dasm_put(Dst, 13269, BC_JLOOP);
2074 } 2075 }
2075 dasm_put(Dst, 9193); 2076 dasm_put(Dst, 9204);
2076 if (sse) { 2077 if (sse) {
2077 dasm_put(Dst, 13272); 2078 dasm_put(Dst, 13283);
2078 } 2079 }
2079 break; 2080 break;
2080 2081
2081 case BC_ITERL: 2082 case BC_ITERL:
2082#if LJ_HASJIT 2083#if LJ_HASJIT
2083 dasm_put(Dst, 13091, HOTCOUNT_PCMASK, GG_DISP2HOT); 2084 dasm_put(Dst, 13102, HOTCOUNT_PCMASK, GG_DISP2HOT);
2084#endif 2085#endif
2085 break; 2086 break;
2086 2087
@@ -2089,33 +2090,33 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
2089 break; 2090 break;
2090#endif 2091#endif
2091 case BC_IITERL: 2092 case BC_IITERL:
2092 dasm_put(Dst, 13283, LJ_TNIL); 2093 dasm_put(Dst, 13294, LJ_TNIL);
2093 if (op == BC_JITERL) { 2094 if (op == BC_JITERL) {
2094 dasm_put(Dst, 13298, BC_JLOOP); 2095 dasm_put(Dst, 13309, BC_JLOOP);
2095 } else { 2096 } else {
2096 dasm_put(Dst, 13312, -BCBIAS_J*4); 2097 dasm_put(Dst, 13323, -BCBIAS_J*4);
2097 } 2098 }
2098 dasm_put(Dst, 9497); 2099 dasm_put(Dst, 9508);
2099 break; 2100 break;
2100 2101
2101 case BC_LOOP: 2102 case BC_LOOP:
2102#if LJ_HASJIT 2103#if LJ_HASJIT
2103 dasm_put(Dst, 13091, HOTCOUNT_PCMASK, GG_DISP2HOT); 2104 dasm_put(Dst, 13102, HOTCOUNT_PCMASK, GG_DISP2HOT);
2104#endif 2105#endif
2105 break; 2106 break;
2106 2107
2107 case BC_ILOOP: 2108 case BC_ILOOP:
2108 dasm_put(Dst, 7283); 2109 dasm_put(Dst, 9206);
2109 break; 2110 break;
2110 2111
2111 case BC_JLOOP: 2112 case BC_JLOOP:
2112#if LJ_HASJIT 2113#if LJ_HASJIT
2113 dasm_put(Dst, 13328, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); 2114 dasm_put(Dst, 13339, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L));
2114#endif 2115#endif
2115 break; 2116 break;
2116 2117
2117 case BC_JMP: 2118 case BC_JMP:
2118 dasm_put(Dst, 13355, -BCBIAS_J*4); 2119 dasm_put(Dst, 13366, -BCBIAS_J*4);
2119 break; 2120 break;
2120 2121
2121 /* -- Function headers -------------------------------------------------- */ 2122 /* -- Function headers -------------------------------------------------- */
@@ -2138,13 +2139,13 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
2138 break; 2139 break;
2139#endif 2140#endif
2140 case BC_IFUNCF: 2141 case BC_IFUNCF:
2141 dasm_put(Dst, 13381, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); 2142 dasm_put(Dst, 13392, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams));
2142 if (op == BC_JFUNCF) { 2143 if (op == BC_JFUNCF) {
2143 dasm_put(Dst, 13412, BC_JLOOP); 2144 dasm_put(Dst, 13423, BC_JLOOP);
2144 } else { 2145 } else {
2145 dasm_put(Dst, 7283); 2146 dasm_put(Dst, 9206);
2146 } 2147 }
2147 dasm_put(Dst, 13421, LJ_TNIL); 2148 dasm_put(Dst, 13432, LJ_TNIL);
2148 break; 2149 break;
2149 2150
2150 case BC_JFUNCV: 2151 case BC_JFUNCV:
@@ -2155,30 +2156,30 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
2155 break; /* NYI: compiled vararg functions. */ 2156 break; /* NYI: compiled vararg functions. */
2156 2157
2157 case BC_IFUNCV: 2158 case BC_IFUNCV:
2158 dasm_put(Dst, 13443, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); 2159 dasm_put(Dst, 13454, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL);
2159 if (op == BC_JFUNCV) { 2160 if (op == BC_JFUNCV) {
2160 dasm_put(Dst, 13412, BC_JLOOP); 2161 dasm_put(Dst, 13423, BC_JLOOP);
2161 } else { 2162 } else {
2162 dasm_put(Dst, 13540, -4+PC2PROTO(k)); 2163 dasm_put(Dst, 13551, -4+PC2PROTO(k));
2163 } 2164 }
2164 dasm_put(Dst, 13565, LJ_TNIL); 2165 dasm_put(Dst, 13576, LJ_TNIL);
2165 break; 2166 break;
2166 2167
2167 case BC_FUNCC: 2168 case BC_FUNCC:
2168 case BC_FUNCCW: 2169 case BC_FUNCCW:
2169 dasm_put(Dst, 13587, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); 2170 dasm_put(Dst, 13598, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top));
2170 if (op == BC_FUNCC) { 2171 if (op == BC_FUNCC) {
2171 dasm_put(Dst, 13617); 2172 dasm_put(Dst, 13628);
2172 } else { 2173 } else {
2173 dasm_put(Dst, 13621); 2174 dasm_put(Dst, 13632);
2174 } 2175 }
2175 dasm_put(Dst, 13629, DISPATCH_GL(vmstate), ~LJ_VMST_C); 2176 dasm_put(Dst, 13640, DISPATCH_GL(vmstate), ~LJ_VMST_C);
2176 if (op == BC_FUNCC) { 2177 if (op == BC_FUNCC) {
2177 dasm_put(Dst, 13639); 2178 dasm_put(Dst, 13650);
2178 } else { 2179 } else {
2179 dasm_put(Dst, 13644, DISPATCH_GL(wrapf)); 2180 dasm_put(Dst, 13655, DISPATCH_GL(wrapf));
2180 } 2181 }
2181 dasm_put(Dst, 13650, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); 2182 dasm_put(Dst, 13661, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top));
2182 break; 2183 break;
2183 2184
2184 /* ---------------------------------------------------------------------- */ 2185 /* ---------------------------------------------------------------------- */
@@ -2206,7 +2207,7 @@ static int build_backend(BuildCtx *ctx)
2206 2207
2207 build_subroutines(ctx, cmov, sse); 2208 build_subroutines(ctx, cmov, sse);
2208 2209
2209 dasm_put(Dst, 13676); 2210 dasm_put(Dst, 13687);
2210 for (op = 0; op < BC__MAX; op++) 2211 for (op = 0; op < BC__MAX; op++)
2211 build_ins(ctx, (BCOp)op, op, cmov, sse); 2212 build_ins(ctx, (BCOp)op, op, cmov, sse);
2212 2213
diff --git a/src/buildvm_x64win.h b/src/buildvm_x64win.h
index 742cf19b..362d993f 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[13490] = { 15static const unsigned char build_actionlist[13501] = {
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,
@@ -366,308 +366,309 @@ static const unsigned char build_actionlist[13490] = {
366 133,233,41,208,72,137,205,15,182,78,252,253,193,232,3,131,192,1,252,255,229, 366 133,233,41,208,72,137,205,15,182,78,252,253,193,232,3,131,192,1,252,255,229,
367 248,143,255,248,144,255,139,122,252,248,139,191,233,139,191,233,199,131,233, 367 248,143,255,248,144,255,139,122,252,248,139,191,233,139,191,233,199,131,233,
368 0,0,0,0,199,131,233,237,139,6,15,182,204,15,182,232,131,198,4,193,232,16, 368 0,0,0,0,199,131,233,237,139,6,15,182,204,15,182,232,131,198,4,193,232,16,
369 252,255,36,252,235,255,248,82,255,217,124,36,4,137,68,36,8,102,184,0,4,102, 369 252,255,36,252,235,248,1,137,252,233,137,194,232,251,1,22,255,248,82,255,
370 11,68,36,4,102,37,252,255,252,247,102,137,68,36,6,217,108,36,6,217,252,252, 370 217,124,36,4,137,68,36,8,102,184,0,4,102,11,68,36,4,102,37,252,255,252,247,
371 217,108,36,4,139,68,36,8,195,255,248,145,72,184,237,237,102,72,15,110,208, 371 102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,139,68,36,8,195,255,
372 72,184,237,237,102,72,15,110,216,15,40,200,102,15,84,202,102,15,46,217,15, 372 248,145,72,184,237,237,102,72,15,110,208,72,184,237,237,102,72,15,110,216,
373 134,244,247,102,15,85,208,252,242,15,88,203,252,242,15,92,203,102,15,86,202, 373 15,40,200,102,15,84,202,102,15,46,217,15,134,244,247,102,15,85,208,252,242,
374 72,184,237,237,102,72,15,110,208,252,242,15,194,193,1,102,15,84,194,252,242, 374 15,88,203,252,242,15,92,203,102,15,86,202,72,184,237,237,102,72,15,110,208,
375 15,92,200,15,40,193,248,1,195,248,84,255,217,124,36,4,137,68,36,8,102,184, 375 252,242,15,194,193,1,102,15,84,194,252,242,15,92,200,15,40,193,248,1,195,
376 0,8,102,11,68,36,4,102,37,252,255,252,251,102,137,68,36,6,217,108,36,6,217, 376 248,84,255,217,124,36,4,137,68,36,8,102,184,0,8,102,11,68,36,4,102,37,252,
377 252,252,217,108,36,4,139,68,36,8,195,255,248,146,72,184,237,237,102,72,15, 377 255,252,251,102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,139,68,
378 110,208,72,184,237,237,102,72,15,110,216,15,40,200,102,15,84,202,102,15,46, 378 36,8,195,255,248,146,72,184,237,237,102,72,15,110,208,72,184,237,237,102,
379 217,15,134,244,247,102,15,85,208,252,242,15,88,203,252,242,15,92,203,102, 379 72,15,110,216,15,40,200,102,15,84,202,102,15,46,217,15,134,244,247,102,15,
380 15,86,202,72,184,237,237,102,72,15,110,208,252,242,15,194,193,6,102,15,84, 380 85,208,252,242,15,88,203,252,242,15,92,203,102,15,86,202,72,184,237,237,102,
381 194,252,242,15,92,200,15,40,193,248,1,195,248,104,255,217,124,36,4,137,68, 381 72,15,110,208,252,242,15,194,193,6,102,15,84,194,252,242,15,92,200,15,40,
382 36,8,102,184,0,12,102,11,68,36,4,102,137,68,36,6,217,108,36,6,217,252,252, 382 193,248,1,195,248,104,255,217,124,36,4,137,68,36,8,102,184,0,12,102,11,68,
383 217,108,36,4,139,68,36,8,195,255,248,147,72,184,237,237,102,72,15,110,208, 383 36,4,102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,139,68,36,8,195,
384 72,184,237,237,102,72,15,110,216,15,40,200,102,15,84,202,102,15,46,217,15, 384 255,248,147,72,184,237,237,102,72,15,110,208,72,184,237,237,102,72,15,110,
385 134,244,247,102,15,85,208,15,40,193,252,242,15,88,203,252,242,15,92,203,72, 385 216,15,40,200,102,15,84,202,102,15,46,217,15,134,244,247,102,15,85,208,15,
386 184,237,237,102,72,15,110,216,252,242,15,194,193,1,102,15,84,195,252,242, 386 40,193,252,242,15,88,203,252,242,15,92,203,72,184,237,237,102,72,15,110,216,
387 15,92,200,102,15,86,202,15,40,193,248,1,195,248,148,255,15,40,232,252,242, 387 252,242,15,194,193,1,102,15,84,195,252,242,15,92,200,102,15,86,202,15,40,
388 15,94,193,72,184,237,237,102,72,15,110,208,72,184,237,237,102,72,15,110,216, 388 193,248,1,195,248,148,255,15,40,232,252,242,15,94,193,72,184,237,237,102,
389 15,40,224,102,15,84,226,102,15,46,220,15,134,244,247,102,15,85,208,252,242, 389 72,15,110,208,72,184,237,237,102,72,15,110,216,15,40,224,102,15,84,226,102,
390 15,88,227,252,242,15,92,227,102,15,86,226,72,184,237,237,102,72,15,110,208, 390 15,46,220,15,134,244,247,102,15,85,208,252,242,15,88,227,252,242,15,92,227,
391 252,242,15,194,196,1,102,15,84,194,252,242,15,92,224,15,40,197,252,242,15, 391 102,15,86,226,72,184,237,237,102,72,15,110,208,252,242,15,194,196,1,102,15,
392 89,204,252,242,15,92,193,195,248,1,252,242,15,89,200,15,40,197,252,242,15, 392 84,194,252,242,15,92,224,15,40,197,252,242,15,89,204,252,242,15,92,193,195,
393 92,193,195,255,217,193,216,252,241,217,124,36,4,102,184,0,4,102,11,68,36, 393 248,1,252,242,15,89,200,15,40,197,252,242,15,92,193,195,255,217,193,216,252,
394 4,102,37,252,255,252,247,102,137,68,36,6,217,108,36,6,217,252,252,217,108, 394 241,217,124,36,4,102,184,0,4,102,11,68,36,4,102,37,252,255,252,247,102,137,
395 36,4,222,201,222,252,233,195,255,248,88,217,252,234,222,201,248,149,217,84, 395 68,36,6,217,108,36,6,217,252,252,217,108,36,4,222,201,222,252,233,195,255,
396 36,8,129,124,36,8,0,0,128,127,15,132,244,247,129,124,36,8,0,0,128,252,255, 396 248,88,217,252,234,222,201,248,149,217,84,36,8,129,124,36,8,0,0,128,127,15,
397 15,132,244,248,248,150,217,192,217,252,252,220,252,233,217,201,217,252,240, 397 132,244,247,129,124,36,8,0,0,128,252,255,15,132,244,248,248,150,217,192,217,
398 217,232,222,193,217,252,253,221,217,248,1,195,248,2,221,216,217,252,238,195, 398 252,252,220,252,233,217,201,217,252,240,217,232,222,193,217,252,253,221,217,
399 255,248,107,255,248,151,252,242,15,45,193,252,242,15,42,208,102,15,46,202, 399 248,1,195,248,2,221,216,217,252,238,195,255,248,107,255,248,151,252,242,15,
400 15,133,244,254,15,138,244,255,248,152,131,252,248,1,15,142,244,252,248,1, 400 45,193,252,242,15,42,208,102,15,46,202,15,133,244,254,15,138,244,255,248,
401 169,1,0,0,0,15,133,244,248,252,242,15,89,192,209,232,252,233,244,1,248,2, 401 152,131,252,248,1,15,142,244,252,248,1,169,1,0,0,0,15,133,244,248,252,242,
402 209,232,15,132,244,251,15,40,200,248,3,252,242,15,89,192,209,232,15,132,244, 402 15,89,192,209,232,252,233,244,1,248,2,209,232,15,132,244,251,15,40,200,248,
403 250,15,131,244,3,255,252,242,15,89,200,252,233,244,3,248,4,252,242,15,89, 403 3,252,242,15,89,192,209,232,15,132,244,250,15,131,244,3,255,252,242,15,89,
404 193,248,5,195,248,6,15,132,244,5,15,130,244,253,80,72,184,237,237,102,72, 404 200,252,233,244,3,248,4,252,242,15,89,193,248,5,195,248,6,15,132,244,5,15,
405 15,110,200,252,242,15,94,200,88,15,40,193,252,247,216,131,252,248,1,15,132, 405 130,244,253,80,72,184,237,237,102,72,15,110,200,252,242,15,94,200,88,15,40,
406 244,5,252,233,244,1,248,7,72,184,237,237,102,72,15,110,192,195,248,8,102, 406 193,252,247,216,131,252,248,1,15,132,244,5,252,233,244,1,248,7,72,184,237,
407 72,15,126,200,72,209,224,72,193,192,12,72,61,252,254,15,0,0,15,132,244,248, 407 237,102,72,15,110,192,195,248,8,102,72,15,126,200,72,209,224,72,193,192,12,
408 255,102,72,15,126,192,72,209,224,15,132,244,250,72,193,192,12,72,61,252,254, 408 72,61,252,254,15,0,0,15,132,244,248,255,102,72,15,126,192,72,209,224,15,132,
409 15,0,0,15,132,244,251,252,242,15,17,76,36,16,252,242,15,17,68,36,8,221,68, 409 244,250,72,193,192,12,72,61,252,254,15,0,0,15,132,244,251,252,242,15,17,76,
410 36,16,221,68,36,8,217,252,241,217,192,217,252,252,220,252,233,217,201,217, 410 36,16,252,242,15,17,68,36,8,221,68,36,16,221,68,36,8,217,252,241,217,192,
411 252,240,217,232,222,193,217,252,253,221,217,221,92,36,8,252,242,15,16,68, 411 217,252,252,220,252,233,217,201,217,252,240,217,232,222,193,217,252,253,221,
412 36,8,195,248,9,72,184,237,237,102,72,15,110,208,102,15,46,194,15,132,244, 412 217,221,92,36,8,252,242,15,16,68,36,8,195,248,9,72,184,237,237,102,72,15,
413 247,15,40,193,248,1,195,248,2,72,184,237,237,102,72,15,110,208,102,15,84, 413 110,208,102,15,46,194,15,132,244,247,15,40,193,248,1,195,248,2,72,184,237,
414 194,72,184,237,237,102,72,15,110,208,102,15,46,194,15,132,244,1,102,15,80, 414 237,102,72,15,110,208,102,15,84,194,72,184,237,237,102,72,15,110,208,102,
415 193,15,87,192,136,196,15,146,208,48,224,15,133,244,1,248,3,72,184,237,237, 415 15,46,194,15,132,244,1,102,15,80,193,15,87,192,136,196,15,146,208,48,224,
416 255,102,72,15,110,192,195,248,4,102,15,80,193,133,192,15,133,244,3,15,87, 416 15,133,244,1,248,3,72,184,237,237,255,102,72,15,110,192,195,248,4,102,15,
417 192,195,248,5,102,15,80,193,133,192,15,132,244,3,15,87,192,195,248,153,255, 417 80,193,133,192,15,133,244,3,15,87,192,195,248,5,102,15,80,193,133,192,15,
418 131,252,250,1,15,130,244,82,15,132,244,84,131,252,250,3,15,130,244,104,15, 418 132,244,3,15,87,192,195,248,153,255,131,252,250,1,15,130,244,82,15,132,244,
419 135,244,248,252,242,15,81,192,195,248,2,252,242,15,17,68,36,8,221,68,36,8, 419 84,131,252,250,3,15,130,244,104,15,135,244,248,252,242,15,81,192,195,248,
420 131,252,250,5,15,135,244,248,88,15,132,244,247,232,244,88,80,252,233,244, 420 2,252,242,15,17,68,36,8,221,68,36,8,131,252,250,5,15,135,244,248,88,15,132,
421 253,248,1,232,244,149,255,80,252,233,244,253,248,2,131,252,250,7,15,132,244, 421 244,247,232,244,88,80,252,233,244,253,248,1,232,244,149,255,80,252,233,244,
422 247,15,135,244,248,217,252,237,217,201,217,252,241,252,233,244,253,248,1, 422 253,248,2,131,252,250,7,15,132,244,247,15,135,244,248,217,252,237,217,201,
423 217,232,217,201,217,252,241,252,233,244,253,248,2,131,252,250,9,15,132,244, 423 217,252,241,252,233,244,253,248,1,217,232,217,201,217,252,241,252,233,244,
424 247,15,135,244,248,217,252,236,217,201,217,252,241,252,233,244,253,248,1, 424 253,248,2,131,252,250,9,15,132,244,247,15,135,244,248,217,252,236,217,201,
425 255,217,252,254,252,233,244,253,248,2,131,252,250,11,15,132,244,247,15,135, 425 217,252,241,252,233,244,253,248,1,255,217,252,254,252,233,244,253,248,2,131,
426 244,255,217,252,255,252,233,244,253,248,1,217,252,242,221,216,248,7,221,92, 426 252,250,11,15,132,244,247,15,135,244,255,217,252,255,252,233,244,253,248,
427 36,8,252,242,15,16,68,36,8,195,255,139,84,36,12,221,68,36,4,131,252,250,1, 427 1,217,252,242,221,216,248,7,221,92,36,8,252,242,15,16,68,36,8,195,255,139,
428 15,130,244,82,15,132,244,84,131,252,250,3,15,130,244,104,15,135,244,248,217, 428 84,36,12,221,68,36,4,131,252,250,1,15,130,244,82,15,132,244,84,131,252,250,
429 252,250,195,248,2,131,252,250,5,15,130,244,88,15,132,244,149,131,252,250, 429 3,15,130,244,104,15,135,244,248,217,252,250,195,248,2,131,252,250,5,15,130,
430 7,15,132,244,247,15,135,244,248,217,252,237,217,201,217,252,241,195,248,1, 430 244,88,15,132,244,149,131,252,250,7,15,132,244,247,15,135,244,248,217,252,
431 217,232,217,201,217,252,241,195,248,2,131,252,250,9,15,132,244,247,255,15, 431 237,217,201,217,252,241,195,248,1,217,232,217,201,217,252,241,195,248,2,131,
432 135,244,248,217,252,236,217,201,217,252,241,195,248,1,217,252,254,195,248, 432 252,250,9,15,132,244,247,255,15,135,244,248,217,252,236,217,201,217,252,241,
433 2,131,252,250,11,15,132,244,247,15,135,244,255,217,252,255,195,248,1,217, 433 195,248,1,217,252,254,195,248,2,131,252,250,11,15,132,244,247,15,135,244,
434 252,242,221,216,195,255,248,9,204,248,154,255,65,131,252,248,1,15,132,244, 434 255,217,252,255,195,248,1,217,252,242,221,216,195,255,248,9,204,248,154,255,
435 247,15,135,244,248,252,242,15,88,193,195,248,1,252,242,15,92,193,195,248, 435 65,131,252,248,1,15,132,244,247,15,135,244,248,252,242,15,88,193,195,248,
436 2,65,131,252,248,3,15,132,244,247,15,135,244,248,252,242,15,89,193,195,248, 436 1,252,242,15,92,193,195,248,2,65,131,252,248,3,15,132,244,247,15,135,244,
437 1,252,242,15,94,193,195,248,2,65,131,252,248,5,15,130,244,148,15,132,244, 437 248,252,242,15,89,193,195,248,1,252,242,15,94,193,195,248,2,65,131,252,248,
438 107,65,131,252,248,7,15,132,244,247,15,135,244,248,72,184,237,237,255,102, 438 5,15,130,244,148,15,132,244,107,65,131,252,248,7,15,132,244,247,15,135,244,
439 72,15,110,200,15,87,193,195,248,1,72,184,237,237,102,72,15,110,200,15,84, 439 248,72,184,237,237,255,102,72,15,110,200,15,87,193,195,248,1,72,184,237,237,
440 193,195,248,2,65,131,252,248,9,15,135,244,248,252,242,15,17,68,36,8,252,242, 440 102,72,15,110,200,15,84,193,195,248,2,65,131,252,248,9,15,135,244,248,252,
441 15,17,76,36,16,221,68,36,8,221,68,36,16,15,132,244,247,217,252,243,248,7, 441 242,15,17,68,36,8,252,242,15,17,76,36,16,221,68,36,8,221,68,36,16,15,132,
442 221,92,36,8,252,242,15,16,68,36,8,195,248,1,217,201,217,252,253,221,217,252, 442 244,247,217,252,243,248,7,221,92,36,8,252,242,15,16,68,36,8,195,248,1,217,
443 233,244,7,248,2,65,131,252,248,11,15,132,244,247,15,135,244,255,252,242,15, 443 201,217,252,253,221,217,252,233,244,7,248,2,65,131,252,248,11,15,132,244,
444 93,193,195,248,1,252,242,15,95,193,195,248,9,204,255,139,68,36,20,221,68, 444 247,15,135,244,255,252,242,15,93,193,195,248,1,252,242,15,95,193,195,248,
445 36,4,221,68,36,12,131,252,248,1,15,132,244,247,15,135,244,248,222,193,195, 445 9,204,255,139,68,36,20,221,68,36,4,221,68,36,12,131,252,248,1,15,132,244,
446 248,1,222,252,233,195,248,2,131,252,248,3,15,132,244,247,15,135,244,248,222, 446 247,15,135,244,248,222,193,195,248,1,222,252,233,195,248,2,131,252,248,3,
447 201,195,248,1,222,252,249,195,248,2,131,252,248,5,15,130,244,148,15,132,244, 447 15,132,244,247,15,135,244,248,222,201,195,248,1,222,252,249,195,248,2,131,
448 107,131,252,248,7,15,132,244,247,15,135,244,248,255,221,216,217,224,195,248, 448 252,248,5,15,130,244,148,15,132,244,107,131,252,248,7,15,132,244,247,15,135,
449 1,221,216,217,225,195,248,2,131,252,248,9,15,132,244,247,15,135,244,248,217, 449 244,248,255,221,216,217,224,195,248,1,221,216,217,225,195,248,2,131,252,248,
450 252,243,195,248,1,217,201,217,252,253,221,217,195,248,2,131,252,248,11,15, 450 9,15,132,244,247,15,135,244,248,217,252,243,195,248,1,217,201,217,252,253,
451 132,244,247,15,135,244,255,255,219,252,233,219,209,221,217,195,248,1,219, 451 221,217,195,248,2,131,252,248,11,15,132,244,247,15,135,244,255,255,219,252,
452 252,233,218,209,221,217,195,255,221,225,223,224,252,246,196,1,15,132,244, 452 233,219,209,221,217,195,248,1,219,252,233,218,209,221,217,195,255,221,225,
453 248,217,201,248,2,221,216,195,248,1,221,225,223,224,252,246,196,1,15,133, 453 223,224,252,246,196,1,15,132,244,248,217,201,248,2,221,216,195,248,1,221,
454 244,248,217,201,248,2,221,216,195,255,248,155,137,200,86,72,137,214,83,15, 454 225,223,224,252,246,196,1,15,133,244,248,217,201,248,2,221,216,195,255,248,
455 162,137,6,137,94,4,137,78,8,137,86,12,91,94,195,255,249,255,129,124,253,202, 455 155,137,200,86,72,137,214,83,15,162,137,6,137,94,4,137,78,8,137,86,12,91,
456 4,239,15,135,244,41,129,124,253,194,4,239,15,135,244,41,255,252,242,15,16, 456 94,195,255,249,255,129,124,253,202,4,239,15,135,244,41,129,124,253,194,4,
457 4,194,131,198,4,102,15,46,4,202,255,221,4,202,221,4,194,131,198,4,255,223, 457 239,15,135,244,41,255,252,242,15,16,4,194,131,198,4,102,15,46,4,202,255,221,
458 252,233,221,216,255,218,252,233,223,224,158,255,15,134,244,248,255,15,131, 458 4,202,221,4,194,131,198,4,255,223,252,233,221,216,255,218,252,233,223,224,
459 244,248,255,248,1,15,183,70,252,254,141,180,253,134,233,248,2,139,6,15,182, 459 158,255,15,134,244,248,255,15,131,244,248,255,248,1,15,183,70,252,254,141,
460 204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,139,108,194,4, 460 180,253,134,233,248,2,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,
461 131,198,4,129,252,253,239,15,135,244,251,129,124,253,202,4,239,15,135,244, 461 255,36,252,235,255,139,108,194,4,131,198,4,129,252,253,239,15,135,244,251,
462 251,255,252,242,15,16,4,194,102,15,46,4,202,255,221,4,202,221,4,194,255,15, 462 129,124,253,202,4,239,15,135,244,251,255,252,242,15,16,4,194,102,15,46,4,
463 138,244,248,15,133,244,248,255,15,138,244,248,15,132,244,247,255,248,1,15, 463 202,255,221,4,202,221,4,194,255,15,138,244,248,15,133,244,248,255,15,138,
464 183,70,252,254,141,180,253,134,233,248,2,255,248,2,15,183,70,252,254,141, 464 244,248,15,132,244,247,255,248,1,15,183,70,252,254,141,180,253,134,233,248,
465 180,253,134,233,248,1,255,248,5,57,108,202,4,15,133,244,2,129,252,253,239, 465 2,255,248,2,15,183,70,252,254,141,180,253,134,233,248,1,255,248,5,57,108,
466 15,131,244,1,139,12,202,139,4,194,57,193,15,132,244,1,129,252,253,239,15, 466 202,4,15,133,244,2,129,252,253,239,15,131,244,1,139,12,202,139,4,194,57,193,
467 135,244,2,139,169,233,133,252,237,15,132,244,2,252,246,133,233,235,15,133, 467 15,132,244,1,129,252,253,239,15,135,244,2,139,169,233,133,252,237,15,132,
468 244,2,255,49,252,237,255,189,1,0,0,0,255,252,233,244,45,255,72,252,247,208, 468 244,2,252,246,133,233,235,15,133,244,2,255,49,252,237,255,189,1,0,0,0,255,
469 131,198,4,129,124,253,202,4,239,15,133,244,248,139,12,202,59,12,135,255,131, 469 252,233,244,45,255,72,252,247,208,131,198,4,129,124,253,202,4,239,15,133,
470 198,4,129,124,253,202,4,239,15,135,244,248,255,252,242,15,16,4,199,102,15, 470 244,248,139,12,202,59,12,135,255,131,198,4,129,124,253,202,4,239,15,135,244,
471 46,4,202,255,221,4,202,221,4,199,255,72,252,247,208,131,198,4,57,68,202,4, 471 248,255,252,242,15,16,4,199,102,15,46,4,202,255,221,4,202,221,4,199,255,72,
472 255,139,108,194,4,131,198,4,129,252,253,239,255,15,131,244,247,255,15,130, 472 252,247,208,131,198,4,57,68,202,4,255,139,108,194,4,131,198,4,129,252,253,
473 244,247,255,137,108,202,4,139,44,194,137,44,202,255,15,183,70,252,254,141, 473 239,255,15,131,244,247,255,15,130,244,247,255,137,108,202,4,139,44,194,137,
474 180,253,134,233,248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, 474 44,202,255,15,183,70,252,254,141,180,253,134,233,248,1,139,6,15,182,204,15,
475 255,36,252,235,255,139,108,194,4,139,4,194,137,108,202,4,137,4,202,139,6, 475 182,232,131,198,4,193,232,16,252,255,36,252,235,255,139,108,194,4,139,4,194,
476 15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,49,252, 476 137,108,202,4,137,4,202,139,6,15,182,204,15,182,232,131,198,4,193,232,16,
477 237,129,124,253,194,4,239,129,213,239,137,108,202,4,139,6,15,182,204,15,182, 477 252,255,36,252,235,255,49,252,237,129,124,253,194,4,239,129,213,239,137,108,
478 232,131,198,4,193,232,16,252,255,36,252,235,255,129,124,253,194,4,239,15, 478 202,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,
479 135,244,48,255,252,242,15,16,4,194,72,184,237,237,102,72,15,110,200,15,87, 479 255,129,124,253,194,4,239,15,135,244,48,255,252,242,15,16,4,194,72,184,237,
480 193,252,242,15,17,4,202,255,221,4,194,217,224,221,28,202,255,129,124,253, 480 237,102,72,15,110,200,15,87,193,252,242,15,17,4,202,255,221,4,194,217,224,
481 194,4,239,15,133,244,248,139,4,194,255,15,87,192,252,242,15,42,128,233,248, 481 221,28,202,255,129,124,253,194,4,239,15,133,244,248,139,4,194,255,15,87,192,
482 1,252,242,15,17,4,202,255,219,128,233,248,1,221,28,202,255,139,6,15,182,204, 482 252,242,15,42,128,233,248,1,252,242,15,17,4,202,255,219,128,233,248,1,221,
483 15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,2,129,124,253,194, 483 28,202,255,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,
484 4,239,15,133,244,50,139,12,194,137,213,232,251,1,18,255,252,242,15,42,192, 484 235,248,2,129,124,253,194,4,239,15,133,244,50,139,12,194,137,213,232,251,
485 137,252,234,255,15,182,78,252,253,252,233,244,1,255,15,182,252,236,15,182, 485 1,18,255,252,242,15,42,192,137,252,234,255,15,182,78,252,253,252,233,244,
486 192,255,129,124,253,252,234,4,239,15,135,244,46,255,252,242,15,16,4,252,234, 486 1,255,15,182,252,236,15,182,192,255,129,124,253,252,234,4,239,15,135,244,
487 252,242,15,88,4,199,255,221,4,252,234,220,4,199,255,129,124,253,252,234,4, 487 46,255,252,242,15,16,4,252,234,252,242,15,88,4,199,255,221,4,252,234,220,
488 239,15,135,244,47,255,252,242,15,16,4,199,252,242,15,88,4,252,234,255,221, 488 4,199,255,129,124,253,252,234,4,239,15,135,244,47,255,252,242,15,16,4,199,
489 4,199,220,4,252,234,255,129,124,253,252,234,4,239,15,135,244,49,129,124,253, 489 252,242,15,88,4,252,234,255,221,4,199,220,4,252,234,255,129,124,253,252,234,
490 194,4,239,15,135,244,49,255,252,242,15,16,4,252,234,252,242,15,88,4,194,255, 490 4,239,15,135,244,49,129,124,253,194,4,239,15,135,244,49,255,252,242,15,16,
491 221,4,252,234,220,4,194,255,252,242,15,16,4,252,234,252,242,15,92,4,199,255, 491 4,252,234,252,242,15,88,4,194,255,221,4,252,234,220,4,194,255,252,242,15,
492 221,4,252,234,220,36,199,255,252,242,15,16,4,199,252,242,15,92,4,252,234, 492 16,4,252,234,252,242,15,92,4,199,255,221,4,252,234,220,36,199,255,252,242,
493 255,221,4,199,220,36,252,234,255,252,242,15,16,4,252,234,252,242,15,92,4, 493 15,16,4,199,252,242,15,92,4,252,234,255,221,4,199,220,36,252,234,255,252,
494 194,255,221,4,252,234,220,36,194,255,252,242,15,16,4,252,234,252,242,15,89, 494 242,15,16,4,252,234,252,242,15,92,4,194,255,221,4,252,234,220,36,194,255,
495 4,199,255,221,4,252,234,220,12,199,255,252,242,15,16,4,199,252,242,15,89, 495 252,242,15,16,4,252,234,252,242,15,89,4,199,255,221,4,252,234,220,12,199,
496 4,252,234,255,221,4,199,220,12,252,234,255,252,242,15,16,4,252,234,252,242, 496 255,252,242,15,16,4,199,252,242,15,89,4,252,234,255,221,4,199,220,12,252,
497 15,89,4,194,255,221,4,252,234,220,12,194,255,252,242,15,16,4,252,234,252, 497 234,255,252,242,15,16,4,252,234,252,242,15,89,4,194,255,221,4,252,234,220,
498 242,15,94,4,199,255,221,4,252,234,220,52,199,255,252,242,15,16,4,199,252, 498 12,194,255,252,242,15,16,4,252,234,252,242,15,94,4,199,255,221,4,252,234,
499 242,15,94,4,252,234,255,221,4,199,220,52,252,234,255,252,242,15,16,4,252, 499 220,52,199,255,252,242,15,16,4,199,252,242,15,94,4,252,234,255,221,4,199,
500 234,252,242,15,94,4,194,255,221,4,252,234,220,52,194,255,252,242,15,16,4, 500 220,52,252,234,255,252,242,15,16,4,252,234,252,242,15,94,4,194,255,221,4,
501 252,234,252,242,15,16,12,199,255,221,4,252,234,221,4,199,255,252,242,15,16, 501 252,234,220,52,194,255,252,242,15,16,4,252,234,252,242,15,16,12,199,255,221,
502 4,199,252,242,15,16,12,252,234,255,221,4,199,221,4,252,234,255,252,242,15, 502 4,252,234,221,4,199,255,252,242,15,16,4,199,252,242,15,16,12,252,234,255,
503 16,4,252,234,252,242,15,16,12,194,255,221,4,252,234,221,4,194,255,248,156, 503 221,4,199,221,4,252,234,255,252,242,15,16,4,252,234,252,242,15,16,12,194,
504 232,244,148,255,252,233,244,156,255,232,244,107,255,15,182,252,236,15,182, 504 255,221,4,252,234,221,4,194,255,248,156,232,244,148,255,252,233,244,156,255,
505 192,139,76,36,96,137,145,233,141,20,194,65,137,192,65,41,232,248,33,137,205, 505 232,244,107,255,15,182,252,236,15,182,192,139,76,36,96,137,145,233,141,20,
506 137,116,36,100,232,251,1,22,139,149,233,133,192,15,133,244,42,15,182,110, 506 194,65,137,192,65,41,232,248,33,137,205,137,116,36,100,232,251,1,23,139,149,
507 252,255,15,182,78,252,253,139,68,252,234,4,139,44,252,234,137,68,202,4,137, 507 233,133,192,15,133,244,42,15,182,110,252,255,15,182,78,252,253,139,68,252,
508 234,4,139,44,252,234,137,68,202,4,137,44,202,139,6,15,182,204,15,182,232,
509 131,198,4,193,232,16,252,255,36,252,235,255,72,252,247,208,139,4,135,199,
510 68,202,4,237,137,4,202,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,
511 255,36,252,235,255,15,191,192,252,242,15,42,192,252,242,15,17,4,202,255,223,
512 70,252,254,221,28,202,255,252,242,15,16,4,199,252,242,15,17,4,202,255,221,
513 4,199,221,28,202,255,72,252,247,208,137,68,202,4,139,6,15,182,204,15,182,
514 232,131,198,4,193,232,16,252,255,36,252,235,255,141,76,202,12,141,68,194,
515 4,189,237,137,105,252,248,248,1,137,41,131,193,8,57,193,15,134,244,1,139,
516 6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,139,106,
517 252,248,139,172,253,133,233,139,173,233,139,69,4,139,109,0,137,68,202,4,137,
508 44,202,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235, 518 44,202,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,
509 255,72,252,247,208,139,4,135,199,68,202,4,237,137,4,202,139,6,15,182,204, 519 255,139,106,252,248,139,172,253,141,233,128,189,233,0,139,173,233,139,12,
510 15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,15,191,192,252,242, 520 194,139,68,194,4,137,77,0,137,69,4,15,132,244,247,252,246,133,233,235,15,
511 15,42,192,252,242,15,17,4,202,255,223,70,252,254,221,28,202,255,252,242,15, 521 133,244,248,248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,
512 16,4,199,252,242,15,17,4,202,255,221,4,199,221,28,202,255,72,252,247,208, 522 36,252,235,248,2,129,232,239,129,252,248,239,15,134,244,1,252,246,129,233,
513 137,68,202,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36, 523 235,15,132,244,1,135,213,141,139,233,255,232,251,1,24,137,252,234,252,233,
514 252,235,255,141,76,202,12,141,68,194,4,189,237,137,105,252,248,248,1,137, 524 244,1,255,72,252,247,208,139,106,252,248,139,172,253,141,233,139,12,135,139,
515 41,131,193,8,57,193,15,134,244,1,139,6,15,182,204,15,182,232,131,198,4,193, 525 133,233,137,8,199,64,4,237,252,246,133,233,235,15,133,244,248,248,1,139,6,
516 232,16,252,255,36,252,235,255,139,106,252,248,139,172,253,133,233,139,173, 526 15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,2,252,246,
517 233,139,69,4,139,109,0,137,68,202,4,137,44,202,139,6,15,182,204,15,182,232, 527 129,233,235,15,132,244,1,128,189,233,0,15,132,244,1,137,213,137,194,141,139,
518 131,198,4,193,232,16,252,255,36,252,235,255,139,106,252,248,139,172,253,141, 528 233,232,251,1,24,137,252,234,252,233,244,1,255,139,106,252,248,255,252,242,
519 233,128,189,233,0,139,173,233,139,12,194,139,68,194,4,137,77,0,137,69,4,15, 529 15,16,4,199,255,139,172,253,141,233,139,141,233,255,252,242,15,17,1,255,221,
520 132,244,247,252,246,133,233,235,15,133,244,248,248,1,139,6,15,182,204,15, 530 25,255,72,252,247,208,139,106,252,248,139,172,253,141,233,139,141,233,137,
521 182,232,131,198,4,193,232,16,252,255,36,252,235,248,2,129,232,239,129,252, 531 65,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,
522 248,239,15,134,244,1,252,246,129,233,235,15,132,244,1,135,213,141,139,233, 532 255,141,180,253,134,233,139,108,36,96,131,189,233,0,15,132,244,247,137,149,
523 255,232,251,1,23,137,252,234,252,233,244,1,255,72,252,247,208,139,106,252, 533 233,141,20,202,137,252,233,232,251,1,25,139,149,233,248,1,139,6,15,182,204,
524 248,139,172,253,141,233,139,12,135,139,133,233,137,8,199,64,4,237,252,246, 534 15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,72,252,247,208,139,
525 133,233,235,15,133,244,248,248,1,139,6,15,182,204,15,182,232,131,198,4,193, 535 108,36,96,137,149,233,68,139,66,252,248,139,20,135,137,252,233,137,116,36,
526 232,16,252,255,36,252,235,248,2,252,246,129,233,235,15,132,244,1,128,189, 536 100,232,251,1,26,139,149,233,15,182,78,252,253,137,4,202,199,68,202,4,237,
527 233,0,15,132,244,1,137,213,137,194,141,139,233,232,251,1,23,137,252,234,252, 537 139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,139,
528 233,244,1,255,139,106,252,248,255,252,242,15,16,4,199,255,139,172,253,141, 538 76,36,96,137,145,233,248,1,65,137,192,37,252,255,7,0,0,65,193,232,11,61,252,
529 233,139,141,233,255,252,242,15,17,1,255,221,25,255,72,252,247,208,139,106, 539 255,7,0,0,15,132,244,249,248,2,137,194,139,131,233,137,205,59,131,233,137,
530 252,248,139,172,253,141,233,139,141,233,137,65,4,139,6,15,182,204,15,182, 540 116,36,100,15,131,244,251,232,251,1,27,139,149,233,15,182,78,252,253,137,
531 232,131,198,4,193,232,16,252,255,36,252,235,255,141,180,253,134,233,139,108, 541 4,202,199,68,202,4,237,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,
532 36,96,131,189,233,0,15,132,244,247,137,149,233,141,20,202,137,252,233,232, 542 255,36,252,235,248,3,184,1,8,0,0,252,233,244,2,248,5,232,251,1,28,15,183,
533 251,1,24,139,149,233,248,1,139,6,15,182,204,15,182,232,131,198,4,193,232, 543 70,252,254,137,252,233,252,233,244,1,255,72,252,247,208,139,108,36,96,139,
534 16,252,255,36,252,235,255,72,252,247,208,139,108,36,96,137,149,233,68,139, 544 139,233,137,116,36,100,59,139,233,137,149,233,15,131,244,249,248,2,139,20,
535 66,252,248,139,20,135,137,252,233,137,116,36,100,232,251,1,25,139,149,233, 545 135,137,252,233,232,251,1,29,139,149,233,15,182,78,252,253,137,4,202,199,
536 15,182,78,252,253,137,4,202,199,68,202,4,237,139,6,15,182,204,15,182,232, 546 68,202,4,237,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,
537 131,198,4,193,232,16,252,255,36,252,235,255,139,76,36,96,137,145,233,248, 547 252,235,248,3,137,252,233,232,251,1,28,15,183,70,252,254,72,252,247,208,252,
538 1,65,137,192,37,252,255,7,0,0,65,193,232,11,61,252,255,7,0,0,15,132,244,249, 548 233,244,2,255,72,252,247,208,139,106,252,248,139,173,233,139,4,135,252,233,
539 248,2,137,194,139,131,233,137,205,59,131,233,137,116,36,100,15,131,244,251, 549 244,157,255,72,252,247,208,139,106,252,248,139,173,233,139,4,135,252,233,
540 232,251,1,26,139,149,233,15,182,78,252,253,137,4,202,199,68,202,4,237,139, 550 244,158,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,
541 6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,3,184, 551 36,139,44,252,234,129,124,253,194,4,239,15,135,244,251,255,252,242,15,16,
542 1,8,0,0,252,233,244,2,248,5,232,251,1,27,15,183,70,252,254,137,252,233,252, 552 4,194,252,242,15,45,192,252,242,15,42,200,102,15,46,193,255,15,133,244,36,
543 233,244,1,255,72,252,247,208,139,108,36,96,139,139,233,137,116,36,100,59, 553 59,133,233,15,131,244,36,193,224,3,3,133,233,129,120,253,4,239,15,132,244,
544 139,233,137,149,233,15,131,244,249,248,2,139,20,135,137,252,233,232,251,1, 554 248,248,1,139,40,139,64,4,137,44,202,137,68,202,4,139,6,15,182,204,15,182,
545 28,139,149,233,15,182,78,252,253,137,4,202,199,68,202,4,237,139,6,15,182, 555 232,131,198,4,193,232,16,252,255,36,252,235,248,2,131,189,233,0,15,132,244,
546 204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,3,137,252,233, 556 1,139,141,233,252,246,129,233,235,15,132,244,36,15,182,78,252,253,252,233,
547 232,251,1,27,15,183,70,252,254,72,252,247,208,252,233,244,2,255,72,252,247, 557 244,1,248,5,255,129,124,253,194,4,239,15,133,244,36,139,4,194,252,233,244,
548 208,139,106,252,248,139,173,233,139,4,135,252,233,244,157,255,72,252,247, 558 157,255,15,182,252,236,15,182,192,72,252,247,208,139,4,135,129,124,253,252,
549 208,139,106,252,248,139,173,233,139,4,135,252,233,244,158,255,15,182,252, 559 234,4,239,15,133,244,34,139,44,252,234,248,157,139,141,233,35,136,233,105,
550 236,15,182,192,129,124,253,252,234,4,239,15,133,244,36,139,44,252,234,129, 560 201,239,3,141,233,248,1,129,185,233,239,15,133,244,250,57,129,233,15,133,
551 124,253,194,4,239,15,135,244,251,255,252,242,15,16,4,194,252,242,15,45,192, 561 244,250,129,121,253,4,239,15,132,244,251,15,182,70,252,253,139,41,139,73,
552 252,242,15,42,200,102,15,46,193,255,15,133,244,36,59,133,233,15,131,244,36, 562 4,137,44,194,248,2,255,137,76,194,4,139,6,15,182,204,15,182,232,131,198,4,
553 193,224,3,3,133,233,129,120,253,4,239,15,132,244,248,248,1,139,40,139,64, 563 193,232,16,252,255,36,252,235,248,3,15,182,70,252,253,185,237,252,233,244,
554 4,137,44,202,137,68,202,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16, 564 2,248,4,139,137,233,133,201,15,133,244,1,248,5,139,141,233,133,201,15,132,
555 252,255,36,252,235,248,2,131,189,233,0,15,132,244,1,139,141,233,252,246,129, 565 244,3,252,246,129,233,235,15,133,244,3,252,233,244,34,255,15,182,252,236,
556 233,235,15,132,244,36,15,182,78,252,253,252,233,244,1,248,5,255,129,124,253, 566 15,182,192,129,124,253,252,234,4,239,15,133,244,35,139,44,252,234,59,133,
557 194,4,239,15,133,244,36,139,4,194,252,233,244,157,255,15,182,252,236,15,182, 567 233,15,131,244,35,193,224,3,3,133,233,129,120,253,4,239,15,132,244,248,248,
558 192,72,252,247,208,139,4,135,129,124,253,252,234,4,239,15,133,244,34,139, 568 1,139,40,139,64,4,137,44,202,137,68,202,4,139,6,15,182,204,15,182,232,131,
559 44,252,234,248,157,139,141,233,35,136,233,105,201,239,3,141,233,248,1,129, 569 198,4,193,232,16,252,255,36,252,235,248,2,131,189,233,0,15,132,244,1,139,
560 185,233,239,15,133,244,250,57,129,233,15,133,244,250,129,121,253,4,239,15, 570 141,233,252,246,129,233,235,15,132,244,35,255,15,182,252,236,15,182,192,129,
561 132,244,251,15,182,70,252,253,139,41,139,73,4,137,44,194,248,2,255,137,76, 571 124,253,252,234,4,239,15,133,244,39,139,44,252,234,129,124,253,194,4,239,
562 194,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235, 572 15,135,244,251,255,15,133,244,39,59,133,233,15,131,244,39,193,224,3,3,133,
563 248,3,15,182,70,252,253,185,237,252,233,244,2,248,4,139,137,233,133,201,15, 573 233,129,120,253,4,239,15,132,244,249,248,1,252,246,133,233,235,15,133,244,
564 133,244,1,248,5,139,141,233,133,201,15,132,244,3,252,246,129,233,235,15,133, 574 253,248,2,139,108,202,4,139,12,202,137,104,4,137,8,139,6,15,182,204,15,182,
565 244,3,252,233,244,34,255,15,182,252,236,15,182,192,129,124,253,252,234,4, 575 232,131,198,4,193,232,16,252,255,36,252,235,248,3,131,189,233,0,15,132,244,
566 239,15,133,244,35,139,44,252,234,59,133,233,15,131,244,35,193,224,3,3,133, 576 1,139,141,233,255,252,246,129,233,235,15,132,244,39,15,182,78,252,253,252,
567 233,129,120,253,4,239,15,132,244,248,248,1,139,40,139,64,4,137,44,202,137, 577 233,244,1,248,5,129,124,253,194,4,239,15,133,244,39,139,4,194,252,233,244,
568 68,202,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252, 578 158,248,7,128,165,233,235,139,139,233,137,171,233,137,141,233,15,182,78,252,
569 235,248,2,131,189,233,0,15,132,244,1,139,141,233,252,246,129,233,235,15,132, 579 253,252,233,244,2,255,15,182,252,236,15,182,192,72,252,247,208,139,4,135,
570 244,35,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244, 580 129,124,253,252,234,4,239,15,133,244,37,139,44,252,234,248,158,139,141,233,
571 39,139,44,252,234,129,124,253,194,4,239,15,135,244,251,255,15,133,244,39, 581 35,136,233,105,201,239,198,133,233,0,3,141,233,248,1,129,185,233,239,15,133,
572 59,133,233,15,131,244,39,193,224,3,3,133,233,129,120,253,4,239,15,132,244, 582 244,251,57,129,233,15,133,244,251,129,121,253,4,239,15,132,244,250,248,2,
583 255,252,246,133,233,235,15,133,244,253,248,3,15,182,70,252,253,139,108,194,
584 4,139,4,194,137,105,4,137,1,139,6,15,182,204,15,182,232,131,198,4,193,232,
585 16,252,255,36,252,235,248,4,131,189,233,0,15,132,244,2,137,76,36,80,139,141,
586 233,252,246,129,233,235,15,132,244,37,139,76,36,80,252,233,244,2,248,5,139,
587 137,233,133,201,15,133,244,1,255,139,141,233,133,201,15,132,244,252,252,246,
588 129,233,235,15,132,244,37,248,6,137,68,36,80,199,68,36,84,237,137,108,36,
589 32,139,76,36,96,137,145,233,76,141,68,36,80,137,252,234,137,205,137,116,36,
590 100,232,251,1,30,139,149,233,139,108,36,32,137,193,252,233,244,2,248,7,128,
591 165,233,235,139,131,233,137,171,233,137,133,233,252,233,244,3,255,15,182,
592 252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,38,139,44,252,234,
593 59,133,233,15,131,244,38,193,224,3,3,133,233,129,120,253,4,239,15,132,244,
573 249,248,1,252,246,133,233,235,15,133,244,253,248,2,139,108,202,4,139,12,202, 594 249,248,1,252,246,133,233,235,15,133,244,253,248,2,139,108,202,4,139,12,202,
574 137,104,4,137,8,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255, 595 137,104,4,137,8,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,
575 36,252,235,248,3,131,189,233,0,15,132,244,1,139,141,233,255,252,246,129,233, 596 36,252,235,248,3,131,189,233,0,15,132,244,1,255,139,141,233,252,246,129,233,
576 235,15,132,244,39,15,182,78,252,253,252,233,244,1,248,5,129,124,253,194,4, 597 235,15,132,244,38,15,182,78,252,253,252,233,244,1,248,7,128,165,233,235,139,
577 239,15,133,244,39,139,4,194,252,233,244,158,248,7,128,165,233,235,139,139, 598 139,233,137,171,233,137,141,233,15,182,78,252,253,252,233,244,2,255,137,124,
578 233,137,171,233,137,141,233,15,182,78,252,253,252,233,244,2,255,15,182,252, 599 36,80,255,248,1,141,12,202,139,105,252,248,252,246,133,233,235,15,133,244,
579 236,15,182,192,72,252,247,208,139,4,135,129,124,253,252,234,4,239,15,133, 600 253,248,2,139,68,36,84,255,252,242,15,45,252,248,255,131,232,1,15,132,244,
580 244,37,139,44,252,234,248,158,139,141,233,35,136,233,105,201,239,198,133, 601 250,1,252,248,59,133,233,15,131,244,251,41,252,248,193,231,3,3,189,233,248,
581 233,0,3,141,233,248,1,129,185,233,239,15,133,244,251,57,129,233,15,133,244, 602 3,139,41,137,47,139,105,4,131,193,8,137,111,4,131,199,8,131,232,1,15,133,
582 251,129,121,253,4,239,15,132,244,250,248,2,255,252,246,133,233,235,15,133, 603 244,3,248,4,139,124,36,80,139,6,15,182,204,15,182,232,131,198,4,193,232,16,
583 244,253,248,3,15,182,70,252,253,139,108,194,4,139,4,194,137,105,4,137,1,139, 604 252,255,36,252,235,248,5,139,76,36,96,137,145,233,137,252,234,65,137,192,
584 6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,4,131, 605 137,205,137,116,36,100,232,251,1,31,139,149,233,15,182,78,252,253,252,233,
585 189,233,0,15,132,244,2,137,76,36,80,139,141,233,252,246,129,233,235,15,132, 606 244,1,248,7,128,165,233,235,139,131,233,137,171,233,255,137,133,233,252,233,
586 244,37,139,76,36,80,252,233,244,2,248,5,139,137,233,133,201,15,133,244,1, 607 244,2,255,3,68,36,84,255,129,124,253,202,4,239,139,44,202,15,133,244,51,141,
587 255,139,141,233,133,201,15,132,244,252,252,246,129,233,235,15,132,244,37, 608 84,202,8,137,114,252,252,139,181,233,139,14,15,182,252,233,15,182,205,131,
588 248,6,137,68,36,80,199,68,36,84,237,137,108,36,32,139,76,36,96,137,145,233, 609 198,4,252,255,36,252,235,255,141,76,202,8,137,215,139,105,252,248,129,121,
589 76,141,68,36,80,137,252,234,137,205,137,116,36,100,232,251,1,29,139,149,233, 610 253,252,252,239,15,133,244,28,248,52,139,114,252,252,252,247,198,237,15,133,
590 139,108,36,32,137,193,252,233,244,2,248,7,128,165,233,235,139,131,233,137, 611 244,253,248,1,137,106,252,248,137,68,36,84,131,232,1,15,132,244,249,248,2,
591 171,233,137,133,233,252,233,244,3,255,15,182,252,236,15,182,192,129,124,253, 612 139,41,137,47,139,105,4,137,111,4,131,199,8,131,193,8,131,232,1,15,133,244,
592 252,234,4,239,15,133,244,38,139,44,252,234,59,133,233,15,131,244,38,193,224, 613 2,139,106,252,248,248,3,139,68,36,84,128,189,233,1,15,135,244,251,248,4,139,
593 3,3,133,233,129,120,253,4,239,15,132,244,249,248,1,252,246,133,233,235,15, 614 181,233,139,14,15,182,252,233,15,182,205,131,198,4,252,255,36,252,235,248,
594 133,244,253,248,2,139,108,202,4,139,12,202,137,104,4,137,8,139,6,15,182,204, 615 5,255,252,247,198,237,15,133,244,4,15,182,78,252,253,72,252,247,209,141,12,
595 15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,3,131,189,233,0,15, 616 202,139,121,252,248,139,191,233,139,191,233,252,233,244,4,248,7,15,139,244,
596 132,244,1,255,139,141,233,252,246,129,233,235,15,132,244,38,15,182,78,252, 617 1,131,230,252,248,41,252,242,137,215,139,114,252,252,252,233,244,1,255,141,
597 253,252,233,244,1,248,7,128,165,233,235,139,139,233,137,171,233,137,141,233, 618 76,202,8,139,105,232,139,65,252,236,137,41,137,65,4,139,105,252,240,139,65,
598 15,182,78,252,253,252,233,244,2,255,137,124,36,80,255,248,1,141,12,202,139, 619 252,244,137,105,8,137,65,12,139,105,224,139,65,228,137,105,252,248,137,65,
599 105,252,248,252,246,133,233,235,15,133,244,253,248,2,139,68,36,84,255,252, 620 252,252,129,252,248,239,184,237,15,133,244,28,137,202,137,114,252,252,139,
600 242,15,45,252,248,255,131,232,1,15,132,244,250,1,252,248,59,133,233,15,131,
601 244,251,41,252,248,193,231,3,3,189,233,248,3,139,41,137,47,139,105,4,131,
602 193,8,137,111,4,131,199,8,131,232,1,15,133,244,3,248,4,139,124,36,80,139,
603 6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,5,139,
604 76,36,96,137,145,233,137,252,234,65,137,192,137,205,137,116,36,100,232,251,
605 1,30,139,149,233,15,182,78,252,253,252,233,244,1,248,7,128,165,233,235,139,
606 131,233,137,171,233,255,137,133,233,252,233,244,2,255,3,68,36,84,255,129,
607 124,253,202,4,239,139,44,202,15,133,244,51,141,84,202,8,137,114,252,252,139,
608 181,233,139,14,15,182,252,233,15,182,205,131,198,4,252,255,36,252,235,255, 621 181,233,139,14,15,182,252,233,15,182,205,131,198,4,252,255,36,252,235,255,
609 141,76,202,8,137,215,139,105,252,248,129,121,253,252,252,239,15,133,244,28, 622 15,182,252,236,139,66,252,248,141,12,202,139,128,233,15,182,128,233,137,124,
610 248,52,139,114,252,252,252,247,198,237,15,133,244,253,248,1,137,106,252,248, 623 36,80,141,188,253,194,233,43,122,252,252,133,252,237,15,132,244,251,141,108,
611 137,68,36,84,131,232,1,15,132,244,249,248,2,139,41,137,47,139,105,4,137,111, 624 252,233,252,248,57,215,15,131,244,248,248,1,139,71,252,248,137,1,139,71,252,
612 4,131,199,8,131,193,8,131,232,1,15,133,244,2,139,106,252,248,248,3,139,68, 625 252,131,199,8,137,65,4,131,193,8,57,252,233,15,131,244,249,57,215,15,130,
613 36,84,128,189,233,1,15,135,244,251,248,4,139,181,233,139,14,15,182,252,233, 626 244,1,248,2,199,65,4,237,131,193,8,57,252,233,15,130,244,2,248,3,139,124,
614 15,182,205,131,198,4,252,255,36,252,235,248,5,255,252,247,198,237,15,133, 627 36,80,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,
615 244,4,15,182,78,252,253,72,252,247,209,141,12,202,139,121,252,248,139,191, 628 248,5,199,68,36,84,1,0,0,0,137,208,41,252,248,15,134,244,3,255,137,197,193,
616 233,139,191,233,252,233,244,4,248,7,15,139,244,1,131,230,252,248,41,252,242, 629 252,237,3,131,197,1,137,108,36,84,139,108,36,96,1,200,59,133,233,15,135,244,
617 137,215,139,114,252,252,252,233,244,1,255,141,76,202,8,139,105,232,139,65, 630 253,248,6,139,71,252,248,137,1,139,71,252,252,131,199,8,137,65,4,131,193,
618 252,236,137,41,137,65,4,139,105,252,240,139,65,252,244,137,105,8,137,65,12, 631 8,57,215,15,130,244,6,252,233,244,3,248,7,137,149,233,137,141,233,137,116,
619 139,105,224,139,65,228,137,105,252,248,137,65,252,252,129,252,248,239,184, 632 36,100,41,215,139,84,36,84,131,252,234,1,137,252,233,232,251,1,0,139,149,
620 237,15,133,244,28,137,202,137,114,252,252,139,181,233,139,14,15,182,252,233, 633 233,139,141,233,1,215,252,233,244,6,255,193,225,3,255,248,1,139,114,252,252,
621 15,182,205,131,198,4,252,255,36,252,235,255,15,182,252,236,139,66,252,248, 634 137,68,36,84,252,247,198,237,15,133,244,253,255,248,13,137,215,131,232,1,
622 141,12,202,139,128,233,15,182,128,233,137,124,36,80,141,188,253,194,233,43, 635 15,132,244,249,248,2,139,44,15,137,111,252,248,139,108,15,4,137,111,252,252,
623 122,252,252,133,252,237,15,132,244,251,141,108,252,233,252,248,57,215,15, 636 131,199,8,131,232,1,15,133,244,2,248,3,139,68,36,84,15,182,110,252,255,248,
624 131,244,248,248,1,139,71,252,248,137,1,139,71,252,252,131,199,8,137,65,4, 637 5,57,197,15,135,244,252,255,139,108,10,4,137,106,252,252,139,44,10,137,106,
625 131,193,8,57,252,233,15,131,244,249,57,215,15,130,244,1,248,2,199,65,4,237, 638 252,248,255,248,5,56,70,252,255,15,135,244,252,255,15,182,78,252,253,72,252,
626 131,193,8,57,252,233,15,130,244,2,248,3,139,124,36,80,139,6,15,182,204,15, 639 247,209,141,20,202,139,122,252,248,139,191,233,139,191,233,139,6,15,182,204,
627 182,232,131,198,4,193,232,16,252,255,36,252,235,248,5,199,68,36,84,1,0,0, 640 15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,6,255,199,71,252,252,
628 0,137,208,41,252,248,15,134,244,3,255,137,197,193,252,237,3,131,197,1,137, 641 237,131,199,8,255,199,68,194,252,244,237,255,131,192,1,252,233,244,5,248,
629 108,36,84,139,108,36,96,1,200,59,133,233,15,135,244,253,248,6,139,71,252, 642 7,15,139,244,14,131,230,252,248,41,252,242,255,1,252,241,255,137,252,245,
630 248,137,1,139,71,252,252,131,199,8,137,65,4,131,193,8,57,215,15,130,244,6, 643 209,252,237,129,229,239,102,131,172,253,43,233,1,15,132,244,140,255,141,12,
631 252,233,244,3,248,7,137,149,233,137,141,233,137,116,36,100,41,215,139,84, 644 202,255,129,121,253,4,239,15,135,244,53,129,121,253,12,239,15,135,244,53,
632 36,84,131,252,234,1,137,252,233,232,251,1,0,139,149,233,139,141,233,1,215, 645 255,139,105,20,255,129,252,253,239,15,135,244,53,255,252,242,15,16,1,252,
633 252,233,244,6,255,193,225,3,255,248,1,139,114,252,252,137,68,36,84,252,247, 646 242,15,16,73,8,255,252,242,15,88,65,16,252,242,15,17,1,133,252,237,15,136,
634 198,237,15,133,244,253,255,248,13,137,215,131,232,1,15,132,244,249,248,2, 647 244,249,255,15,140,244,249,255,102,15,46,200,248,1,252,242,15,17,65,24,255,
635 139,44,15,137,111,252,248,139,108,15,4,137,111,252,252,131,199,8,131,232, 648 221,65,8,221,1,255,220,65,16,221,17,221,81,24,133,252,237,15,136,244,247,
636 1,15,133,244,2,248,3,139,68,36,84,15,182,110,252,255,248,5,57,197,15,135, 649 255,221,81,24,15,140,244,247,255,217,201,248,1,255,15,183,70,252,254,255,
637 244,252,255,139,108,10,4,137,106,252,252,139,44,10,137,106,252,248,255,248, 650 15,131,244,248,141,180,253,134,233,255,141,180,253,134,233,15,183,70,252,
638 5,56,70,252,255,15,135,244,252,255,15,182,78,252,253,72,252,247,209,141,20, 651 254,15,131,245,255,15,130,244,248,141,180,253,134,233,255,248,3,102,15,46,
639 202,139,122,252,248,139,191,233,139,191,233,139,6,15,182,204,15,182,232,131, 652 193,252,233,244,1,255,141,12,202,139,105,4,129,252,253,239,15,132,244,247,
640 198,4,193,232,16,252,255,36,252,235,248,6,255,199,71,252,252,237,131,199, 653 255,137,105,252,252,139,41,137,105,252,248,252,233,245,255,141,180,253,134,
641 8,255,199,68,194,252,244,237,255,131,192,1,252,233,244,5,248,7,15,139,244, 654 233,139,1,137,105,252,252,137,65,252,248,255,139,139,233,139,4,129,72,139,
642 14,131,230,252,248,41,252,242,255,1,252,241,255,137,252,245,209,252,237,129, 655 128,233,139,108,36,96,137,147,233,137,171,233,252,255,224,255,141,180,253,
643 229,239,102,131,172,253,43,233,1,15,132,244,140,255,141,12,202,255,129,121, 656 134,233,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,
644 253,4,239,15,135,244,53,129,121,253,12,239,15,135,244,53,255,139,105,20,255, 657 255,139,190,233,139,108,36,96,141,12,202,59,141,233,15,135,244,23,15,182,
645 129,252,253,239,15,135,244,53,255,252,242,15,16,1,252,242,15,16,73,8,255, 658 142,233,57,200,15,134,244,249,248,2,255,15,183,70,252,254,252,233,245,255,
646 252,242,15,88,65,16,252,242,15,17,1,133,252,237,15,136,244,249,255,15,140, 659 248,3,199,68,194,252,252,237,131,192,1,57,200,15,134,244,3,252,233,244,2,
647 244,249,255,102,15,46,200,248,1,252,242,15,17,65,24,255,221,65,8,221,1,255, 660 255,141,44,197,237,141,4,194,139,122,252,248,137,104,252,252,137,120,252,
648 220,65,16,221,17,221,81,24,133,252,237,15,136,244,247,255,221,81,24,15,140, 661 248,139,108,36,96,141,12,200,59,141,233,15,135,244,22,137,209,137,194,15,
649 244,247,255,217,201,248,1,255,15,183,70,252,254,255,15,131,244,248,141,180, 662 182,174,233,133,252,237,15,132,244,248,248,1,131,193,8,57,209,15,131,244,
650 253,134,233,255,141,180,253,134,233,15,183,70,252,254,15,131,245,255,15,130, 663 249,139,121,252,248,137,56,139,121,252,252,137,120,4,131,192,8,199,65,252,
651 244,248,141,180,253,134,233,255,248,3,102,15,46,193,252,233,244,1,255,141, 664 252,237,131,252,237,1,15,133,244,1,248,2,255,139,190,233,139,6,15,182,204,
652 12,202,139,105,4,129,252,253,239,15,132,244,247,255,137,105,252,252,139,41, 665 15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,248,3,199,64,4,237,
653 137,105,252,248,252,233,245,255,141,180,253,134,233,139,1,137,105,252,252, 666 131,192,8,131,252,237,1,15,133,244,3,252,233,244,2,255,139,106,252,248,72,
654 137,65,252,248,255,139,139,233,139,4,129,72,139,128,233,139,108,36,96,137, 667 139,189,233,139,108,36,96,141,68,194,252,248,137,149,233,141,136,233,59,141,
655 147,233,137,171,233,252,255,224,255,141,180,253,134,233,139,6,15,182,204, 668 233,137,133,233,255,137,252,233,255,72,137,252,250,137,252,233,255,15,135,
656 15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,139,190,233,139,108, 669 244,21,199,131,233,237,255,252,255,215,255,252,255,147,233,255,199,131,233,
657 36,96,141,12,202,59,141,233,15,135,244,23,15,182,142,233,57,200,15,134,244, 670 237,139,149,233,141,12,194,252,247,217,3,141,233,139,114,252,252,252,233,
658 249,248,2,255,15,183,70,252,254,252,233,245,255,248,3,199,68,194,252,252, 671 244,12,255,254,0
659 237,131,192,1,57,200,15,134,244,3,252,233,244,2,255,141,44,197,237,141,4,
660 194,139,122,252,248,137,104,252,252,137,120,252,248,139,108,36,96,141,12,
661 200,59,141,233,15,135,244,22,137,209,137,194,15,182,174,233,133,252,237,15,
662 132,244,248,248,1,131,193,8,57,209,15,131,244,249,139,121,252,248,137,56,
663 139,121,252,252,137,120,4,131,192,8,199,65,252,252,237,131,252,237,1,15,133,
664 244,1,248,2,255,139,190,233,139,6,15,182,204,15,182,232,131,198,4,193,232,
665 16,252,255,36,252,235,255,248,3,199,64,4,237,131,192,8,131,252,237,1,15,133,
666 244,3,252,233,244,2,255,139,106,252,248,72,139,189,233,139,108,36,96,141,
667 68,194,252,248,137,149,233,141,136,233,59,141,233,137,133,233,255,137,252,
668 233,255,72,137,252,250,137,252,233,255,15,135,244,21,199,131,233,237,255,
669 252,255,215,255,252,255,147,233,255,199,131,233,237,139,149,233,141,12,194,
670 252,247,217,3,141,233,139,114,252,252,252,233,244,12,255,254,0
671}; 672};
672 673
673enum { 674enum {
@@ -997,6 +998,7 @@ static const char *const extnames[] = {
997 "lj_gc_step@4", 998 "lj_gc_step@4",
998 "lj_dispatch_ins@8", 999 "lj_dispatch_ins@8",
999 "lj_dispatch_call@8", 1000 "lj_dispatch_call@8",
1001 "lj_err_throw@8",
1000 "lj_meta_cat", 1002 "lj_meta_cat",
1001 "lj_gc_barrieruv@8", 1003 "lj_gc_barrieruv@8",
1002 "lj_func_closeuv@8", 1004 "lj_func_closeuv@8",
@@ -1343,63 +1345,63 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse)
1343#if LJ_HASJIT 1345#if LJ_HASJIT
1344 dasm_put(Dst, 7212, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP); 1346 dasm_put(Dst, 7212, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP);
1345#endif 1347#endif
1346 dasm_put(Dst, 7253); 1348 dasm_put(Dst, 7264);
1347 if (!sse) { 1349 if (!sse) {
1348 dasm_put(Dst, 7256); 1350 dasm_put(Dst, 7267);
1349 } 1351 }
1350 dasm_put(Dst, 7301, (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 dasm_put(Dst, 7312, (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) { 1353 if (!sse) {
1352 dasm_put(Dst, 7387); 1354 dasm_put(Dst, 7398);
1353 } 1355 }
1354 dasm_put(Dst, 7432, (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)); 1356 dasm_put(Dst, 7443, (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) { 1357 if (!sse) {
1356 dasm_put(Dst, 7518); 1358 dasm_put(Dst, 7529);
1357 } 1359 }
1358 dasm_put(Dst, 7557, (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)); 1360 dasm_put(Dst, 7568, (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) { 1361 if (sse) {
1360 dasm_put(Dst, 7646, (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)); 1362 dasm_put(Dst, 7657, (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 { 1363 } else {
1362 dasm_put(Dst, 7760); 1364 dasm_put(Dst, 7771);
1363 } 1365 }
1364 dasm_put(Dst, 7807); 1366 dasm_put(Dst, 7818);
1365 if (!sse) { 1367 if (!sse) {
1366 } else { 1368 } else {
1367 dasm_put(Dst, 7881); 1369 dasm_put(Dst, 7892);
1368 } 1370 }
1369 dasm_put(Dst, 7884); 1371 dasm_put(Dst, 7895);
1370 dasm_put(Dst, 7969, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); 1372 dasm_put(Dst, 7980, (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, 8070, (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)); 1373 dasm_put(Dst, 8081, (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, 8238); 1374 dasm_put(Dst, 8249);
1373 if (sse) { 1375 if (sse) {
1374 dasm_put(Dst, 8279); 1376 dasm_put(Dst, 8290);
1375 dasm_put(Dst, 8349); 1377 dasm_put(Dst, 8360);
1376 dasm_put(Dst, 8422); 1378 dasm_put(Dst, 8433);
1377 } else { 1379 } else {
1378 dasm_put(Dst, 8472); 1380 dasm_put(Dst, 8483);
1379 dasm_put(Dst, 8564); 1381 dasm_put(Dst, 8575);
1380 } 1382 }
1381 dasm_put(Dst, 8610); 1383 dasm_put(Dst, 8621);
1382 if (sse) { 1384 if (sse) {
1383 dasm_put(Dst, 8616, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); 1385 dasm_put(Dst, 8627, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32));
1384 dasm_put(Dst, 8705, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); 1386 dasm_put(Dst, 8716, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32));
1385 } else { 1387 } else {
1386 dasm_put(Dst, 8829); 1388 dasm_put(Dst, 8840);
1387 dasm_put(Dst, 8912); 1389 dasm_put(Dst, 8923);
1388 if (cmov) { 1390 if (cmov) {
1389 dasm_put(Dst, 8967); 1391 dasm_put(Dst, 8978);
1390 } else { 1392 } else {
1391 dasm_put(Dst, 8986); 1393 dasm_put(Dst, 8997);
1392 } 1394 }
1393 dasm_put(Dst, 8825); 1395 dasm_put(Dst, 8836);
1394 } 1396 }
1395 dasm_put(Dst, 9027); 1397 dasm_put(Dst, 9038);
1396} 1398}
1397 1399
1398/* Generate the code for a single instruction. */ 1400/* Generate the code for a single instruction. */
1399static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) 1401static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
1400{ 1402{
1401 int vk = 0; 1403 int vk = 0;
1402 dasm_put(Dst, 9053, defop); 1404 dasm_put(Dst, 9064, defop);
1403 1405
1404 switch (op) { 1406 switch (op) {
1405 1407
@@ -1408,600 +1410,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. */ 1410 /* Remember: all ops branch for a true comparison, fall through otherwise. */
1409 1411
1410 case BC_ISLT: case BC_ISGE: case BC_ISLE: case BC_ISGT: 1412 case BC_ISLT: case BC_ISGE: case BC_ISLE: case BC_ISGT:
1411 dasm_put(Dst, 9055, LJ_TISNUM, LJ_TISNUM); 1413 dasm_put(Dst, 9066, LJ_TISNUM, LJ_TISNUM);
1412 if (sse) { 1414 if (sse) {
1413 dasm_put(Dst, 9076); 1415 dasm_put(Dst, 9087);
1414 } else { 1416 } else {
1415 dasm_put(Dst, 9091); 1417 dasm_put(Dst, 9102);
1416 if (cmov) { 1418 if (cmov) {
1417 dasm_put(Dst, 9101); 1419 dasm_put(Dst, 9112);
1418 } else { 1420 } else {
1419 dasm_put(Dst, 9107); 1421 dasm_put(Dst, 9118);
1420 } 1422 }
1421 } 1423 }
1422 switch (op) { 1424 switch (op) {
1423 case BC_ISLT: 1425 case BC_ISLT:
1424 dasm_put(Dst, 9114); 1426 dasm_put(Dst, 9125);
1425 break; 1427 break;
1426 case BC_ISGE: 1428 case BC_ISGE:
1427 dasm_put(Dst, 8907); 1429 dasm_put(Dst, 8918);
1428 break; 1430 break;
1429 case BC_ISLE: 1431 case BC_ISLE:
1430 dasm_put(Dst, 5872); 1432 dasm_put(Dst, 5872);
1431 break; 1433 break;
1432 case BC_ISGT: 1434 case BC_ISGT:
1433 dasm_put(Dst, 9119); 1435 dasm_put(Dst, 9130);
1434 break; 1436 break;
1435 default: break; /* Shut up GCC. */ 1437 default: break; /* Shut up GCC. */
1436 } 1438 }
1437 dasm_put(Dst, 9124, -BCBIAS_J*4); 1439 dasm_put(Dst, 9135, -BCBIAS_J*4);
1438 break; 1440 break;
1439 1441
1440 case BC_ISEQV: case BC_ISNEV: 1442 case BC_ISEQV: case BC_ISNEV:
1441 vk = op == BC_ISEQV; 1443 vk = op == BC_ISEQV;
1442 dasm_put(Dst, 9158, LJ_TISNUM, LJ_TISNUM); 1444 dasm_put(Dst, 9169, LJ_TISNUM, LJ_TISNUM);
1443 if (sse) { 1445 if (sse) {
1444 dasm_put(Dst, 9184); 1446 dasm_put(Dst, 9195);
1445 } else { 1447 } else {
1446 dasm_put(Dst, 9196); 1448 dasm_put(Dst, 9207);
1447 if (cmov) { 1449 if (cmov) {
1448 dasm_put(Dst, 9101); 1450 dasm_put(Dst, 9112);
1449 } else { 1451 } else {
1450 dasm_put(Dst, 9107); 1452 dasm_put(Dst, 9118);
1451 } 1453 }
1452 } 1454 }
1453 iseqne_fp: 1455 iseqne_fp:
1454 if (vk) { 1456 if (vk) {
1455 dasm_put(Dst, 9203); 1457 dasm_put(Dst, 9214);
1456 } else { 1458 } else {
1457 dasm_put(Dst, 9212); 1459 dasm_put(Dst, 9223);
1458 } 1460 }
1459 iseqne_end: 1461 iseqne_end:
1460 if (vk) { 1462 if (vk) {
1461 dasm_put(Dst, 9221, -BCBIAS_J*4); 1463 dasm_put(Dst, 9232, -BCBIAS_J*4);
1462 } else { 1464 } else {
1463 dasm_put(Dst, 9236, -BCBIAS_J*4); 1465 dasm_put(Dst, 9247, -BCBIAS_J*4);
1464 } 1466 }
1465 dasm_put(Dst, 7233); 1467 dasm_put(Dst, 9149);
1466 if (op == BC_ISEQV || op == BC_ISNEV) { 1468 if (op == BC_ISEQV || op == BC_ISNEV) {
1467 dasm_put(Dst, 9251, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<<MM_eq); 1469 dasm_put(Dst, 9262, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<<MM_eq);
1468 if (vk) { 1470 if (vk) {
1469 dasm_put(Dst, 9309); 1471 dasm_put(Dst, 9320);
1470 } else { 1472 } else {
1471 dasm_put(Dst, 9313); 1473 dasm_put(Dst, 9324);
1472 } 1474 }
1473 dasm_put(Dst, 9319); 1475 dasm_put(Dst, 9330);
1474 } 1476 }
1475 break; 1477 break;
1476 case BC_ISEQS: case BC_ISNES: 1478 case BC_ISEQS: case BC_ISNES:
1477 vk = op == BC_ISEQS; 1479 vk = op == BC_ISEQS;
1478 dasm_put(Dst, 9324, LJ_TSTR); 1480 dasm_put(Dst, 9335, LJ_TSTR);
1479 iseqne_test: 1481 iseqne_test:
1480 if (vk) { 1482 if (vk) {
1481 dasm_put(Dst, 9207); 1483 dasm_put(Dst, 9218);
1482 } else { 1484 } else {
1483 dasm_put(Dst, 2774); 1485 dasm_put(Dst, 2774);
1484 } 1486 }
1485 goto iseqne_end; 1487 goto iseqne_end;
1486 case BC_ISEQN: case BC_ISNEN: 1488 case BC_ISEQN: case BC_ISNEN:
1487 vk = op == BC_ISEQN; 1489 vk = op == BC_ISEQN;
1488 dasm_put(Dst, 9348, LJ_TISNUM); 1490 dasm_put(Dst, 9359, LJ_TISNUM);
1489 if (sse) { 1491 if (sse) {
1490 dasm_put(Dst, 9362); 1492 dasm_put(Dst, 9373);
1491 } else { 1493 } else {
1492 dasm_put(Dst, 9374); 1494 dasm_put(Dst, 9385);
1493 if (cmov) { 1495 if (cmov) {
1494 dasm_put(Dst, 9101); 1496 dasm_put(Dst, 9112);
1495 } else { 1497 } else {
1496 dasm_put(Dst, 9107); 1498 dasm_put(Dst, 9118);
1497 } 1499 }
1498 } 1500 }
1499 goto iseqne_fp; 1501 goto iseqne_fp;
1500 case BC_ISEQP: case BC_ISNEP: 1502 case BC_ISEQP: case BC_ISNEP:
1501 vk = op == BC_ISEQP; 1503 vk = op == BC_ISEQP;
1502 dasm_put(Dst, 9381); 1504 dasm_put(Dst, 9392);
1503 goto iseqne_test; 1505 goto iseqne_test;
1504 1506
1505 /* -- Unary test and copy ops ------------------------------------------- */ 1507 /* -- Unary test and copy ops ------------------------------------------- */
1506 1508
1507 case BC_ISTC: case BC_ISFC: case BC_IST: case BC_ISF: 1509 case BC_ISTC: case BC_ISFC: case BC_IST: case BC_ISF:
1508 dasm_put(Dst, 9393, LJ_TISTRUECOND); 1510 dasm_put(Dst, 9404, LJ_TISTRUECOND);
1509 if (op == BC_IST || op == BC_ISTC) { 1511 if (op == BC_IST || op == BC_ISTC) {
1510 dasm_put(Dst, 9405); 1512 dasm_put(Dst, 9416);
1511 } else { 1513 } else {
1512 dasm_put(Dst, 9410); 1514 dasm_put(Dst, 9421);
1513 } 1515 }
1514 if (op == BC_ISTC || op == BC_ISFC) { 1516 if (op == BC_ISTC || op == BC_ISFC) {
1515 dasm_put(Dst, 9415); 1517 dasm_put(Dst, 9426);
1516 } 1518 }
1517 dasm_put(Dst, 9426, -BCBIAS_J*4); 1519 dasm_put(Dst, 9437, -BCBIAS_J*4);
1518 break; 1520 break;
1519 1521
1520 /* -- Unary ops --------------------------------------------------------- */ 1522 /* -- Unary ops --------------------------------------------------------- */
1521 1523
1522 case BC_MOV: 1524 case BC_MOV:
1523 dasm_put(Dst, 9458); 1525 dasm_put(Dst, 9469);
1524 break; 1526 break;
1525 case BC_NOT: 1527 case BC_NOT:
1526 dasm_put(Dst, 9492, LJ_TISTRUECOND, LJ_TTRUE); 1528 dasm_put(Dst, 9503, LJ_TISTRUECOND, LJ_TTRUE);
1527 break; 1529 break;
1528 case BC_UNM: 1530 case BC_UNM:
1529 dasm_put(Dst, 9528, LJ_TISNUM); 1531 dasm_put(Dst, 9539, LJ_TISNUM);
1530 if (sse) { 1532 if (sse) {
1531 dasm_put(Dst, 9539, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); 1533 dasm_put(Dst, 9550, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32));
1532 } else { 1534 } else {
1533 dasm_put(Dst, 9564); 1535 dasm_put(Dst, 9575);
1534 } 1536 }
1535 dasm_put(Dst, 7233); 1537 dasm_put(Dst, 9149);
1536 break; 1538 break;
1537 case BC_LEN: 1539 case BC_LEN:
1538 dasm_put(Dst, 9573, LJ_TSTR); 1540 dasm_put(Dst, 9584, LJ_TSTR);
1539 if (sse) { 1541 if (sse) {
1540 dasm_put(Dst, 9587, Dt5(->len)); 1542 dasm_put(Dst, 9598, Dt5(->len));
1541 } else { 1543 } else {
1542 dasm_put(Dst, 9605, Dt5(->len)); 1544 dasm_put(Dst, 9616, Dt5(->len));
1543 } 1545 }
1544 dasm_put(Dst, 9614, LJ_TTAB); 1546 dasm_put(Dst, 9625, LJ_TTAB);
1545 if (sse) { 1547 if (sse) {
1546 dasm_put(Dst, 9655); 1548 dasm_put(Dst, 9666);
1547 } else { 1549 } else {
1548 } 1550 }
1549 dasm_put(Dst, 9664); 1551 dasm_put(Dst, 9675);
1550 break; 1552 break;
1551 1553
1552 /* -- Binary ops -------------------------------------------------------- */ 1554 /* -- Binary ops -------------------------------------------------------- */
1553 1555
1554 1556
1555 case BC_ADDVN: case BC_ADDNV: case BC_ADDVV: 1557 case BC_ADDVN: case BC_ADDNV: case BC_ADDVV:
1556 dasm_put(Dst, 9674); 1558 dasm_put(Dst, 9685);
1557 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1559 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1558 switch (vk) { 1560 switch (vk) {
1559 case 0: 1561 case 0:
1560 dasm_put(Dst, 9682, LJ_TISNUM); 1562 dasm_put(Dst, 9693, LJ_TISNUM);
1561 if (sse) { 1563 if (sse) {
1562 dasm_put(Dst, 9694); 1564 dasm_put(Dst, 9705);
1563 } else { 1565 } else {
1564 dasm_put(Dst, 9708); 1566 dasm_put(Dst, 9719);
1565 } 1567 }
1566 break; 1568 break;
1567 case 1: 1569 case 1:
1568 dasm_put(Dst, 9716, LJ_TISNUM); 1570 dasm_put(Dst, 9727, LJ_TISNUM);
1569 if (sse) { 1571 if (sse) {
1570 dasm_put(Dst, 9728); 1572 dasm_put(Dst, 9739);
1571 } else { 1573 } else {
1572 dasm_put(Dst, 9742); 1574 dasm_put(Dst, 9753);
1573 } 1575 }
1574 break; 1576 break;
1575 default: 1577 default:
1576 dasm_put(Dst, 9750, LJ_TISNUM, LJ_TISNUM); 1578 dasm_put(Dst, 9761, LJ_TISNUM, LJ_TISNUM);
1577 if (sse) { 1579 if (sse) {
1578 dasm_put(Dst, 9772); 1580 dasm_put(Dst, 9783);
1579 } else { 1581 } else {
1580 dasm_put(Dst, 9786); 1582 dasm_put(Dst, 9797);
1581 } 1583 }
1582 break; 1584 break;
1583 } 1585 }
1584 if (sse) { 1586 if (sse) {
1585 dasm_put(Dst, 9557); 1587 dasm_put(Dst, 9568);
1586 } else { 1588 } else {
1587 dasm_put(Dst, 9569); 1589 dasm_put(Dst, 9580);
1588 } 1590 }
1589 dasm_put(Dst, 7233); 1591 dasm_put(Dst, 9149);
1590 break; 1592 break;
1591 case BC_SUBVN: case BC_SUBNV: case BC_SUBVV: 1593 case BC_SUBVN: case BC_SUBNV: case BC_SUBVV:
1592 dasm_put(Dst, 9674); 1594 dasm_put(Dst, 9685);
1593 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1595 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1594 switch (vk) { 1596 switch (vk) {
1595 case 0: 1597 case 0:
1596 dasm_put(Dst, 9682, LJ_TISNUM); 1598 dasm_put(Dst, 9693, LJ_TISNUM);
1597 if (sse) { 1599 if (sse) {
1598 dasm_put(Dst, 9794); 1600 dasm_put(Dst, 9805);
1599 } else { 1601 } else {
1600 dasm_put(Dst, 9808); 1602 dasm_put(Dst, 9819);
1601 } 1603 }
1602 break; 1604 break;
1603 case 1: 1605 case 1:
1604 dasm_put(Dst, 9716, LJ_TISNUM); 1606 dasm_put(Dst, 9727, LJ_TISNUM);
1605 if (sse) { 1607 if (sse) {
1606 dasm_put(Dst, 9816); 1608 dasm_put(Dst, 9827);
1607 } else { 1609 } else {
1608 dasm_put(Dst, 9830); 1610 dasm_put(Dst, 9841);
1609 } 1611 }
1610 break; 1612 break;
1611 default: 1613 default:
1612 dasm_put(Dst, 9750, LJ_TISNUM, LJ_TISNUM); 1614 dasm_put(Dst, 9761, LJ_TISNUM, LJ_TISNUM);
1613 if (sse) { 1615 if (sse) {
1614 dasm_put(Dst, 9838); 1616 dasm_put(Dst, 9849);
1615 } else { 1617 } else {
1616 dasm_put(Dst, 9852); 1618 dasm_put(Dst, 9863);
1617 } 1619 }
1618 break; 1620 break;
1619 } 1621 }
1620 if (sse) { 1622 if (sse) {
1621 dasm_put(Dst, 9557); 1623 dasm_put(Dst, 9568);
1622 } else { 1624 } else {
1623 dasm_put(Dst, 9569); 1625 dasm_put(Dst, 9580);
1624 } 1626 }
1625 dasm_put(Dst, 7233); 1627 dasm_put(Dst, 9149);
1626 break; 1628 break;
1627 case BC_MULVN: case BC_MULNV: case BC_MULVV: 1629 case BC_MULVN: case BC_MULNV: case BC_MULVV:
1628 dasm_put(Dst, 9674); 1630 dasm_put(Dst, 9685);
1629 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1631 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1630 switch (vk) { 1632 switch (vk) {
1631 case 0: 1633 case 0:
1632 dasm_put(Dst, 9682, LJ_TISNUM); 1634 dasm_put(Dst, 9693, LJ_TISNUM);
1633 if (sse) { 1635 if (sse) {
1634 dasm_put(Dst, 9860); 1636 dasm_put(Dst, 9871);
1635 } else { 1637 } else {
1636 dasm_put(Dst, 9874); 1638 dasm_put(Dst, 9885);
1637 } 1639 }
1638 break; 1640 break;
1639 case 1: 1641 case 1:
1640 dasm_put(Dst, 9716, LJ_TISNUM); 1642 dasm_put(Dst, 9727, LJ_TISNUM);
1641 if (sse) { 1643 if (sse) {
1642 dasm_put(Dst, 9882); 1644 dasm_put(Dst, 9893);
1643 } else { 1645 } else {
1644 dasm_put(Dst, 9896); 1646 dasm_put(Dst, 9907);
1645 } 1647 }
1646 break; 1648 break;
1647 default: 1649 default:
1648 dasm_put(Dst, 9750, LJ_TISNUM, LJ_TISNUM); 1650 dasm_put(Dst, 9761, LJ_TISNUM, LJ_TISNUM);
1649 if (sse) { 1651 if (sse) {
1650 dasm_put(Dst, 9904); 1652 dasm_put(Dst, 9915);
1651 } else { 1653 } else {
1652 dasm_put(Dst, 9918); 1654 dasm_put(Dst, 9929);
1653 } 1655 }
1654 break; 1656 break;
1655 } 1657 }
1656 if (sse) { 1658 if (sse) {
1657 dasm_put(Dst, 9557); 1659 dasm_put(Dst, 9568);
1658 } else { 1660 } else {
1659 dasm_put(Dst, 9569); 1661 dasm_put(Dst, 9580);
1660 } 1662 }
1661 dasm_put(Dst, 7233); 1663 dasm_put(Dst, 9149);
1662 break; 1664 break;
1663 case BC_DIVVN: case BC_DIVNV: case BC_DIVVV: 1665 case BC_DIVVN: case BC_DIVNV: case BC_DIVVV:
1664 dasm_put(Dst, 9674); 1666 dasm_put(Dst, 9685);
1665 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1667 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1666 switch (vk) { 1668 switch (vk) {
1667 case 0: 1669 case 0:
1668 dasm_put(Dst, 9682, LJ_TISNUM); 1670 dasm_put(Dst, 9693, LJ_TISNUM);
1669 if (sse) { 1671 if (sse) {
1670 dasm_put(Dst, 9926); 1672 dasm_put(Dst, 9937);
1671 } else { 1673 } else {
1672 dasm_put(Dst, 9940); 1674 dasm_put(Dst, 9951);
1673 } 1675 }
1674 break; 1676 break;
1675 case 1: 1677 case 1:
1676 dasm_put(Dst, 9716, LJ_TISNUM); 1678 dasm_put(Dst, 9727, LJ_TISNUM);
1677 if (sse) { 1679 if (sse) {
1678 dasm_put(Dst, 9948); 1680 dasm_put(Dst, 9959);
1679 } else { 1681 } else {
1680 dasm_put(Dst, 9962); 1682 dasm_put(Dst, 9973);
1681 } 1683 }
1682 break; 1684 break;
1683 default: 1685 default:
1684 dasm_put(Dst, 9750, LJ_TISNUM, LJ_TISNUM); 1686 dasm_put(Dst, 9761, LJ_TISNUM, LJ_TISNUM);
1685 if (sse) { 1687 if (sse) {
1686 dasm_put(Dst, 9970); 1688 dasm_put(Dst, 9981);
1687 } else { 1689 } else {
1688 dasm_put(Dst, 9984); 1690 dasm_put(Dst, 9995);
1689 } 1691 }
1690 break; 1692 break;
1691 } 1693 }
1692 if (sse) { 1694 if (sse) {
1693 dasm_put(Dst, 9557); 1695 dasm_put(Dst, 9568);
1694 } else { 1696 } else {
1695 dasm_put(Dst, 9569); 1697 dasm_put(Dst, 9580);
1696 } 1698 }
1697 dasm_put(Dst, 7233); 1699 dasm_put(Dst, 9149);
1698 break; 1700 break;
1699 case BC_MODVN: 1701 case BC_MODVN:
1700 dasm_put(Dst, 9674); 1702 dasm_put(Dst, 9685);
1701 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1703 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1702 switch (vk) { 1704 switch (vk) {
1703 case 0: 1705 case 0:
1704 dasm_put(Dst, 9682, LJ_TISNUM); 1706 dasm_put(Dst, 9693, LJ_TISNUM);
1705 if (sse) { 1707 if (sse) {
1706 dasm_put(Dst, 9992); 1708 dasm_put(Dst, 10003);
1707 } else { 1709 } else {
1708 dasm_put(Dst, 10006); 1710 dasm_put(Dst, 10017);
1709 } 1711 }
1710 break; 1712 break;
1711 case 1: 1713 case 1:
1712 dasm_put(Dst, 9716, LJ_TISNUM); 1714 dasm_put(Dst, 9727, LJ_TISNUM);
1713 if (sse) { 1715 if (sse) {
1714 dasm_put(Dst, 10014); 1716 dasm_put(Dst, 10025);
1715 } else { 1717 } else {
1716 dasm_put(Dst, 10028); 1718 dasm_put(Dst, 10039);
1717 } 1719 }
1718 break; 1720 break;
1719 default: 1721 default:
1720 dasm_put(Dst, 9750, LJ_TISNUM, LJ_TISNUM); 1722 dasm_put(Dst, 9761, LJ_TISNUM, LJ_TISNUM);
1721 if (sse) { 1723 if (sse) {
1722 dasm_put(Dst, 10036); 1724 dasm_put(Dst, 10047);
1723 } else { 1725 } else {
1724 dasm_put(Dst, 10050); 1726 dasm_put(Dst, 10061);
1725 } 1727 }
1726 break; 1728 break;
1727 } 1729 }
1728 dasm_put(Dst, 10058); 1730 dasm_put(Dst, 10069);
1729 if (sse) { 1731 if (sse) {
1730 dasm_put(Dst, 9557); 1732 dasm_put(Dst, 9568);
1731 } else { 1733 } else {
1732 dasm_put(Dst, 9569); 1734 dasm_put(Dst, 9580);
1733 } 1735 }
1734 dasm_put(Dst, 7233); 1736 dasm_put(Dst, 9149);
1735 break; 1737 break;
1736 case BC_MODNV: case BC_MODVV: 1738 case BC_MODNV: case BC_MODVV:
1737 dasm_put(Dst, 9674); 1739 dasm_put(Dst, 9685);
1738 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1740 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1739 switch (vk) { 1741 switch (vk) {
1740 case 0: 1742 case 0:
1741 dasm_put(Dst, 9682, LJ_TISNUM); 1743 dasm_put(Dst, 9693, LJ_TISNUM);
1742 if (sse) { 1744 if (sse) {
1743 dasm_put(Dst, 9992); 1745 dasm_put(Dst, 10003);
1744 } else { 1746 } else {
1745 dasm_put(Dst, 10006); 1747 dasm_put(Dst, 10017);
1746 } 1748 }
1747 break; 1749 break;
1748 case 1: 1750 case 1:
1749 dasm_put(Dst, 9716, LJ_TISNUM); 1751 dasm_put(Dst, 9727, LJ_TISNUM);
1750 if (sse) { 1752 if (sse) {
1751 dasm_put(Dst, 10014); 1753 dasm_put(Dst, 10025);
1752 } else { 1754 } else {
1753 dasm_put(Dst, 10028); 1755 dasm_put(Dst, 10039);
1754 } 1756 }
1755 break; 1757 break;
1756 default: 1758 default:
1757 dasm_put(Dst, 9750, LJ_TISNUM, LJ_TISNUM); 1759 dasm_put(Dst, 9761, LJ_TISNUM, LJ_TISNUM);
1758 if (sse) { 1760 if (sse) {
1759 dasm_put(Dst, 10036); 1761 dasm_put(Dst, 10047);
1760 } else { 1762 } else {
1761 dasm_put(Dst, 10050); 1763 dasm_put(Dst, 10061);
1762 } 1764 }
1763 break; 1765 break;
1764 } 1766 }
1765 dasm_put(Dst, 10064); 1767 dasm_put(Dst, 10075);
1766 break; 1768 break;
1767 case BC_POW: 1769 case BC_POW:
1768 dasm_put(Dst, 9674); 1770 dasm_put(Dst, 9685);
1769 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1771 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1770 switch (vk) { 1772 switch (vk) {
1771 case 0: 1773 case 0:
1772 dasm_put(Dst, 9682, LJ_TISNUM); 1774 dasm_put(Dst, 9693, LJ_TISNUM);
1773 if (sse) { 1775 if (sse) {
1774 dasm_put(Dst, 9992); 1776 dasm_put(Dst, 10003);
1775 } else { 1777 } else {
1776 dasm_put(Dst, 10006); 1778 dasm_put(Dst, 10017);
1777 } 1779 }
1778 break; 1780 break;
1779 case 1: 1781 case 1:
1780 dasm_put(Dst, 9716, LJ_TISNUM); 1782 dasm_put(Dst, 9727, LJ_TISNUM);
1781 if (sse) { 1783 if (sse) {
1782 dasm_put(Dst, 10014); 1784 dasm_put(Dst, 10025);
1783 } else { 1785 } else {
1784 dasm_put(Dst, 10028); 1786 dasm_put(Dst, 10039);
1785 } 1787 }
1786 break; 1788 break;
1787 default: 1789 default:
1788 dasm_put(Dst, 9750, LJ_TISNUM, LJ_TISNUM); 1790 dasm_put(Dst, 9761, LJ_TISNUM, LJ_TISNUM);
1789 if (sse) { 1791 if (sse) {
1790 dasm_put(Dst, 10036); 1792 dasm_put(Dst, 10047);
1791 } else { 1793 } else {
1792 dasm_put(Dst, 10050); 1794 dasm_put(Dst, 10061);
1793 } 1795 }
1794 break; 1796 break;
1795 } 1797 }
1796 dasm_put(Dst, 10069); 1798 dasm_put(Dst, 10080);
1797 if (sse) { 1799 if (sse) {
1798 dasm_put(Dst, 9557); 1800 dasm_put(Dst, 9568);
1799 } else { 1801 } else {
1800 dasm_put(Dst, 9569); 1802 dasm_put(Dst, 9580);
1801 } 1803 }
1802 dasm_put(Dst, 7233); 1804 dasm_put(Dst, 9149);
1803 break; 1805 break;
1804 1806
1805 case BC_CAT: 1807 case BC_CAT:
1806 dasm_put(Dst, 10073, Dt1(->base), Dt1(->base)); 1808 dasm_put(Dst, 10084, Dt1(->base), Dt1(->base));
1807 break; 1809 break;
1808 1810
1809 /* -- Constant ops ------------------------------------------------------ */ 1811 /* -- Constant ops ------------------------------------------------------ */
1810 1812
1811 case BC_KSTR: 1813 case BC_KSTR:
1812 dasm_put(Dst, 10163, LJ_TSTR); 1814 dasm_put(Dst, 10174, LJ_TSTR);
1813 break; 1815 break;
1814 case BC_KSHORT: 1816 case BC_KSHORT:
1815 if (sse) { 1817 if (sse) {
1816 dasm_put(Dst, 10198); 1818 dasm_put(Dst, 10209);
1817 } else { 1819 } else {
1818 dasm_put(Dst, 10213); 1820 dasm_put(Dst, 10224);
1819 } 1821 }
1820 dasm_put(Dst, 7233); 1822 dasm_put(Dst, 9149);
1821 break; 1823 break;
1822 case BC_KNUM: 1824 case BC_KNUM:
1823 if (sse) { 1825 if (sse) {
1824 dasm_put(Dst, 10221); 1826 dasm_put(Dst, 10232);
1825 } else { 1827 } else {
1826 dasm_put(Dst, 10234); 1828 dasm_put(Dst, 10245);
1827 } 1829 }
1828 dasm_put(Dst, 7233); 1830 dasm_put(Dst, 9149);
1829 break; 1831 break;
1830 case BC_KPRI: 1832 case BC_KPRI:
1831 dasm_put(Dst, 10241); 1833 dasm_put(Dst, 10252);
1832 break; 1834 break;
1833 case BC_KNIL: 1835 case BC_KNIL:
1834 dasm_put(Dst, 10269, LJ_TNIL); 1836 dasm_put(Dst, 10280, LJ_TNIL);
1835 break; 1837 break;
1836 1838
1837 /* -- Upvalue and function ops ------------------------------------------ */ 1839 /* -- Upvalue and function ops ------------------------------------------ */
1838 1840
1839 case BC_UGET: 1841 case BC_UGET:
1840 dasm_put(Dst, 10316, offsetof(GCfuncL, uvptr), DtA(->v)); 1842 dasm_put(Dst, 10327, offsetof(GCfuncL, uvptr), DtA(->v));
1841 break; 1843 break;
1842 case BC_USETV: 1844 case BC_USETV:
1843#define TV2MARKOFS \ 1845#define TV2MARKOFS \
1844 ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv)) 1846 ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv))
1845 dasm_put(Dst, 10361, 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); 1847 dasm_put(Dst, 10372, 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, 10452); 1848 dasm_put(Dst, 10463);
1847 break; 1849 break;
1848#undef TV2MARKOFS 1850#undef TV2MARKOFS
1849 case BC_USETS: 1851 case BC_USETS:
1850 dasm_put(Dst, 10464, offsetof(GCfuncL, uvptr), DtA(->v), LJ_TSTR, DtA(->marked), LJ_GC_BLACK, Dt4(->gch.marked), LJ_GC_WHITES, DtA(->closed), GG_DISP2G); 1852 dasm_put(Dst, 10475, offsetof(GCfuncL, uvptr), DtA(->v), LJ_TSTR, DtA(->marked), LJ_GC_BLACK, Dt4(->gch.marked), LJ_GC_WHITES, DtA(->closed), GG_DISP2G);
1851 break; 1853 break;
1852 case BC_USETN: 1854 case BC_USETN:
1853 dasm_put(Dst, 10557); 1855 dasm_put(Dst, 10568);
1854 if (sse) { 1856 if (sse) {
1855 dasm_put(Dst, 10562); 1857 dasm_put(Dst, 10573);
1856 } else { 1858 } else {
1857 dasm_put(Dst, 9377); 1859 dasm_put(Dst, 9388);
1858 } 1860 }
1859 dasm_put(Dst, 10569, offsetof(GCfuncL, uvptr), DtA(->v)); 1861 dasm_put(Dst, 10580, offsetof(GCfuncL, uvptr), DtA(->v));
1860 if (sse) { 1862 if (sse) {
1861 dasm_put(Dst, 10578); 1863 dasm_put(Dst, 10589);
1862 } else { 1864 } else {
1863 dasm_put(Dst, 10584); 1865 dasm_put(Dst, 10595);
1864 } 1866 }
1865 dasm_put(Dst, 7233); 1867 dasm_put(Dst, 9149);
1866 break; 1868 break;
1867 case BC_USETP: 1869 case BC_USETP:
1868 dasm_put(Dst, 10587, offsetof(GCfuncL, uvptr), DtA(->v)); 1870 dasm_put(Dst, 10598, offsetof(GCfuncL, uvptr), DtA(->v));
1869 break; 1871 break;
1870 case BC_UCLO: 1872 case BC_UCLO:
1871 dasm_put(Dst, 10626, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); 1873 dasm_put(Dst, 10637, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base));
1872 break; 1874 break;
1873 1875
1874 case BC_FNEW: 1876 case BC_FNEW:
1875 dasm_put(Dst, 10681, Dt1(->base), Dt1(->base), LJ_TFUNC); 1877 dasm_put(Dst, 10692, Dt1(->base), Dt1(->base), LJ_TFUNC);
1876 break; 1878 break;
1877 1879
1878 /* -- Table ops --------------------------------------------------------- */ 1880 /* -- Table ops --------------------------------------------------------- */
1879 1881
1880 case BC_TNEW: 1882 case BC_TNEW:
1881 dasm_put(Dst, 10747, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); 1883 dasm_put(Dst, 10758, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB);
1882 break; 1884 break;
1883 case BC_TDUP: 1885 case BC_TDUP:
1884 dasm_put(Dst, 10868, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); 1886 dasm_put(Dst, 10879, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB);
1885 break; 1887 break;
1886 1888
1887 case BC_GGET: 1889 case BC_GGET:
1888 dasm_put(Dst, 10963, Dt7(->env)); 1890 dasm_put(Dst, 10974, Dt7(->env));
1889 break; 1891 break;
1890 case BC_GSET: 1892 case BC_GSET:
1891 dasm_put(Dst, 10982, Dt7(->env)); 1893 dasm_put(Dst, 10993, Dt7(->env));
1892 break; 1894 break;
1893 1895
1894 case BC_TGETV: 1896 case BC_TGETV:
1895 dasm_put(Dst, 11001, LJ_TTAB, LJ_TISNUM); 1897 dasm_put(Dst, 11012, LJ_TTAB, LJ_TISNUM);
1896 if (sse) { 1898 if (sse) {
1897 dasm_put(Dst, 11034); 1899 dasm_put(Dst, 11045);
1898 } else { 1900 } else {
1899 } 1901 }
1900 dasm_put(Dst, 11055, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index); 1902 dasm_put(Dst, 11066, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
1901 dasm_put(Dst, 11148, LJ_TSTR); 1903 dasm_put(Dst, 11159, LJ_TSTR);
1902 break; 1904 break;
1903 case BC_TGETS: 1905 case BC_TGETS:
1904 dasm_put(Dst, 11166, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); 1906 dasm_put(Dst, 11177, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL);
1905 dasm_put(Dst, 11251, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<<MM_index); 1907 dasm_put(Dst, 11262, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
1906 break; 1908 break;
1907 case BC_TGETB: 1909 case BC_TGETB:
1908 dasm_put(Dst, 11323, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index); 1910 dasm_put(Dst, 11334, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
1909 dasm_put(Dst, 9664); 1911 dasm_put(Dst, 9675);
1910 break; 1912 break;
1911 1913
1912 case BC_TSETV: 1914 case BC_TSETV:
1913 dasm_put(Dst, 11423, LJ_TTAB, LJ_TISNUM); 1915 dasm_put(Dst, 11434, LJ_TTAB, LJ_TISNUM);
1914 if (sse) { 1916 if (sse) {
1915 dasm_put(Dst, 11034); 1917 dasm_put(Dst, 11045);
1916 } else { 1918 } else {
1917 } 1919 }
1918 dasm_put(Dst, 11456, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable)); 1920 dasm_put(Dst, 11467, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable));
1919 dasm_put(Dst, 11540, Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); 1921 dasm_put(Dst, 11551, 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; 1922 break;
1921 case BC_TSETS: 1923 case BC_TSETS:
1922 dasm_put(Dst, 11602, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->nomm), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); 1924 dasm_put(Dst, 11613, 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, 11678, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, DtB(->next)); 1925 dasm_put(Dst, 11689, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, DtB(->next));
1924 dasm_put(Dst, 11771, 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)); 1926 dasm_put(Dst, 11782, 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; 1927 break;
1926 case BC_TSETB: 1928 case BC_TSETB:
1927 dasm_put(Dst, 11862, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); 1929 dasm_put(Dst, 11873, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable));
1928 dasm_put(Dst, 11961, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); 1930 dasm_put(Dst, 11972, 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; 1931 break;
1930 1932
1931 case BC_TSETM: 1933 case BC_TSETM:
1932 dasm_put(Dst, 12007); 1934 dasm_put(Dst, 12018);
1933 if (sse) { 1935 if (sse) {
1934 dasm_put(Dst, 10562); 1936 dasm_put(Dst, 10573);
1935 } else { 1937 } else {
1936 } 1938 }
1937 dasm_put(Dst, 12012, Dt6(->marked), LJ_GC_BLACK); 1939 dasm_put(Dst, 12023, Dt6(->marked), LJ_GC_BLACK);
1938 if (sse) { 1940 if (sse) {
1939 dasm_put(Dst, 12037); 1941 dasm_put(Dst, 12048);
1940 } else { 1942 } else {
1941 } 1943 }
1942 dasm_put(Dst, 12044, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain)); 1944 dasm_put(Dst, 12055, 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, 12170, Dt6(->gclist)); 1945 dasm_put(Dst, 12181, Dt6(->gclist));
1944 break; 1946 break;
1945 1947
1946 /* -- Calls and vararg handling ----------------------------------------- */ 1948 /* -- Calls and vararg handling ----------------------------------------- */
1947 1949
1948 case BC_CALL: case BC_CALLM: 1950 case BC_CALL: case BC_CALLM:
1949 dasm_put(Dst, 9678); 1951 dasm_put(Dst, 9689);
1950 if (op == BC_CALLM) { 1952 if (op == BC_CALLM) {
1951 dasm_put(Dst, 12178); 1953 dasm_put(Dst, 12189);
1952 } 1954 }
1953 dasm_put(Dst, 12183, LJ_TFUNC, Dt7(->pc)); 1955 dasm_put(Dst, 12194, LJ_TFUNC, Dt7(->pc));
1954 break; 1956 break;
1955 1957
1956 case BC_CALLMT: 1958 case BC_CALLMT:
1957 dasm_put(Dst, 12178); 1959 dasm_put(Dst, 12189);
1958 break; 1960 break;
1959 case BC_CALLT: 1961 case BC_CALLT:
1960 dasm_put(Dst, 12225, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); 1962 dasm_put(Dst, 12236, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc));
1961 dasm_put(Dst, 12344, FRAME_TYPE, Dt7(->pc), PC2PROTO(k)); 1963 dasm_put(Dst, 12355, FRAME_TYPE, Dt7(->pc), PC2PROTO(k));
1962 break; 1964 break;
1963 1965
1964 case BC_ITERC: 1966 case BC_ITERC:
1965 dasm_put(Dst, 12402, LJ_TFUNC, 2+1, Dt7(->pc)); 1967 dasm_put(Dst, 12413, LJ_TFUNC, 2+1, Dt7(->pc));
1966 break; 1968 break;
1967 1969
1968 case BC_VARG: 1970 case BC_VARG:
1969 dasm_put(Dst, 12483, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL); 1971 dasm_put(Dst, 12494, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL);
1970 dasm_put(Dst, 12628, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); 1972 dasm_put(Dst, 12639, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top));
1971 break; 1973 break;
1972 1974
1973 /* -- Returns ----------------------------------------------------------- */ 1975 /* -- Returns ----------------------------------------------------------- */
1974 1976
1975 case BC_RETM: 1977 case BC_RETM:
1976 dasm_put(Dst, 12178); 1978 dasm_put(Dst, 12189);
1977 break; 1979 break;
1978 1980
1979 case BC_RET: case BC_RET0: case BC_RET1: 1981 case BC_RET: case BC_RET0: case BC_RET1:
1980 if (op != BC_RET0) { 1982 if (op != BC_RET0) {
1981 dasm_put(Dst, 12727); 1983 dasm_put(Dst, 12738);
1982 } 1984 }
1983 dasm_put(Dst, 12731, FRAME_TYPE); 1985 dasm_put(Dst, 12742, FRAME_TYPE);
1984 switch (op) { 1986 switch (op) {
1985 case BC_RET: 1987 case BC_RET:
1986 dasm_put(Dst, 12750); 1988 dasm_put(Dst, 12761);
1987 break; 1989 break;
1988 case BC_RET1: 1990 case BC_RET1:
1989 dasm_put(Dst, 12808); 1991 dasm_put(Dst, 12819);
1990 /* fallthrough */ 1992 /* fallthrough */
1991 case BC_RET0: 1993 case BC_RET0:
1992 dasm_put(Dst, 12824); 1994 dasm_put(Dst, 12835);
1993 default: 1995 default:
1994 break; 1996 break;
1995 } 1997 }
1996 dasm_put(Dst, 12835, Dt7(->pc), PC2PROTO(k)); 1998 dasm_put(Dst, 12846, Dt7(->pc), PC2PROTO(k));
1997 if (op == BC_RET) { 1999 if (op == BC_RET) {
1998 dasm_put(Dst, 12879, LJ_TNIL); 2000 dasm_put(Dst, 12890, LJ_TNIL);
1999 } else { 2001 } else {
2000 dasm_put(Dst, 12888, LJ_TNIL); 2002 dasm_put(Dst, 12899, LJ_TNIL);
2001 } 2003 }
2002 dasm_put(Dst, 12895); 2004 dasm_put(Dst, 12906);
2003 if (op != BC_RET0) { 2005 if (op != BC_RET0) {
2004 dasm_put(Dst, 12916); 2006 dasm_put(Dst, 12927);
2005 } 2007 }
2006 dasm_put(Dst, 4542); 2008 dasm_put(Dst, 4542);
2007 break; 2009 break;
@@ -2011,7 +2013,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
2011 2013
2012 case BC_FORL: 2014 case BC_FORL:
2013#if LJ_HASJIT 2015#if LJ_HASJIT
2014 dasm_put(Dst, 12920, HOTCOUNT_PCMASK, GG_DISP2HOT); 2016 dasm_put(Dst, 12931, HOTCOUNT_PCMASK, GG_DISP2HOT);
2015#endif 2017#endif
2016 break; 2018 break;
2017 2019
@@ -2023,57 +2025,57 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
2023 case BC_FORI: 2025 case BC_FORI:
2024 case BC_IFORL: 2026 case BC_IFORL:
2025 vk = (op == BC_IFORL || op == BC_JFORL); 2027 vk = (op == BC_IFORL || op == BC_JFORL);
2026 dasm_put(Dst, 12941); 2028 dasm_put(Dst, 12952);
2027 if (!vk) { 2029 if (!vk) {
2028 dasm_put(Dst, 12945, LJ_TISNUM, LJ_TISNUM); 2030 dasm_put(Dst, 12956, LJ_TISNUM, LJ_TISNUM);
2029 } 2031 }
2030 dasm_put(Dst, 12964); 2032 dasm_put(Dst, 12975);
2031 if (!vk) { 2033 if (!vk) {
2032 dasm_put(Dst, 12968, LJ_TISNUM); 2034 dasm_put(Dst, 12979, LJ_TISNUM);
2033 } 2035 }
2034 if (sse) { 2036 if (sse) {
2035 dasm_put(Dst, 12977); 2037 dasm_put(Dst, 12988);
2036 if (vk) { 2038 if (vk) {
2037 dasm_put(Dst, 12989); 2039 dasm_put(Dst, 13000);
2038 } else { 2040 } else {
2039 dasm_put(Dst, 13008); 2041 dasm_put(Dst, 13019);
2040 } 2042 }
2041 dasm_put(Dst, 13013); 2043 dasm_put(Dst, 13024);
2042 } else { 2044 } else {
2043 dasm_put(Dst, 13026); 2045 dasm_put(Dst, 13037);
2044 if (vk) { 2046 if (vk) {
2045 dasm_put(Dst, 13032); 2047 dasm_put(Dst, 13043);
2046 } else { 2048 } else {
2047 dasm_put(Dst, 13048); 2049 dasm_put(Dst, 13059);
2048 } 2050 }
2049 dasm_put(Dst, 13056); 2051 dasm_put(Dst, 13067);
2050 if (cmov) { 2052 if (cmov) {
2051 dasm_put(Dst, 9101); 2053 dasm_put(Dst, 9112);
2052 } else { 2054 } else {
2053 dasm_put(Dst, 9107); 2055 dasm_put(Dst, 9118);
2054 } 2056 }
2055 if (!cmov) { 2057 if (!cmov) {
2056 dasm_put(Dst, 13061); 2058 dasm_put(Dst, 13072);
2057 } 2059 }
2058 } 2060 }
2059 if (op == BC_FORI) { 2061 if (op == BC_FORI) {
2060 dasm_put(Dst, 13067, -BCBIAS_J*4); 2062 dasm_put(Dst, 13078, -BCBIAS_J*4);
2061 } else if (op == BC_JFORI) { 2063 } else if (op == BC_JFORI) {
2062 dasm_put(Dst, 13077, -BCBIAS_J*4, BC_JLOOP); 2064 dasm_put(Dst, 13088, -BCBIAS_J*4, BC_JLOOP);
2063 } else if (op == BC_IFORL) { 2065 } else if (op == BC_IFORL) {
2064 dasm_put(Dst, 13091, -BCBIAS_J*4); 2066 dasm_put(Dst, 13102, -BCBIAS_J*4);
2065 } else { 2067 } else {
2066 dasm_put(Dst, 13087, BC_JLOOP); 2068 dasm_put(Dst, 13098, BC_JLOOP);
2067 } 2069 }
2068 dasm_put(Dst, 9136); 2070 dasm_put(Dst, 9147);
2069 if (sse) { 2071 if (sse) {
2070 dasm_put(Dst, 13101); 2072 dasm_put(Dst, 13112);
2071 } 2073 }
2072 break; 2074 break;
2073 2075
2074 case BC_ITERL: 2076 case BC_ITERL:
2075#if LJ_HASJIT 2077#if LJ_HASJIT
2076 dasm_put(Dst, 12920, HOTCOUNT_PCMASK, GG_DISP2HOT); 2078 dasm_put(Dst, 12931, HOTCOUNT_PCMASK, GG_DISP2HOT);
2077#endif 2079#endif
2078 break; 2080 break;
2079 2081
@@ -2082,33 +2084,33 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
2082 break; 2084 break;
2083#endif 2085#endif
2084 case BC_IITERL: 2086 case BC_IITERL:
2085 dasm_put(Dst, 13112, LJ_TNIL); 2087 dasm_put(Dst, 13123, LJ_TNIL);
2086 if (op == BC_JITERL) { 2088 if (op == BC_JITERL) {
2087 dasm_put(Dst, 13127, BC_JLOOP); 2089 dasm_put(Dst, 13138, BC_JLOOP);
2088 } else { 2090 } else {
2089 dasm_put(Dst, 13141, -BCBIAS_J*4); 2091 dasm_put(Dst, 13152, -BCBIAS_J*4);
2090 } 2092 }
2091 dasm_put(Dst, 9436); 2093 dasm_put(Dst, 9447);
2092 break; 2094 break;
2093 2095
2094 case BC_LOOP: 2096 case BC_LOOP:
2095#if LJ_HASJIT 2097#if LJ_HASJIT
2096 dasm_put(Dst, 12920, HOTCOUNT_PCMASK, GG_DISP2HOT); 2098 dasm_put(Dst, 12931, HOTCOUNT_PCMASK, GG_DISP2HOT);
2097#endif 2099#endif
2098 break; 2100 break;
2099 2101
2100 case BC_ILOOP: 2102 case BC_ILOOP:
2101 dasm_put(Dst, 7233); 2103 dasm_put(Dst, 9149);
2102 break; 2104 break;
2103 2105
2104 case BC_JLOOP: 2106 case BC_JLOOP:
2105#if LJ_HASJIT 2107#if LJ_HASJIT
2106 dasm_put(Dst, 13157, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); 2108 dasm_put(Dst, 13168, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L));
2107#endif 2109#endif
2108 break; 2110 break;
2109 2111
2110 case BC_JMP: 2112 case BC_JMP:
2111 dasm_put(Dst, 13181, -BCBIAS_J*4); 2113 dasm_put(Dst, 13192, -BCBIAS_J*4);
2112 break; 2114 break;
2113 2115
2114 /* -- Function headers -------------------------------------------------- */ 2116 /* -- Function headers -------------------------------------------------- */
@@ -2131,13 +2133,13 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
2131 break; 2133 break;
2132#endif 2134#endif
2133 case BC_IFUNCF: 2135 case BC_IFUNCF:
2134 dasm_put(Dst, 13206, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); 2136 dasm_put(Dst, 13217, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams));
2135 if (op == BC_JFUNCF) { 2137 if (op == BC_JFUNCF) {
2136 dasm_put(Dst, 13236, BC_JLOOP); 2138 dasm_put(Dst, 13247, BC_JLOOP);
2137 } else { 2139 } else {
2138 dasm_put(Dst, 7233); 2140 dasm_put(Dst, 9149);
2139 } 2141 }
2140 dasm_put(Dst, 13245, LJ_TNIL); 2142 dasm_put(Dst, 13256, LJ_TNIL);
2141 break; 2143 break;
2142 2144
2143 case BC_JFUNCV: 2145 case BC_JFUNCV:
@@ -2148,30 +2150,30 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
2148 break; /* NYI: compiled vararg functions. */ 2150 break; /* NYI: compiled vararg functions. */
2149 2151
2150 case BC_IFUNCV: 2152 case BC_IFUNCV:
2151 dasm_put(Dst, 13267, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); 2153 dasm_put(Dst, 13278, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL);
2152 if (op == BC_JFUNCV) { 2154 if (op == BC_JFUNCV) {
2153 dasm_put(Dst, 13236, BC_JLOOP); 2155 dasm_put(Dst, 13247, BC_JLOOP);
2154 } else { 2156 } else {
2155 dasm_put(Dst, 13358, -4+PC2PROTO(k)); 2157 dasm_put(Dst, 13369, -4+PC2PROTO(k));
2156 } 2158 }
2157 dasm_put(Dst, 13381, LJ_TNIL); 2159 dasm_put(Dst, 13392, LJ_TNIL);
2158 break; 2160 break;
2159 2161
2160 case BC_FUNCC: 2162 case BC_FUNCC:
2161 case BC_FUNCCW: 2163 case BC_FUNCCW:
2162 dasm_put(Dst, 13403, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); 2164 dasm_put(Dst, 13414, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top));
2163 if (op == BC_FUNCC) { 2165 if (op == BC_FUNCC) {
2164 dasm_put(Dst, 13433); 2166 dasm_put(Dst, 13444);
2165 } else { 2167 } else {
2166 dasm_put(Dst, 13437); 2168 dasm_put(Dst, 13448);
2167 } 2169 }
2168 dasm_put(Dst, 13445, DISPATCH_GL(vmstate), ~LJ_VMST_C); 2170 dasm_put(Dst, 13456, DISPATCH_GL(vmstate), ~LJ_VMST_C);
2169 if (op == BC_FUNCC) { 2171 if (op == BC_FUNCC) {
2170 dasm_put(Dst, 13454); 2172 dasm_put(Dst, 13465);
2171 } else { 2173 } else {
2172 dasm_put(Dst, 13458, DISPATCH_GL(wrapf)); 2174 dasm_put(Dst, 13469, DISPATCH_GL(wrapf));
2173 } 2175 }
2174 dasm_put(Dst, 13463, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); 2176 dasm_put(Dst, 13474, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top));
2175 break; 2177 break;
2176 2178
2177 /* ---------------------------------------------------------------------- */ 2179 /* ---------------------------------------------------------------------- */
@@ -2199,7 +2201,7 @@ static int build_backend(BuildCtx *ctx)
2199 2201
2200 build_subroutines(ctx, cmov, sse); 2202 build_subroutines(ctx, cmov, sse);
2201 2203
2202 dasm_put(Dst, 13488); 2204 dasm_put(Dst, 13499);
2203 for (op = 0; op < BC__MAX; op++) 2205 for (op = 0; op < BC__MAX; op++)
2204 build_ins(ctx, (BCOp)op, op, cmov, sse); 2206 build_ins(ctx, (BCOp)op, op, cmov, sse);
2205 2207
diff --git a/src/buildvm_x86.dasc b/src/buildvm_x86.dasc
index 5ec87aa8..0d97d01c 100644
--- a/src/buildvm_x86.dasc
+++ b/src/buildvm_x86.dasc
@@ -2591,11 +2591,14 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse)
2591 | lea FCARG2, [esp+16] 2591 | lea FCARG2, [esp+16]
2592 | lea FCARG1, [DISPATCH+GG_DISP2J] 2592 | lea FCARG1, [DISPATCH+GG_DISP2J]
2593 | call extern lj_trace_exit@8 // (jit_State *J, ExitState *ex) 2593 | call extern lj_trace_exit@8 // (jit_State *J, ExitState *ex)
2594 | // Interpreter C frame returned in eax. 2594 | // Error code returned in eax (RD).
2595 | mov esp, eax // Reposition stack to C frame. 2595 | mov RAa, L:RB->cframe
2596 | and RAa, CFRAME_RAWMASK
2597 | mov esp, RAa // Reposition stack to C frame.
2598 | mov SAVE_L, L:RB // Needed for on-trace resume/yield.
2599 | test RD, RD; jnz >1 // Check for error from exit.
2596 | mov BASE, L:RB->base 2600 | mov BASE, L:RB->base
2597 | mov PC, SAVE_PC 2601 | mov PC, SAVE_PC
2598 | mov SAVE_L, L:RB // Needed for on-trace resume/yield.
2599 |.endif 2602 |.endif
2600#endif 2603#endif
2601 |->vm_exit_interp: 2604 |->vm_exit_interp:
@@ -2606,6 +2609,11 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse)
2606 | mov dword [DISPATCH+DISPATCH_GL(jit_L)], 0 2609 | mov dword [DISPATCH+DISPATCH_GL(jit_L)], 0
2607 | set_vmstate INTERP 2610 | set_vmstate INTERP
2608 | ins_next 2611 | ins_next
2612 |
2613 |1: // Rethrow error from the right C frame.
2614 | mov FCARG1, L:RB
2615 | mov FCARG2, RD
2616 | call extern lj_err_throw@8 // (lua_State *L, int errcode)
2609#endif 2617#endif
2610 | 2618 |
2611 |//----------------------------------------------------------------------- 2619 |//-----------------------------------------------------------------------
diff --git a/src/buildvm_x86.h b/src/buildvm_x86.h
index ef160e61..9253bc21 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[15165] = { 15static const unsigned char build_actionlist[15189] = {
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,
@@ -417,170 +417,171 @@ static const unsigned char build_actionlist[15165] = {
417 15,17,125,216,252,242,15,17,117,208,252,242,15,17,109,200,252,242,15,17,101, 417 15,17,125,216,252,242,15,17,117,208,252,242,15,17,109,200,252,242,15,17,101,
418 192,252,242,15,17,93,184,252,242,15,17,85,176,252,242,15,17,77,168,252,242, 418 192,252,242,15,17,93,184,252,242,15,17,85,176,252,242,15,17,77,168,252,242,
419 15,17,69,160,248,1,139,171,233,139,147,233,137,171,233,137,149,233,141,84, 419 15,17,69,160,248,1,139,171,233,139,147,233,137,171,233,137,149,233,141,84,
420 36,16,141,139,233,232,251,1,23,137,196,139,149,233,139,116,36,24,137,108, 420 36,16,141,139,233,232,251,1,23,139,141,233,129,225,239,137,204,137,108,36,
421 36,48,255,248,144,255,139,122,252,248,139,191,233,139,191,233,199,131,233, 421 48,133,192,15,133,244,247,255,139,149,233,139,116,36,24,255,248,144,255,139,
422 0,0,0,0,199,131,233,237,139,6,15,182,204,15,182,232,131,198,4,193,232,16, 422 122,252,248,139,191,233,139,191,233,199,131,233,0,0,0,0,199,131,233,237,139,
423 252,255,36,171,255,248,82,255,217,124,36,4,137,68,36,8,102,184,0,4,102,11, 423 6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,1,137,252,
424 68,36,4,102,37,252,255,252,247,102,137,68,36,6,217,108,36,6,217,252,252,217, 424 233,137,194,232,251,1,24,255,248,82,255,217,124,36,4,137,68,36,8,102,184,
425 108,36,4,139,68,36,8,195,255,248,145,102,15,252,239,210,102,15,118,210,102, 425 0,4,102,11,68,36,4,102,37,252,255,252,247,102,137,68,36,6,217,108,36,6,217,
426 252,252,217,108,36,4,139,68,36,8,195,255,248,145,102,15,252,239,210,102,15,
427 118,210,102,15,115,210,1,184,0,0,48,67,102,15,110,216,102,15,112,219,81,15,
428 40,200,102,15,84,202,102,15,46,217,15,134,244,247,102,15,85,208,252,242,15,
429 88,203,252,242,15,92,203,102,15,86,202,184,0,0,252,240,63,102,15,110,208,
430 102,15,112,210,81,252,242,15,194,193,1,102,15,84,194,252,242,15,92,200,15,
431 40,193,248,1,195,248,84,255,217,124,36,4,137,68,36,8,102,184,0,8,102,11,68,
432 36,4,102,37,252,255,252,251,102,137,68,36,6,217,108,36,6,217,252,252,217,
433 108,36,4,139,68,36,8,195,255,248,146,102,15,252,239,210,102,15,118,210,102,
426 15,115,210,1,184,0,0,48,67,102,15,110,216,102,15,112,219,81,15,40,200,102, 434 15,115,210,1,184,0,0,48,67,102,15,110,216,102,15,112,219,81,15,40,200,102,
427 15,84,202,102,15,46,217,15,134,244,247,102,15,85,208,252,242,15,88,203,252, 435 15,84,202,102,15,46,217,15,134,244,247,102,15,85,208,252,242,15,88,203,252,
428 242,15,92,203,102,15,86,202,184,0,0,252,240,63,102,15,110,208,102,15,112, 436 242,15,92,203,102,15,86,202,184,0,0,252,240,191,102,15,110,208,102,15,112,
429 210,81,252,242,15,194,193,1,102,15,84,194,252,242,15,92,200,15,40,193,248, 437 210,81,252,242,15,194,193,6,102,15,84,194,252,242,15,92,200,15,40,193,248,
430 1,195,248,84,255,217,124,36,4,137,68,36,8,102,184,0,8,102,11,68,36,4,102, 438 1,195,248,104,255,217,124,36,4,137,68,36,8,102,184,0,12,102,11,68,36,4,102,
431 37,252,255,252,251,102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,4, 439 137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,139,68,36,8,195,255,248,
432 139,68,36,8,195,255,248,146,102,15,252,239,210,102,15,118,210,102,15,115, 440 147,102,15,252,239,210,102,15,118,210,102,15,115,210,1,184,0,0,48,67,102,
433 210,1,184,0,0,48,67,102,15,110,216,102,15,112,219,81,15,40,200,102,15,84, 441 15,110,216,102,15,112,219,81,15,40,200,102,15,84,202,102,15,46,217,15,134,
434 202,102,15,46,217,15,134,244,247,102,15,85,208,252,242,15,88,203,252,242, 442 244,247,102,15,85,208,15,40,193,252,242,15,88,203,252,242,15,92,203,184,0,
435 15,92,203,102,15,86,202,184,0,0,252,240,191,102,15,110,208,102,15,112,210, 443 0,252,240,63,102,15,110,216,102,15,112,219,81,252,242,15,194,193,1,102,15,
436 81,252,242,15,194,193,6,102,15,84,194,252,242,15,92,200,15,40,193,248,1,195, 444 84,195,252,242,15,92,200,102,15,86,202,15,40,193,248,1,195,248,148,255,15,
437 248,104,255,217,124,36,4,137,68,36,8,102,184,0,12,102,11,68,36,4,102,137, 445 40,232,252,242,15,94,193,102,15,252,239,210,102,15,118,210,102,15,115,210,
438 68,36,6,217,108,36,6,217,252,252,217,108,36,4,139,68,36,8,195,255,248,147, 446 1,184,0,0,48,67,102,15,110,216,102,15,112,219,81,15,40,224,102,15,84,226,
439 102,15,252,239,210,102,15,118,210,102,15,115,210,1,184,0,0,48,67,102,15,110, 447 102,15,46,220,15,134,244,247,102,15,85,208,252,242,15,88,227,252,242,15,92,
440 216,102,15,112,219,81,15,40,200,102,15,84,202,102,15,46,217,15,134,244,247, 448 227,102,15,86,226,184,0,0,252,240,63,102,15,110,208,102,15,112,210,81,252,
441 102,15,85,208,15,40,193,252,242,15,88,203,252,242,15,92,203,184,0,0,252,240, 449 242,15,194,196,1,102,15,84,194,252,242,15,92,224,15,40,197,252,242,15,89,
442 63,102,15,110,216,102,15,112,219,81,252,242,15,194,193,1,102,15,84,195,252, 450 204,252,242,15,92,193,195,248,1,252,242,15,89,200,15,40,197,252,242,15,92,
443 242,15,92,200,102,15,86,202,15,40,193,248,1,195,248,148,255,15,40,232,252, 451 193,195,255,217,193,216,252,241,217,124,36,4,102,184,0,4,102,11,68,36,4,102,
444 242,15,94,193,102,15,252,239,210,102,15,118,210,102,15,115,210,1,184,0,0, 452 37,252,255,252,247,102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,
445 48,67,102,15,110,216,102,15,112,219,81,15,40,224,102,15,84,226,102,15,46, 453 222,201,222,252,233,195,255,248,88,217,252,234,222,201,248,149,217,84,36,
446 220,15,134,244,247,102,15,85,208,252,242,15,88,227,252,242,15,92,227,102, 454 4,129,124,36,4,0,0,128,127,15,132,244,247,129,124,36,4,0,0,128,252,255,15,
447 15,86,226,184,0,0,252,240,63,102,15,110,208,102,15,112,210,81,252,242,15, 455 132,244,248,248,150,217,192,217,252,252,220,252,233,217,201,217,252,240,217,
448 194,196,1,102,15,84,194,252,242,15,92,224,15,40,197,252,242,15,89,204,252, 456 232,222,193,217,252,253,221,217,248,1,195,248,2,221,216,217,252,238,195,255,
449 242,15,92,193,195,248,1,252,242,15,89,200,15,40,197,252,242,15,92,193,195, 457 248,107,219,84,36,4,219,68,36,4,255,223,252,233,255,221,252,233,223,224,158,
450 255,217,193,216,252,241,217,124,36,4,102,184,0,4,102,11,68,36,4,102,37,252, 458 255,15,133,244,254,15,138,244,255,221,216,139,68,36,4,131,252,248,1,15,142,
451 255,252,247,102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,222,201, 459 244,252,248,1,169,1,0,0,0,15,133,244,248,216,200,209,232,252,233,244,1,248,
452 222,252,233,195,255,248,88,217,252,234,222,201,248,149,217,84,36,4,129,124, 460 2,209,232,15,132,244,251,217,192,248,3,216,200,209,232,15,132,244,250,15,
453 36,4,0,0,128,127,15,132,244,247,129,124,36,4,0,0,128,252,255,15,132,244,248, 461 131,244,3,220,201,252,233,244,3,248,4,255,222,201,248,5,195,248,6,15,132,
454 248,150,217,192,217,252,252,220,252,233,217,201,217,252,240,217,232,222,193, 462 244,5,15,130,244,253,217,232,222,252,241,252,247,216,131,252,248,1,15,132,
455 217,252,253,221,217,248,1,195,248,2,221,216,217,252,238,195,255,248,107,219, 463 244,5,252,233,244,1,248,7,221,216,217,232,195,248,8,217,84,36,4,217,201,217,
456 84,36,4,219,68,36,4,255,223,252,233,255,221,252,233,223,224,158,255,15,133, 464 84,36,8,139,68,36,4,209,224,61,0,0,0,252,255,15,132,244,248,139,68,36,8,209,
457 244,254,15,138,244,255,221,216,139,68,36,4,131,252,248,1,15,142,244,252,248, 465 224,15,132,244,250,61,0,0,0,252,255,15,132,244,250,217,252,241,252,233,244,
458 1,169,1,0,0,0,15,133,244,248,216,200,209,232,252,233,244,1,248,2,209,232, 466 150,248,9,255,217,232,255,223,252,234,255,221,252,234,223,224,158,255,15,
459 15,132,244,251,217,192,248,3,216,200,209,232,15,132,244,250,15,131,244,3, 467 132,244,247,217,201,248,1,221,216,195,248,2,217,225,217,232,255,15,132,244,
460 220,201,252,233,244,3,248,4,255,222,201,248,5,195,248,6,15,132,244,5,15,130, 468 249,221,216,217,225,217,252,238,184,0,0,0,0,15,146,208,209,200,51,68,36,4,
461 244,253,217,232,222,252,241,252,247,216,131,252,248,1,15,132,244,5,252,233, 469 15,137,244,249,217,201,248,3,221,217,217,225,195,248,4,131,124,36,4,0,15,
462 244,1,248,7,221,216,217,232,195,248,8,217,84,36,4,217,201,217,84,36,8,139, 470 141,244,3,221,216,221,216,133,192,15,132,244,251,217,252,238,195,248,5,199,
463 68,36,4,209,224,61,0,0,0,252,255,15,132,244,248,139,68,36,8,209,224,15,132, 471 68,36,4,0,0,128,127,217,68,36,4,195,255,248,107,255,248,151,252,242,15,45,
464 244,250,61,0,0,0,252,255,15,132,244,250,217,252,241,252,233,244,150,248,9, 472 193,252,242,15,42,208,102,15,46,202,15,133,244,254,15,138,244,255,248,152,
465 255,217,232,255,223,252,234,255,221,252,234,223,224,158,255,15,132,244,247, 473 131,252,248,1,15,142,244,252,248,1,169,1,0,0,0,15,133,244,248,252,242,15,
466 217,201,248,1,221,216,195,248,2,217,225,217,232,255,15,132,244,249,221,216, 474 89,192,209,232,252,233,244,1,248,2,209,232,15,132,244,251,15,40,200,248,3,
467 217,225,217,252,238,184,0,0,0,0,15,146,208,209,200,51,68,36,4,15,137,244, 475 252,242,15,89,192,209,232,15,132,244,250,15,131,244,3,255,252,242,15,89,200,
468 249,217,201,248,3,221,217,217,225,195,248,4,131,124,36,4,0,15,141,244,3,221, 476 252,233,244,3,248,4,252,242,15,89,193,248,5,195,248,6,15,132,244,5,15,130,
469 216,221,216,133,192,15,132,244,251,217,252,238,195,248,5,199,68,36,4,0,0, 477 244,253,80,184,0,0,252,240,63,102,15,110,200,102,15,112,201,81,252,242,15,
470 128,127,217,68,36,4,195,255,248,107,255,248,151,252,242,15,45,193,252,242, 478 94,200,88,15,40,193,252,247,216,131,252,248,1,15,132,244,5,252,233,244,1,
471 15,42,208,102,15,46,202,15,133,244,254,15,138,244,255,248,152,131,252,248, 479 248,7,184,0,0,252,240,63,102,15,110,192,102,15,112,192,81,195,248,8,252,242,
472 1,15,142,244,252,248,1,169,1,0,0,0,15,133,244,248,252,242,15,89,192,209,232, 480 15,17,76,36,12,252,242,15,17,68,36,4,131,124,36,12,0,15,133,244,247,139,68,
473 252,233,244,1,248,2,209,232,15,132,244,251,15,40,200,248,3,252,242,15,89, 481 36,16,209,224,61,0,0,224,252,255,15,132,244,248,248,1,255,131,124,36,4,0,
474 192,209,232,15,132,244,250,15,131,244,3,255,252,242,15,89,200,252,233,244, 482 15,133,244,247,139,68,36,8,209,224,15,132,244,250,61,0,0,224,252,255,15,132,
475 3,248,4,252,242,15,89,193,248,5,195,248,6,15,132,244,5,15,130,244,253,80, 483 244,251,248,1,221,68,36,12,221,68,36,4,217,252,241,217,192,217,252,252,220,
476 184,0,0,252,240,63,102,15,110,200,102,15,112,201,81,252,242,15,94,200,88, 484 252,233,217,201,217,252,240,217,232,222,193,217,252,253,221,217,221,92,36,
477 15,40,193,252,247,216,131,252,248,1,15,132,244,5,252,233,244,1,248,7,184, 485 4,252,242,15,16,68,36,4,195,248,9,184,0,0,252,240,63,102,15,110,208,102,15,
478 0,0,252,240,63,102,15,110,192,102,15,112,192,81,195,248,8,252,242,15,17,76, 486 112,210,81,102,15,46,194,15,132,244,247,15,40,193,248,1,195,248,2,102,15,
479 36,12,252,242,15,17,68,36,4,131,124,36,12,0,15,133,244,247,139,68,36,16,209, 487 252,239,210,102,15,118,210,102,15,115,210,1,102,15,84,194,184,0,0,252,240,
480 224,61,0,0,224,252,255,15,132,244,248,248,1,255,131,124,36,4,0,15,133,244, 488 63,102,15,110,208,102,15,112,210,81,102,15,46,194,15,132,244,1,102,15,80,
481 247,139,68,36,8,209,224,15,132,244,250,61,0,0,224,252,255,15,132,244,251, 489 193,15,87,192,136,196,15,146,208,48,224,15,133,244,1,248,3,184,0,0,252,240,
482 248,1,221,68,36,12,221,68,36,4,217,252,241,217,192,217,252,252,220,252,233, 490 127,102,15,110,192,102,15,112,192,81,195,248,4,102,15,80,193,133,192,15,133,
483 217,201,217,252,240,217,232,222,193,217,252,253,221,217,221,92,36,4,252,242, 491 244,3,255,15,87,192,195,248,5,102,15,80,193,133,192,15,132,244,3,15,87,192,
484 15,16,68,36,4,195,248,9,184,0,0,252,240,63,102,15,110,208,102,15,112,210, 492 195,248,153,255,139,68,36,12,252,242,15,16,68,36,4,131,252,248,1,15,132,244,
485 81,102,15,46,194,15,132,244,247,15,40,193,248,1,195,248,2,102,15,252,239, 493 247,15,135,244,248,232,244,82,252,233,244,253,248,1,232,244,84,252,233,244,
486 210,102,15,118,210,102,15,115,210,1,102,15,84,194,184,0,0,252,240,63,102, 494 253,248,2,131,252,248,3,15,132,244,247,15,135,244,248,232,244,104,255,252,
487 15,110,208,102,15,112,210,81,102,15,46,194,15,132,244,1,102,15,80,193,15, 495 233,244,253,248,1,252,242,15,81,192,248,7,252,242,15,17,68,36,4,221,68,36,
488 87,192,136,196,15,146,208,48,224,15,133,244,1,248,3,184,0,0,252,240,127,102, 496 4,195,248,2,221,68,36,4,131,252,248,5,15,130,244,88,15,132,244,149,248,2,
489 15,110,192,102,15,112,192,81,195,248,4,102,15,80,193,133,192,15,133,244,3, 497 131,252,248,7,15,132,244,247,15,135,244,248,217,252,237,217,201,217,252,241,
490 255,15,87,192,195,248,5,102,15,80,193,133,192,15,132,244,3,15,87,192,195, 498 195,248,1,217,232,217,201,217,252,241,195,248,2,131,252,248,9,15,132,244,
491 248,153,255,139,68,36,12,252,242,15,16,68,36,4,131,252,248,1,15,132,244,247, 499 247,15,135,244,248,255,217,252,236,217,201,217,252,241,195,248,1,217,252,
492 15,135,244,248,232,244,82,252,233,244,253,248,1,232,244,84,252,233,244,253, 500 254,195,248,2,131,252,248,11,15,132,244,247,15,135,244,255,217,252,255,195,
493 248,2,131,252,248,3,15,132,244,247,15,135,244,248,232,244,104,255,252,233, 501 248,1,217,252,242,221,216,195,255,139,68,36,12,221,68,36,4,131,252,248,1,
494 244,253,248,1,252,242,15,81,192,248,7,252,242,15,17,68,36,4,221,68,36,4,195, 502 15,130,244,82,15,132,244,84,131,252,248,3,15,130,244,104,15,135,244,248,217,
495 248,2,221,68,36,4,131,252,248,5,15,130,244,88,15,132,244,149,248,2,131,252, 503 252,250,195,248,2,131,252,248,5,15,130,244,88,15,132,244,149,131,252,248,
496 248,7,15,132,244,247,15,135,244,248,217,252,237,217,201,217,252,241,195,248, 504 7,15,132,244,247,15,135,244,248,217,252,237,217,201,217,252,241,195,248,1,
497 1,217,232,217,201,217,252,241,195,248,2,131,252,248,9,15,132,244,247,15,135, 505 217,232,217,201,217,252,241,195,248,2,131,252,248,9,15,132,244,247,255,15,
498 244,248,255,217,252,236,217,201,217,252,241,195,248,1,217,252,254,195,248, 506 135,244,248,217,252,236,217,201,217,252,241,195,248,1,217,252,254,195,248,
499 2,131,252,248,11,15,132,244,247,15,135,244,255,217,252,255,195,248,1,217, 507 2,131,252,248,11,15,132,244,247,15,135,244,255,217,252,255,195,248,1,217,
500 252,242,221,216,195,255,139,68,36,12,221,68,36,4,131,252,248,1,15,130,244, 508 252,242,221,216,195,255,248,9,204,248,154,255,139,68,36,20,252,242,15,16,
501 82,15,132,244,84,131,252,248,3,15,130,244,104,15,135,244,248,217,252,250, 509 68,36,4,252,242,15,16,76,36,12,131,252,248,1,15,132,244,247,15,135,244,248,
502 195,248,2,131,252,248,5,15,130,244,88,15,132,244,149,131,252,248,7,15,132, 510 252,242,15,88,193,248,7,252,242,15,17,68,36,4,221,68,36,4,195,248,1,252,242,
503 244,247,15,135,244,248,217,252,237,217,201,217,252,241,195,248,1,217,232, 511 15,92,193,252,233,244,7,248,2,131,252,248,3,15,132,244,247,15,135,244,248,
504 217,201,217,252,241,195,248,2,131,252,248,9,15,132,244,247,255,15,135,244, 512 252,242,15,89,193,252,233,244,7,248,1,252,242,15,94,193,252,233,244,7,248,
505 248,217,252,236,217,201,217,252,241,195,248,1,217,252,254,195,248,2,131,252, 513 2,131,252,248,5,15,132,244,247,255,15,135,244,248,232,244,148,252,233,244,
506 248,11,15,132,244,247,15,135,244,255,217,252,255,195,248,1,217,252,242,221, 514 7,248,1,90,232,244,107,82,252,233,244,7,248,2,131,252,248,7,15,132,244,247,
507 216,195,255,248,9,204,248,154,255,139,68,36,20,252,242,15,16,68,36,4,252, 515 15,135,244,248,184,0,0,0,128,102,15,110,200,102,15,112,201,81,15,87,193,252,
508 242,15,16,76,36,12,131,252,248,1,15,132,244,247,15,135,244,248,252,242,15, 516 233,244,7,248,1,102,15,252,239,201,102,15,118,201,102,15,115,209,1,15,84,
509 88,193,248,7,252,242,15,17,68,36,4,221,68,36,4,195,248,1,252,242,15,92,193, 517 193,252,233,244,7,248,2,255,131,252,248,9,15,135,244,248,221,68,36,4,221,
510 252,233,244,7,248,2,131,252,248,3,15,132,244,247,15,135,244,248,252,242,15, 518 68,36,12,15,132,244,247,217,252,243,195,248,1,217,201,217,252,253,221,217,
511 89,193,252,233,244,7,248,1,252,242,15,94,193,252,233,244,7,248,2,131,252, 519 195,248,2,131,252,248,11,15,132,244,247,15,135,244,255,252,242,15,93,193,
512 248,5,15,132,244,247,255,15,135,244,248,232,244,148,252,233,244,7,248,1,90, 520 252,233,244,7,248,1,252,242,15,95,193,252,233,244,7,248,9,204,255,139,68,
513 232,244,107,82,252,233,244,7,248,2,131,252,248,7,15,132,244,247,15,135,244, 521 36,20,221,68,36,4,221,68,36,12,131,252,248,1,15,132,244,247,15,135,244,248,
514 248,184,0,0,0,128,102,15,110,200,102,15,112,201,81,15,87,193,252,233,244, 522 222,193,195,248,1,222,252,233,195,248,2,131,252,248,3,15,132,244,247,15,135,
515 7,248,1,102,15,252,239,201,102,15,118,201,102,15,115,209,1,15,84,193,252, 523 244,248,222,201,195,248,1,222,252,249,195,248,2,131,252,248,5,15,130,244,
516 233,244,7,248,2,255,131,252,248,9,15,135,244,248,221,68,36,4,221,68,36,12, 524 148,15,132,244,107,131,252,248,7,15,132,244,247,15,135,244,248,255,221,216,
517 15,132,244,247,217,252,243,195,248,1,217,201,217,252,253,221,217,195,248, 525 217,224,195,248,1,221,216,217,225,195,248,2,131,252,248,9,15,132,244,247,
518 2,131,252,248,11,15,132,244,247,15,135,244,255,252,242,15,93,193,252,233, 526 15,135,244,248,217,252,243,195,248,1,217,201,217,252,253,221,217,195,248,
519 244,7,248,1,252,242,15,95,193,252,233,244,7,248,9,204,255,139,68,36,20,221, 527 2,131,252,248,11,15,132,244,247,15,135,244,255,255,219,252,233,219,209,221,
520 68,36,4,221,68,36,12,131,252,248,1,15,132,244,247,15,135,244,248,222,193, 528 217,195,248,1,219,252,233,218,209,221,217,195,255,221,225,223,224,252,246,
521 195,248,1,222,252,233,195,248,2,131,252,248,3,15,132,244,247,15,135,244,248, 529 196,1,15,132,244,248,217,201,248,2,221,216,195,248,1,221,225,223,224,252,
522 222,201,195,248,1,222,252,249,195,248,2,131,252,248,5,15,130,244,148,15,132, 530 246,196,1,15,133,244,248,217,201,248,2,221,216,195,255,248,155,156,90,137,
523 244,107,131,252,248,7,15,132,244,247,15,135,244,248,255,221,216,217,224,195, 531 209,129,252,242,0,0,32,0,82,157,156,90,49,192,57,209,15,132,244,247,139,68,
524 248,1,221,216,217,225,195,248,2,131,252,248,9,15,132,244,247,15,135,244,248, 532 36,4,87,83,15,162,139,124,36,16,137,7,137,95,4,137,79,8,137,87,12,91,95,248,
525 217,252,243,195,248,1,217,201,217,252,253,221,217,195,248,2,131,252,248,11, 533 1,195,255,249,255,129,124,253,202,4,239,15,135,244,41,129,124,253,194,4,239,
526 15,132,244,247,15,135,244,255,255,219,252,233,219,209,221,217,195,248,1,219, 534 15,135,244,41,255,252,242,15,16,4,194,131,198,4,102,15,46,4,202,255,221,4,
527 252,233,218,209,221,217,195,255,221,225,223,224,252,246,196,1,15,132,244, 535 202,221,4,194,131,198,4,255,223,252,233,221,216,255,218,252,233,223,224,158,
528 248,217,201,248,2,221,216,195,248,1,221,225,223,224,252,246,196,1,15,133, 536 255,15,134,244,248,255,15,131,244,248,255,248,1,15,183,70,252,254,141,180,
529 244,248,217,201,248,2,221,216,195,255,248,155,156,90,137,209,129,252,242, 537 253,134,233,248,2,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,
530 0,0,32,0,82,157,156,90,49,192,57,209,15,132,244,247,139,68,36,4,87,83,15, 538 36,171,255,139,108,194,4,131,198,4,129,252,253,239,15,135,244,251,129,124,
531 162,139,124,36,16,137,7,137,95,4,137,79,8,137,87,12,91,95,248,1,195,255,249, 539 253,202,4,239,15,135,244,251,255,252,242,15,16,4,194,102,15,46,4,202,255,
532 255,129,124,253,202,4,239,15,135,244,41,129,124,253,194,4,239,15,135,244, 540 221,4,202,221,4,194,255,15,138,244,248,15,133,244,248,255,15,138,244,248,
533 41,255,252,242,15,16,4,194,131,198,4,102,15,46,4,202,255,221,4,202,221,4, 541 15,132,244,247,255,248,1,15,183,70,252,254,141,180,253,134,233,248,2,255,
534 194,131,198,4,255,223,252,233,221,216,255,218,252,233,223,224,158,255,15, 542 248,2,15,183,70,252,254,141,180,253,134,233,248,1,255,248,5,57,108,202,4,
535 134,244,248,255,15,131,244,248,255,248,1,15,183,70,252,254,141,180,253,134, 543 15,133,244,2,129,252,253,239,15,131,244,1,139,12,202,139,4,194,57,193,15,
536 233,248,2,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171, 544 132,244,1,129,252,253,239,15,135,244,2,139,169,233,133,252,237,15,132,244,
537 255,139,108,194,4,131,198,4,129,252,253,239,15,135,244,251,129,124,253,202, 545 2,252,246,133,233,235,15,133,244,2,255,49,252,237,255,189,1,0,0,0,255,252,
538 4,239,15,135,244,251,255,252,242,15,16,4,194,102,15,46,4,202,255,221,4,202, 546 233,244,45,255,252,247,208,131,198,4,129,124,253,202,4,239,15,133,244,248,
539 221,4,194,255,15,138,244,248,15,133,244,248,255,15,138,244,248,15,132,244, 547 139,12,202,59,12,135,255,131,198,4,129,124,253,202,4,239,15,135,244,248,255,
540 247,255,248,1,15,183,70,252,254,141,180,253,134,233,248,2,255,248,2,15,183, 548 252,242,15,16,4,199,102,15,46,4,202,255,221,4,202,221,4,199,255,252,247,208,
541 70,252,254,141,180,253,134,233,248,1,255,248,5,57,108,202,4,15,133,244,2, 549 131,198,4,57,68,202,4,255,139,108,194,4,131,198,4,129,252,253,239,255,15,
542 129,252,253,239,15,131,244,1,139,12,202,139,4,194,57,193,15,132,244,1,129, 550 131,244,247,255,15,130,244,247,255,137,108,202,4,139,44,194,137,44,202,255,
543 252,253,239,15,135,244,2,139,169,233,133,252,237,15,132,244,2,252,246,133, 551 15,183,70,252,254,141,180,253,134,233,248,1,139,6,15,182,204,15,182,232,131,
544 233,235,15,133,244,2,255,49,252,237,255,189,1,0,0,0,255,252,233,244,45,255, 552 198,4,193,232,16,252,255,36,171,255,139,108,194,4,139,4,194,137,108,202,4,
545 252,247,208,131,198,4,129,124,253,202,4,239,15,133,244,248,139,12,202,59, 553 137,4,202,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,
546 12,135,255,131,198,4,129,124,253,202,4,239,15,135,244,248,255,252,242,15, 554 255,49,252,237,129,124,253,194,4,239,129,213,239,137,108,202,4,139,6,15,182,
547 16,4,199,102,15,46,4,202,255,221,4,202,221,4,199,255,252,247,208,131,198, 555 204,15,182,232,131,198,4,193,232,16,252,255,36,171,255,129,124,253,194,4,
548 4,57,68,202,4,255,139,108,194,4,131,198,4,129,252,253,239,255,15,131,244, 556 239,15,135,244,48,255,252,242,15,16,4,194,184,0,0,0,128,102,15,110,200,102,
549 247,255,15,130,244,247,255,137,108,202,4,139,44,194,137,44,202,255,15,183, 557 15,112,201,81,15,87,193,252,242,15,17,4,202,255,221,4,194,217,224,221,28,
550 70,252,254,141,180,253,134,233,248,1,139,6,15,182,204,15,182,232,131,198, 558 202,255,129,124,253,194,4,239,15,133,244,248,139,4,194,255,15,87,192,252,
551 4,193,232,16,252,255,36,171,255,139,108,194,4,139,4,194,137,108,202,4,137, 559 242,15,42,128,233,248,1,252,242,15,17,4,202,255,219,128,233,248,1,221,28,
552 4,202,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,255, 560 202,255,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,
553 49,252,237,129,124,253,194,4,239,129,213,239,137,108,202,4,139,6,15,182,204, 561 2,129,124,253,194,4,239,15,133,244,50,139,12,194,137,213,232,251,1,18,255,
554 15,182,232,131,198,4,193,232,16,252,255,36,171,255,129,124,253,194,4,239, 562 252,242,15,42,192,137,252,234,255,137,4,36,137,252,234,219,4,36,255,15,182,
555 15,135,244,48,255,252,242,15,16,4,194,184,0,0,0,128,102,15,110,200,102,15, 563 78,252,253,252,233,244,1,255,15,182,252,236,15,182,192,255,129,124,253,252,
556 112,201,81,15,87,193,252,242,15,17,4,202,255,221,4,194,217,224,221,28,202, 564 234,4,239,15,135,244,46,255,252,242,15,16,4,252,234,252,242,15,88,4,199,255,
557 255,129,124,253,194,4,239,15,133,244,248,139,4,194,255,15,87,192,252,242, 565 221,4,252,234,220,4,199,255,129,124,253,252,234,4,239,15,135,244,47,255,252,
558 15,42,128,233,248,1,252,242,15,17,4,202,255,219,128,233,248,1,221,28,202, 566 242,15,16,4,199,252,242,15,88,4,252,234,255,221,4,199,220,4,252,234,255,129,
559 255,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,2, 567 124,253,252,234,4,239,15,135,244,49,129,124,253,194,4,239,15,135,244,49,255,
560 129,124,253,194,4,239,15,133,244,50,139,12,194,137,213,232,251,1,18,255,252, 568 252,242,15,16,4,252,234,252,242,15,88,4,194,255,221,4,252,234,220,4,194,255,
561 242,15,42,192,137,252,234,255,137,4,36,137,252,234,219,4,36,255,15,182,78, 569 252,242,15,16,4,252,234,252,242,15,92,4,199,255,221,4,252,234,220,36,199,
562 252,253,252,233,244,1,255,15,182,252,236,15,182,192,255,129,124,253,252,234, 570 255,252,242,15,16,4,199,252,242,15,92,4,252,234,255,221,4,199,220,36,252,
563 4,239,15,135,244,46,255,252,242,15,16,4,252,234,252,242,15,88,4,199,255,221, 571 234,255,252,242,15,16,4,252,234,252,242,15,92,4,194,255,221,4,252,234,220,
564 4,252,234,220,4,199,255,129,124,253,252,234,4,239,15,135,244,47,255,252,242, 572 36,194,255,252,242,15,16,4,252,234,252,242,15,89,4,199,255,221,4,252,234,
565 15,16,4,199,252,242,15,88,4,252,234,255,221,4,199,220,4,252,234,255,129,124, 573 220,12,199,255,252,242,15,16,4,199,252,242,15,89,4,252,234,255,221,4,199,
566 253,252,234,4,239,15,135,244,49,129,124,253,194,4,239,15,135,244,49,255,252, 574 220,12,252,234,255,252,242,15,16,4,252,234,252,242,15,89,4,194,255,221,4,
567 242,15,16,4,252,234,252,242,15,88,4,194,255,221,4,252,234,220,4,194,255,252, 575 252,234,220,12,194,255,252,242,15,16,4,252,234,252,242,15,94,4,199,255,221,
568 242,15,16,4,252,234,252,242,15,92,4,199,255,221,4,252,234,220,36,199,255, 576 4,252,234,220,52,199,255,252,242,15,16,4,199,252,242,15,94,4,252,234,255,
569 252,242,15,16,4,199,252,242,15,92,4,252,234,255,221,4,199,220,36,252,234, 577 221,4,199,220,52,252,234,255,252,242,15,16,4,252,234,252,242,15,94,4,194,
570 255,252,242,15,16,4,252,234,252,242,15,92,4,194,255,221,4,252,234,220,36, 578 255,221,4,252,234,220,52,194,255,252,242,15,16,4,252,234,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, 579 199,255,221,4,252,234,221,4,199,255,252,242,15,16,4,199,252,242,15,16,12,
572 12,199,255,252,242,15,16,4,199,252,242,15,89,4,252,234,255,221,4,199,220, 580 252,234,255,221,4,199,221,4,252,234,255,252,242,15,16,4,252,234,252,242,15,
573 12,252,234,255,252,242,15,16,4,252,234,252,242,15,89,4,194,255,221,4,252, 581 16,12,194,255,221,4,252,234,221,4,194,255,248,156,232,244,148,255,252,233,
574 234,220,12,194,255,252,242,15,16,4,252,234,252,242,15,94,4,199,255,221,4, 582 244,156,255,232,244,107,255,15,182,252,236,15,182,192,141,12,194,41,232,137,
575 252,234,220,52,199,255,252,242,15,16,4,199,252,242,15,94,4,252,234,255,221, 583 76,36,4,137,68,36,8,248,33,139,108,36,48,137,44,36,137,149,233,137,116,36,
576 4,199,220,52,252,234,255,252,242,15,16,4,252,234,252,242,15,94,4,194,255, 584 24,232,251,1,25,139,149,233,133,192,15,133,244,42,15,182,110,252,255,15,182,
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,
584 78,252,253,139,68,252,234,4,139,44,252,234,137,68,202,4,137,44,202,139,6, 585 78,252,253,139,68,252,234,4,139,44,252,234,137,68,202,4,137,44,202,139,6,
585 15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,255,252,247,208, 586 15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,255,252,247,208,
586 139,4,135,199,68,202,4,237,137,4,202,139,6,15,182,204,15,182,232,131,198, 587 139,4,135,199,68,202,4,237,137,4,202,139,6,15,182,204,15,182,232,131,198,
@@ -596,31 +597,31 @@ static const unsigned char build_actionlist[15165] = {
596 12,194,139,68,194,4,137,77,0,137,69,4,15,132,244,247,252,246,133,233,235, 597 12,194,139,68,194,4,137,77,0,137,69,4,15,132,244,247,252,246,133,233,235,
597 15,133,244,248,248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, 598 15,133,244,248,248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,
598 255,36,171,248,2,129,232,239,129,252,248,239,15,134,244,1,252,246,129,233, 599 255,36,171,248,2,129,232,239,129,252,248,239,15,134,244,1,252,246,129,233,
599 235,15,132,244,1,135,213,141,139,233,255,232,251,1,25,137,252,234,252,233, 600 235,15,132,244,1,135,213,141,139,233,255,232,251,1,26,137,252,234,252,233,
600 244,1,255,252,247,208,139,106,252,248,139,172,253,141,233,139,12,135,139, 601 244,1,255,252,247,208,139,106,252,248,139,172,253,141,233,139,12,135,139,
601 133,233,137,8,199,64,4,237,252,246,133,233,235,15,133,244,248,248,1,139,6, 602 133,233,137,8,199,64,4,237,252,246,133,233,235,15,133,244,248,248,1,139,6,
602 15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,2,252,246,129, 603 15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,2,252,246,129,
603 233,235,15,132,244,1,128,189,233,0,15,132,244,1,137,213,137,194,141,139,233, 604 233,235,15,132,244,1,128,189,233,0,15,132,244,1,137,213,137,194,141,139,233,
604 232,251,1,25,137,252,234,252,233,244,1,255,139,106,252,248,255,252,242,15, 605 232,251,1,26,137,252,234,252,233,244,1,255,139,106,252,248,255,252,242,15,
605 16,4,199,255,139,172,253,141,233,139,141,233,255,252,242,15,17,1,255,221, 606 16,4,199,255,139,172,253,141,233,139,141,233,255,252,242,15,17,1,255,221,
606 25,255,252,247,208,139,106,252,248,139,172,253,141,233,139,141,233,137,65, 607 25,255,252,247,208,139,106,252,248,139,172,253,141,233,139,141,233,137,65,
607 4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,255,141, 608 4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,255,141,
608 180,253,134,233,139,108,36,48,131,189,233,0,15,132,244,247,137,149,233,141, 609 180,253,134,233,139,108,36,48,131,189,233,0,15,132,244,247,137,149,233,141,
609 20,202,137,252,233,232,251,1,26,139,149,233,248,1,139,6,15,182,204,15,182, 610 20,202,137,252,233,232,251,1,27,139,149,233,248,1,139,6,15,182,204,15,182,
610 232,131,198,4,193,232,16,252,255,36,171,255,252,247,208,139,74,252,248,139, 611 232,131,198,4,193,232,16,252,255,36,171,255,252,247,208,139,74,252,248,139,
611 4,135,139,108,36,48,137,76,36,8,137,68,36,4,137,44,36,137,149,233,137,116, 612 4,135,139,108,36,48,137,76,36,8,137,68,36,4,137,44,36,137,149,233,137,116,
612 36,24,232,251,1,27,139,149,233,15,182,78,252,253,137,4,202,199,68,202,4,237, 613 36,24,232,251,1,28,139,149,233,15,182,78,252,253,137,4,202,199,68,202,4,237,
613 139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,255,137,197, 614 139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,255,137,197,
614 37,252,255,7,0,0,193,252,237,11,61,252,255,7,0,0,15,132,244,249,248,2,137, 615 37,252,255,7,0,0,193,252,237,11,61,252,255,7,0,0,15,132,244,249,248,2,137,
615 108,36,8,139,108,36,48,137,68,36,4,137,116,36,24,139,131,233,137,44,36,59, 616 108,36,8,139,108,36,48,137,68,36,4,137,116,36,24,139,131,233,137,44,36,59,
616 131,233,137,149,233,15,131,244,251,248,1,232,251,1,28,139,149,233,15,182, 617 131,233,137,149,233,15,131,244,251,248,1,232,251,1,29,139,149,233,15,182,
617 78,252,253,137,4,202,199,68,202,4,237,139,6,15,182,204,15,182,232,131,198, 618 78,252,253,137,4,202,199,68,202,4,237,139,6,15,182,204,15,182,232,131,198,
618 4,193,232,16,252,255,36,171,248,3,184,1,8,0,0,252,233,244,2,248,5,137,252, 619 4,193,232,16,252,255,36,171,248,3,184,1,8,0,0,252,233,244,2,248,5,137,252,
619 233,232,251,1,29,252,233,244,1,255,252,247,208,139,108,36,48,139,139,233, 620 233,232,251,1,30,252,233,244,1,255,252,247,208,139,108,36,48,139,139,233,
620 137,116,36,24,59,139,233,137,149,233,15,131,244,249,248,2,139,20,135,137, 621 137,116,36,24,59,139,233,137,149,233,15,131,244,249,248,2,139,20,135,137,
621 252,233,232,251,1,30,139,149,233,15,182,78,252,253,137,4,202,199,68,202,4, 622 252,233,232,251,1,31,139,149,233,15,182,78,252,253,137,4,202,199,68,202,4,
622 237,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,3, 623 237,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,3,
623 137,252,233,232,251,1,29,15,183,70,252,254,252,247,208,252,233,244,2,255, 624 137,252,233,232,251,1,30,15,183,70,252,254,252,247,208,252,233,244,2,255,
624 252,247,208,139,106,252,248,139,173,233,139,4,135,252,233,244,157,255,252, 625 252,247,208,139,106,252,248,139,173,233,139,4,135,252,233,244,157,255,252,
625 247,208,139,106,252,248,139,173,233,139,4,135,252,233,244,158,255,15,182, 626 247,208,139,106,252,248,139,173,233,139,4,135,252,233,244,158,255,15,182,
626 252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,36,139,44,252,234, 627 252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,36,139,44,252,234,
@@ -663,7 +664,7 @@ static const unsigned char build_actionlist[15165] = {
663 133,201,15,133,244,1,255,139,141,233,133,201,15,132,244,252,252,246,129,233, 664 133,201,15,133,244,1,255,139,141,233,133,201,15,132,244,252,252,246,129,233,
664 235,15,132,244,37,248,6,137,68,36,16,199,68,36,20,237,137,108,36,12,141,68, 665 235,15,132,244,37,248,6,137,68,36,16,199,68,36,20,237,137,108,36,12,141,68,
665 36,16,137,108,36,4,139,108,36,48,137,68,36,8,137,44,36,137,149,233,137,116, 666 36,16,137,108,36,4,139,108,36,48,137,68,36,8,137,44,36,137,149,233,137,116,
666 36,24,232,251,1,31,139,149,233,139,108,36,12,137,193,252,233,244,2,248,7, 667 36,24,232,251,1,32,139,149,233,139,108,36,12,137,193,252,233,244,2,248,7,
667 128,165,233,235,139,131,233,137,171,233,137,133,233,252,233,244,3,255,15, 668 128,165,233,235,139,131,233,137,171,233,137,133,233,252,233,244,3,255,15,
668 182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,38,139,44,252, 669 182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,38,139,44,252,
669 234,59,133,233,15,131,244,38,193,224,3,3,133,233,129,120,253,4,239,15,132, 670 234,59,133,233,15,131,244,38,193,224,3,3,133,233,129,120,253,4,239,15,132,
@@ -679,7 +680,7 @@ static const unsigned char build_actionlist[15165] = {
679 193,8,137,111,4,131,199,8,131,232,1,15,133,244,3,248,4,139,124,36,16,139, 680 193,8,137,111,4,131,199,8,131,232,1,15,133,244,3,248,4,139,124,36,16,139,
680 6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,5,137,108, 681 6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,5,137,108,
681 36,4,139,108,36,48,137,149,233,137,68,36,8,137,44,36,137,116,36,24,232,251, 682 36,4,139,108,36,48,137,149,233,137,68,36,8,137,44,36,137,116,36,24,232,251,
682 1,32,139,149,233,15,182,78,252,253,252,233,244,1,248,7,128,165,233,235,139, 683 1,33,139,149,233,15,182,78,252,253,252,233,244,1,248,7,128,165,233,235,139,
683 131,233,137,171,233,255,137,133,233,252,233,244,2,255,3,68,36,20,255,129, 684 131,233,137,171,233,255,137,133,233,252,233,244,2,255,3,68,36,20,255,129,
684 124,253,202,4,239,139,44,202,15,133,244,51,141,84,202,8,137,114,252,252,139, 685 124,253,202,4,239,139,44,202,15,133,244,51,141,84,202,8,137,114,252,252,139,
685 181,233,139,14,15,182,252,233,15,182,205,131,198,4,252,255,36,171,255,141, 686 181,233,139,14,15,182,252,233,15,182,205,131,198,4,252,255,36,171,255,141,
@@ -1076,6 +1077,7 @@ static const char *const extnames[] = {
1076 "lj_trace_hot@8", 1077 "lj_trace_hot@8",
1077 "lj_dispatch_call@8", 1078 "lj_dispatch_call@8",
1078 "lj_trace_exit@8", 1079 "lj_trace_exit@8",
1080 "lj_err_throw@8",
1079 "lj_meta_cat", 1081 "lj_meta_cat",
1080 "lj_gc_barrieruv@8", 1082 "lj_gc_barrieruv@8",
1081 "lj_func_closeuv@8", 1083 "lj_func_closeuv@8",
@@ -1453,91 +1455,92 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse)
1453#endif 1455#endif
1454 dasm_put(Dst, 8216, Dt1(->base), Dt1(->top)); 1456 dasm_put(Dst, 8216, Dt1(->base), Dt1(->top));
1455#if LJ_HASJIT 1457#if LJ_HASJIT
1456 dasm_put(Dst, 8245, 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)); 1458 dasm_put(Dst, 8245, 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(->cframe), CFRAME_RAWMASK);
1459 dasm_put(Dst, 8393, Dt1(->base));
1457#endif 1460#endif
1458 dasm_put(Dst, 8388); 1461 dasm_put(Dst, 8401);
1459#if LJ_HASJIT 1462#if LJ_HASJIT
1460 dasm_put(Dst, 8391, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP); 1463 dasm_put(Dst, 8404, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP);
1461#endif 1464#endif
1462 dasm_put(Dst, 8431); 1465 dasm_put(Dst, 8455);
1463 if (!sse) { 1466 if (!sse) {
1464 dasm_put(Dst, 8434); 1467 dasm_put(Dst, 8458);
1465 } 1468 }
1466 dasm_put(Dst, 8479); 1469 dasm_put(Dst, 8503);
1467 if (!sse) { 1470 if (!sse) {
1468 dasm_put(Dst, 8581); 1471 dasm_put(Dst, 8605);
1469 } 1472 }
1470 dasm_put(Dst, 8626); 1473 dasm_put(Dst, 8650);
1471 if (!sse) { 1474 if (!sse) {
1472 dasm_put(Dst, 8728); 1475 dasm_put(Dst, 8752);
1473 } 1476 }
1474 dasm_put(Dst, 8767); 1477 dasm_put(Dst, 8791);
1475 if (sse) { 1478 if (sse) {
1476 dasm_put(Dst, 8872); 1479 dasm_put(Dst, 8896);
1477 } else { 1480 } else {
1478 dasm_put(Dst, 9002); 1481 dasm_put(Dst, 9026);
1479 } 1482 }
1480 dasm_put(Dst, 9049); 1483 dasm_put(Dst, 9073);
1481 if (!sse) { 1484 if (!sse) {
1482 dasm_put(Dst, 9123); 1485 dasm_put(Dst, 9147);
1483 if (cmov) { 1486 if (cmov) {
1484 dasm_put(Dst, 9134); 1487 dasm_put(Dst, 9158);
1485 } else { 1488 } else {
1486 dasm_put(Dst, 9138); 1489 dasm_put(Dst, 9162);
1487 } 1490 }
1488 dasm_put(Dst, 9145); 1491 dasm_put(Dst, 9169);
1489 dasm_put(Dst, 9219); 1492 dasm_put(Dst, 9243);
1490 dasm_put(Dst, 9319); 1493 dasm_put(Dst, 9343);
1491 if (cmov) { 1494 if (cmov) {
1492 dasm_put(Dst, 9322); 1495 dasm_put(Dst, 9346);
1493 } else { 1496 } else {
1494 dasm_put(Dst, 9326); 1497 dasm_put(Dst, 9350);
1495 } 1498 }
1496 dasm_put(Dst, 9333); 1499 dasm_put(Dst, 9357);
1497 if (cmov) { 1500 if (cmov) {
1498 dasm_put(Dst, 9134); 1501 dasm_put(Dst, 9158);
1499 } else { 1502 } else {
1500 dasm_put(Dst, 9138); 1503 dasm_put(Dst, 9162);
1501 } 1504 }
1502 dasm_put(Dst, 9351); 1505 dasm_put(Dst, 9375);
1503 } else { 1506 } else {
1504 dasm_put(Dst, 9430); 1507 dasm_put(Dst, 9454);
1505 } 1508 }
1506 dasm_put(Dst, 9433); 1509 dasm_put(Dst, 9457);
1507 dasm_put(Dst, 9518); 1510 dasm_put(Dst, 9542);
1508 dasm_put(Dst, 9649); 1511 dasm_put(Dst, 9673);
1509 dasm_put(Dst, 9848); 1512 dasm_put(Dst, 9872);
1510 if (sse) { 1513 if (sse) {
1511 dasm_put(Dst, 9871); 1514 dasm_put(Dst, 9895);
1512 dasm_put(Dst, 9928); 1515 dasm_put(Dst, 9952);
1513 dasm_put(Dst, 10019); 1516 dasm_put(Dst, 10043);
1514 } else { 1517 } else {
1515 dasm_put(Dst, 10061); 1518 dasm_put(Dst, 10085);
1516 dasm_put(Dst, 10153); 1519 dasm_put(Dst, 10177);
1517 } 1520 }
1518 dasm_put(Dst, 10199); 1521 dasm_put(Dst, 10223);
1519 if (sse) { 1522 if (sse) {
1520 dasm_put(Dst, 10205); 1523 dasm_put(Dst, 10229);
1521 dasm_put(Dst, 10310); 1524 dasm_put(Dst, 10334);
1522 dasm_put(Dst, 10393); 1525 dasm_put(Dst, 10417);
1523 } else { 1526 } else {
1524 dasm_put(Dst, 10465); 1527 dasm_put(Dst, 10489);
1525 dasm_put(Dst, 10548); 1528 dasm_put(Dst, 10572);
1526 if (cmov) { 1529 if (cmov) {
1527 dasm_put(Dst, 10603); 1530 dasm_put(Dst, 10627);
1528 } else { 1531 } else {
1529 dasm_put(Dst, 10622); 1532 dasm_put(Dst, 10646);
1530 } 1533 }
1531 dasm_put(Dst, 10461); 1534 dasm_put(Dst, 10485);
1532 } 1535 }
1533 dasm_put(Dst, 10663); 1536 dasm_put(Dst, 10687);
1534} 1537}
1535 1538
1536/* Generate the code for a single instruction. */ 1539/* Generate the code for a single instruction. */
1537static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) 1540static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
1538{ 1541{
1539 int vk = 0; 1542 int vk = 0;
1540 dasm_put(Dst, 10717, defop); 1543 dasm_put(Dst, 10741, defop);
1541 1544
1542 switch (op) { 1545 switch (op) {
1543 1546
@@ -1546,617 +1549,617 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
1546 /* Remember: all ops branch for a true comparison, fall through otherwise. */ 1549 /* Remember: all ops branch for a true comparison, fall through otherwise. */
1547 1550
1548 case BC_ISLT: case BC_ISGE: case BC_ISLE: case BC_ISGT: 1551 case BC_ISLT: case BC_ISGE: case BC_ISLE: case BC_ISGT:
1549 dasm_put(Dst, 10719, LJ_TISNUM, LJ_TISNUM); 1552 dasm_put(Dst, 10743, LJ_TISNUM, LJ_TISNUM);
1550 if (sse) { 1553 if (sse) {
1551 dasm_put(Dst, 10740); 1554 dasm_put(Dst, 10764);
1552 } else { 1555 } else {
1553 dasm_put(Dst, 10755); 1556 dasm_put(Dst, 10779);
1554 if (cmov) { 1557 if (cmov) {
1555 dasm_put(Dst, 10765); 1558 dasm_put(Dst, 10789);
1556 } else { 1559 } else {
1557 dasm_put(Dst, 10771); 1560 dasm_put(Dst, 10795);
1558 } 1561 }
1559 } 1562 }
1560 switch (op) { 1563 switch (op) {
1561 case BC_ISLT: 1564 case BC_ISLT:
1562 dasm_put(Dst, 10778); 1565 dasm_put(Dst, 10802);
1563 break; 1566 break;
1564 case BC_ISGE: 1567 case BC_ISGE:
1565 dasm_put(Dst, 10014); 1568 dasm_put(Dst, 10038);
1566 break; 1569 break;
1567 case BC_ISLE: 1570 case BC_ISLE:
1568 dasm_put(Dst, 6179); 1571 dasm_put(Dst, 6179);
1569 break; 1572 break;
1570 case BC_ISGT: 1573 case BC_ISGT:
1571 dasm_put(Dst, 10783); 1574 dasm_put(Dst, 10807);
1572 break; 1575 break;
1573 default: break; /* Shut up GCC. */ 1576 default: break; /* Shut up GCC. */
1574 } 1577 }
1575 dasm_put(Dst, 10788, -BCBIAS_J*4); 1578 dasm_put(Dst, 10812, -BCBIAS_J*4);
1576 break; 1579 break;
1577 1580
1578 case BC_ISEQV: case BC_ISNEV: 1581 case BC_ISEQV: case BC_ISNEV:
1579 vk = op == BC_ISEQV; 1582 vk = op == BC_ISEQV;
1580 dasm_put(Dst, 10821, LJ_TISNUM, LJ_TISNUM); 1583 dasm_put(Dst, 10845, LJ_TISNUM, LJ_TISNUM);
1581 if (sse) { 1584 if (sse) {
1582 dasm_put(Dst, 10847); 1585 dasm_put(Dst, 10871);
1583 } else { 1586 } else {
1584 dasm_put(Dst, 10859); 1587 dasm_put(Dst, 10883);
1585 if (cmov) { 1588 if (cmov) {
1586 dasm_put(Dst, 10765); 1589 dasm_put(Dst, 10789);
1587 } else { 1590 } else {
1588 dasm_put(Dst, 10771); 1591 dasm_put(Dst, 10795);
1589 } 1592 }
1590 } 1593 }
1591 iseqne_fp: 1594 iseqne_fp:
1592 if (vk) { 1595 if (vk) {
1593 dasm_put(Dst, 10866); 1596 dasm_put(Dst, 10890);
1594 } else { 1597 } else {
1595 dasm_put(Dst, 10875); 1598 dasm_put(Dst, 10899);
1596 } 1599 }
1597 iseqne_end: 1600 iseqne_end:
1598 if (vk) { 1601 if (vk) {
1599 dasm_put(Dst, 10884, -BCBIAS_J*4); 1602 dasm_put(Dst, 10908, -BCBIAS_J*4);
1600 } else { 1603 } else {
1601 dasm_put(Dst, 10899, -BCBIAS_J*4); 1604 dasm_put(Dst, 10923, -BCBIAS_J*4);
1602 } 1605 }
1603 dasm_put(Dst, 8412); 1606 dasm_put(Dst, 10826);
1604 if (op == BC_ISEQV || op == BC_ISNEV) { 1607 if (op == BC_ISEQV || op == BC_ISNEV) {
1605 dasm_put(Dst, 10914, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<<MM_eq); 1608 dasm_put(Dst, 10938, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<<MM_eq);
1606 if (vk) { 1609 if (vk) {
1607 dasm_put(Dst, 10972); 1610 dasm_put(Dst, 10996);
1608 } else { 1611 } else {
1609 dasm_put(Dst, 10976); 1612 dasm_put(Dst, 11000);
1610 } 1613 }
1611 dasm_put(Dst, 10982); 1614 dasm_put(Dst, 11006);
1612 } 1615 }
1613 break; 1616 break;
1614 case BC_ISEQS: case BC_ISNES: 1617 case BC_ISEQS: case BC_ISNES:
1615 vk = op == BC_ISEQS; 1618 vk = op == BC_ISEQS;
1616 dasm_put(Dst, 10987, LJ_TSTR); 1619 dasm_put(Dst, 11011, LJ_TSTR);
1617 iseqne_test: 1620 iseqne_test:
1618 if (vk) { 1621 if (vk) {
1619 dasm_put(Dst, 10870); 1622 dasm_put(Dst, 10894);
1620 } else { 1623 } else {
1621 dasm_put(Dst, 2809); 1624 dasm_put(Dst, 2809);
1622 } 1625 }
1623 goto iseqne_end; 1626 goto iseqne_end;
1624 case BC_ISEQN: case BC_ISNEN: 1627 case BC_ISEQN: case BC_ISNEN:
1625 vk = op == BC_ISEQN; 1628 vk = op == BC_ISEQN;
1626 dasm_put(Dst, 11010, LJ_TISNUM); 1629 dasm_put(Dst, 11034, LJ_TISNUM);
1627 if (sse) { 1630 if (sse) {
1628 dasm_put(Dst, 11024); 1631 dasm_put(Dst, 11048);
1629 } else { 1632 } else {
1630 dasm_put(Dst, 11036); 1633 dasm_put(Dst, 11060);
1631 if (cmov) { 1634 if (cmov) {
1632 dasm_put(Dst, 10765); 1635 dasm_put(Dst, 10789);
1633 } else { 1636 } else {
1634 dasm_put(Dst, 10771); 1637 dasm_put(Dst, 10795);
1635 } 1638 }
1636 } 1639 }
1637 goto iseqne_fp; 1640 goto iseqne_fp;
1638 case BC_ISEQP: case BC_ISNEP: 1641 case BC_ISEQP: case BC_ISNEP:
1639 vk = op == BC_ISEQP; 1642 vk = op == BC_ISEQP;
1640 dasm_put(Dst, 11043); 1643 dasm_put(Dst, 11067);
1641 goto iseqne_test; 1644 goto iseqne_test;
1642 1645
1643 /* -- Unary test and copy ops ------------------------------------------- */ 1646 /* -- Unary test and copy ops ------------------------------------------- */
1644 1647
1645 case BC_ISTC: case BC_ISFC: case BC_IST: case BC_ISF: 1648 case BC_ISTC: case BC_ISFC: case BC_IST: case BC_ISF:
1646 dasm_put(Dst, 11054, LJ_TISTRUECOND); 1649 dasm_put(Dst, 11078, LJ_TISTRUECOND);
1647 if (op == BC_IST || op == BC_ISTC) { 1650 if (op == BC_IST || op == BC_ISTC) {
1648 dasm_put(Dst, 11066); 1651 dasm_put(Dst, 11090);
1649 } else { 1652 } else {
1650 dasm_put(Dst, 11071); 1653 dasm_put(Dst, 11095);
1651 } 1654 }
1652 if (op == BC_ISTC || op == BC_ISFC) { 1655 if (op == BC_ISTC || op == BC_ISFC) {
1653 dasm_put(Dst, 11076); 1656 dasm_put(Dst, 11100);
1654 } 1657 }
1655 dasm_put(Dst, 11087, -BCBIAS_J*4); 1658 dasm_put(Dst, 11111, -BCBIAS_J*4);
1656 break; 1659 break;
1657 1660
1658 /* -- Unary ops --------------------------------------------------------- */ 1661 /* -- Unary ops --------------------------------------------------------- */
1659 1662
1660 case BC_MOV: 1663 case BC_MOV:
1661 dasm_put(Dst, 11118); 1664 dasm_put(Dst, 11142);
1662 break; 1665 break;
1663 case BC_NOT: 1666 case BC_NOT:
1664 dasm_put(Dst, 11151, LJ_TISTRUECOND, LJ_TTRUE); 1667 dasm_put(Dst, 11175, LJ_TISTRUECOND, LJ_TTRUE);
1665 break; 1668 break;
1666 case BC_UNM: 1669 case BC_UNM:
1667 dasm_put(Dst, 11186, LJ_TISNUM); 1670 dasm_put(Dst, 11210, LJ_TISNUM);
1668 if (sse) { 1671 if (sse) {
1669 dasm_put(Dst, 11197); 1672 dasm_put(Dst, 11221);
1670 } else { 1673 } else {
1671 dasm_put(Dst, 11227); 1674 dasm_put(Dst, 11251);
1672 } 1675 }
1673 dasm_put(Dst, 8412); 1676 dasm_put(Dst, 10826);
1674 break; 1677 break;
1675 case BC_LEN: 1678 case BC_LEN:
1676 dasm_put(Dst, 11236, LJ_TSTR); 1679 dasm_put(Dst, 11260, LJ_TSTR);
1677 if (sse) { 1680 if (sse) {
1678 dasm_put(Dst, 11250, Dt5(->len)); 1681 dasm_put(Dst, 11274, Dt5(->len));
1679 } else { 1682 } else {
1680 dasm_put(Dst, 11268, Dt5(->len)); 1683 dasm_put(Dst, 11292, Dt5(->len));
1681 } 1684 }
1682 dasm_put(Dst, 11277, LJ_TTAB); 1685 dasm_put(Dst, 11301, LJ_TTAB);
1683 if (sse) { 1686 if (sse) {
1684 dasm_put(Dst, 11317); 1687 dasm_put(Dst, 11341);
1685 } else { 1688 } else {
1686 dasm_put(Dst, 11326); 1689 dasm_put(Dst, 11350);
1687 } 1690 }
1688 dasm_put(Dst, 11336); 1691 dasm_put(Dst, 11360);
1689 break; 1692 break;
1690 1693
1691 /* -- Binary ops -------------------------------------------------------- */ 1694 /* -- Binary ops -------------------------------------------------------- */
1692 1695
1693 1696
1694 case BC_ADDVN: case BC_ADDNV: case BC_ADDVV: 1697 case BC_ADDVN: case BC_ADDNV: case BC_ADDVV:
1695 dasm_put(Dst, 11346); 1698 dasm_put(Dst, 11370);
1696 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1699 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1697 switch (vk) { 1700 switch (vk) {
1698 case 0: 1701 case 0:
1699 dasm_put(Dst, 11354, LJ_TISNUM); 1702 dasm_put(Dst, 11378, LJ_TISNUM);
1700 if (sse) { 1703 if (sse) {
1701 dasm_put(Dst, 11366); 1704 dasm_put(Dst, 11390);
1702 } else { 1705 } else {
1703 dasm_put(Dst, 11380); 1706 dasm_put(Dst, 11404);
1704 } 1707 }
1705 break; 1708 break;
1706 case 1: 1709 case 1:
1707 dasm_put(Dst, 11388, LJ_TISNUM); 1710 dasm_put(Dst, 11412, LJ_TISNUM);
1708 if (sse) { 1711 if (sse) {
1709 dasm_put(Dst, 11400); 1712 dasm_put(Dst, 11424);
1710 } else { 1713 } else {
1711 dasm_put(Dst, 11414); 1714 dasm_put(Dst, 11438);
1712 } 1715 }
1713 break; 1716 break;
1714 default: 1717 default:
1715 dasm_put(Dst, 11422, LJ_TISNUM, LJ_TISNUM); 1718 dasm_put(Dst, 11446, LJ_TISNUM, LJ_TISNUM);
1716 if (sse) { 1719 if (sse) {
1717 dasm_put(Dst, 11444); 1720 dasm_put(Dst, 11468);
1718 } else { 1721 } else {
1719 dasm_put(Dst, 11458); 1722 dasm_put(Dst, 11482);
1720 } 1723 }
1721 break; 1724 break;
1722 } 1725 }
1723 if (sse) { 1726 if (sse) {
1724 dasm_put(Dst, 11220); 1727 dasm_put(Dst, 11244);
1725 } else { 1728 } else {
1726 dasm_put(Dst, 11232); 1729 dasm_put(Dst, 11256);
1727 } 1730 }
1728 dasm_put(Dst, 8412); 1731 dasm_put(Dst, 10826);
1729 break; 1732 break;
1730 case BC_SUBVN: case BC_SUBNV: case BC_SUBVV: 1733 case BC_SUBVN: case BC_SUBNV: case BC_SUBVV:
1731 dasm_put(Dst, 11346); 1734 dasm_put(Dst, 11370);
1732 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1735 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1733 switch (vk) { 1736 switch (vk) {
1734 case 0: 1737 case 0:
1735 dasm_put(Dst, 11354, LJ_TISNUM); 1738 dasm_put(Dst, 11378, LJ_TISNUM);
1736 if (sse) { 1739 if (sse) {
1737 dasm_put(Dst, 11466); 1740 dasm_put(Dst, 11490);
1738 } else { 1741 } else {
1739 dasm_put(Dst, 11480); 1742 dasm_put(Dst, 11504);
1740 } 1743 }
1741 break; 1744 break;
1742 case 1: 1745 case 1:
1743 dasm_put(Dst, 11388, LJ_TISNUM); 1746 dasm_put(Dst, 11412, LJ_TISNUM);
1744 if (sse) { 1747 if (sse) {
1745 dasm_put(Dst, 11488); 1748 dasm_put(Dst, 11512);
1746 } else { 1749 } else {
1747 dasm_put(Dst, 11502); 1750 dasm_put(Dst, 11526);
1748 } 1751 }
1749 break; 1752 break;
1750 default: 1753 default:
1751 dasm_put(Dst, 11422, LJ_TISNUM, LJ_TISNUM); 1754 dasm_put(Dst, 11446, LJ_TISNUM, LJ_TISNUM);
1752 if (sse) { 1755 if (sse) {
1753 dasm_put(Dst, 11510); 1756 dasm_put(Dst, 11534);
1754 } else { 1757 } else {
1755 dasm_put(Dst, 11524); 1758 dasm_put(Dst, 11548);
1756 } 1759 }
1757 break; 1760 break;
1758 } 1761 }
1759 if (sse) { 1762 if (sse) {
1760 dasm_put(Dst, 11220); 1763 dasm_put(Dst, 11244);
1761 } else { 1764 } else {
1762 dasm_put(Dst, 11232); 1765 dasm_put(Dst, 11256);
1763 } 1766 }
1764 dasm_put(Dst, 8412); 1767 dasm_put(Dst, 10826);
1765 break; 1768 break;
1766 case BC_MULVN: case BC_MULNV: case BC_MULVV: 1769 case BC_MULVN: case BC_MULNV: case BC_MULVV:
1767 dasm_put(Dst, 11346); 1770 dasm_put(Dst, 11370);
1768 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1771 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1769 switch (vk) { 1772 switch (vk) {
1770 case 0: 1773 case 0:
1771 dasm_put(Dst, 11354, LJ_TISNUM); 1774 dasm_put(Dst, 11378, LJ_TISNUM);
1772 if (sse) { 1775 if (sse) {
1773 dasm_put(Dst, 11532); 1776 dasm_put(Dst, 11556);
1774 } else { 1777 } else {
1775 dasm_put(Dst, 11546); 1778 dasm_put(Dst, 11570);
1776 } 1779 }
1777 break; 1780 break;
1778 case 1: 1781 case 1:
1779 dasm_put(Dst, 11388, LJ_TISNUM); 1782 dasm_put(Dst, 11412, LJ_TISNUM);
1780 if (sse) { 1783 if (sse) {
1781 dasm_put(Dst, 11554); 1784 dasm_put(Dst, 11578);
1782 } else { 1785 } else {
1783 dasm_put(Dst, 11568); 1786 dasm_put(Dst, 11592);
1784 } 1787 }
1785 break; 1788 break;
1786 default: 1789 default:
1787 dasm_put(Dst, 11422, LJ_TISNUM, LJ_TISNUM); 1790 dasm_put(Dst, 11446, LJ_TISNUM, LJ_TISNUM);
1788 if (sse) { 1791 if (sse) {
1789 dasm_put(Dst, 11576); 1792 dasm_put(Dst, 11600);
1790 } else { 1793 } else {
1791 dasm_put(Dst, 11590); 1794 dasm_put(Dst, 11614);
1792 } 1795 }
1793 break; 1796 break;
1794 } 1797 }
1795 if (sse) { 1798 if (sse) {
1796 dasm_put(Dst, 11220); 1799 dasm_put(Dst, 11244);
1797 } else { 1800 } else {
1798 dasm_put(Dst, 11232); 1801 dasm_put(Dst, 11256);
1799 } 1802 }
1800 dasm_put(Dst, 8412); 1803 dasm_put(Dst, 10826);
1801 break; 1804 break;
1802 case BC_DIVVN: case BC_DIVNV: case BC_DIVVV: 1805 case BC_DIVVN: case BC_DIVNV: case BC_DIVVV:
1803 dasm_put(Dst, 11346); 1806 dasm_put(Dst, 11370);
1804 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1807 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1805 switch (vk) { 1808 switch (vk) {
1806 case 0: 1809 case 0:
1807 dasm_put(Dst, 11354, LJ_TISNUM); 1810 dasm_put(Dst, 11378, LJ_TISNUM);
1808 if (sse) { 1811 if (sse) {
1809 dasm_put(Dst, 11598); 1812 dasm_put(Dst, 11622);
1810 } else { 1813 } else {
1811 dasm_put(Dst, 11612); 1814 dasm_put(Dst, 11636);
1812 } 1815 }
1813 break; 1816 break;
1814 case 1: 1817 case 1:
1815 dasm_put(Dst, 11388, LJ_TISNUM); 1818 dasm_put(Dst, 11412, LJ_TISNUM);
1816 if (sse) { 1819 if (sse) {
1817 dasm_put(Dst, 11620); 1820 dasm_put(Dst, 11644);
1818 } else { 1821 } else {
1819 dasm_put(Dst, 11634); 1822 dasm_put(Dst, 11658);
1820 } 1823 }
1821 break; 1824 break;
1822 default: 1825 default:
1823 dasm_put(Dst, 11422, LJ_TISNUM, LJ_TISNUM); 1826 dasm_put(Dst, 11446, LJ_TISNUM, LJ_TISNUM);
1824 if (sse) { 1827 if (sse) {
1825 dasm_put(Dst, 11642); 1828 dasm_put(Dst, 11666);
1826 } else { 1829 } else {
1827 dasm_put(Dst, 11656); 1830 dasm_put(Dst, 11680);
1828 } 1831 }
1829 break; 1832 break;
1830 } 1833 }
1831 if (sse) { 1834 if (sse) {
1832 dasm_put(Dst, 11220); 1835 dasm_put(Dst, 11244);
1833 } else { 1836 } else {
1834 dasm_put(Dst, 11232); 1837 dasm_put(Dst, 11256);
1835 } 1838 }
1836 dasm_put(Dst, 8412); 1839 dasm_put(Dst, 10826);
1837 break; 1840 break;
1838 case BC_MODVN: 1841 case BC_MODVN:
1839 dasm_put(Dst, 11346); 1842 dasm_put(Dst, 11370);
1840 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1843 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1841 switch (vk) { 1844 switch (vk) {
1842 case 0: 1845 case 0:
1843 dasm_put(Dst, 11354, LJ_TISNUM); 1846 dasm_put(Dst, 11378, LJ_TISNUM);
1844 if (sse) { 1847 if (sse) {
1845 dasm_put(Dst, 11664); 1848 dasm_put(Dst, 11688);
1846 } else { 1849 } else {
1847 dasm_put(Dst, 11678); 1850 dasm_put(Dst, 11702);
1848 } 1851 }
1849 break; 1852 break;
1850 case 1: 1853 case 1:
1851 dasm_put(Dst, 11388, LJ_TISNUM); 1854 dasm_put(Dst, 11412, LJ_TISNUM);
1852 if (sse) { 1855 if (sse) {
1853 dasm_put(Dst, 11686); 1856 dasm_put(Dst, 11710);
1854 } else { 1857 } else {
1855 dasm_put(Dst, 11700); 1858 dasm_put(Dst, 11724);
1856 } 1859 }
1857 break; 1860 break;
1858 default: 1861 default:
1859 dasm_put(Dst, 11422, LJ_TISNUM, LJ_TISNUM); 1862 dasm_put(Dst, 11446, LJ_TISNUM, LJ_TISNUM);
1860 if (sse) { 1863 if (sse) {
1861 dasm_put(Dst, 11708); 1864 dasm_put(Dst, 11732);
1862 } else { 1865 } else {
1863 dasm_put(Dst, 11722); 1866 dasm_put(Dst, 11746);
1864 } 1867 }
1865 break; 1868 break;
1866 } 1869 }
1867 dasm_put(Dst, 11730); 1870 dasm_put(Dst, 11754);
1868 if (sse) { 1871 if (sse) {
1869 dasm_put(Dst, 11220); 1872 dasm_put(Dst, 11244);
1870 } else { 1873 } else {
1871 dasm_put(Dst, 11232); 1874 dasm_put(Dst, 11256);
1872 } 1875 }
1873 dasm_put(Dst, 8412); 1876 dasm_put(Dst, 10826);
1874 break; 1877 break;
1875 case BC_MODNV: case BC_MODVV: 1878 case BC_MODNV: case BC_MODVV:
1876 dasm_put(Dst, 11346); 1879 dasm_put(Dst, 11370);
1877 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1880 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1878 switch (vk) { 1881 switch (vk) {
1879 case 0: 1882 case 0:
1880 dasm_put(Dst, 11354, LJ_TISNUM); 1883 dasm_put(Dst, 11378, LJ_TISNUM);
1881 if (sse) { 1884 if (sse) {
1882 dasm_put(Dst, 11664); 1885 dasm_put(Dst, 11688);
1883 } else { 1886 } else {
1884 dasm_put(Dst, 11678); 1887 dasm_put(Dst, 11702);
1885 } 1888 }
1886 break; 1889 break;
1887 case 1: 1890 case 1:
1888 dasm_put(Dst, 11388, LJ_TISNUM); 1891 dasm_put(Dst, 11412, LJ_TISNUM);
1889 if (sse) { 1892 if (sse) {
1890 dasm_put(Dst, 11686); 1893 dasm_put(Dst, 11710);
1891 } else { 1894 } else {
1892 dasm_put(Dst, 11700); 1895 dasm_put(Dst, 11724);
1893 } 1896 }
1894 break; 1897 break;
1895 default: 1898 default:
1896 dasm_put(Dst, 11422, LJ_TISNUM, LJ_TISNUM); 1899 dasm_put(Dst, 11446, LJ_TISNUM, LJ_TISNUM);
1897 if (sse) { 1900 if (sse) {
1898 dasm_put(Dst, 11708); 1901 dasm_put(Dst, 11732);
1899 } else { 1902 } else {
1900 dasm_put(Dst, 11722); 1903 dasm_put(Dst, 11746);
1901 } 1904 }
1902 break; 1905 break;
1903 } 1906 }
1904 dasm_put(Dst, 11736); 1907 dasm_put(Dst, 11760);
1905 break; 1908 break;
1906 case BC_POW: 1909 case BC_POW:
1907 dasm_put(Dst, 11346); 1910 dasm_put(Dst, 11370);
1908 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); 1911 vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
1909 switch (vk) { 1912 switch (vk) {
1910 case 0: 1913 case 0:
1911 dasm_put(Dst, 11354, LJ_TISNUM); 1914 dasm_put(Dst, 11378, LJ_TISNUM);
1912 if (sse) { 1915 if (sse) {
1913 dasm_put(Dst, 11664); 1916 dasm_put(Dst, 11688);
1914 } else { 1917 } else {
1915 dasm_put(Dst, 11678); 1918 dasm_put(Dst, 11702);
1916 } 1919 }
1917 break; 1920 break;
1918 case 1: 1921 case 1:
1919 dasm_put(Dst, 11388, LJ_TISNUM); 1922 dasm_put(Dst, 11412, LJ_TISNUM);
1920 if (sse) { 1923 if (sse) {
1921 dasm_put(Dst, 11686); 1924 dasm_put(Dst, 11710);
1922 } else { 1925 } else {
1923 dasm_put(Dst, 11700); 1926 dasm_put(Dst, 11724);
1924 } 1927 }
1925 break; 1928 break;
1926 default: 1929 default:
1927 dasm_put(Dst, 11422, LJ_TISNUM, LJ_TISNUM); 1930 dasm_put(Dst, 11446, LJ_TISNUM, LJ_TISNUM);
1928 if (sse) { 1931 if (sse) {
1929 dasm_put(Dst, 11708); 1932 dasm_put(Dst, 11732);
1930 } else { 1933 } else {
1931 dasm_put(Dst, 11722); 1934 dasm_put(Dst, 11746);
1932 } 1935 }
1933 break; 1936 break;
1934 } 1937 }
1935 dasm_put(Dst, 11741); 1938 dasm_put(Dst, 11765);
1936 if (sse) { 1939 if (sse) {
1937 dasm_put(Dst, 11220); 1940 dasm_put(Dst, 11244);
1938 } else { 1941 } else {
1939 dasm_put(Dst, 11232); 1942 dasm_put(Dst, 11256);
1940 } 1943 }
1941 dasm_put(Dst, 8412); 1944 dasm_put(Dst, 10826);
1942 break; 1945 break;
1943 1946
1944 case BC_CAT: 1947 case BC_CAT:
1945 dasm_put(Dst, 11745, Dt1(->base), Dt1(->base)); 1948 dasm_put(Dst, 11769, Dt1(->base), Dt1(->base));
1946 break; 1949 break;
1947 1950
1948 /* -- Constant ops ------------------------------------------------------ */ 1951 /* -- Constant ops ------------------------------------------------------ */
1949 1952
1950 case BC_KSTR: 1953 case BC_KSTR:
1951 dasm_put(Dst, 11839, LJ_TSTR); 1954 dasm_put(Dst, 11863, LJ_TSTR);
1952 break; 1955 break;
1953 case BC_KSHORT: 1956 case BC_KSHORT:
1954 if (sse) { 1957 if (sse) {
1955 dasm_put(Dst, 11872); 1958 dasm_put(Dst, 11896);
1956 } else { 1959 } else {
1957 dasm_put(Dst, 11887); 1960 dasm_put(Dst, 11911);
1958 } 1961 }
1959 dasm_put(Dst, 8412); 1962 dasm_put(Dst, 10826);
1960 break; 1963 break;
1961 case BC_KNUM: 1964 case BC_KNUM:
1962 if (sse) { 1965 if (sse) {
1963 dasm_put(Dst, 11895); 1966 dasm_put(Dst, 11919);
1964 } else { 1967 } else {
1965 dasm_put(Dst, 11908); 1968 dasm_put(Dst, 11932);
1966 } 1969 }
1967 dasm_put(Dst, 8412); 1970 dasm_put(Dst, 10826);
1968 break; 1971 break;
1969 case BC_KPRI: 1972 case BC_KPRI:
1970 dasm_put(Dst, 11915); 1973 dasm_put(Dst, 11939);
1971 break; 1974 break;
1972 case BC_KNIL: 1975 case BC_KNIL:
1973 dasm_put(Dst, 11941, LJ_TNIL); 1976 dasm_put(Dst, 11965, LJ_TNIL);
1974 break; 1977 break;
1975 1978
1976 /* -- Upvalue and function ops ------------------------------------------ */ 1979 /* -- Upvalue and function ops ------------------------------------------ */
1977 1980
1978 case BC_UGET: 1981 case BC_UGET:
1979 dasm_put(Dst, 11987, offsetof(GCfuncL, uvptr), DtA(->v)); 1982 dasm_put(Dst, 12011, offsetof(GCfuncL, uvptr), DtA(->v));
1980 break; 1983 break;
1981 case BC_USETV: 1984 case BC_USETV:
1982#define TV2MARKOFS \ 1985#define TV2MARKOFS \
1983 ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv)) 1986 ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv))
1984 dasm_put(Dst, 12031, 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); 1987 dasm_put(Dst, 12055, 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);
1985 dasm_put(Dst, 12121); 1988 dasm_put(Dst, 12145);
1986 break; 1989 break;
1987#undef TV2MARKOFS 1990#undef TV2MARKOFS
1988 case BC_USETS: 1991 case BC_USETS:
1989 dasm_put(Dst, 12133, offsetof(GCfuncL, uvptr), DtA(->v), LJ_TSTR, DtA(->marked), LJ_GC_BLACK, Dt4(->gch.marked), LJ_GC_WHITES, DtA(->closed), GG_DISP2G); 1992 dasm_put(Dst, 12157, offsetof(GCfuncL, uvptr), DtA(->v), LJ_TSTR, DtA(->marked), LJ_GC_BLACK, Dt4(->gch.marked), LJ_GC_WHITES, DtA(->closed), GG_DISP2G);
1990 break; 1993 break;
1991 case BC_USETN: 1994 case BC_USETN:
1992 dasm_put(Dst, 12224); 1995 dasm_put(Dst, 12248);
1993 if (sse) { 1996 if (sse) {
1994 dasm_put(Dst, 12229); 1997 dasm_put(Dst, 12253);
1995 } else { 1998 } else {
1996 dasm_put(Dst, 11039); 1999 dasm_put(Dst, 11063);
1997 } 2000 }
1998 dasm_put(Dst, 12236, offsetof(GCfuncL, uvptr), DtA(->v)); 2001 dasm_put(Dst, 12260, offsetof(GCfuncL, uvptr), DtA(->v));
1999 if (sse) { 2002 if (sse) {
2000 dasm_put(Dst, 12245); 2003 dasm_put(Dst, 12269);
2001 } else { 2004 } else {
2002 dasm_put(Dst, 12251); 2005 dasm_put(Dst, 12275);
2003 } 2006 }
2004 dasm_put(Dst, 8412); 2007 dasm_put(Dst, 10826);
2005 break; 2008 break;
2006 case BC_USETP: 2009 case BC_USETP:
2007 dasm_put(Dst, 12254, offsetof(GCfuncL, uvptr), DtA(->v)); 2010 dasm_put(Dst, 12278, offsetof(GCfuncL, uvptr), DtA(->v));
2008 break; 2011 break;
2009 case BC_UCLO: 2012 case BC_UCLO:
2010 dasm_put(Dst, 12291, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); 2013 dasm_put(Dst, 12315, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base));
2011 break; 2014 break;
2012 2015
2013 case BC_FNEW: 2016 case BC_FNEW:
2014 dasm_put(Dst, 12345, Dt1(->base), Dt1(->base), LJ_TFUNC); 2017 dasm_put(Dst, 12369, Dt1(->base), Dt1(->base), LJ_TFUNC);
2015 break; 2018 break;
2016 2019
2017 /* -- Table ops --------------------------------------------------------- */ 2020 /* -- Table ops --------------------------------------------------------- */
2018 2021
2019 case BC_TNEW: 2022 case BC_TNEW:
2020 dasm_put(Dst, 12416, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); 2023 dasm_put(Dst, 12440, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB);
2021 break; 2024 break;
2022 case BC_TDUP: 2025 case BC_TDUP:
2023 dasm_put(Dst, 12537, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); 2026 dasm_put(Dst, 12561, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB);
2024 break; 2027 break;
2025 2028
2026 case BC_GGET: 2029 case BC_GGET:
2027 dasm_put(Dst, 12629, Dt7(->env)); 2030 dasm_put(Dst, 12653, Dt7(->env));
2028 break; 2031 break;
2029 case BC_GSET: 2032 case BC_GSET:
2030 dasm_put(Dst, 12647, Dt7(->env)); 2033 dasm_put(Dst, 12671, Dt7(->env));
2031 break; 2034 break;
2032 2035
2033 case BC_TGETV: 2036 case BC_TGETV:
2034 dasm_put(Dst, 12665, LJ_TTAB, LJ_TISNUM); 2037 dasm_put(Dst, 12689, LJ_TTAB, LJ_TISNUM);
2035 if (sse) { 2038 if (sse) {
2036 dasm_put(Dst, 12698); 2039 dasm_put(Dst, 12722);
2037 } else { 2040 } else {
2038 dasm_put(Dst, 12719); 2041 dasm_put(Dst, 12743);
2039 if (cmov) { 2042 if (cmov) {
2040 dasm_put(Dst, 10765); 2043 dasm_put(Dst, 10789);
2041 } else { 2044 } else {
2042 dasm_put(Dst, 10771); 2045 dasm_put(Dst, 10795);
2043 } 2046 }
2044 dasm_put(Dst, 2522); 2047 dasm_put(Dst, 2522);
2045 } 2048 }
2046 dasm_put(Dst, 12729, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index); 2049 dasm_put(Dst, 12753, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
2047 dasm_put(Dst, 12821, LJ_TSTR); 2050 dasm_put(Dst, 12845, LJ_TSTR);
2048 break; 2051 break;
2049 case BC_TGETS: 2052 case BC_TGETS:
2050 dasm_put(Dst, 12839, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); 2053 dasm_put(Dst, 12863, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL);
2051 dasm_put(Dst, 12923, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<<MM_index); 2054 dasm_put(Dst, 12947, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
2052 break; 2055 break;
2053 case BC_TGETB: 2056 case BC_TGETB:
2054 dasm_put(Dst, 12994, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index); 2057 dasm_put(Dst, 13018, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
2055 dasm_put(Dst, 11336); 2058 dasm_put(Dst, 11360);
2056 break; 2059 break;
2057 2060
2058 case BC_TSETV: 2061 case BC_TSETV:
2059 dasm_put(Dst, 13093, LJ_TTAB, LJ_TISNUM); 2062 dasm_put(Dst, 13117, LJ_TTAB, LJ_TISNUM);
2060 if (sse) { 2063 if (sse) {
2061 dasm_put(Dst, 12698); 2064 dasm_put(Dst, 12722);
2062 } else { 2065 } else {
2063 dasm_put(Dst, 12719); 2066 dasm_put(Dst, 12743);
2064 if (cmov) { 2067 if (cmov) {
2065 dasm_put(Dst, 10765); 2068 dasm_put(Dst, 10789);
2066 } else { 2069 } else {
2067 dasm_put(Dst, 10771); 2070 dasm_put(Dst, 10795);
2068 } 2071 }
2069 dasm_put(Dst, 2522); 2072 dasm_put(Dst, 2522);
2070 } 2073 }
2071 dasm_put(Dst, 13126, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable)); 2074 dasm_put(Dst, 13150, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable));
2072 dasm_put(Dst, 13209, Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); 2075 dasm_put(Dst, 13233, Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
2073 break; 2076 break;
2074 case BC_TSETS: 2077 case BC_TSETS:
2075 dasm_put(Dst, 13271, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->nomm), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); 2078 dasm_put(Dst, 13295, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->nomm), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL);
2076 dasm_put(Dst, 13346, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, DtB(->next)); 2079 dasm_put(Dst, 13370, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, DtB(->next));
2077 dasm_put(Dst, 13438, 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)); 2080 dasm_put(Dst, 13462, 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));
2078 break; 2081 break;
2079 case BC_TSETB: 2082 case BC_TSETB:
2080 dasm_put(Dst, 13534, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); 2083 dasm_put(Dst, 13558, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable));
2081 dasm_put(Dst, 13632, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); 2084 dasm_put(Dst, 13656, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
2082 break; 2085 break;
2083 2086
2084 case BC_TSETM: 2087 case BC_TSETM:
2085 dasm_put(Dst, 13678); 2088 dasm_put(Dst, 13702);
2086 if (sse) { 2089 if (sse) {
2087 dasm_put(Dst, 12229); 2090 dasm_put(Dst, 12253);
2088 } else { 2091 } else {
2089 dasm_put(Dst, 13683); 2092 dasm_put(Dst, 13707);
2090 } 2093 }
2091 dasm_put(Dst, 13691, Dt6(->marked), LJ_GC_BLACK); 2094 dasm_put(Dst, 13715, Dt6(->marked), LJ_GC_BLACK);
2092 if (sse) { 2095 if (sse) {
2093 dasm_put(Dst, 13716); 2096 dasm_put(Dst, 13740);
2094 } else { 2097 } else {
2095 dasm_put(Dst, 13723); 2098 dasm_put(Dst, 13747);
2096 } 2099 }
2097 dasm_put(Dst, 13728, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain)); 2100 dasm_put(Dst, 13752, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain));
2098 dasm_put(Dst, 13856, Dt6(->gclist)); 2101 dasm_put(Dst, 13880, Dt6(->gclist));
2099 break; 2102 break;
2100 2103
2101 /* -- Calls and vararg handling ----------------------------------------- */ 2104 /* -- Calls and vararg handling ----------------------------------------- */
2102 2105
2103 case BC_CALL: case BC_CALLM: 2106 case BC_CALL: case BC_CALLM:
2104 dasm_put(Dst, 11350); 2107 dasm_put(Dst, 11374);
2105 if (op == BC_CALLM) { 2108 if (op == BC_CALLM) {
2106 dasm_put(Dst, 13864); 2109 dasm_put(Dst, 13888);
2107 } 2110 }
2108 dasm_put(Dst, 13869, LJ_TFUNC, Dt7(->pc)); 2111 dasm_put(Dst, 13893, LJ_TFUNC, Dt7(->pc));
2109 break; 2112 break;
2110 2113
2111 case BC_CALLMT: 2114 case BC_CALLMT:
2112 dasm_put(Dst, 13864); 2115 dasm_put(Dst, 13888);
2113 break; 2116 break;
2114 case BC_CALLT: 2117 case BC_CALLT:
2115 dasm_put(Dst, 13910, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); 2118 dasm_put(Dst, 13934, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc));
2116 dasm_put(Dst, 14028, FRAME_TYPE, Dt7(->pc), PC2PROTO(k)); 2119 dasm_put(Dst, 14052, FRAME_TYPE, Dt7(->pc), PC2PROTO(k));
2117 break; 2120 break;
2118 2121
2119 case BC_ITERC: 2122 case BC_ITERC:
2120 dasm_put(Dst, 14085, LJ_TFUNC, 2+1, Dt7(->pc)); 2123 dasm_put(Dst, 14109, LJ_TFUNC, 2+1, Dt7(->pc));
2121 break; 2124 break;
2122 2125
2123 case BC_VARG: 2126 case BC_VARG:
2124 dasm_put(Dst, 14165, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL); 2127 dasm_put(Dst, 14189, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL);
2125 dasm_put(Dst, 14309, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); 2128 dasm_put(Dst, 14333, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top));
2126 break; 2129 break;
2127 2130
2128 /* -- Returns ----------------------------------------------------------- */ 2131 /* -- Returns ----------------------------------------------------------- */
2129 2132
2130 case BC_RETM: 2133 case BC_RETM:
2131 dasm_put(Dst, 13864); 2134 dasm_put(Dst, 13888);
2132 break; 2135 break;
2133 2136
2134 case BC_RET: case BC_RET0: case BC_RET1: 2137 case BC_RET: case BC_RET0: case BC_RET1:
2135 if (op != BC_RET0) { 2138 if (op != BC_RET0) {
2136 dasm_put(Dst, 14408); 2139 dasm_put(Dst, 14432);
2137 } 2140 }
2138 dasm_put(Dst, 14412, FRAME_TYPE); 2141 dasm_put(Dst, 14436, FRAME_TYPE);
2139 switch (op) { 2142 switch (op) {
2140 case BC_RET: 2143 case BC_RET:
2141 dasm_put(Dst, 14431); 2144 dasm_put(Dst, 14455);
2142 break; 2145 break;
2143 case BC_RET1: 2146 case BC_RET1:
2144 dasm_put(Dst, 14489); 2147 dasm_put(Dst, 14513);
2145 /* fallthrough */ 2148 /* fallthrough */
2146 case BC_RET0: 2149 case BC_RET0:
2147 dasm_put(Dst, 14505); 2150 dasm_put(Dst, 14529);
2148 default: 2151 default:
2149 break; 2152 break;
2150 } 2153 }
2151 dasm_put(Dst, 14516, Dt7(->pc), PC2PROTO(k)); 2154 dasm_put(Dst, 14540, Dt7(->pc), PC2PROTO(k));
2152 if (op == BC_RET) { 2155 if (op == BC_RET) {
2153 dasm_put(Dst, 14558, LJ_TNIL); 2156 dasm_put(Dst, 14582, LJ_TNIL);
2154 } else { 2157 } else {
2155 dasm_put(Dst, 14567, LJ_TNIL); 2158 dasm_put(Dst, 14591, LJ_TNIL);
2156 } 2159 }
2157 dasm_put(Dst, 14574); 2160 dasm_put(Dst, 14598);
2158 if (op != BC_RET0) { 2161 if (op != BC_RET0) {
2159 dasm_put(Dst, 14595); 2162 dasm_put(Dst, 14619);
2160 } 2163 }
2161 dasm_put(Dst, 4678); 2164 dasm_put(Dst, 4678);
2162 break; 2165 break;
@@ -2166,7 +2169,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
2166 2169
2167 case BC_FORL: 2170 case BC_FORL:
2168#if LJ_HASJIT 2171#if LJ_HASJIT
2169 dasm_put(Dst, 14599, HOTCOUNT_PCMASK, GG_DISP2HOT); 2172 dasm_put(Dst, 14623, HOTCOUNT_PCMASK, GG_DISP2HOT);
2170#endif 2173#endif
2171 break; 2174 break;
2172 2175
@@ -2178,57 +2181,57 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
2178 case BC_FORI: 2181 case BC_FORI:
2179 case BC_IFORL: 2182 case BC_IFORL:
2180 vk = (op == BC_IFORL || op == BC_JFORL); 2183 vk = (op == BC_IFORL || op == BC_JFORL);
2181 dasm_put(Dst, 14620); 2184 dasm_put(Dst, 14644);
2182 if (!vk) { 2185 if (!vk) {
2183 dasm_put(Dst, 14624, LJ_TISNUM, LJ_TISNUM); 2186 dasm_put(Dst, 14648, LJ_TISNUM, LJ_TISNUM);
2184 } 2187 }
2185 dasm_put(Dst, 14643); 2188 dasm_put(Dst, 14667);
2186 if (!vk) { 2189 if (!vk) {
2187 dasm_put(Dst, 14647, LJ_TISNUM); 2190 dasm_put(Dst, 14671, LJ_TISNUM);
2188 } 2191 }
2189 if (sse) { 2192 if (sse) {
2190 dasm_put(Dst, 14656); 2193 dasm_put(Dst, 14680);
2191 if (vk) { 2194 if (vk) {
2192 dasm_put(Dst, 14668); 2195 dasm_put(Dst, 14692);
2193 } else { 2196 } else {
2194 dasm_put(Dst, 14687); 2197 dasm_put(Dst, 14711);
2195 } 2198 }
2196 dasm_put(Dst, 14692); 2199 dasm_put(Dst, 14716);
2197 } else { 2200 } else {
2198 dasm_put(Dst, 14705); 2201 dasm_put(Dst, 14729);
2199 if (vk) { 2202 if (vk) {
2200 dasm_put(Dst, 14711); 2203 dasm_put(Dst, 14735);
2201 } else { 2204 } else {
2202 dasm_put(Dst, 14727); 2205 dasm_put(Dst, 14751);
2203 } 2206 }
2204 dasm_put(Dst, 14735); 2207 dasm_put(Dst, 14759);
2205 if (cmov) { 2208 if (cmov) {
2206 dasm_put(Dst, 10765); 2209 dasm_put(Dst, 10789);
2207 } else { 2210 } else {
2208 dasm_put(Dst, 10771); 2211 dasm_put(Dst, 10795);
2209 } 2212 }
2210 if (!cmov) { 2213 if (!cmov) {
2211 dasm_put(Dst, 14740); 2214 dasm_put(Dst, 14764);
2212 } 2215 }
2213 } 2216 }
2214 if (op == BC_FORI) { 2217 if (op == BC_FORI) {
2215 dasm_put(Dst, 14746, -BCBIAS_J*4); 2218 dasm_put(Dst, 14770, -BCBIAS_J*4);
2216 } else if (op == BC_JFORI) { 2219 } else if (op == BC_JFORI) {
2217 dasm_put(Dst, 14756, -BCBIAS_J*4, BC_JLOOP); 2220 dasm_put(Dst, 14780, -BCBIAS_J*4, BC_JLOOP);
2218 } else if (op == BC_IFORL) { 2221 } else if (op == BC_IFORL) {
2219 dasm_put(Dst, 14770, -BCBIAS_J*4); 2222 dasm_put(Dst, 14794, -BCBIAS_J*4);
2220 } else { 2223 } else {
2221 dasm_put(Dst, 14766, BC_JLOOP); 2224 dasm_put(Dst, 14790, BC_JLOOP);
2222 } 2225 }
2223 dasm_put(Dst, 10800); 2226 dasm_put(Dst, 10824);
2224 if (sse) { 2227 if (sse) {
2225 dasm_put(Dst, 14780); 2228 dasm_put(Dst, 14804);
2226 } 2229 }
2227 break; 2230 break;
2228 2231
2229 case BC_ITERL: 2232 case BC_ITERL:
2230#if LJ_HASJIT 2233#if LJ_HASJIT
2231 dasm_put(Dst, 14599, HOTCOUNT_PCMASK, GG_DISP2HOT); 2234 dasm_put(Dst, 14623, HOTCOUNT_PCMASK, GG_DISP2HOT);
2232#endif 2235#endif
2233 break; 2236 break;
2234 2237
@@ -2237,33 +2240,33 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
2237 break; 2240 break;
2238#endif 2241#endif
2239 case BC_IITERL: 2242 case BC_IITERL:
2240 dasm_put(Dst, 14791, LJ_TNIL); 2243 dasm_put(Dst, 14815, LJ_TNIL);
2241 if (op == BC_JITERL) { 2244 if (op == BC_JITERL) {
2242 dasm_put(Dst, 14806, BC_JLOOP); 2245 dasm_put(Dst, 14830, BC_JLOOP);
2243 } else { 2246 } else {
2244 dasm_put(Dst, 14820, -BCBIAS_J*4); 2247 dasm_put(Dst, 14844, -BCBIAS_J*4);
2245 } 2248 }
2246 dasm_put(Dst, 11097); 2249 dasm_put(Dst, 11121);
2247 break; 2250 break;
2248 2251
2249 case BC_LOOP: 2252 case BC_LOOP:
2250#if LJ_HASJIT 2253#if LJ_HASJIT
2251 dasm_put(Dst, 14599, HOTCOUNT_PCMASK, GG_DISP2HOT); 2254 dasm_put(Dst, 14623, HOTCOUNT_PCMASK, GG_DISP2HOT);
2252#endif 2255#endif
2253 break; 2256 break;
2254 2257
2255 case BC_ILOOP: 2258 case BC_ILOOP:
2256 dasm_put(Dst, 8412); 2259 dasm_put(Dst, 10826);
2257 break; 2260 break;
2258 2261
2259 case BC_JLOOP: 2262 case BC_JLOOP:
2260#if LJ_HASJIT 2263#if LJ_HASJIT
2261 dasm_put(Dst, 14836, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); 2264 dasm_put(Dst, 14860, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L));
2262#endif 2265#endif
2263 break; 2266 break;
2264 2267
2265 case BC_JMP: 2268 case BC_JMP:
2266 dasm_put(Dst, 14859, -BCBIAS_J*4); 2269 dasm_put(Dst, 14883, -BCBIAS_J*4);
2267 break; 2270 break;
2268 2271
2269 /* -- Function headers -------------------------------------------------- */ 2272 /* -- Function headers -------------------------------------------------- */
@@ -2286,47 +2289,47 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
2286 break; 2289 break;
2287#endif 2290#endif
2288 case BC_IFUNCF: 2291 case BC_IFUNCF:
2289 dasm_put(Dst, 14883, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); 2292 dasm_put(Dst, 14907, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams));
2290 if (op == BC_JFUNCF) { 2293 if (op == BC_JFUNCF) {
2291 dasm_put(Dst, 14913, BC_JLOOP); 2294 dasm_put(Dst, 14937, BC_JLOOP);
2292 } else { 2295 } else {
2293 dasm_put(Dst, 8412); 2296 dasm_put(Dst, 10826);
2294 } 2297 }
2295 dasm_put(Dst, 14922, LJ_TNIL); 2298 dasm_put(Dst, 14946, LJ_TNIL);
2296 break; 2299 break;
2297 2300
2298 case BC_JFUNCV: 2301 case BC_JFUNCV:
2299#if !LJ_HASJIT 2302#if !LJ_HASJIT
2300 break; 2303 break;
2301#endif 2304#endif
2302 dasm_put(Dst, 10463); 2305 dasm_put(Dst, 10487);
2303 break; /* NYI: compiled vararg functions. */ 2306 break; /* NYI: compiled vararg functions. */
2304 2307
2305 case BC_IFUNCV: 2308 case BC_IFUNCV:
2306 dasm_put(Dst, 14944, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); 2309 dasm_put(Dst, 14968, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL);
2307 if (op == BC_JFUNCV) { 2310 if (op == BC_JFUNCV) {
2308 dasm_put(Dst, 14913, BC_JLOOP); 2311 dasm_put(Dst, 14937, BC_JLOOP);
2309 } else { 2312 } else {
2310 dasm_put(Dst, 15035, -4+PC2PROTO(k)); 2313 dasm_put(Dst, 15059, -4+PC2PROTO(k));
2311 } 2314 }
2312 dasm_put(Dst, 15057, LJ_TNIL); 2315 dasm_put(Dst, 15081, LJ_TNIL);
2313 break; 2316 break;
2314 2317
2315 case BC_FUNCC: 2318 case BC_FUNCC:
2316 case BC_FUNCCW: 2319 case BC_FUNCCW:
2317 dasm_put(Dst, 15079, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); 2320 dasm_put(Dst, 15103, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top));
2318 if (op == BC_FUNCC) { 2321 if (op == BC_FUNCC) {
2319 dasm_put(Dst, 15108); 2322 dasm_put(Dst, 15132);
2320 } else { 2323 } else {
2321 dasm_put(Dst, 15112); 2324 dasm_put(Dst, 15136);
2322 } 2325 }
2323 dasm_put(Dst, 15120, DISPATCH_GL(vmstate), ~LJ_VMST_C); 2326 dasm_put(Dst, 15144, DISPATCH_GL(vmstate), ~LJ_VMST_C);
2324 if (op == BC_FUNCC) { 2327 if (op == BC_FUNCC) {
2325 dasm_put(Dst, 15129); 2328 dasm_put(Dst, 15153);
2326 } else { 2329 } else {
2327 dasm_put(Dst, 15133, DISPATCH_GL(wrapf)); 2330 dasm_put(Dst, 15157, DISPATCH_GL(wrapf));
2328 } 2331 }
2329 dasm_put(Dst, 15138, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); 2332 dasm_put(Dst, 15162, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top));
2330 break; 2333 break;
2331 2334
2332 /* ---------------------------------------------------------------------- */ 2335 /* ---------------------------------------------------------------------- */
@@ -2354,7 +2357,7 @@ static int build_backend(BuildCtx *ctx)
2354 2357
2355 build_subroutines(ctx, cmov, sse); 2358 build_subroutines(ctx, cmov, sse);
2356 2359
2357 dasm_put(Dst, 15163); 2360 dasm_put(Dst, 15187);
2358 for (op = 0; op < BC__MAX; op++) 2361 for (op = 0; op < BC__MAX; op++)
2359 build_ins(ctx, (BCOp)op, op, cmov, sse); 2362 build_ins(ctx, (BCOp)op, op, cmov, sse);
2360 2363
diff --git a/src/lj_err.c b/src/lj_err.c
index fdc06001..0aaf5497 100644
--- a/src/lj_err.c
+++ b/src/lj_err.c
@@ -695,7 +695,7 @@ static void err_raise_ext(int errcode)
695/* -- Error handling ------------------------------------------------------ */ 695/* -- Error handling ------------------------------------------------------ */
696 696
697/* Throw error. Find catch frame, unwind stack and continue. */ 697/* Throw error. Find catch frame, unwind stack and continue. */
698LJ_NOINLINE void lj_err_throw(lua_State *L, int errcode) 698LJ_NOINLINE void LJ_FASTCALL lj_err_throw(lua_State *L, int errcode)
699{ 699{
700 global_State *g = G(L); 700 global_State *g = G(L);
701 lj_trace_abort(g); 701 lj_trace_abort(g);
diff --git a/src/lj_err.h b/src/lj_err.h
index aadb7c59..58a85381 100644
--- a/src/lj_err.h
+++ b/src/lj_err.h
@@ -18,7 +18,7 @@ typedef enum {
18} ErrMsg; 18} ErrMsg;
19 19
20LJ_FUNC GCstr *lj_err_str(lua_State *L, ErrMsg em); 20LJ_FUNC GCstr *lj_err_str(lua_State *L, ErrMsg em);
21LJ_FUNC_NORET void lj_err_throw(lua_State *L, int errcode); 21LJ_FUNC_NORET void LJ_FASTCALL lj_err_throw(lua_State *L, int errcode);
22LJ_FUNC_NORET void lj_err_mem(lua_State *L); 22LJ_FUNC_NORET void lj_err_mem(lua_State *L);
23LJ_FUNC_NORET void lj_err_run(lua_State *L); 23LJ_FUNC_NORET void lj_err_run(lua_State *L);
24LJ_FUNC_NORET void lj_err_msg(lua_State *L, ErrMsg em); 24LJ_FUNC_NORET void lj_err_msg(lua_State *L, ErrMsg em);
diff --git a/src/lj_snap.c b/src/lj_snap.c
index e17b7a0d..1353e90f 100644
--- a/src/lj_snap.c
+++ b/src/lj_snap.c
@@ -216,8 +216,12 @@ const BCIns *lj_snap_restore(jit_State *J, void *exptr)
216 BCReg nslots = snap->nslots; 216 BCReg nslots = snap->nslots;
217 TValue *frame; 217 TValue *frame;
218 BloomFilter rfilt = snap_renamefilter(T, snapno); 218 BloomFilter rfilt = snap_renamefilter(T, snapno);
219 const BCIns *pc = snap_pc(map[nent]);
219 lua_State *L = J->L; 220 lua_State *L = J->L;
220 221
222 /* Set interpreter PC to the next PC to get correct error messages. */
223 setcframe_pc(cframe_raw(L->cframe), pc+1);
224
221 /* Make sure the stack is big enough for the slots from the snapshot. */ 225 /* Make sure the stack is big enough for the slots from the snapshot. */
222 if (LJ_UNLIKELY(L->base + nslots > L->maxstack)) { 226 if (LJ_UNLIKELY(L->base + nslots > L->maxstack)) {
223 L->top = curr_topL(L); 227 L->top = curr_topL(L);
@@ -289,7 +293,7 @@ const BCIns *lj_snap_restore(jit_State *J, void *exptr)
289 } 293 }
290 L->top = curr_topL(L); 294 L->top = curr_topL(L);
291 lua_assert(map + nent == flinks); 295 lua_assert(map + nent == flinks);
292 return snap_pc(*flinks); 296 return pc;
293} 297}
294 298
295#undef IR 299#undef IR
diff --git a/src/lj_trace.c b/src/lj_trace.c
index 3b137164..43104be6 100644
--- a/src/lj_trace.c
+++ b/src/lj_trace.c
@@ -574,13 +574,34 @@ static void trace_hotside(jit_State *J, const BCIns *pc)
574 } 574 }
575} 575}
576 576
577/* Tiny struct to pass data to protected call. */
578typedef struct ExitDataCP {
579 jit_State *J;
580 void *exptr; /* Pointer to exit state. */
581 const BCIns *pc; /* Restart interpreter at this PC. */
582} ExitDataCP;
583
584/* Need to protect lj_snap_restore because it may throw. */
585static TValue *trace_exit_cp(lua_State *L, lua_CFunction dummy, void *ud)
586{
587 ExitDataCP *exd = (ExitDataCP *)ud;
588 cframe_errfunc(L->cframe) = -1; /* Inherit error function. */
589 exd->pc = lj_snap_restore(exd->J, exd->exptr);
590 UNUSED(dummy);
591 return NULL;
592}
593
577/* A trace exited. Restore interpreter state. */ 594/* A trace exited. Restore interpreter state. */
578void * LJ_FASTCALL lj_trace_exit(jit_State *J, void *exptr) 595int LJ_FASTCALL lj_trace_exit(jit_State *J, void *exptr)
579{ 596{
580 const BCIns *pc = lj_snap_restore(J, exptr);
581 lua_State *L = J->L; 597 lua_State *L = J->L;
582 void *cf = cframe_raw(L->cframe); 598 ExitDataCP exd;
583 setcframe_pc(cf, pc); /* Restart interpreter at this PC. */ 599 int errcode;
600 exd.J = J;
601 exd.exptr = exptr;
602 errcode = lj_vm_cpcall(L, NULL, &exd, trace_exit_cp);
603 if (errcode)
604 return errcode;
584 605
585 lj_vmevent_send(L, TEXIT, 606 lj_vmevent_send(L, TEXIT,
586 ExitState *ex = (ExitState *)exptr; 607 ExitState *ex = (ExitState *)exptr;
@@ -600,8 +621,9 @@ void * LJ_FASTCALL lj_trace_exit(jit_State *J, void *exptr)
600 } 621 }
601 ); 622 );
602 623
603 trace_hotside(J, pc); 624 trace_hotside(J, exd.pc);
604 return cf; /* Return the interpreter C frame. */ 625 setcframe_pc(cframe_raw(L->cframe), exd.pc);
626 return 0;
605} 627}
606 628
607#endif 629#endif
diff --git a/src/lj_trace.h b/src/lj_trace.h
index a8e45974..6944bd9c 100644
--- a/src/lj_trace.h
+++ b/src/lj_trace.h
@@ -33,7 +33,7 @@ LJ_FUNC void lj_trace_freestate(global_State *g);
33/* Event handling. */ 33/* Event handling. */
34LJ_FUNC void lj_trace_ins(jit_State *J, const BCIns *pc); 34LJ_FUNC void lj_trace_ins(jit_State *J, const BCIns *pc);
35LJ_FUNCA void LJ_FASTCALL lj_trace_hot(jit_State *J, const BCIns *pc); 35LJ_FUNCA void LJ_FASTCALL lj_trace_hot(jit_State *J, const BCIns *pc);
36LJ_FUNCA void * LJ_FASTCALL lj_trace_exit(jit_State *J, void *exptr); 36LJ_FUNCA int LJ_FASTCALL lj_trace_exit(jit_State *J, void *exptr);
37 37
38/* Signal asynchronous abort of trace or end of trace. */ 38/* Signal asynchronous abort of trace or end of trace. */
39#define lj_trace_abort(g) (G2J(g)->state &= ~LJ_TRACE_ACTIVE) 39#define lj_trace_abort(g) (G2J(g)->state &= ~LJ_TRACE_ACTIVE)