diff --git a/src/buildvm_x64.h b/src/buildvm_x64.h index 42d435cb..801345d5 100644 --- a/src/buildvm_x64.h +++ b/src/buildvm_x64.h @@ -12,7 +12,7 @@ #define DASM_SECTION_CODE_OP 0 #define DASM_SECTION_CODE_SUB 1 #define DASM_MAXSECTION 2 -static const unsigned char build_actionlist[15911] = { +static const unsigned char build_actionlist[15952] = { 254,1,248,10,252,247,195,237,15,132,244,11,131,227,252,248,41,218,72,141, 76,25,252,248,139,90,252,252,199,68,10,4,237,248,12,131,192,1,137,68,36,4, 252,247,195,237,15,132,244,13,248,14,129,252,243,239,252,247,195,237,15,133, @@ -488,299 +488,301 @@ static const unsigned char build_actionlist[15911] = { 133,192,15,132,244,251,15,40,131,233,15,40,139,233,255,15,40,147,233,15,40, 155,233,131,252,248,4,15,134,244,251,15,40,163,233,15,40,171,233,15,40,179, 233,15,40,187,233,248,5,252,255,147,233,72,137,131,233,15,41,131,233,72,137, - 147,233,15,41,139,233,255,72,139,93,252,248,201,195,255,249,255,129,124,253, - 202,4,239,15,133,244,253,129,124,253,194,4,239,15,133,244,254,139,44,202, - 131,195,4,59,44,194,255,15,141,244,255,255,15,140,244,255,255,15,143,244, - 255,255,15,142,244,255,255,248,6,15,183,67,252,254,141,156,253,131,233,248, - 9,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238, - 248,7,15,135,244,41,129,124,253,194,4,239,15,130,244,247,15,133,244,41,255, - 252,242,15,42,4,194,252,233,244,248,255,221,4,202,219,4,194,252,233,244,249, - 255,248,8,15,135,244,41,255,252,242,15,42,12,202,252,242,15,16,4,194,131, - 195,4,102,15,46,193,255,15,134,244,9,255,15,135,244,9,255,15,130,244,9,255, - 15,131,244,9,255,252,233,244,6,255,219,4,202,252,233,244,248,255,129,124, - 253,202,4,239,15,131,244,41,129,124,253,194,4,239,15,131,244,41,255,248,1, - 252,242,15,16,4,194,248,2,131,195,4,102,15,46,4,202,248,3,255,248,1,221,4, - 202,248,2,221,4,194,248,3,131,195,4,255,223,252,233,221,216,255,218,252,233, - 223,224,158,255,15,134,244,247,255,15,135,244,247,255,15,130,244,247,255, - 15,131,244,247,255,15,183,67,252,254,141,156,253,131,233,248,1,139,3,15,182, - 204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,139,108,194, - 4,131,195,4,255,129,252,253,239,15,133,244,253,129,124,253,202,4,239,15,133, - 244,254,139,44,194,59,44,202,255,15,133,244,255,255,15,132,244,255,255,15, - 183,67,252,254,141,156,253,131,233,248,9,139,3,15,182,204,15,182,232,131, - 195,4,193,232,16,65,252,255,36,252,238,248,7,15,135,244,251,129,124,253,202, - 4,239,15,130,244,247,15,133,244,251,255,252,242,15,42,4,202,255,219,4,202, - 255,252,233,244,248,248,8,15,135,244,251,255,252,242,15,42,4,194,102,15,46, - 4,202,255,219,4,194,221,4,202,255,252,233,244,250,255,129,252,253,239,15, - 131,244,251,129,124,253,202,4,239,15,131,244,251,255,248,1,252,242,15,16, - 4,202,248,2,102,15,46,4,194,248,4,255,248,1,221,4,202,248,2,221,4,194,248, - 4,255,15,138,244,248,15,133,244,248,255,15,138,244,248,15,132,244,247,255, - 248,1,15,183,67,252,254,141,156,253,131,233,248,2,255,248,2,15,183,67,252, - 254,141,156,253,131,233,248,1,255,252,233,244,9,255,248,5,255,129,252,253, - 239,15,132,244,46,129,124,253,202,4,239,15,132,244,46,255,57,108,202,4,15, - 133,244,2,129,252,253,239,15,131,244,1,139,12,202,139,4,194,57,193,15,132, - 244,1,129,252,253,239,15,135,244,2,139,169,233,133,252,237,15,132,244,2,252, - 246,133,233,235,15,133,244,2,255,49,252,237,255,189,1,0,0,0,255,252,233,244, - 45,255,248,3,129,252,253,239,255,15,133,244,9,255,252,233,244,46,255,72,252, - 247,208,139,108,202,4,131,195,4,129,252,253,239,15,133,244,249,139,12,202, - 65,59,12,135,255,139,108,202,4,131,195,4,255,129,252,253,239,15,133,244,253, - 65,129,124,253,199,4,239,15,133,244,254,65,139,44,199,59,44,202,255,15,183, - 67,252,254,141,156,253,131,233,248,9,139,3,15,182,204,15,182,232,131,195, - 4,193,232,16,65,252,255,36,252,238,248,7,15,135,244,249,65,129,124,253,199, - 4,239,15,130,244,247,255,252,242,65,15,42,4,199,255,65,219,4,199,255,252, - 233,244,248,248,8,255,252,242,15,42,4,202,102,65,15,46,4,199,255,219,4,202, - 65,221,4,199,255,129,252,253,239,15,131,244,249,255,248,1,252,242,65,15,16, - 4,199,248,2,102,15,46,4,202,248,4,255,248,1,65,221,4,199,248,2,221,4,202, - 248,4,255,72,252,247,208,139,108,202,4,131,195,4,57,197,255,15,133,244,249, - 15,183,67,252,254,141,156,253,131,233,248,2,139,3,15,182,204,15,182,232,131, - 195,4,193,232,16,65,252,255,36,252,238,248,3,129,252,253,239,15,133,244,2, - 252,233,244,46,255,15,132,244,248,129,252,253,239,15,132,244,46,15,183,67, - 252,254,141,156,253,131,233,248,2,139,3,15,182,204,15,182,232,131,195,4,193, - 232,16,65,252,255,36,252,238,255,139,108,194,4,131,195,4,129,252,253,239, - 255,137,108,202,4,139,44,194,137,44,202,255,72,139,44,194,72,137,44,202,139, - 3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,49, - 252,237,129,124,253,194,4,239,129,213,239,137,108,202,4,139,3,15,182,204, - 15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,129,124,253,194, - 4,239,15,133,244,251,139,44,194,252,247,221,15,128,244,250,199,68,202,4,237, - 137,44,202,248,9,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252, - 255,36,252,238,248,4,199,68,202,4,0,0,224,65,199,4,202,0,0,0,0,252,233,244, - 9,248,5,15,135,244,51,255,129,124,253,194,4,239,15,131,244,51,255,252,242, - 15,16,4,194,72,184,237,237,102,72,15,110,200,15,87,193,252,242,15,17,4,202, - 255,221,4,194,217,224,221,28,202,255,129,124,253,194,4,239,15,133,244,248, - 139,4,194,255,139,128,233,248,1,199,68,202,4,237,137,4,202,255,15,87,192, - 252,242,15,42,128,233,248,1,252,242,15,17,4,202,255,219,128,233,248,1,221, - 28,202,255,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36, - 252,238,248,2,129,124,253,194,4,239,15,133,244,54,139,60,194,137,213,232, - 251,1,20,255,252,242,15,42,192,255,137,252,234,15,182,75,252,253,252,233, - 244,1,255,15,182,252,236,15,182,192,255,129,124,253,252,234,4,239,15,133, - 244,48,65,129,124,253,199,4,239,15,133,244,48,139,44,252,234,65,3,44,199, - 15,128,244,47,255,129,124,253,252,234,4,239,15,133,244,50,65,129,124,253, - 199,4,239,15,133,244,50,65,139,4,199,3,4,252,234,15,128,244,49,255,129,124, - 253,252,234,4,239,15,133,244,53,129,124,253,194,4,239,15,133,244,53,139,44, - 252,234,3,44,194,15,128,244,52,255,199,68,202,4,237,255,129,124,253,252,234, - 4,239,15,131,244,48,255,65,129,124,253,199,4,239,15,131,244,48,255,252,242, - 15,16,4,252,234,252,242,65,15,88,4,199,255,221,4,252,234,65,220,4,199,255, - 129,124,253,252,234,4,239,15,131,244,50,255,65,129,124,253,199,4,239,15,131, - 244,50,255,252,242,65,15,16,4,199,252,242,15,88,4,252,234,255,65,221,4,199, - 220,4,252,234,255,129,124,253,252,234,4,239,15,131,244,53,129,124,253,194, - 4,239,15,131,244,53,255,252,242,15,16,4,252,234,252,242,15,88,4,194,255,221, - 4,252,234,220,4,194,255,129,124,253,252,234,4,239,15,133,244,48,65,129,124, - 253,199,4,239,15,133,244,48,139,44,252,234,65,43,44,199,15,128,244,47,255, - 129,124,253,252,234,4,239,15,133,244,50,65,129,124,253,199,4,239,15,133,244, - 50,65,139,4,199,43,4,252,234,15,128,244,49,255,129,124,253,252,234,4,239, - 15,133,244,53,129,124,253,194,4,239,15,133,244,53,139,44,252,234,43,44,194, - 15,128,244,52,255,252,242,15,16,4,252,234,252,242,65,15,92,4,199,255,221, - 4,252,234,65,220,36,199,255,252,242,65,15,16,4,199,252,242,15,92,4,252,234, - 255,65,221,4,199,220,36,252,234,255,252,242,15,16,4,252,234,252,242,15,92, - 4,194,255,221,4,252,234,220,36,194,255,129,124,253,252,234,4,239,15,133,244, - 48,65,129,124,253,199,4,239,15,133,244,48,139,44,252,234,65,15,175,44,199, - 15,128,244,47,255,129,124,253,252,234,4,239,15,133,244,50,65,129,124,253, - 199,4,239,15,133,244,50,65,139,4,199,15,175,4,252,234,15,128,244,49,255,129, + 147,233,15,41,139,233,255,72,139,93,252,248,201,195,255,248,162,255,249,255, + 129,124,253,202,4,239,15,133,244,253,129,124,253,194,4,239,15,133,244,254, + 139,44,202,131,195,4,59,44,194,255,15,141,244,255,255,15,140,244,255,255, + 15,143,244,255,255,15,142,244,255,255,248,6,15,183,67,252,254,141,156,253, + 131,233,248,9,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255, + 36,252,238,248,7,15,135,244,41,129,124,253,194,4,239,15,130,244,247,15,133, + 244,41,255,252,242,15,42,4,194,252,233,244,248,255,221,4,202,219,4,194,252, + 233,244,249,255,248,8,15,135,244,41,255,252,242,15,42,12,202,252,242,15,16, + 4,194,131,195,4,102,15,46,193,255,15,134,244,9,255,15,135,244,9,255,15,130, + 244,9,255,15,131,244,9,255,252,233,244,6,255,219,4,202,252,233,244,248,255, + 129,124,253,202,4,239,15,131,244,41,129,124,253,194,4,239,15,131,244,41,255, + 248,1,252,242,15,16,4,194,248,2,131,195,4,102,15,46,4,202,248,3,255,248,1, + 221,4,202,248,2,221,4,194,248,3,131,195,4,255,223,252,233,221,216,255,218, + 252,233,223,224,158,255,15,134,244,247,255,15,135,244,247,255,15,130,244, + 247,255,15,131,244,247,255,15,183,67,252,254,141,156,253,131,233,248,1,139, + 3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,139, + 108,194,4,131,195,4,255,129,252,253,239,15,133,244,253,129,124,253,202,4, + 239,15,133,244,254,139,44,194,59,44,202,255,15,133,244,255,255,15,132,244, + 255,255,15,183,67,252,254,141,156,253,131,233,248,9,139,3,15,182,204,15,182, + 232,131,195,4,193,232,16,65,252,255,36,252,238,248,7,15,135,244,251,129,124, + 253,202,4,239,15,130,244,247,15,133,244,251,255,252,242,15,42,4,202,255,219, + 4,202,255,252,233,244,248,248,8,15,135,244,251,255,252,242,15,42,4,194,102, + 15,46,4,202,255,219,4,194,221,4,202,255,252,233,244,250,255,129,252,253,239, + 15,131,244,251,129,124,253,202,4,239,15,131,244,251,255,248,1,252,242,15, + 16,4,202,248,2,102,15,46,4,194,248,4,255,248,1,221,4,202,248,2,221,4,194, + 248,4,255,15,138,244,248,15,133,244,248,255,15,138,244,248,15,132,244,247, + 255,248,1,15,183,67,252,254,141,156,253,131,233,248,2,255,248,2,15,183,67, + 252,254,141,156,253,131,233,248,1,255,252,233,244,9,255,248,5,255,129,252, + 253,239,15,132,244,46,129,124,253,202,4,239,15,132,244,46,255,57,108,202, + 4,15,133,244,2,129,252,253,239,15,131,244,1,139,12,202,139,4,194,57,193,15, + 132,244,1,129,252,253,239,15,135,244,2,139,169,233,133,252,237,15,132,244, + 2,252,246,133,233,235,15,133,244,2,255,49,252,237,255,189,1,0,0,0,255,252, + 233,244,45,255,248,3,129,252,253,239,255,15,133,244,9,255,252,233,244,46, + 255,72,252,247,208,139,108,202,4,131,195,4,129,252,253,239,15,133,244,249, + 139,12,202,65,59,12,135,255,139,108,202,4,131,195,4,255,129,252,253,239,15, + 133,244,253,65,129,124,253,199,4,239,15,133,244,254,65,139,44,199,59,44,202, + 255,15,183,67,252,254,141,156,253,131,233,248,9,139,3,15,182,204,15,182,232, + 131,195,4,193,232,16,65,252,255,36,252,238,248,7,15,135,244,249,65,129,124, + 253,199,4,239,15,130,244,247,255,252,242,65,15,42,4,199,255,65,219,4,199, + 255,252,233,244,248,248,8,255,252,242,15,42,4,202,102,65,15,46,4,199,255, + 219,4,202,65,221,4,199,255,129,252,253,239,15,131,244,249,255,248,1,252,242, + 65,15,16,4,199,248,2,102,15,46,4,202,248,4,255,248,1,65,221,4,199,248,2,221, + 4,202,248,4,255,72,252,247,208,139,108,202,4,131,195,4,57,197,255,15,133, + 244,249,15,183,67,252,254,141,156,253,131,233,248,2,139,3,15,182,204,15,182, + 232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,129,252,253,239,15,133, + 244,2,252,233,244,46,255,15,132,244,248,129,252,253,239,15,132,244,46,15, + 183,67,252,254,141,156,253,131,233,248,2,139,3,15,182,204,15,182,232,131, + 195,4,193,232,16,65,252,255,36,252,238,255,139,108,194,4,131,195,4,129,252, + 253,239,255,137,108,202,4,139,44,194,137,44,202,255,72,139,44,194,72,137, + 44,202,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252, + 238,255,49,252,237,129,124,253,194,4,239,129,213,239,137,108,202,4,139,3, + 15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,129, + 124,253,194,4,239,15,133,244,251,139,44,194,252,247,221,15,128,244,250,199, + 68,202,4,237,137,44,202,248,9,139,3,15,182,204,15,182,232,131,195,4,193,232, + 16,65,252,255,36,252,238,248,4,199,68,202,4,0,0,224,65,199,4,202,0,0,0,0, + 252,233,244,9,248,5,15,135,244,51,255,129,124,253,194,4,239,15,131,244,51, + 255,252,242,15,16,4,194,72,184,237,237,102,72,15,110,200,15,87,193,252,242, + 15,17,4,202,255,221,4,194,217,224,221,28,202,255,129,124,253,194,4,239,15, + 133,244,248,139,4,194,255,139,128,233,248,1,199,68,202,4,237,137,4,202,255, + 15,87,192,252,242,15,42,128,233,248,1,252,242,15,17,4,202,255,219,128,233, + 248,1,221,28,202,255,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65, + 252,255,36,252,238,248,2,129,124,253,194,4,239,15,133,244,54,139,60,194,137, + 213,232,251,1,20,255,252,242,15,42,192,255,137,252,234,15,182,75,252,253, + 252,233,244,1,255,15,182,252,236,15,182,192,255,129,124,253,252,234,4,239, + 15,133,244,48,65,129,124,253,199,4,239,15,133,244,48,139,44,252,234,65,3, + 44,199,15,128,244,47,255,129,124,253,252,234,4,239,15,133,244,50,65,129,124, + 253,199,4,239,15,133,244,50,65,139,4,199,3,4,252,234,15,128,244,49,255,129, 124,253,252,234,4,239,15,133,244,53,129,124,253,194,4,239,15,133,244,53,139, - 44,252,234,15,175,44,194,15,128,244,52,255,252,242,15,16,4,252,234,252,242, - 65,15,89,4,199,255,221,4,252,234,65,220,12,199,255,252,242,65,15,16,4,199, - 252,242,15,89,4,252,234,255,65,221,4,199,220,12,252,234,255,252,242,15,16, - 4,252,234,252,242,15,89,4,194,255,221,4,252,234,220,12,194,255,252,242,15, - 16,4,252,234,252,242,65,15,94,4,199,255,221,4,252,234,65,220,52,199,255,252, - 242,65,15,16,4,199,252,242,15,94,4,252,234,255,65,221,4,199,220,52,252,234, - 255,252,242,15,16,4,252,234,252,242,15,94,4,194,255,221,4,252,234,220,52, - 194,255,252,242,15,16,4,252,234,252,242,65,15,16,12,199,255,221,4,252,234, - 65,221,4,199,255,252,242,65,15,16,4,199,252,242,15,16,12,252,234,255,65,221, - 4,199,221,4,252,234,255,252,242,15,16,4,252,234,252,242,15,16,12,194,255, - 221,4,252,234,221,4,194,255,248,162,232,244,153,255,252,233,244,162,255,232, - 244,113,255,15,182,252,236,15,182,192,139,124,36,24,137,151,233,141,52,194, - 137,194,41,252,234,248,33,137,252,253,137,92,36,28,232,251,1,27,139,149,233, - 133,192,15,133,244,42,15,182,107,252,255,15,182,75,252,253,72,139,4,252,234, - 72,137,4,202,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255, - 36,252,238,255,72,252,247,208,65,139,4,135,199,68,202,4,237,137,4,202,139, - 3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,15, - 191,192,199,68,202,4,237,137,4,202,255,15,191,192,252,242,15,42,192,252,242, - 15,17,4,202,255,223,67,252,254,221,28,202,255,252,242,65,15,16,4,199,252, - 242,15,17,4,202,255,65,221,4,199,221,28,202,255,72,252,247,208,137,68,202, - 4,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238, - 255,141,76,202,12,141,68,194,4,189,237,137,105,252,248,248,1,137,41,131,193, - 8,57,193,15,134,244,1,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65, - 252,255,36,252,238,255,139,106,252,248,139,172,253,133,233,139,173,233,72, - 139,69,0,72,137,4,202,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65, - 252,255,36,252,238,255,139,106,252,248,139,172,253,141,233,128,189,233,0, - 139,173,233,139,12,194,139,68,194,4,137,77,0,137,69,4,15,132,244,247,252, - 246,133,233,235,15,133,244,248,248,1,139,3,15,182,204,15,182,232,131,195, - 4,193,232,16,65,252,255,36,252,238,248,2,129,232,239,129,252,248,239,15,134, - 244,1,252,246,129,233,235,15,132,244,1,137,252,238,137,213,65,141,190,233, - 255,232,251,1,28,137,252,234,252,233,244,1,255,72,252,247,208,139,106,252, - 248,139,172,253,141,233,65,139,12,135,139,133,233,137,8,199,64,4,237,252, - 246,133,233,235,15,133,244,248,248,1,139,3,15,182,204,15,182,232,131,195, - 4,193,232,16,65,252,255,36,252,238,248,2,252,246,129,233,235,15,132,244,1, - 128,189,233,0,15,132,244,1,137,213,137,198,65,141,190,233,232,251,1,28,137, - 252,234,252,233,244,1,255,139,106,252,248,255,252,242,65,15,16,4,199,255, - 139,172,253,141,233,139,141,233,255,252,242,15,17,1,255,221,25,255,72,252, - 247,208,139,106,252,248,139,172,253,141,233,139,141,233,137,65,4,139,3,15, - 182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,141,156, - 253,131,233,139,108,36,24,131,189,233,0,15,132,244,247,137,149,233,141,52, - 202,137,252,239,232,251,1,29,139,149,233,248,1,139,3,15,182,204,15,182,232, - 131,195,4,193,232,16,65,252,255,36,252,238,255,72,252,247,208,139,108,36, - 24,137,149,233,139,82,252,248,65,139,52,135,137,252,239,137,92,36,28,232, - 251,1,30,139,149,233,15,182,75,252,253,137,4,202,199,68,202,4,237,139,3,15, - 182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,139,108, - 36,24,137,149,233,65,139,142,233,65,59,142,233,137,92,36,28,15,131,244,251, - 248,1,137,194,37,252,255,7,0,0,193,252,234,11,61,252,255,7,0,0,15,132,244, - 249,248,2,137,252,239,137,198,232,251,1,31,139,149,233,15,182,75,252,253, - 137,4,202,199,68,202,4,237,139,3,15,182,204,15,182,232,131,195,4,193,232, - 16,65,252,255,36,252,238,248,3,184,1,8,0,0,252,233,244,2,248,5,137,252,239, - 232,251,1,32,15,183,67,252,254,252,233,244,1,255,72,252,247,208,139,108,36, - 24,65,139,142,233,137,92,36,28,65,59,142,233,137,149,233,15,131,244,249,248, - 2,65,139,52,135,137,252,239,232,251,1,33,139,149,233,15,182,75,252,253,137, - 4,202,199,68,202,4,237,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65, - 252,255,36,252,238,248,3,137,252,239,232,251,1,32,15,183,67,252,254,72,252, - 247,208,252,233,244,2,255,72,252,247,208,139,106,252,248,139,173,233,65,139, - 4,135,252,233,244,163,255,72,252,247,208,139,106,252,248,139,173,233,65,139, - 4,135,252,233,244,164,255,15,182,252,236,15,182,192,129,124,253,252,234,4, - 239,15,133,244,36,139,44,252,234,255,129,124,253,194,4,239,15,133,244,251, - 139,4,194,255,129,124,253,194,4,239,15,131,244,251,255,252,242,15,16,4,194, - 252,242,15,45,192,252,242,15,42,200,102,15,46,193,255,15,133,244,36,255,59, - 133,233,15,131,244,36,193,224,3,3,133,233,129,120,253,4,239,15,132,244,248, - 72,139,40,72,137,44,202,248,1,139,3,15,182,204,15,182,232,131,195,4,193,232, - 16,65,252,255,36,252,238,248,2,131,189,233,0,15,132,244,249,139,141,233,252, - 246,129,233,235,15,132,244,36,15,182,75,252,253,248,3,199,68,202,4,237,252, - 233,244,1,248,5,255,129,124,253,194,4,239,15,133,244,36,139,4,194,252,233, - 244,163,255,15,182,252,236,15,182,192,72,252,247,208,65,139,4,135,129,124, - 253,252,234,4,239,15,133,244,34,139,44,252,234,248,163,139,141,233,35,136, - 233,105,201,239,3,141,233,248,1,129,185,233,239,15,133,244,250,57,129,233, - 15,133,244,250,129,121,253,4,239,15,132,244,251,15,182,67,252,253,72,139, - 41,72,137,44,194,248,2,255,139,3,15,182,204,15,182,232,131,195,4,193,232, - 16,65,252,255,36,252,238,248,3,15,182,67,252,253,199,68,194,4,237,252,233, - 244,2,248,4,139,137,233,133,201,15,133,244,1,248,5,139,141,233,133,201,15, - 132,244,3,252,246,129,233,235,15,133,244,3,252,233,244,34,255,15,182,252, - 236,15,182,192,129,124,253,252,234,4,239,15,133,244,35,139,44,252,234,59, - 133,233,15,131,244,35,193,224,3,3,133,233,129,120,253,4,239,15,132,244,248, - 72,139,40,72,137,44,202,248,1,139,3,15,182,204,15,182,232,131,195,4,193,232, - 16,65,252,255,36,252,238,248,2,131,189,233,0,15,132,244,249,139,141,233,252, - 246,129,233,235,15,132,244,35,255,15,182,75,252,253,248,3,199,68,202,4,237, - 252,233,244,1,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15, - 133,244,39,139,44,252,234,255,15,133,244,39,255,59,133,233,15,131,244,39, - 193,224,3,3,133,233,129,120,253,4,239,15,132,244,249,248,1,252,246,133,233, - 235,15,133,244,253,248,2,72,139,44,202,72,137,40,139,3,15,182,204,15,182, - 232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,131,189,233,0,15,132, - 244,1,139,141,233,252,246,129,233,235,255,15,132,244,39,15,182,75,252,253, - 252,233,244,1,248,5,129,124,253,194,4,239,15,133,244,39,139,4,194,252,233, - 244,164,248,7,128,165,233,235,65,139,142,233,65,137,174,233,137,141,233,15, - 182,75,252,253,252,233,244,2,255,15,182,252,236,15,182,192,72,252,247,208, - 65,139,4,135,129,124,253,252,234,4,239,15,133,244,37,139,44,252,234,248,164, - 139,141,233,35,136,233,105,201,239,198,133,233,0,3,141,233,248,1,129,185, - 233,239,15,133,244,251,57,129,233,15,133,244,251,129,121,253,4,239,15,132, - 244,250,248,2,255,252,246,133,233,235,15,133,244,253,248,3,15,182,67,252, - 253,72,139,44,194,72,137,41,139,3,15,182,204,15,182,232,131,195,4,193,232, - 16,65,252,255,36,252,238,248,4,131,189,233,0,15,132,244,2,137,12,36,139,141, - 233,252,246,129,233,235,15,132,244,37,139,12,36,252,233,244,2,248,5,139,137, - 233,133,201,15,133,244,1,255,139,141,233,133,201,15,132,244,252,252,246,129, - 233,235,15,132,244,37,248,6,137,4,36,199,68,36,4,237,137,108,36,8,139,124, - 36,24,137,151,233,72,141,20,36,137,252,238,137,252,253,137,92,36,28,232,251, - 1,34,139,149,233,139,108,36,8,137,193,252,233,244,2,248,7,128,165,233,235, - 65,139,134,233,65,137,174,233,137,133,233,252,233,244,3,255,15,182,252,236, - 15,182,192,129,124,253,252,234,4,239,15,133,244,38,139,44,252,234,59,133, - 233,15,131,244,38,193,224,3,3,133,233,129,120,253,4,239,15,132,244,249,248, - 1,252,246,133,233,235,15,133,244,253,248,2,72,139,12,202,72,137,8,139,3,15, - 182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,131,189, - 233,0,15,132,244,1,255,139,141,233,252,246,129,233,235,15,132,244,38,15,182, - 75,252,253,252,233,244,1,248,7,128,165,233,235,65,139,142,233,65,137,174, - 233,137,141,233,15,182,75,252,253,252,233,244,2,255,68,137,60,36,69,139,60, - 199,248,1,141,12,202,139,105,252,248,252,246,133,233,235,15,133,244,253,248, - 2,139,68,36,4,131,232,1,15,132,244,250,68,1,252,248,59,133,233,15,135,244, - 251,68,41,252,248,65,193,231,3,68,3,189,233,248,3,72,139,41,131,193,8,73, - 137,47,65,131,199,8,131,232,1,15,133,244,3,248,4,68,139,60,36,139,3,15,182, - 204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,5,139,124,36, - 24,137,151,233,137,252,238,137,194,137,252,253,137,92,36,28,232,251,1,35, - 139,149,233,15,182,75,252,253,252,233,244,1,248,7,255,128,165,233,235,65, - 139,134,233,65,137,174,233,137,133,233,252,233,244,2,255,3,68,36,4,255,129, - 124,253,202,4,239,139,44,202,15,133,244,55,141,84,202,8,137,90,252,252,139, + 44,252,234,3,44,194,15,128,244,52,255,199,68,202,4,237,255,129,124,253,252, + 234,4,239,15,131,244,48,255,65,129,124,253,199,4,239,15,131,244,48,255,252, + 242,15,16,4,252,234,252,242,65,15,88,4,199,255,221,4,252,234,65,220,4,199, + 255,129,124,253,252,234,4,239,15,131,244,50,255,65,129,124,253,199,4,239, + 15,131,244,50,255,252,242,65,15,16,4,199,252,242,15,88,4,252,234,255,65,221, + 4,199,220,4,252,234,255,129,124,253,252,234,4,239,15,131,244,53,129,124,253, + 194,4,239,15,131,244,53,255,252,242,15,16,4,252,234,252,242,15,88,4,194,255, + 221,4,252,234,220,4,194,255,129,124,253,252,234,4,239,15,133,244,48,65,129, + 124,253,199,4,239,15,133,244,48,139,44,252,234,65,43,44,199,15,128,244,47, + 255,129,124,253,252,234,4,239,15,133,244,50,65,129,124,253,199,4,239,15,133, + 244,50,65,139,4,199,43,4,252,234,15,128,244,49,255,129,124,253,252,234,4, + 239,15,133,244,53,129,124,253,194,4,239,15,133,244,53,139,44,252,234,43,44, + 194,15,128,244,52,255,252,242,15,16,4,252,234,252,242,65,15,92,4,199,255, + 221,4,252,234,65,220,36,199,255,252,242,65,15,16,4,199,252,242,15,92,4,252, + 234,255,65,221,4,199,220,36,252,234,255,252,242,15,16,4,252,234,252,242,15, + 92,4,194,255,221,4,252,234,220,36,194,255,129,124,253,252,234,4,239,15,133, + 244,48,65,129,124,253,199,4,239,15,133,244,48,139,44,252,234,65,15,175,44, + 199,15,128,244,47,255,129,124,253,252,234,4,239,15,133,244,50,65,129,124, + 253,199,4,239,15,133,244,50,65,139,4,199,15,175,4,252,234,15,128,244,49,255, + 129,124,253,252,234,4,239,15,133,244,53,129,124,253,194,4,239,15,133,244, + 53,139,44,252,234,15,175,44,194,15,128,244,52,255,252,242,15,16,4,252,234, + 252,242,65,15,89,4,199,255,221,4,252,234,65,220,12,199,255,252,242,65,15, + 16,4,199,252,242,15,89,4,252,234,255,65,221,4,199,220,12,252,234,255,252, + 242,15,16,4,252,234,252,242,15,89,4,194,255,221,4,252,234,220,12,194,255, + 252,242,15,16,4,252,234,252,242,65,15,94,4,199,255,221,4,252,234,65,220,52, + 199,255,252,242,65,15,16,4,199,252,242,15,94,4,252,234,255,65,221,4,199,220, + 52,252,234,255,252,242,15,16,4,252,234,252,242,15,94,4,194,255,221,4,252, + 234,220,52,194,255,252,242,15,16,4,252,234,252,242,65,15,16,12,199,255,221, + 4,252,234,65,221,4,199,255,252,242,65,15,16,4,199,252,242,15,16,12,252,234, + 255,65,221,4,199,221,4,252,234,255,252,242,15,16,4,252,234,252,242,15,16, + 12,194,255,221,4,252,234,221,4,194,255,248,163,232,244,153,255,252,233,244, + 163,255,232,244,113,255,15,182,252,236,15,182,192,139,124,36,24,137,151,233, + 141,52,194,137,194,41,252,234,248,33,137,252,253,137,92,36,28,232,251,1,27, + 139,149,233,133,192,15,133,244,42,15,182,107,252,255,15,182,75,252,253,72, + 139,4,252,234,72,137,4,202,139,3,15,182,204,15,182,232,131,195,4,193,232, + 16,65,252,255,36,252,238,255,72,252,247,208,65,139,4,135,199,68,202,4,237, + 137,4,202,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36, + 252,238,255,15,191,192,199,68,202,4,237,137,4,202,255,15,191,192,252,242, + 15,42,192,252,242,15,17,4,202,255,223,67,252,254,221,28,202,255,252,242,65, + 15,16,4,199,252,242,15,17,4,202,255,65,221,4,199,221,28,202,255,72,252,247, + 208,137,68,202,4,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252, + 255,36,252,238,255,141,76,202,12,141,68,194,4,189,237,137,105,252,248,248, + 1,137,41,131,193,8,57,193,15,134,244,1,139,3,15,182,204,15,182,232,131,195, + 4,193,232,16,65,252,255,36,252,238,255,139,106,252,248,139,172,253,133,233, + 139,173,233,72,139,69,0,72,137,4,202,139,3,15,182,204,15,182,232,131,195, + 4,193,232,16,65,252,255,36,252,238,255,139,106,252,248,139,172,253,141,233, + 128,189,233,0,139,173,233,139,12,194,139,68,194,4,137,77,0,137,69,4,15,132, + 244,247,252,246,133,233,235,15,133,244,248,248,1,139,3,15,182,204,15,182, + 232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,129,232,239,129,252, + 248,239,15,134,244,1,252,246,129,233,235,15,132,244,1,137,252,238,137,213, + 65,141,190,233,255,232,251,1,28,137,252,234,252,233,244,1,255,72,252,247, + 208,139,106,252,248,139,172,253,141,233,65,139,12,135,139,133,233,137,8,199, + 64,4,237,252,246,133,233,235,15,133,244,248,248,1,139,3,15,182,204,15,182, + 232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,252,246,129,233,235, + 15,132,244,1,128,189,233,0,15,132,244,1,137,213,137,198,65,141,190,233,232, + 251,1,28,137,252,234,252,233,244,1,255,139,106,252,248,255,252,242,65,15, + 16,4,199,255,139,172,253,141,233,139,141,233,255,252,242,15,17,1,255,221, + 25,255,72,252,247,208,139,106,252,248,139,172,253,141,233,139,141,233,137, + 65,4,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238, + 255,141,156,253,131,233,139,108,36,24,131,189,233,0,15,132,244,247,137,149, + 233,141,52,202,137,252,239,232,251,1,29,139,149,233,248,1,139,3,15,182,204, + 15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,72,252,247,208, + 139,108,36,24,137,149,233,139,82,252,248,65,139,52,135,137,252,239,137,92, + 36,28,232,251,1,30,139,149,233,15,182,75,252,253,137,4,202,199,68,202,4,237, + 139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255, + 139,108,36,24,137,149,233,65,139,142,233,65,59,142,233,137,92,36,28,15,131, + 244,251,248,1,137,194,37,252,255,7,0,0,193,252,234,11,61,252,255,7,0,0,15, + 132,244,249,248,2,137,252,239,137,198,232,251,1,31,139,149,233,15,182,75, + 252,253,137,4,202,199,68,202,4,237,139,3,15,182,204,15,182,232,131,195,4, + 193,232,16,65,252,255,36,252,238,248,3,184,1,8,0,0,252,233,244,2,248,5,137, + 252,239,232,251,1,32,15,183,67,252,254,252,233,244,1,255,72,252,247,208,139, + 108,36,24,65,139,142,233,137,92,36,28,65,59,142,233,137,149,233,15,131,244, + 249,248,2,65,139,52,135,137,252,239,232,251,1,33,139,149,233,15,182,75,252, + 253,137,4,202,199,68,202,4,237,139,3,15,182,204,15,182,232,131,195,4,193, + 232,16,65,252,255,36,252,238,248,3,137,252,239,232,251,1,32,15,183,67,252, + 254,72,252,247,208,252,233,244,2,255,72,252,247,208,139,106,252,248,139,173, + 233,65,139,4,135,252,233,244,164,255,72,252,247,208,139,106,252,248,139,173, + 233,65,139,4,135,252,233,244,165,255,15,182,252,236,15,182,192,129,124,253, + 252,234,4,239,15,133,244,36,139,44,252,234,255,129,124,253,194,4,239,15,133, + 244,251,139,4,194,255,129,124,253,194,4,239,15,131,244,251,255,252,242,15, + 16,4,194,252,242,15,45,192,252,242,15,42,200,102,15,46,193,255,15,133,244, + 36,255,59,133,233,15,131,244,36,193,224,3,3,133,233,129,120,253,4,239,15, + 132,244,248,72,139,40,72,137,44,202,248,1,139,3,15,182,204,15,182,232,131, + 195,4,193,232,16,65,252,255,36,252,238,248,2,131,189,233,0,15,132,244,249, + 139,141,233,252,246,129,233,235,15,132,244,36,15,182,75,252,253,248,3,199, + 68,202,4,237,252,233,244,1,248,5,255,129,124,253,194,4,239,15,133,244,36, + 139,4,194,252,233,244,164,255,15,182,252,236,15,182,192,72,252,247,208,65, + 139,4,135,129,124,253,252,234,4,239,15,133,244,34,139,44,252,234,248,164, + 139,141,233,35,136,233,105,201,239,3,141,233,248,1,129,185,233,239,15,133, + 244,250,57,129,233,15,133,244,250,129,121,253,4,239,15,132,244,251,15,182, + 67,252,253,72,139,41,72,137,44,194,248,2,255,139,3,15,182,204,15,182,232, + 131,195,4,193,232,16,65,252,255,36,252,238,248,3,15,182,67,252,253,199,68, + 194,4,237,252,233,244,2,248,4,139,137,233,133,201,15,133,244,1,248,5,139, + 141,233,133,201,15,132,244,3,252,246,129,233,235,15,133,244,3,252,233,244, + 34,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,35, + 139,44,252,234,59,133,233,15,131,244,35,193,224,3,3,133,233,129,120,253,4, + 239,15,132,244,248,72,139,40,72,137,44,202,248,1,139,3,15,182,204,15,182, + 232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,131,189,233,0,15,132, + 244,249,139,141,233,252,246,129,233,235,15,132,244,35,255,15,182,75,252,253, + 248,3,199,68,202,4,237,252,233,244,1,255,15,182,252,236,15,182,192,129,124, + 253,252,234,4,239,15,133,244,39,139,44,252,234,255,15,133,244,39,255,59,133, + 233,15,131,244,39,193,224,3,3,133,233,129,120,253,4,239,15,132,244,249,248, + 1,252,246,133,233,235,15,133,244,253,248,2,72,139,44,202,72,137,40,139,3, + 15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,131, + 189,233,0,15,132,244,1,139,141,233,252,246,129,233,235,255,15,132,244,39, + 15,182,75,252,253,252,233,244,1,248,5,129,124,253,194,4,239,15,133,244,39, + 139,4,194,252,233,244,165,248,7,128,165,233,235,65,139,142,233,65,137,174, + 233,137,141,233,15,182,75,252,253,252,233,244,2,255,15,182,252,236,15,182, + 192,72,252,247,208,65,139,4,135,129,124,253,252,234,4,239,15,133,244,37,139, + 44,252,234,248,165,139,141,233,35,136,233,105,201,239,198,133,233,0,3,141, + 233,248,1,129,185,233,239,15,133,244,251,57,129,233,15,133,244,251,129,121, + 253,4,239,15,132,244,250,248,2,255,252,246,133,233,235,15,133,244,253,248, + 3,15,182,67,252,253,72,139,44,194,72,137,41,139,3,15,182,204,15,182,232,131, + 195,4,193,232,16,65,252,255,36,252,238,248,4,131,189,233,0,15,132,244,2,137, + 12,36,139,141,233,252,246,129,233,235,15,132,244,37,139,12,36,252,233,244, + 2,248,5,139,137,233,133,201,15,133,244,1,255,139,141,233,133,201,15,132,244, + 252,252,246,129,233,235,15,132,244,37,248,6,137,4,36,199,68,36,4,237,137, + 108,36,8,139,124,36,24,137,151,233,72,141,20,36,137,252,238,137,252,253,137, + 92,36,28,232,251,1,34,139,149,233,139,108,36,8,137,193,252,233,244,2,248, + 7,128,165,233,235,65,139,134,233,65,137,174,233,137,133,233,252,233,244,3, + 255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,38,139, + 44,252,234,59,133,233,15,131,244,38,193,224,3,3,133,233,129,120,253,4,239, + 15,132,244,249,248,1,252,246,133,233,235,15,133,244,253,248,2,72,139,12,202, + 72,137,8,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252, + 238,248,3,131,189,233,0,15,132,244,1,255,139,141,233,252,246,129,233,235, + 15,132,244,38,15,182,75,252,253,252,233,244,1,248,7,128,165,233,235,65,139, + 142,233,65,137,174,233,137,141,233,15,182,75,252,253,252,233,244,2,255,68, + 137,60,36,69,139,60,199,248,1,141,12,202,139,105,252,248,252,246,133,233, + 235,15,133,244,253,248,2,139,68,36,4,131,232,1,15,132,244,250,68,1,252,248, + 59,133,233,15,135,244,251,68,41,252,248,65,193,231,3,68,3,189,233,248,3,72, + 139,41,131,193,8,73,137,47,65,131,199,8,131,232,1,15,133,244,3,248,4,68,139, + 60,36,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252, + 238,248,5,139,124,36,24,137,151,233,137,252,238,137,194,137,252,253,137,92, + 36,28,232,251,1,35,139,149,233,15,182,75,252,253,252,233,244,1,248,7,255, + 128,165,233,235,65,139,134,233,65,137,174,233,137,133,233,252,233,244,2,255, + 3,68,36,4,255,129,124,253,202,4,239,139,44,202,15,133,244,55,141,84,202,8, + 137,90,252,252,139,157,233,139,11,15,182,252,233,15,182,205,131,195,4,65, + 252,255,36,252,238,255,141,76,202,8,65,137,215,139,105,252,248,129,121,253, + 252,252,239,15,133,244,28,248,56,139,90,252,252,252,247,195,237,15,133,244, + 253,248,1,137,106,252,248,137,68,36,4,131,232,1,15,132,244,249,248,2,72,139, + 41,131,193,8,73,137,47,65,131,199,8,131,232,1,15,133,244,2,139,106,252,248, + 248,3,139,68,36,4,128,189,233,1,15,135,244,251,248,4,139,157,233,139,11,15, + 182,252,233,15,182,205,131,195,4,65,252,255,36,252,238,248,5,255,252,247, + 195,237,15,133,244,4,15,182,75,252,253,72,252,247,209,141,12,202,68,139,121, + 252,248,69,139,191,233,69,139,191,233,252,233,244,4,248,7,129,252,235,239, + 252,247,195,237,15,133,244,254,41,218,65,137,215,139,90,252,252,252,233,244, + 1,248,8,129,195,239,252,233,244,1,255,141,76,202,8,72,139,105,232,72,139, + 65,252,240,72,137,41,72,137,65,8,139,105,224,139,65,228,137,105,252,248,137, + 65,252,252,129,252,248,239,184,237,15,133,244,28,137,202,137,90,252,252,139, 157,233,139,11,15,182,252,233,15,182,205,131,195,4,65,252,255,36,252,238, - 255,141,76,202,8,65,137,215,139,105,252,248,129,121,253,252,252,239,15,133, - 244,28,248,56,139,90,252,252,252,247,195,237,15,133,244,253,248,1,137,106, - 252,248,137,68,36,4,131,232,1,15,132,244,249,248,2,72,139,41,131,193,8,73, - 137,47,65,131,199,8,131,232,1,15,133,244,2,139,106,252,248,248,3,139,68,36, - 4,128,189,233,1,15,135,244,251,248,4,139,157,233,139,11,15,182,252,233,15, - 182,205,131,195,4,65,252,255,36,252,238,248,5,255,252,247,195,237,15,133, - 244,4,15,182,75,252,253,72,252,247,209,141,12,202,68,139,121,252,248,69,139, - 191,233,69,139,191,233,252,233,244,4,248,7,129,252,235,239,252,247,195,237, - 15,133,244,254,41,218,65,137,215,139,90,252,252,252,233,244,1,248,8,129,195, - 239,252,233,244,1,255,141,76,202,8,72,139,105,232,72,139,65,252,240,72,137, - 41,72,137,65,8,139,105,224,139,65,228,137,105,252,248,137,65,252,252,129, - 252,248,239,184,237,15,133,244,28,137,202,137,90,252,252,139,157,233,139, - 11,15,182,252,233,15,182,205,131,195,4,65,252,255,36,252,238,255,68,137,60, - 36,68,137,116,36,4,139,108,202,252,240,139,68,202,252,248,68,139,181,233, - 131,195,4,68,139,189,233,248,1,68,57,252,240,15,131,244,251,65,129,124,253, - 199,4,239,15,132,244,250,255,219,68,202,252,248,255,73,139,44,199,72,137, - 108,202,8,131,192,1,255,137,68,202,252,248,248,2,15,183,67,252,254,141,156, - 253,131,233,248,3,68,139,116,36,4,68,139,60,36,139,3,15,182,204,15,182,232, - 131,195,4,193,232,16,65,252,255,36,252,238,248,4,131,192,1,255,137,68,202, - 252,248,255,252,233,244,1,248,5,68,41,252,240,248,6,59,133,233,15,135,244, - 3,68,105,252,248,239,68,3,189,233,65,129,191,233,239,15,132,244,253,70,141, - 116,48,1,73,139,175,233,73,139,135,233,72,137,44,202,72,137,68,202,8,68,137, - 116,202,252,248,252,233,244,2,248,7,131,192,1,252,233,244,6,255,129,124,253, - 202,252,236,239,15,133,244,251,139,108,202,232,129,124,253,202,252,244,239, - 15,133,244,251,129,124,253,202,252,252,239,15,133,244,251,128,189,233,235, - 15,133,244,251,141,156,253,131,233,199,68,202,252,248,0,0,0,0,248,1,139,3, - 15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,5,198, - 67,252,252,235,141,156,253,131,233,198,3,235,252,233,244,1,255,15,182,252, - 236,15,182,192,68,137,60,36,68,141,188,253,194,233,141,12,202,68,43,122,252, - 252,133,252,237,15,132,244,251,141,108,252,233,252,248,65,57,215,15,131,244, - 248,248,1,73,139,71,252,248,65,131,199,8,72,137,1,131,193,8,57,252,233,15, - 131,244,249,65,57,215,15,130,244,1,248,2,199,65,4,237,131,193,8,57,252,233, - 15,130,244,2,248,3,68,139,60,36,139,3,15,182,204,15,182,232,131,195,4,193, - 232,16,65,252,255,36,252,238,248,5,199,68,36,4,1,0,0,0,137,208,68,41,252, - 248,15,134,244,3,137,197,193,252,237,3,131,197,1,137,108,36,4,139,108,36, - 24,1,200,59,133,233,15,135,244,253,248,6,255,73,139,71,252,248,65,131,199, - 8,72,137,1,131,193,8,65,57,215,15,130,244,6,252,233,244,3,248,7,137,149,233, - 137,141,233,137,92,36,28,65,41,215,139,116,36,4,131,252,238,1,137,252,239, - 232,251,1,0,139,149,233,139,141,233,65,1,215,252,233,244,6,255,193,225,3, - 255,248,1,139,90,252,252,137,68,36,4,252,247,195,237,15,133,244,253,255,248, - 13,65,137,215,131,232,1,15,132,244,249,248,2,73,139,44,15,73,137,111,252, - 248,65,131,199,8,131,232,1,15,133,244,2,248,3,139,68,36,4,15,182,107,252, - 255,248,5,57,197,15,135,244,252,255,72,139,44,10,72,137,106,252,248,255,248, - 5,56,67,252,255,15,135,244,252,255,15,182,75,252,253,72,252,247,209,141,20, - 202,68,139,122,252,248,69,139,191,233,69,139,191,233,139,3,15,182,204,15, - 182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,6,255,65,199,71,252, - 252,237,65,131,199,8,255,199,68,194,252,244,237,255,131,192,1,252,233,244, - 5,248,7,141,171,233,252,247,197,237,15,133,244,14,41,252,234,255,1,252,233, - 255,137,221,209,252,237,129,229,239,102,65,131,172,253,46,233,1,15,132,244, - 145,255,141,12,202,255,129,121,253,4,239,15,133,244,255,255,129,121,253,12, - 239,15,133,244,57,129,121,253,20,239,15,133,244,57,139,41,131,121,16,0,15, - 140,244,251,255,139,105,16,133,252,237,15,136,244,251,3,41,15,128,244,247, - 137,41,255,59,105,8,199,65,28,237,137,105,24,255,15,142,244,253,248,1,248, - 6,141,156,253,131,233,255,141,156,253,131,233,15,183,67,252,254,15,142,245, - 248,1,248,6,255,15,143,244,253,248,6,141,156,253,131,233,248,1,255,248,7, - 139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248, - 5,255,3,41,15,128,244,1,137,41,255,15,141,244,7,255,141,156,253,131,233,15, - 183,67,252,254,15,141,245,255,15,140,244,7,255,252,233,244,6,248,9,255,129, - 121,253,4,239,255,15,131,244,57,129,121,253,12,239,15,131,244,57,255,139, - 105,20,255,129,252,253,239,15,131,244,57,255,252,242,15,16,1,252,242,15,16, - 73,8,255,252,242,15,88,65,16,252,242,15,17,1,133,252,237,15,136,244,249,255, - 15,140,244,249,255,102,15,46,200,248,1,252,242,15,17,65,24,255,221,65,8,221, - 1,255,220,65,16,221,17,221,81,24,133,252,237,15,136,244,247,255,221,81,24, - 15,140,244,247,255,217,201,248,1,255,15,183,67,252,254,255,15,131,244,7,255, - 15,131,244,248,141,156,253,131,233,255,141,156,253,131,233,15,183,67,252, - 254,15,131,245,255,15,130,244,7,255,15,130,244,248,141,156,253,131,233,255, - 248,3,102,15,46,193,252,233,244,1,255,141,12,202,139,105,4,129,252,253,239, - 15,132,244,247,255,137,105,252,252,139,41,137,105,252,248,252,233,245,255, - 141,156,253,131,233,139,1,137,105,252,252,137,65,252,248,255,65,139,142,233, - 139,4,129,72,139,128,233,139,108,36,24,65,137,150,233,65,137,174,233,76,137, - 36,36,76,137,108,36,8,72,131,252,236,16,252,255,224,255,141,156,253,131,233, - 139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255, - 137,221,209,252,237,129,229,239,102,65,131,172,253,46,233,1,15,132,244,147, - 255,68,139,187,233,139,108,36,24,141,12,202,59,141,233,15,135,244,23,15,182, - 139,233,57,200,15,134,244,249,248,2,255,15,183,67,252,254,252,233,245,255, - 248,3,199,68,194,252,252,237,131,192,1,57,200,15,134,244,3,252,233,244,2, - 255,141,44,197,237,141,4,194,68,139,122,252,248,137,104,252,252,68,137,120, - 252,248,139,108,36,24,141,12,200,59,141,233,15,135,244,22,137,209,137,194, - 15,182,171,233,133,252,237,15,132,244,248,248,1,131,193,8,57,209,15,131,244, - 249,68,139,121,252,248,68,137,56,68,139,121,252,252,68,137,120,4,131,192, - 8,199,65,252,252,237,131,252,237,1,15,133,244,1,248,2,255,68,139,187,233, - 139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255, - 248,3,199,64,4,237,131,192,8,131,252,237,1,15,133,244,3,252,233,244,2,255, - 139,106,252,248,76,139,189,233,139,108,36,24,141,68,194,252,248,137,149,233, - 141,136,233,59,141,233,137,133,233,255,76,137,252,254,137,252,239,255,15, - 135,244,21,65,199,134,233,237,255,65,252,255,215,255,65,252,255,150,233,255, - 65,199,134,233,237,139,149,233,141,12,194,252,247,217,3,141,233,139,90,252, - 252,252,233,244,12,255,254,0 + 255,68,137,60,36,68,137,116,36,4,139,108,202,252,240,139,68,202,252,248,68, + 139,181,233,131,195,4,68,139,189,233,248,1,68,57,252,240,15,131,244,251,65, + 129,124,253,199,4,239,15,132,244,250,255,219,68,202,252,248,255,73,139,44, + 199,72,137,108,202,8,131,192,1,255,137,68,202,252,248,248,2,15,183,67,252, + 254,141,156,253,131,233,248,3,68,139,116,36,4,68,139,60,36,139,3,15,182,204, + 15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,4,131,192,1,255, + 137,68,202,252,248,255,252,233,244,1,248,5,68,41,252,240,248,6,59,133,233, + 15,135,244,3,68,105,252,248,239,68,3,189,233,65,129,191,233,239,15,132,244, + 253,70,141,116,48,1,73,139,175,233,73,139,135,233,72,137,44,202,72,137,68, + 202,8,68,137,116,202,252,248,252,233,244,2,248,7,131,192,1,252,233,244,6, + 255,129,124,253,202,252,236,239,15,133,244,251,139,108,202,232,129,124,253, + 202,252,244,239,15,133,244,251,129,124,253,202,252,252,239,15,133,244,251, + 128,189,233,235,15,133,244,251,141,156,253,131,233,199,68,202,252,248,0,0, + 0,0,248,1,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36, + 252,238,248,5,198,67,252,252,235,141,156,253,131,233,198,3,235,252,233,244, + 1,255,15,182,252,236,15,182,192,68,137,60,36,68,141,188,253,194,233,141,12, + 202,68,43,122,252,252,133,252,237,15,132,244,251,141,108,252,233,252,248, + 65,57,215,15,131,244,248,248,1,73,139,71,252,248,65,131,199,8,72,137,1,131, + 193,8,57,252,233,15,131,244,249,65,57,215,15,130,244,1,248,2,199,65,4,237, + 131,193,8,57,252,233,15,130,244,2,248,3,68,139,60,36,139,3,15,182,204,15, + 182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,5,199,68,36,4,1,0, + 0,0,137,208,68,41,252,248,15,134,244,3,137,197,193,252,237,3,131,197,1,137, + 108,36,4,139,108,36,24,1,200,59,133,233,15,135,244,253,248,6,255,73,139,71, + 252,248,65,131,199,8,72,137,1,131,193,8,65,57,215,15,130,244,6,252,233,244, + 3,248,7,137,149,233,137,141,233,137,92,36,28,65,41,215,139,116,36,4,131,252, + 238,1,137,252,239,232,251,1,0,139,149,233,139,141,233,65,1,215,252,233,244, + 6,255,193,225,3,255,248,1,139,90,252,252,137,68,36,4,252,247,195,237,15,133, + 244,253,255,248,13,65,137,215,131,232,1,15,132,244,249,248,2,73,139,44,15, + 73,137,111,252,248,65,131,199,8,131,232,1,15,133,244,2,248,3,139,68,36,4, + 15,182,107,252,255,248,5,57,197,15,135,244,252,255,72,139,44,10,72,137,106, + 252,248,255,248,5,56,67,252,255,15,135,244,252,255,15,182,75,252,253,72,252, + 247,209,141,20,202,68,139,122,252,248,69,139,191,233,69,139,191,233,139,3, + 15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,6,255, + 65,199,71,252,252,237,65,131,199,8,255,199,68,194,252,244,237,255,131,192, + 1,252,233,244,5,248,7,141,171,233,252,247,197,237,15,133,244,14,41,252,234, + 255,1,252,233,255,137,221,209,252,237,129,229,239,102,65,131,172,253,46,233, + 1,15,132,244,145,255,141,12,202,255,129,121,253,4,239,15,133,244,255,255, + 129,121,253,12,239,15,133,244,57,129,121,253,20,239,15,133,244,57,139,41, + 131,121,16,0,15,140,244,251,255,129,121,253,12,239,15,133,244,162,129,121, + 253,20,239,15,133,244,162,255,139,105,16,133,252,237,15,136,244,251,3,41, + 15,128,244,247,137,41,255,59,105,8,199,65,28,237,137,105,24,255,15,142,244, + 253,248,1,248,6,141,156,253,131,233,255,141,156,253,131,233,15,183,67,252, + 254,15,142,245,248,1,248,6,255,15,143,244,253,248,6,141,156,253,131,233,248, + 1,255,248,7,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36, + 252,238,248,5,255,3,41,15,128,244,1,137,41,255,15,141,244,7,255,141,156,253, + 131,233,15,183,67,252,254,15,141,245,255,15,140,244,7,255,252,233,244,6,248, + 9,255,129,121,253,4,239,255,15,131,244,57,129,121,253,12,239,15,131,244,57, + 255,129,121,253,12,239,15,131,244,162,129,121,253,20,239,15,131,244,162,255, + 139,105,20,255,129,252,253,239,15,131,244,57,255,252,242,15,16,1,252,242, + 15,16,73,8,255,252,242,15,88,65,16,252,242,15,17,1,133,252,237,15,136,244, + 249,255,15,140,244,249,255,102,15,46,200,248,1,252,242,15,17,65,24,255,221, + 65,8,221,1,255,220,65,16,221,17,221,81,24,133,252,237,15,136,244,247,255, + 221,81,24,15,140,244,247,255,217,201,248,1,255,15,183,67,252,254,255,15,131, + 244,7,255,15,131,244,248,141,156,253,131,233,255,141,156,253,131,233,15,183, + 67,252,254,15,131,245,255,15,130,244,7,255,15,130,244,248,141,156,253,131, + 233,255,248,3,102,15,46,193,252,233,244,1,255,141,12,202,139,105,4,129,252, + 253,239,15,132,244,247,255,137,105,252,252,139,41,137,105,252,248,252,233, + 245,255,141,156,253,131,233,139,1,137,105,252,252,137,65,252,248,255,65,139, + 142,233,139,4,129,72,139,128,233,139,108,36,24,65,137,150,233,65,137,174, + 233,76,137,36,36,76,137,108,36,8,72,131,252,236,16,252,255,224,255,141,156, + 253,131,233,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36, + 252,238,255,137,221,209,252,237,129,229,239,102,65,131,172,253,46,233,1,15, + 132,244,147,255,68,139,187,233,139,108,36,24,141,12,202,59,141,233,15,135, + 244,23,15,182,139,233,57,200,15,134,244,249,248,2,255,15,183,67,252,254,252, + 233,245,255,248,3,199,68,194,252,252,237,131,192,1,57,200,15,134,244,3,252, + 233,244,2,255,141,44,197,237,141,4,194,68,139,122,252,248,137,104,252,252, + 68,137,120,252,248,139,108,36,24,141,12,200,59,141,233,15,135,244,22,137, + 209,137,194,15,182,171,233,133,252,237,15,132,244,248,248,1,131,193,8,57, + 209,15,131,244,249,68,139,121,252,248,68,137,56,68,139,121,252,252,68,137, + 120,4,131,192,8,199,65,252,252,237,131,252,237,1,15,133,244,1,248,2,255,68, + 139,187,233,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36, + 252,238,255,248,3,199,64,4,237,131,192,8,131,252,237,1,15,133,244,3,252,233, + 244,2,255,139,106,252,248,76,139,189,233,139,108,36,24,141,68,194,252,248, + 137,149,233,141,136,233,59,141,233,137,133,233,255,76,137,252,254,137,252, + 239,255,15,135,244,21,65,199,134,233,237,255,65,252,255,215,255,65,252,255, + 150,233,255,65,199,134,233,237,139,149,233,141,12,194,252,247,217,3,141,233, + 139,90,252,252,252,233,244,12,255,254,0 }; enum { @@ -936,6 +938,7 @@ enum { GLOB_vm_foldarith, GLOB_vm_cpuid, GLOB_vm_ffi_call, + GLOB_assert_bad_for_arg_type, GLOB_BC_MODVN_Z, GLOB_BC_TGETS_Z, GLOB_BC_TSETS_Z, @@ -1094,6 +1097,7 @@ static const char *const globnames[] = { "vm_foldarith", "vm_cpuid", "vm_ffi_call@4", + "assert_bad_for_arg_type", "BC_MODVN_Z", "BC_TGETS_Z", "BC_TSETS_Z", @@ -1818,13 +1822,18 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse) #endif dasm_put(Dst, 9832); #endif + dasm_put(Dst, 9840); +#ifdef LUA_USE_ASSERT + dasm_put(Dst, 9242); +#endif + dasm_put(Dst, 9242); } /* Generate the code for a single instruction. */ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) { int vk = 0; - dasm_put(Dst, 9840, defop); + dasm_put(Dst, 9843, defop); switch (op) { @@ -1835,145 +1844,145 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_ISLT: case BC_ISGE: case BC_ISLE: case BC_ISGT: if (LJ_DUALNUM) { - dasm_put(Dst, 9842, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 9845, LJ_TISNUM, LJ_TISNUM); switch (op) { case BC_ISLT: - dasm_put(Dst, 9872); + dasm_put(Dst, 9875); break; case BC_ISGE: - dasm_put(Dst, 9877); + dasm_put(Dst, 9880); break; case BC_ISLE: - dasm_put(Dst, 9882); + dasm_put(Dst, 9885); break; case BC_ISGT: - dasm_put(Dst, 9887); + dasm_put(Dst, 9890); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 9892, -BCBIAS_J*4, LJ_TISNUM); + dasm_put(Dst, 9895, -BCBIAS_J*4, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9947); + dasm_put(Dst, 9950); } else { - dasm_put(Dst, 9958); + dasm_put(Dst, 9961); } - dasm_put(Dst, 9969); + dasm_put(Dst, 9972); if (sse) { - dasm_put(Dst, 9976); + dasm_put(Dst, 9979); switch (op) { case BC_ISLT: - dasm_put(Dst, 9996); + dasm_put(Dst, 9999); break; case BC_ISGE: - dasm_put(Dst, 10001); + dasm_put(Dst, 10004); break; case BC_ISLE: - dasm_put(Dst, 10006); + dasm_put(Dst, 10009); break; case BC_ISGT: - dasm_put(Dst, 10011); + dasm_put(Dst, 10014); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 10016); + dasm_put(Dst, 10019); } else { - dasm_put(Dst, 10021); + dasm_put(Dst, 10024); } } else { - dasm_put(Dst, 10029, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10032, LJ_TISNUM, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 10050); + dasm_put(Dst, 10053); } else { - dasm_put(Dst, 10071); + dasm_put(Dst, 10074); if (cmov) { - dasm_put(Dst, 10087); + dasm_put(Dst, 10090); } else { - dasm_put(Dst, 10093); + dasm_put(Dst, 10096); } } if (LJ_DUALNUM) { switch (op) { case BC_ISLT: - dasm_put(Dst, 9996); + dasm_put(Dst, 9999); break; case BC_ISGE: - dasm_put(Dst, 10001); + dasm_put(Dst, 10004); break; case BC_ISLE: - dasm_put(Dst, 10006); + dasm_put(Dst, 10009); break; case BC_ISGT: - dasm_put(Dst, 10011); + dasm_put(Dst, 10014); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 10016); + dasm_put(Dst, 10019); } else { switch (op) { case BC_ISLT: - dasm_put(Dst, 10100); + dasm_put(Dst, 10103); break; case BC_ISGE: - dasm_put(Dst, 10105); + dasm_put(Dst, 10108); break; case BC_ISLE: - dasm_put(Dst, 10110); + dasm_put(Dst, 10113); break; case BC_ISGT: - dasm_put(Dst, 10115); + dasm_put(Dst, 10118); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 10120, -BCBIAS_J*4); + dasm_put(Dst, 10123, -BCBIAS_J*4); } break; case BC_ISEQV: case BC_ISNEV: vk = op == BC_ISEQV; - dasm_put(Dst, 10153); + dasm_put(Dst, 10156); if (LJ_DUALNUM) { - dasm_put(Dst, 10161, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10164, LJ_TISNUM, LJ_TISNUM); if (vk) { - dasm_put(Dst, 10186); + dasm_put(Dst, 10189); } else { - dasm_put(Dst, 10191); + dasm_put(Dst, 10194); } - dasm_put(Dst, 10196, -BCBIAS_J*4, LJ_TISNUM); + dasm_put(Dst, 10199, -BCBIAS_J*4, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10249); + dasm_put(Dst, 10252); } else { - dasm_put(Dst, 10256); + dasm_put(Dst, 10259); } - dasm_put(Dst, 10260); + dasm_put(Dst, 10263); if (sse) { - dasm_put(Dst, 10271); + dasm_put(Dst, 10274); } else { - dasm_put(Dst, 10283); + dasm_put(Dst, 10286); } - dasm_put(Dst, 10290); + dasm_put(Dst, 10293); } else { - dasm_put(Dst, 10295, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10298, LJ_TISNUM, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 10314); + dasm_put(Dst, 10317); } else { - dasm_put(Dst, 10332); + dasm_put(Dst, 10335); if (cmov) { - dasm_put(Dst, 10087); + dasm_put(Dst, 10090); } else { - dasm_put(Dst, 10093); + dasm_put(Dst, 10096); } } iseqne_fp: if (vk) { - dasm_put(Dst, 10345); + dasm_put(Dst, 10348); } else { - dasm_put(Dst, 10354); + dasm_put(Dst, 10357); } iseqne_end: if (vk) { - dasm_put(Dst, 10363, -BCBIAS_J*4); + dasm_put(Dst, 10366, -BCBIAS_J*4); if (!LJ_HASFFI) { dasm_put(Dst, 4592); } @@ -1981,150 +1990,150 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) if (!LJ_HASFFI) { dasm_put(Dst, 4592); } - dasm_put(Dst, 10378, -BCBIAS_J*4); + dasm_put(Dst, 10381, -BCBIAS_J*4); } if (LJ_DUALNUM && (op == BC_ISEQV || op == BC_ISNEV || op == BC_ISEQN || op == BC_ISNEN)) { - dasm_put(Dst, 10393); + dasm_put(Dst, 10396); } else { - dasm_put(Dst, 10132); + dasm_put(Dst, 10135); } if (op == BC_ISEQV || op == BC_ISNEV) { - dasm_put(Dst, 10398); + dasm_put(Dst, 10401); if (LJ_HASFFI) { - dasm_put(Dst, 10401, LJ_TCDATA, LJ_TCDATA); + dasm_put(Dst, 10404, LJ_TCDATA, LJ_TCDATA); } - dasm_put(Dst, 10420, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<metatable), Dt6(->nomm), 1<>32)); + dasm_put(Dst, 10994, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); } else { - dasm_put(Dst, 11016); + dasm_put(Dst, 11019); } if (LJ_DUALNUM) { - dasm_put(Dst, 10393); + dasm_put(Dst, 10396); } else { - dasm_put(Dst, 10132); + dasm_put(Dst, 10135); } break; case BC_LEN: - dasm_put(Dst, 11025, LJ_TSTR); + dasm_put(Dst, 11028, LJ_TSTR); if (LJ_DUALNUM) { - dasm_put(Dst, 11039, Dt5(->len), LJ_TISNUM); + dasm_put(Dst, 11042, Dt5(->len), LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 11053, Dt5(->len)); + dasm_put(Dst, 11056, Dt5(->len)); } else { - dasm_put(Dst, 11071, Dt5(->len)); + dasm_put(Dst, 11074, Dt5(->len)); } - dasm_put(Dst, 11080, LJ_TTAB); + dasm_put(Dst, 11083, LJ_TTAB); if (LJ_DUALNUM) { } else if (sse) { - dasm_put(Dst, 11122); + dasm_put(Dst, 11125); } else { } - dasm_put(Dst, 11128); + dasm_put(Dst, 11131); break; /* -- Binary ops -------------------------------------------------------- */ @@ -2132,603 +2141,603 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_ADDVN: case BC_ADDNV: case BC_ADDVV: if (LJ_DUALNUM) { - dasm_put(Dst, 11141); + dasm_put(Dst, 11144); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11149, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11152, LJ_TISNUM, LJ_TISNUM); break; case 1: - dasm_put(Dst, 11184, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11187, LJ_TISNUM, LJ_TISNUM); break; default: - dasm_put(Dst, 11219, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11222, LJ_TISNUM, LJ_TISNUM); break; } - dasm_put(Dst, 11252, LJ_TISNUM); + dasm_put(Dst, 11255, LJ_TISNUM); if (vk == 1) { - dasm_put(Dst, 11049); + dasm_put(Dst, 11052); } else { - dasm_put(Dst, 10832); + dasm_put(Dst, 10835); } - dasm_put(Dst, 10132); + dasm_put(Dst, 10135); } else { - dasm_put(Dst, 11141); + dasm_put(Dst, 11144); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11258, LJ_TISNUM); + dasm_put(Dst, 11261, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11270, LJ_TISNUM); + dasm_put(Dst, 11273, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11282); + dasm_put(Dst, 11285); } else { - dasm_put(Dst, 11297); + dasm_put(Dst, 11300); } break; case 1: - dasm_put(Dst, 11306, LJ_TISNUM); + dasm_put(Dst, 11309, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11318, LJ_TISNUM); + dasm_put(Dst, 11321, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11330); + dasm_put(Dst, 11333); } else { - dasm_put(Dst, 11345); + dasm_put(Dst, 11348); } break; default: - dasm_put(Dst, 11354, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11357, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11376); + dasm_put(Dst, 11379); } else { - dasm_put(Dst, 11390); + dasm_put(Dst, 11393); } break; } if (sse) { - dasm_put(Dst, 11009); + dasm_put(Dst, 11012); } else { - dasm_put(Dst, 11021); + dasm_put(Dst, 11024); } - dasm_put(Dst, 10132); + dasm_put(Dst, 10135); } break; case BC_SUBVN: case BC_SUBNV: case BC_SUBVV: if (LJ_DUALNUM) { - dasm_put(Dst, 11141); + dasm_put(Dst, 11144); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11398, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11401, LJ_TISNUM, LJ_TISNUM); break; case 1: - dasm_put(Dst, 11433, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11436, LJ_TISNUM, LJ_TISNUM); break; default: - dasm_put(Dst, 11468, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11471, LJ_TISNUM, LJ_TISNUM); break; } - dasm_put(Dst, 11252, LJ_TISNUM); + dasm_put(Dst, 11255, LJ_TISNUM); if (vk == 1) { - dasm_put(Dst, 11049); + dasm_put(Dst, 11052); } else { - dasm_put(Dst, 10832); + dasm_put(Dst, 10835); } - dasm_put(Dst, 10132); + dasm_put(Dst, 10135); } else { - dasm_put(Dst, 11141); + dasm_put(Dst, 11144); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11258, LJ_TISNUM); + dasm_put(Dst, 11261, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11270, LJ_TISNUM); + dasm_put(Dst, 11273, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11501); + dasm_put(Dst, 11504); } else { - dasm_put(Dst, 11516); + dasm_put(Dst, 11519); } break; case 1: - dasm_put(Dst, 11306, LJ_TISNUM); + dasm_put(Dst, 11309, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11318, LJ_TISNUM); + dasm_put(Dst, 11321, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11525); + dasm_put(Dst, 11528); } else { - dasm_put(Dst, 11540); + dasm_put(Dst, 11543); } break; default: - dasm_put(Dst, 11354, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11357, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11549); + dasm_put(Dst, 11552); } else { - dasm_put(Dst, 11563); + dasm_put(Dst, 11566); } break; } if (sse) { - dasm_put(Dst, 11009); + dasm_put(Dst, 11012); } else { - dasm_put(Dst, 11021); + dasm_put(Dst, 11024); } - dasm_put(Dst, 10132); + dasm_put(Dst, 10135); } break; case BC_MULVN: case BC_MULNV: case BC_MULVV: if (LJ_DUALNUM) { - dasm_put(Dst, 11141); + dasm_put(Dst, 11144); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11571, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11574, LJ_TISNUM, LJ_TISNUM); break; case 1: - dasm_put(Dst, 11607, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11610, LJ_TISNUM, LJ_TISNUM); break; default: - dasm_put(Dst, 11643, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11646, LJ_TISNUM, LJ_TISNUM); break; } - dasm_put(Dst, 11252, LJ_TISNUM); + dasm_put(Dst, 11255, LJ_TISNUM); if (vk == 1) { - dasm_put(Dst, 11049); + dasm_put(Dst, 11052); } else { - dasm_put(Dst, 10832); + dasm_put(Dst, 10835); } - dasm_put(Dst, 10132); + dasm_put(Dst, 10135); } else { - dasm_put(Dst, 11141); + dasm_put(Dst, 11144); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11258, LJ_TISNUM); + dasm_put(Dst, 11261, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11270, LJ_TISNUM); + dasm_put(Dst, 11273, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11677); + dasm_put(Dst, 11680); } else { - dasm_put(Dst, 11692); + dasm_put(Dst, 11695); } break; case 1: - dasm_put(Dst, 11306, LJ_TISNUM); + dasm_put(Dst, 11309, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11318, LJ_TISNUM); + dasm_put(Dst, 11321, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11701); + dasm_put(Dst, 11704); } else { - dasm_put(Dst, 11716); + dasm_put(Dst, 11719); } break; default: - dasm_put(Dst, 11354, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11357, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11725); + dasm_put(Dst, 11728); } else { - dasm_put(Dst, 11739); + dasm_put(Dst, 11742); } break; } if (sse) { - dasm_put(Dst, 11009); + dasm_put(Dst, 11012); } else { - dasm_put(Dst, 11021); + dasm_put(Dst, 11024); } - dasm_put(Dst, 10132); + dasm_put(Dst, 10135); } break; case BC_DIVVN: case BC_DIVNV: case BC_DIVVV: - dasm_put(Dst, 11141); + dasm_put(Dst, 11144); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11258, LJ_TISNUM); + dasm_put(Dst, 11261, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11270, LJ_TISNUM); + dasm_put(Dst, 11273, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11747); + dasm_put(Dst, 11750); } else { - dasm_put(Dst, 11762); + dasm_put(Dst, 11765); } break; case 1: - dasm_put(Dst, 11306, LJ_TISNUM); + dasm_put(Dst, 11309, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11318, LJ_TISNUM); + dasm_put(Dst, 11321, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11771); + dasm_put(Dst, 11774); } else { - dasm_put(Dst, 11786); + dasm_put(Dst, 11789); } break; default: - dasm_put(Dst, 11354, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11357, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11795); + dasm_put(Dst, 11798); } else { - dasm_put(Dst, 11809); + dasm_put(Dst, 11812); } break; } if (sse) { - dasm_put(Dst, 11009); + dasm_put(Dst, 11012); } else { - dasm_put(Dst, 11021); + dasm_put(Dst, 11024); } - dasm_put(Dst, 10132); + dasm_put(Dst, 10135); break; case BC_MODVN: - dasm_put(Dst, 11141); + dasm_put(Dst, 11144); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11258, LJ_TISNUM); + dasm_put(Dst, 11261, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11270, LJ_TISNUM); + dasm_put(Dst, 11273, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11817); + dasm_put(Dst, 11820); } else { - dasm_put(Dst, 11832); + dasm_put(Dst, 11835); } break; case 1: - dasm_put(Dst, 11306, LJ_TISNUM); + dasm_put(Dst, 11309, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11318, LJ_TISNUM); + dasm_put(Dst, 11321, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11841); + dasm_put(Dst, 11844); } else { - dasm_put(Dst, 11856); + dasm_put(Dst, 11859); } break; default: - dasm_put(Dst, 11354, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11357, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11865); + dasm_put(Dst, 11868); } else { - dasm_put(Dst, 11879); + dasm_put(Dst, 11882); } break; } - dasm_put(Dst, 11887); + dasm_put(Dst, 11890); if (sse) { - dasm_put(Dst, 11009); + dasm_put(Dst, 11012); } else { - dasm_put(Dst, 11021); + dasm_put(Dst, 11024); } - dasm_put(Dst, 10132); + dasm_put(Dst, 10135); break; case BC_MODNV: case BC_MODVV: - dasm_put(Dst, 11141); + dasm_put(Dst, 11144); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11258, LJ_TISNUM); + dasm_put(Dst, 11261, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11270, LJ_TISNUM); + dasm_put(Dst, 11273, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11817); + dasm_put(Dst, 11820); } else { - dasm_put(Dst, 11832); + dasm_put(Dst, 11835); } break; case 1: - dasm_put(Dst, 11306, LJ_TISNUM); + dasm_put(Dst, 11309, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11318, LJ_TISNUM); + dasm_put(Dst, 11321, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11841); + dasm_put(Dst, 11844); } else { - dasm_put(Dst, 11856); + dasm_put(Dst, 11859); } break; default: - dasm_put(Dst, 11354, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11357, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11865); + dasm_put(Dst, 11868); } else { - dasm_put(Dst, 11879); + dasm_put(Dst, 11882); } break; } - dasm_put(Dst, 11893); + dasm_put(Dst, 11896); break; case BC_POW: - dasm_put(Dst, 11141); + dasm_put(Dst, 11144); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11258, LJ_TISNUM); + dasm_put(Dst, 11261, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11270, LJ_TISNUM); + dasm_put(Dst, 11273, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11817); + dasm_put(Dst, 11820); } else { - dasm_put(Dst, 11832); + dasm_put(Dst, 11835); } break; case 1: - dasm_put(Dst, 11306, LJ_TISNUM); + dasm_put(Dst, 11309, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11318, LJ_TISNUM); + dasm_put(Dst, 11321, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11841); + dasm_put(Dst, 11844); } else { - dasm_put(Dst, 11856); + dasm_put(Dst, 11859); } break; default: - dasm_put(Dst, 11354, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11357, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11865); + dasm_put(Dst, 11868); } else { - dasm_put(Dst, 11879); + dasm_put(Dst, 11882); } break; } - dasm_put(Dst, 11898); + dasm_put(Dst, 11901); if (sse) { - dasm_put(Dst, 11009); + dasm_put(Dst, 11012); } else { - dasm_put(Dst, 11021); + dasm_put(Dst, 11024); } - dasm_put(Dst, 10132); + dasm_put(Dst, 10135); break; case BC_CAT: - dasm_put(Dst, 11902, Dt1(->base), Dt1(->base)); + dasm_put(Dst, 11905, Dt1(->base), Dt1(->base)); break; /* -- Constant ops ------------------------------------------------------ */ case BC_KSTR: - dasm_put(Dst, 11986, LJ_TSTR); + dasm_put(Dst, 11989, LJ_TSTR); break; case BC_KCDATA: #if LJ_HASFFI - dasm_put(Dst, 11986, LJ_TCDATA); + dasm_put(Dst, 11989, LJ_TCDATA); #endif break; case BC_KSHORT: if (LJ_DUALNUM) { - dasm_put(Dst, 12023, LJ_TISNUM); + dasm_put(Dst, 12026, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 12035); + dasm_put(Dst, 12038); } else { - dasm_put(Dst, 12050); + dasm_put(Dst, 12053); } - dasm_put(Dst, 10132); + dasm_put(Dst, 10135); break; case BC_KNUM: if (sse) { - dasm_put(Dst, 12058); + dasm_put(Dst, 12061); } else { - dasm_put(Dst, 12072); + dasm_put(Dst, 12075); } - dasm_put(Dst, 10132); + dasm_put(Dst, 10135); break; case BC_KPRI: - dasm_put(Dst, 12080); + dasm_put(Dst, 12083); break; case BC_KNIL: - dasm_put(Dst, 12109, LJ_TNIL); + dasm_put(Dst, 12112, LJ_TNIL); break; /* -- Upvalue and function ops ------------------------------------------ */ case BC_UGET: - dasm_put(Dst, 12157, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12160, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_USETV: #define TV2MARKOFS \ ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv)) - dasm_put(Dst, 12198, 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); - dasm_put(Dst, 12294); + dasm_put(Dst, 12201, 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); + dasm_put(Dst, 12297); break; #undef TV2MARKOFS case BC_USETS: - dasm_put(Dst, 12306, offsetof(GCfuncL, uvptr), DtA(->v), LJ_TSTR, DtA(->marked), LJ_GC_BLACK, Dt4(->gch.marked), LJ_GC_WHITES, DtA(->closed), GG_DISP2G); + dasm_put(Dst, 12309, offsetof(GCfuncL, uvptr), DtA(->v), LJ_TSTR, DtA(->marked), LJ_GC_BLACK, Dt4(->gch.marked), LJ_GC_WHITES, DtA(->closed), GG_DISP2G); break; case BC_USETN: - dasm_put(Dst, 12402); + dasm_put(Dst, 12405); if (sse) { - dasm_put(Dst, 12407); + dasm_put(Dst, 12410); } else { - dasm_put(Dst, 10656); + dasm_put(Dst, 10659); } - dasm_put(Dst, 12415, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12418, offsetof(GCfuncL, uvptr), DtA(->v)); if (sse) { - dasm_put(Dst, 12424); + dasm_put(Dst, 12427); } else { - dasm_put(Dst, 12430); + dasm_put(Dst, 12433); } - dasm_put(Dst, 10132); + dasm_put(Dst, 10135); break; case BC_USETP: - dasm_put(Dst, 12433, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12436, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_UCLO: - dasm_put(Dst, 12473, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 12476, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); break; case BC_FNEW: - dasm_put(Dst, 12529, Dt1(->base), Dt1(->base), LJ_TFUNC); + dasm_put(Dst, 12532, Dt1(->base), Dt1(->base), LJ_TFUNC); break; /* -- Table ops --------------------------------------------------------- */ case BC_TNEW: - dasm_put(Dst, 12596, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 12599, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); break; case BC_TDUP: - dasm_put(Dst, 12720, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 12723, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); break; case BC_GGET: - dasm_put(Dst, 12819, Dt7(->env)); + dasm_put(Dst, 12822, Dt7(->env)); break; case BC_GSET: - dasm_put(Dst, 12839, Dt7(->env)); + dasm_put(Dst, 12842, Dt7(->env)); break; case BC_TGETV: - dasm_put(Dst, 12859, LJ_TTAB); + dasm_put(Dst, 12862, LJ_TTAB); if (LJ_DUALNUM) { - dasm_put(Dst, 12882, LJ_TISNUM); + dasm_put(Dst, 12885, LJ_TISNUM); } else { - dasm_put(Dst, 12896, LJ_TISNUM); + dasm_put(Dst, 12899, LJ_TISNUM); if (sse) { - dasm_put(Dst, 12907); + dasm_put(Dst, 12910); } else { } - dasm_put(Dst, 12928); + dasm_put(Dst, 12931); } - dasm_put(Dst, 12933, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); - dasm_put(Dst, 13128, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); + dasm_put(Dst, 13131, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13344, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETS: - dasm_put(Dst, 13481, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->nomm), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); - dasm_put(Dst, 13558, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); - dasm_put(Dst, 13645, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13484, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->nomm), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); + dasm_put(Dst, 13561, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); + dasm_put(Dst, 13648, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETB: - dasm_put(Dst, 13737, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); - dasm_put(Dst, 13832, Dt6(->metatable), Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13740, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); + dasm_put(Dst, 13835, Dt6(->metatable), Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETM: - dasm_put(Dst, 13880, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); - dasm_put(Dst, 14030, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13883, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 14033, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; /* -- Calls and vararg handling ----------------------------------------- */ case BC_CALL: case BC_CALLM: - dasm_put(Dst, 11145); + dasm_put(Dst, 11148); if (op == BC_CALLM) { - dasm_put(Dst, 14050); + dasm_put(Dst, 14053); } - dasm_put(Dst, 14055, LJ_TFUNC, Dt7(->pc)); + dasm_put(Dst, 14058, LJ_TFUNC, Dt7(->pc)); break; case BC_CALLMT: - dasm_put(Dst, 14050); + dasm_put(Dst, 14053); break; case BC_CALLT: - dasm_put(Dst, 14098, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); - dasm_put(Dst, 14216, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG); + dasm_put(Dst, 14101, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); + dasm_put(Dst, 14219, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG); break; case BC_ITERC: - dasm_put(Dst, 14290, LJ_TFUNC, 2+1, Dt7(->pc)); + dasm_put(Dst, 14293, LJ_TFUNC, 2+1, Dt7(->pc)); break; case BC_ITERN: #if LJ_HASJIT #endif - dasm_put(Dst, 14362, Dt6(->asize), Dt6(->array), LJ_TNIL); + dasm_put(Dst, 14365, Dt6(->asize), Dt6(->array), LJ_TNIL); if (LJ_DUALNUM) { - dasm_put(Dst, 11044, LJ_TISNUM); + dasm_put(Dst, 11047, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 11122); + dasm_put(Dst, 11125); } else { - dasm_put(Dst, 14414); + dasm_put(Dst, 14417); } - dasm_put(Dst, 14420); + dasm_put(Dst, 14423); if (LJ_DUALNUM) { } else if (sse) { - dasm_put(Dst, 11009); + dasm_put(Dst, 11012); } else { - dasm_put(Dst, 11021); + dasm_put(Dst, 11024); } - dasm_put(Dst, 14433, -BCBIAS_J*4); + dasm_put(Dst, 14436, -BCBIAS_J*4); if (!LJ_DUALNUM && !sse) { - dasm_put(Dst, 14487); + dasm_put(Dst, 14490); } - dasm_put(Dst, 14493, Dt6(->hmask), sizeof(Node), Dt6(->node), DtB(->val.it), LJ_TNIL, DtB(->key), DtB(->val)); + dasm_put(Dst, 14496, Dt6(->hmask), sizeof(Node), Dt6(->node), DtB(->val.it), LJ_TNIL, DtB(->key), DtB(->val)); break; case BC_ISNEXT: - dasm_put(Dst, 14572, LJ_TFUNC, LJ_TTAB, LJ_TNIL, Dt8(->ffid), FF_next_N, -BCBIAS_J*4, BC_JMP, -BCBIAS_J*4, BC_ITERC); + dasm_put(Dst, 14575, LJ_TFUNC, LJ_TTAB, LJ_TNIL, Dt8(->ffid), FF_next_N, -BCBIAS_J*4, BC_JMP, -BCBIAS_J*4, BC_ITERC); break; case BC_VARG: - dasm_put(Dst, 14673, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); - dasm_put(Dst, 14840, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 14676, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); + dasm_put(Dst, 14843, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); break; /* -- Returns ----------------------------------------------------------- */ case BC_RETM: - dasm_put(Dst, 14050); + dasm_put(Dst, 14053); break; case BC_RET: case BC_RET0: case BC_RET1: if (op != BC_RET0) { - dasm_put(Dst, 14910); + dasm_put(Dst, 14913); } - dasm_put(Dst, 14914, FRAME_TYPE); + dasm_put(Dst, 14917, FRAME_TYPE); switch (op) { case BC_RET: - dasm_put(Dst, 14933); + dasm_put(Dst, 14936); break; case BC_RET1: - dasm_put(Dst, 14987); + dasm_put(Dst, 14990); /* fallthrough */ case BC_RET0: - dasm_put(Dst, 14997); + dasm_put(Dst, 15000); default: break; } - dasm_put(Dst, 15008, Dt7(->pc), PC2PROTO(k)); + dasm_put(Dst, 15011, Dt7(->pc), PC2PROTO(k)); if (op == BC_RET) { - dasm_put(Dst, 15056, LJ_TNIL); + dasm_put(Dst, 15059, LJ_TNIL); } else { - dasm_put(Dst, 15067, LJ_TNIL); + dasm_put(Dst, 15070, LJ_TNIL); } - dasm_put(Dst, 15074, -FRAME_VARG, FRAME_TYPEP); + dasm_put(Dst, 15077, -FRAME_VARG, FRAME_TYPEP); if (op != BC_RET0) { - dasm_put(Dst, 15098); + dasm_put(Dst, 15101); } dasm_put(Dst, 4669); break; @@ -2738,7 +2747,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORL: #if LJ_HASJIT - dasm_put(Dst, 15102, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 15105, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2750,104 +2759,111 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORI: case BC_IFORL: vk = (op == BC_IFORL || op == BC_JFORL); - dasm_put(Dst, 15123); + dasm_put(Dst, 15126); if (LJ_DUALNUM) { - dasm_put(Dst, 15127, LJ_TISNUM); + dasm_put(Dst, 15130, LJ_TISNUM); if (!vk) { - dasm_put(Dst, 15137, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 15140, LJ_TISNUM, LJ_TISNUM); } else { - dasm_put(Dst, 15166); +#ifdef LUA_USE_ASSERT + dasm_put(Dst, 15169, LJ_TISNUM, LJ_TISNUM); +#endif + dasm_put(Dst, 15188); } - dasm_put(Dst, 15185, LJ_TISNUM); + dasm_put(Dst, 15207, LJ_TISNUM); if (op == BC_FORI) { - dasm_put(Dst, 15196, -BCBIAS_J*4); + dasm_put(Dst, 15218, -BCBIAS_J*4); } else if (op == BC_JFORI) { - dasm_put(Dst, 15210, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 15232, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 15228, -BCBIAS_J*4); + dasm_put(Dst, 15250, -BCBIAS_J*4); } else { - dasm_put(Dst, 15220, BC_JLOOP); + dasm_put(Dst, 15242, BC_JLOOP); } - dasm_put(Dst, 15242); + dasm_put(Dst, 15264); if (vk) { - dasm_put(Dst, 15267); + dasm_put(Dst, 15289); } - dasm_put(Dst, 15185, LJ_TISNUM); + dasm_put(Dst, 15207, LJ_TISNUM); if (op == BC_FORI) { - dasm_put(Dst, 15276); + dasm_put(Dst, 15298); } else if (op == BC_JFORI) { - dasm_put(Dst, 15281, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 15303, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 15295); + dasm_put(Dst, 15317); } else { - dasm_put(Dst, 15291, BC_JLOOP); + dasm_put(Dst, 15313, BC_JLOOP); } - dasm_put(Dst, 15300); + dasm_put(Dst, 15322); } else if (!vk) { - dasm_put(Dst, 15307, LJ_TISNUM); + dasm_put(Dst, 15329, LJ_TISNUM); } if (!vk) { - dasm_put(Dst, 15313, LJ_TISNUM); + dasm_put(Dst, 15335, LJ_TISNUM); + } else { +#ifdef LUA_USE_ASSERT + dasm_put(Dst, 15349, LJ_TISNUM, LJ_TISNUM); +#endif } - dasm_put(Dst, 15327); + dasm_put(Dst, 15368); if (!vk) { - dasm_put(Dst, 15331, LJ_TISNUM); + dasm_put(Dst, 15372, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 15340); + dasm_put(Dst, 15381); if (vk) { - dasm_put(Dst, 15352); + dasm_put(Dst, 15393); } else { - dasm_put(Dst, 15371); + dasm_put(Dst, 15412); } - dasm_put(Dst, 15376); + dasm_put(Dst, 15417); } else { - dasm_put(Dst, 15389); + dasm_put(Dst, 15430); if (vk) { - dasm_put(Dst, 15395); + dasm_put(Dst, 15436); } else { - dasm_put(Dst, 15411); + dasm_put(Dst, 15452); } - dasm_put(Dst, 15419); + dasm_put(Dst, 15460); if (cmov) { - dasm_put(Dst, 10087); + dasm_put(Dst, 10090); } else { - dasm_put(Dst, 10093); + dasm_put(Dst, 10096); } if (!cmov) { - dasm_put(Dst, 15424); + dasm_put(Dst, 15465); } } if (op == BC_FORI) { if (LJ_DUALNUM) { - dasm_put(Dst, 15430); + dasm_put(Dst, 15471); } else { - dasm_put(Dst, 15435, -BCBIAS_J*4); + dasm_put(Dst, 15476, -BCBIAS_J*4); } } else if (op == BC_JFORI) { - dasm_put(Dst, 15445, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 15486, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { if (LJ_DUALNUM) { - dasm_put(Dst, 15459); + dasm_put(Dst, 15500); } else { - dasm_put(Dst, 15464, -BCBIAS_J*4); + dasm_put(Dst, 15505, -BCBIAS_J*4); } } else { - dasm_put(Dst, 15455, BC_JLOOP); + dasm_put(Dst, 15496, BC_JLOOP); } if (LJ_DUALNUM) { - dasm_put(Dst, 10016); + dasm_put(Dst, 10019); } else { - dasm_put(Dst, 10790); + dasm_put(Dst, 10793); } if (sse) { - dasm_put(Dst, 15474); + dasm_put(Dst, 15515); } break; case BC_ITERL: #if LJ_HASJIT - dasm_put(Dst, 15102, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 15105, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2856,33 +2872,33 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IITERL: - dasm_put(Dst, 15485, LJ_TNIL); + dasm_put(Dst, 15526, LJ_TNIL); if (op == BC_JITERL) { - dasm_put(Dst, 15500, BC_JLOOP); + dasm_put(Dst, 15541, BC_JLOOP); } else { - dasm_put(Dst, 15514, -BCBIAS_J*4); + dasm_put(Dst, 15555, -BCBIAS_J*4); } - dasm_put(Dst, 10130); + dasm_put(Dst, 10133); break; case BC_LOOP: #if LJ_HASJIT - dasm_put(Dst, 15102, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 15105, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; case BC_ILOOP: - dasm_put(Dst, 10132); + dasm_put(Dst, 10135); break; case BC_JLOOP: #if LJ_HASJIT - dasm_put(Dst, 15530, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); + dasm_put(Dst, 15571, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); #endif break; case BC_JMP: - dasm_put(Dst, 15571, -BCBIAS_J*4); + dasm_put(Dst, 15612, -BCBIAS_J*4); break; /* -- Function headers -------------------------------------------------- */ @@ -2896,7 +2912,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FUNCF: #if LJ_HASJIT - dasm_put(Dst, 15597, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 15638, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif case BC_FUNCV: /* NYI: compiled vararg functions. */ break; @@ -2906,13 +2922,13 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IFUNCF: - dasm_put(Dst, 15618, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); + dasm_put(Dst, 15659, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); if (op == BC_JFUNCF) { - dasm_put(Dst, 15649, BC_JLOOP); + dasm_put(Dst, 15690, BC_JLOOP); } else { - dasm_put(Dst, 10132); + dasm_put(Dst, 10135); } - dasm_put(Dst, 15658, LJ_TNIL); + dasm_put(Dst, 15699, LJ_TNIL); break; case BC_JFUNCV: @@ -2923,30 +2939,30 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; /* NYI: compiled vararg functions. */ case BC_IFUNCV: - dasm_put(Dst, 15680, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); + dasm_put(Dst, 15721, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); if (op == BC_JFUNCV) { - dasm_put(Dst, 15649, BC_JLOOP); + dasm_put(Dst, 15690, BC_JLOOP); } else { - dasm_put(Dst, 15777, -4+PC2PROTO(k)); + dasm_put(Dst, 15818, -4+PC2PROTO(k)); } - dasm_put(Dst, 15802, LJ_TNIL); + dasm_put(Dst, 15843, LJ_TNIL); break; case BC_FUNCC: case BC_FUNCCW: - dasm_put(Dst, 15824, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); + dasm_put(Dst, 15865, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); if (op == BC_FUNCC) { dasm_put(Dst, 2341); } else { - dasm_put(Dst, 15854); + dasm_put(Dst, 15895); } - dasm_put(Dst, 15862, DISPATCH_GL(vmstate), ~LJ_VMST_C); + dasm_put(Dst, 15903, DISPATCH_GL(vmstate), ~LJ_VMST_C); if (op == BC_FUNCC) { - dasm_put(Dst, 15872); + dasm_put(Dst, 15913); } else { - dasm_put(Dst, 15877, DISPATCH_GL(wrapf)); + dasm_put(Dst, 15918, DISPATCH_GL(wrapf)); } - dasm_put(Dst, 15883, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 15924, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); break; /* ---------------------------------------------------------------------- */ @@ -2974,7 +2990,7 @@ static int build_backend(BuildCtx *ctx) build_subroutines(ctx, cmov, sse); - dasm_put(Dst, 15909); + dasm_put(Dst, 15950); for (op = 0; op < BC__MAX; op++) build_ins(ctx, (BCOp)op, op, cmov, sse); diff --git a/src/buildvm_x64win.h b/src/buildvm_x64win.h index 2e51c32b..5c19f6de 100644 --- a/src/buildvm_x64win.h +++ b/src/buildvm_x64win.h @@ -12,7 +12,7 @@ #define DASM_SECTION_CODE_OP 0 #define DASM_SECTION_CODE_SUB 1 #define DASM_MAXSECTION 2 -static const unsigned char build_actionlist[15787] = { +static const unsigned char build_actionlist[15828] = { 254,1,248,10,252,247,198,237,15,132,244,11,131,230,252,248,41,252,242,72, 141,76,49,252,248,139,114,252,252,199,68,10,4,237,248,12,131,192,1,137,68, 36,84,252,247,198,237,15,132,244,13,248,14,129,252,246,239,252,247,198,237, @@ -489,15 +489,15 @@ static const unsigned char build_actionlist[15787] = { 2,15,182,131,233,72,139,139,233,72,139,147,233,76,139,131,233,76,139,139, 233,133,192,15,132,244,251,15,40,131,233,15,40,139,233,15,40,147,233,15,40, 155,233,248,5,255,252,255,147,233,72,137,131,233,15,41,131,233,255,72,139, - 93,252,248,201,195,255,249,255,129,124,253,202,4,239,15,133,244,253,129,124, - 253,194,4,239,15,133,244,254,139,44,202,131,198,4,59,44,194,255,15,141,244, - 255,255,15,140,244,255,255,15,143,244,255,255,15,142,244,255,255,248,6,15, - 183,70,252,254,141,180,253,134,233,248,9,139,6,15,182,204,15,182,232,131, - 198,4,193,232,16,252,255,36,252,235,248,7,15,135,244,41,129,124,253,194,4, - 239,15,130,244,247,15,133,244,41,255,252,242,15,42,4,194,252,233,244,248, - 255,221,4,202,219,4,194,252,233,244,249,255,248,8,15,135,244,41,255,252,242, - 15,42,12,202,252,242,15,16,4,194,131,198,4,102,15,46,193,255,15,134,244,9, - 255,15,135,244,9,255,15,130,244,9,255,15,131,244,9,255,252,233,244,6,255, + 93,252,248,201,195,255,248,162,255,249,255,129,124,253,202,4,239,15,133,244, + 253,129,124,253,194,4,239,15,133,244,254,139,44,202,131,198,4,59,44,194,255, + 15,141,244,255,255,15,140,244,255,255,15,143,244,255,255,15,142,244,255,255, + 248,6,15,183,70,252,254,141,180,253,134,233,248,9,139,6,15,182,204,15,182, + 232,131,198,4,193,232,16,252,255,36,252,235,248,7,15,135,244,41,129,124,253, + 194,4,239,15,130,244,247,15,133,244,41,255,252,242,15,42,4,194,252,233,244, + 248,255,221,4,202,219,4,194,252,233,244,249,255,248,8,15,135,244,41,255,252, + 242,15,42,12,202,252,242,15,16,4,194,131,198,4,102,15,46,193,255,15,134,244, + 9,255,15,135,244,9,255,15,130,244,9,255,15,131,244,9,255,252,233,244,6,255, 219,4,202,252,233,244,248,255,129,124,253,202,4,239,15,131,244,41,129,124, 253,194,4,239,15,131,244,41,255,248,1,252,242,15,16,4,194,248,2,131,198,4, 102,15,46,4,202,248,3,255,248,1,221,4,202,248,2,221,4,194,248,3,131,198,4, @@ -584,8 +584,8 @@ static const unsigned char build_actionlist[15787] = { 15,94,4,194,255,221,4,252,234,220,52,194,255,252,242,15,16,4,252,234,252, 242,15,16,12,199,255,221,4,252,234,221,4,199,255,252,242,15,16,4,199,252, 242,15,16,12,252,234,255,221,4,199,221,4,252,234,255,252,242,15,16,4,252, - 234,252,242,15,16,12,194,255,221,4,252,234,221,4,194,255,248,162,232,244, - 153,255,252,233,244,162,255,232,244,113,255,15,182,252,236,15,182,192,139, + 234,252,242,15,16,12,194,255,221,4,252,234,221,4,194,255,248,163,232,244, + 153,255,252,233,244,163,255,232,244,113,255,15,182,252,236,15,182,192,139, 76,36,96,137,145,233,141,20,194,65,137,192,65,41,232,248,33,137,205,137,116, 36,100,232,251,1,27,139,149,233,133,192,15,133,244,42,15,182,110,252,255, 15,182,78,252,253,72,139,4,252,234,72,137,4,202,139,6,15,182,204,15,182,232, @@ -629,8 +629,8 @@ static const unsigned char build_actionlist[15787] = { 233,15,182,78,252,253,137,4,202,199,68,202,4,237,139,6,15,182,204,15,182, 232,131,198,4,193,232,16,252,255,36,252,235,248,3,137,252,233,232,251,1,32, 15,183,70,252,254,72,252,247,208,252,233,244,2,255,72,252,247,208,139,106, - 252,248,139,173,233,139,4,135,252,233,244,163,255,72,252,247,208,139,106, - 252,248,139,173,233,139,4,135,252,233,244,164,255,15,182,252,236,15,182,192, + 252,248,139,173,233,139,4,135,252,233,244,164,255,72,252,247,208,139,106, + 252,248,139,173,233,139,4,135,252,233,244,165,255,15,182,252,236,15,182,192, 129,124,253,252,234,4,239,15,133,244,36,139,44,252,234,255,129,124,253,194, 4,239,15,133,244,251,139,4,194,255,129,124,253,194,4,239,15,131,244,251,255, 252,242,15,16,4,194,252,242,15,45,192,252,242,15,42,200,102,15,46,193,255, @@ -639,8 +639,8 @@ static const unsigned char build_actionlist[15787] = { 232,131,198,4,193,232,16,252,255,36,252,235,248,2,131,189,233,0,15,132,244, 249,139,141,233,252,246,129,233,235,15,132,244,36,15,182,78,252,253,248,3, 199,68,202,4,237,252,233,244,1,248,5,255,129,124,253,194,4,239,15,133,244, - 36,139,4,194,252,233,244,163,255,15,182,252,236,15,182,192,72,252,247,208, - 139,4,135,129,124,253,252,234,4,239,15,133,244,34,139,44,252,234,248,163, + 36,139,4,194,252,233,244,164,255,15,182,252,236,15,182,192,72,252,247,208, + 139,4,135,129,124,253,252,234,4,239,15,133,244,34,139,44,252,234,248,164, 139,141,233,35,136,233,105,201,239,3,141,233,248,1,129,185,233,239,15,133, 244,250,57,129,233,15,133,244,250,129,121,253,4,239,15,132,244,251,15,182, 70,252,253,72,139,41,72,137,44,194,248,2,255,139,6,15,182,204,15,182,232, @@ -659,10 +659,10 @@ static const unsigned char build_actionlist[15787] = { 182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,3,131,189, 233,0,15,132,244,1,139,141,233,252,246,129,233,235,255,15,132,244,39,15,182, 78,252,253,252,233,244,1,248,5,129,124,253,194,4,239,15,133,244,39,139,4, - 194,252,233,244,164,248,7,128,165,233,235,139,139,233,137,171,233,137,141, + 194,252,233,244,165,248,7,128,165,233,235,139,139,233,137,171,233,137,141, 233,15,182,78,252,253,252,233,244,2,255,15,182,252,236,15,182,192,72,252, 247,208,139,4,135,129,124,253,252,234,4,239,15,133,244,37,139,44,252,234, - 248,164,139,141,233,35,136,233,105,201,239,198,133,233,0,3,141,233,248,1, + 248,165,139,141,233,35,136,233,105,201,239,198,133,233,0,3,141,233,248,1, 129,185,233,239,15,133,244,251,57,129,233,15,133,244,251,129,121,253,4,239, 15,132,244,250,248,2,255,252,246,133,233,235,15,133,244,253,248,3,15,182, 70,252,253,72,139,44,194,72,137,41,139,6,15,182,204,15,182,232,131,198,4, @@ -739,46 +739,48 @@ static const unsigned char build_actionlist[15787] = { 244,14,41,252,234,255,1,252,233,255,137,252,245,209,252,237,129,229,239,102, 131,172,253,43,233,1,15,132,244,145,255,141,12,202,255,129,121,253,4,239, 15,133,244,255,255,129,121,253,12,239,15,133,244,57,129,121,253,20,239,15, - 133,244,57,139,41,131,121,16,0,15,140,244,251,255,139,105,16,133,252,237, - 15,136,244,251,3,41,15,128,244,247,137,41,255,59,105,8,199,65,28,237,137, - 105,24,255,15,142,244,253,248,1,248,6,141,180,253,134,233,255,141,180,253, - 134,233,15,183,70,252,254,15,142,245,248,1,248,6,255,15,143,244,253,248,6, - 141,180,253,134,233,248,1,255,248,7,139,6,15,182,204,15,182,232,131,198,4, - 193,232,16,252,255,36,252,235,248,5,255,3,41,15,128,244,1,137,41,255,15,141, - 244,7,255,141,180,253,134,233,15,183,70,252,254,15,141,245,255,15,140,244, - 7,255,252,233,244,6,248,9,255,129,121,253,4,239,255,15,131,244,57,129,121, - 253,12,239,15,131,244,57,255,139,105,20,255,129,252,253,239,15,131,244,57, - 255,252,242,15,16,1,252,242,15,16,73,8,255,252,242,15,88,65,16,252,242,15, - 17,1,133,252,237,15,136,244,249,255,15,140,244,249,255,102,15,46,200,248, - 1,252,242,15,17,65,24,255,221,65,8,221,1,255,220,65,16,221,17,221,81,24,133, - 252,237,15,136,244,247,255,221,81,24,15,140,244,247,255,217,201,248,1,255, - 15,183,70,252,254,255,15,131,244,7,255,15,131,244,248,141,180,253,134,233, - 255,141,180,253,134,233,15,183,70,252,254,15,131,245,255,15,130,244,7,255, - 15,130,244,248,141,180,253,134,233,255,248,3,102,15,46,193,252,233,244,1, - 255,141,12,202,139,105,4,129,252,253,239,15,132,244,247,255,137,105,252,252, - 139,41,137,105,252,248,252,233,245,255,141,180,253,134,233,139,1,137,105, - 252,252,137,65,252,248,255,139,139,233,139,4,129,72,139,128,233,139,108,36, - 96,137,147,233,137,171,233,76,137,100,36,80,76,137,108,36,32,76,137,116,36, - 24,76,137,124,36,16,72,137,225,72,129,252,236,239,102,15,127,49,102,15,127, - 185,233,102,68,15,127,129,233,102,68,15,127,137,233,102,68,15,127,145,233, - 102,68,15,127,153,233,102,68,15,127,161,233,102,68,15,127,169,233,102,68, - 15,127,177,233,102,68,15,127,185,233,252,255,224,255,141,180,253,134,233, - 139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,137, - 252,245,209,252,237,129,229,239,102,131,172,253,43,233,1,15,132,244,147,255, - 139,190,233,139,108,36,96,141,12,202,59,141,233,15,135,244,23,15,182,142, - 233,57,200,15,134,244,249,248,2,255,15,183,70,252,254,252,233,245,255,248, - 3,199,68,194,252,252,237,131,192,1,57,200,15,134,244,3,252,233,244,2,255, - 141,44,197,237,141,4,194,139,122,252,248,137,104,252,252,137,120,252,248, - 139,108,36,96,141,12,200,59,141,233,15,135,244,22,137,209,137,194,15,182, - 174,233,133,252,237,15,132,244,248,248,1,131,193,8,57,209,15,131,244,249, - 139,121,252,248,137,56,139,121,252,252,137,120,4,131,192,8,199,65,252,252, - 237,131,252,237,1,15,133,244,1,248,2,255,139,190,233,139,6,15,182,204,15, - 182,232,131,198,4,193,232,16,252,255,36,252,235,255,248,3,199,64,4,237,131, - 192,8,131,252,237,1,15,133,244,3,252,233,244,2,255,139,106,252,248,72,139, - 189,233,139,108,36,96,141,68,194,252,248,137,149,233,141,136,233,59,141,233, - 137,133,233,255,72,137,252,250,137,252,233,255,15,135,244,21,199,131,233, - 237,255,252,255,215,255,252,255,147,233,255,199,131,233,237,139,149,233,141, - 12,194,252,247,217,3,141,233,139,114,252,252,252,233,244,12,255,254,0 + 133,244,57,139,41,131,121,16,0,15,140,244,251,255,129,121,253,12,239,15,133, + 244,162,129,121,253,20,239,15,133,244,162,255,139,105,16,133,252,237,15,136, + 244,251,3,41,15,128,244,247,137,41,255,59,105,8,199,65,28,237,137,105,24, + 255,15,142,244,253,248,1,248,6,141,180,253,134,233,255,141,180,253,134,233, + 15,183,70,252,254,15,142,245,248,1,248,6,255,15,143,244,253,248,6,141,180, + 253,134,233,248,1,255,248,7,139,6,15,182,204,15,182,232,131,198,4,193,232, + 16,252,255,36,252,235,248,5,255,3,41,15,128,244,1,137,41,255,15,141,244,7, + 255,141,180,253,134,233,15,183,70,252,254,15,141,245,255,15,140,244,7,255, + 252,233,244,6,248,9,255,129,121,253,4,239,255,15,131,244,57,129,121,253,12, + 239,15,131,244,57,255,129,121,253,12,239,15,131,244,162,129,121,253,20,239, + 15,131,244,162,255,139,105,20,255,129,252,253,239,15,131,244,57,255,252,242, + 15,16,1,252,242,15,16,73,8,255,252,242,15,88,65,16,252,242,15,17,1,133,252, + 237,15,136,244,249,255,15,140,244,249,255,102,15,46,200,248,1,252,242,15, + 17,65,24,255,221,65,8,221,1,255,220,65,16,221,17,221,81,24,133,252,237,15, + 136,244,247,255,221,81,24,15,140,244,247,255,217,201,248,1,255,15,183,70, + 252,254,255,15,131,244,7,255,15,131,244,248,141,180,253,134,233,255,141,180, + 253,134,233,15,183,70,252,254,15,131,245,255,15,130,244,7,255,15,130,244, + 248,141,180,253,134,233,255,248,3,102,15,46,193,252,233,244,1,255,141,12, + 202,139,105,4,129,252,253,239,15,132,244,247,255,137,105,252,252,139,41,137, + 105,252,248,252,233,245,255,141,180,253,134,233,139,1,137,105,252,252,137, + 65,252,248,255,139,139,233,139,4,129,72,139,128,233,139,108,36,96,137,147, + 233,137,171,233,76,137,100,36,80,76,137,108,36,32,76,137,116,36,24,76,137, + 124,36,16,72,137,225,72,129,252,236,239,102,15,127,49,102,15,127,185,233, + 102,68,15,127,129,233,102,68,15,127,137,233,102,68,15,127,145,233,102,68, + 15,127,153,233,102,68,15,127,161,233,102,68,15,127,169,233,102,68,15,127, + 177,233,102,68,15,127,185,233,252,255,224,255,141,180,253,134,233,139,6,15, + 182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,137,252,245, + 209,252,237,129,229,239,102,131,172,253,43,233,1,15,132,244,147,255,139,190, + 233,139,108,36,96,141,12,202,59,141,233,15,135,244,23,15,182,142,233,57,200, + 15,134,244,249,248,2,255,15,183,70,252,254,252,233,245,255,248,3,199,68,194, + 252,252,237,131,192,1,57,200,15,134,244,3,252,233,244,2,255,141,44,197,237, + 141,4,194,139,122,252,248,137,104,252,252,137,120,252,248,139,108,36,96,141, + 12,200,59,141,233,15,135,244,22,137,209,137,194,15,182,174,233,133,252,237, + 15,132,244,248,248,1,131,193,8,57,209,15,131,244,249,139,121,252,248,137, + 56,139,121,252,252,137,120,4,131,192,8,199,65,252,252,237,131,252,237,1,15, + 133,244,1,248,2,255,139,190,233,139,6,15,182,204,15,182,232,131,198,4,193, + 232,16,252,255,36,252,235,255,248,3,199,64,4,237,131,192,8,131,252,237,1, + 15,133,244,3,252,233,244,2,255,139,106,252,248,72,139,189,233,139,108,36, + 96,141,68,194,252,248,137,149,233,141,136,233,59,141,233,137,133,233,255, + 72,137,252,250,137,252,233,255,15,135,244,21,199,131,233,237,255,252,255, + 215,255,252,255,147,233,255,199,131,233,237,139,149,233,141,12,194,252,247, + 217,3,141,233,139,114,252,252,252,233,244,12,255,254,0 }; enum { @@ -934,6 +936,7 @@ enum { GLOB_vm_foldarith, GLOB_vm_cpuid, GLOB_vm_ffi_call, + GLOB_assert_bad_for_arg_type, GLOB_BC_MODVN_Z, GLOB_BC_TGETS_Z, GLOB_BC_TSETS_Z, @@ -1092,6 +1095,7 @@ static const char *const globnames[] = { "vm_foldarith", "vm_cpuid", "vm_ffi_call@4", + "assert_bad_for_arg_type", "BC_MODVN_Z", "BC_TGETS_Z", "BC_TSETS_Z", @@ -1817,13 +1821,18 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse) #endif dasm_put(Dst, 9803); #endif + dasm_put(Dst, 9811); +#ifdef LUA_USE_ASSERT + dasm_put(Dst, 9250); +#endif + dasm_put(Dst, 9250); } /* Generate the code for a single instruction. */ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) { int vk = 0; - dasm_put(Dst, 9811, defop); + dasm_put(Dst, 9814, defop); switch (op) { @@ -1834,145 +1843,145 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_ISLT: case BC_ISGE: case BC_ISLE: case BC_ISGT: if (LJ_DUALNUM) { - dasm_put(Dst, 9813, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 9816, LJ_TISNUM, LJ_TISNUM); switch (op) { case BC_ISLT: - dasm_put(Dst, 9843); + dasm_put(Dst, 9846); break; case BC_ISGE: - dasm_put(Dst, 9848); + dasm_put(Dst, 9851); break; case BC_ISLE: - dasm_put(Dst, 9853); + dasm_put(Dst, 9856); break; case BC_ISGT: - dasm_put(Dst, 9858); + dasm_put(Dst, 9861); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 9863, -BCBIAS_J*4, LJ_TISNUM); + dasm_put(Dst, 9866, -BCBIAS_J*4, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9917); + dasm_put(Dst, 9920); } else { - dasm_put(Dst, 9928); + dasm_put(Dst, 9931); } - dasm_put(Dst, 9939); + dasm_put(Dst, 9942); if (sse) { - dasm_put(Dst, 9946); + dasm_put(Dst, 9949); switch (op) { case BC_ISLT: - dasm_put(Dst, 9966); + dasm_put(Dst, 9969); break; case BC_ISGE: - dasm_put(Dst, 9971); + dasm_put(Dst, 9974); break; case BC_ISLE: - dasm_put(Dst, 9976); + dasm_put(Dst, 9979); break; case BC_ISGT: - dasm_put(Dst, 9981); + dasm_put(Dst, 9984); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 9986); + dasm_put(Dst, 9989); } else { - dasm_put(Dst, 9991); + dasm_put(Dst, 9994); } } else { - dasm_put(Dst, 9999, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10002, LJ_TISNUM, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 10020); + dasm_put(Dst, 10023); } else { - dasm_put(Dst, 10041); + dasm_put(Dst, 10044); if (cmov) { - dasm_put(Dst, 10057); + dasm_put(Dst, 10060); } else { - dasm_put(Dst, 10063); + dasm_put(Dst, 10066); } } if (LJ_DUALNUM) { switch (op) { case BC_ISLT: - dasm_put(Dst, 9966); + dasm_put(Dst, 9969); break; case BC_ISGE: - dasm_put(Dst, 9971); + dasm_put(Dst, 9974); break; case BC_ISLE: - dasm_put(Dst, 9976); + dasm_put(Dst, 9979); break; case BC_ISGT: - dasm_put(Dst, 9981); + dasm_put(Dst, 9984); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 9986); + dasm_put(Dst, 9989); } else { switch (op) { case BC_ISLT: - dasm_put(Dst, 10070); + dasm_put(Dst, 10073); break; case BC_ISGE: - dasm_put(Dst, 10075); + dasm_put(Dst, 10078); break; case BC_ISLE: - dasm_put(Dst, 10080); + dasm_put(Dst, 10083); break; case BC_ISGT: - dasm_put(Dst, 10085); + dasm_put(Dst, 10088); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 10090, -BCBIAS_J*4); + dasm_put(Dst, 10093, -BCBIAS_J*4); } break; case BC_ISEQV: case BC_ISNEV: vk = op == BC_ISEQV; - dasm_put(Dst, 10122); + dasm_put(Dst, 10125); if (LJ_DUALNUM) { - dasm_put(Dst, 10130, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10133, LJ_TISNUM, LJ_TISNUM); if (vk) { - dasm_put(Dst, 10155); + dasm_put(Dst, 10158); } else { - dasm_put(Dst, 10160); + dasm_put(Dst, 10163); } - dasm_put(Dst, 10165, -BCBIAS_J*4, LJ_TISNUM); + dasm_put(Dst, 10168, -BCBIAS_J*4, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10217); + dasm_put(Dst, 10220); } else { - dasm_put(Dst, 10224); + dasm_put(Dst, 10227); } - dasm_put(Dst, 10228); + dasm_put(Dst, 10231); if (sse) { - dasm_put(Dst, 10239); + dasm_put(Dst, 10242); } else { - dasm_put(Dst, 10251); + dasm_put(Dst, 10254); } - dasm_put(Dst, 10258); + dasm_put(Dst, 10261); } else { - dasm_put(Dst, 10263, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10266, LJ_TISNUM, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 10282); + dasm_put(Dst, 10285); } else { - dasm_put(Dst, 10300); + dasm_put(Dst, 10303); if (cmov) { - dasm_put(Dst, 10057); + dasm_put(Dst, 10060); } else { - dasm_put(Dst, 10063); + dasm_put(Dst, 10066); } } iseqne_fp: if (vk) { - dasm_put(Dst, 10313); + dasm_put(Dst, 10316); } else { - dasm_put(Dst, 10322); + dasm_put(Dst, 10325); } iseqne_end: if (vk) { - dasm_put(Dst, 10331, -BCBIAS_J*4); + dasm_put(Dst, 10334, -BCBIAS_J*4); if (!LJ_HASFFI) { dasm_put(Dst, 4567); } @@ -1980,150 +1989,150 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) if (!LJ_HASFFI) { dasm_put(Dst, 4567); } - dasm_put(Dst, 10346, -BCBIAS_J*4); + dasm_put(Dst, 10349, -BCBIAS_J*4); } if (LJ_DUALNUM && (op == BC_ISEQV || op == BC_ISNEV || op == BC_ISEQN || op == BC_ISNEN)) { - dasm_put(Dst, 10361); + dasm_put(Dst, 10364); } else { - dasm_put(Dst, 10102); + dasm_put(Dst, 10105); } if (op == BC_ISEQV || op == BC_ISNEV) { dasm_put(Dst, 9787); if (LJ_HASFFI) { - dasm_put(Dst, 10366, LJ_TCDATA, LJ_TCDATA); + dasm_put(Dst, 10369, LJ_TCDATA, LJ_TCDATA); } - dasm_put(Dst, 10385, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<metatable), Dt6(->nomm), 1<>32)); + dasm_put(Dst, 10943, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); } else { - dasm_put(Dst, 10965); + dasm_put(Dst, 10968); } if (LJ_DUALNUM) { - dasm_put(Dst, 10361); + dasm_put(Dst, 10364); } else { - dasm_put(Dst, 10102); + dasm_put(Dst, 10105); } break; case BC_LEN: - dasm_put(Dst, 10974, LJ_TSTR); + dasm_put(Dst, 10977, LJ_TSTR); if (LJ_DUALNUM) { - dasm_put(Dst, 10988, Dt5(->len), LJ_TISNUM); + dasm_put(Dst, 10991, Dt5(->len), LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 11002, Dt5(->len)); + dasm_put(Dst, 11005, Dt5(->len)); } else { - dasm_put(Dst, 11020, Dt5(->len)); + dasm_put(Dst, 11023, Dt5(->len)); } - dasm_put(Dst, 11029, LJ_TTAB); + dasm_put(Dst, 11032, LJ_TTAB); if (LJ_DUALNUM) { } else if (sse) { - dasm_put(Dst, 11070); + dasm_put(Dst, 11073); } else { } - dasm_put(Dst, 11076); + dasm_put(Dst, 11079); break; /* -- Binary ops -------------------------------------------------------- */ @@ -2131,603 +2140,603 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_ADDVN: case BC_ADDNV: case BC_ADDVV: if (LJ_DUALNUM) { - dasm_put(Dst, 11089); + dasm_put(Dst, 11092); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11097, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11100, LJ_TISNUM, LJ_TISNUM); break; case 1: - dasm_put(Dst, 11130, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11133, LJ_TISNUM, LJ_TISNUM); break; default: - dasm_put(Dst, 11163, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11166, LJ_TISNUM, LJ_TISNUM); break; } - dasm_put(Dst, 11196, LJ_TISNUM); + dasm_put(Dst, 11199, LJ_TISNUM); if (vk == 1) { - dasm_put(Dst, 10998); + dasm_put(Dst, 11001); } else { - dasm_put(Dst, 10784); + dasm_put(Dst, 10787); } - dasm_put(Dst, 10102); + dasm_put(Dst, 10105); } else { - dasm_put(Dst, 11089); + dasm_put(Dst, 11092); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11202, LJ_TISNUM); + dasm_put(Dst, 11205, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11214, LJ_TISNUM); + dasm_put(Dst, 11217, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11225); + dasm_put(Dst, 11228); } else { - dasm_put(Dst, 11239); + dasm_put(Dst, 11242); } break; case 1: - dasm_put(Dst, 11247, LJ_TISNUM); + dasm_put(Dst, 11250, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11259, LJ_TISNUM); + dasm_put(Dst, 11262, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11270); + dasm_put(Dst, 11273); } else { - dasm_put(Dst, 11284); + dasm_put(Dst, 11287); } break; default: - dasm_put(Dst, 11292, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11295, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11314); + dasm_put(Dst, 11317); } else { - dasm_put(Dst, 11328); + dasm_put(Dst, 11331); } break; } if (sse) { - dasm_put(Dst, 10958); + dasm_put(Dst, 10961); } else { - dasm_put(Dst, 10970); + dasm_put(Dst, 10973); } - dasm_put(Dst, 10102); + dasm_put(Dst, 10105); } break; case BC_SUBVN: case BC_SUBNV: case BC_SUBVV: if (LJ_DUALNUM) { - dasm_put(Dst, 11089); + dasm_put(Dst, 11092); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11336, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11339, LJ_TISNUM, LJ_TISNUM); break; case 1: - dasm_put(Dst, 11369, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11372, LJ_TISNUM, LJ_TISNUM); break; default: - dasm_put(Dst, 11402, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11405, LJ_TISNUM, LJ_TISNUM); break; } - dasm_put(Dst, 11196, LJ_TISNUM); + dasm_put(Dst, 11199, LJ_TISNUM); if (vk == 1) { - dasm_put(Dst, 10998); + dasm_put(Dst, 11001); } else { - dasm_put(Dst, 10784); + dasm_put(Dst, 10787); } - dasm_put(Dst, 10102); + dasm_put(Dst, 10105); } else { - dasm_put(Dst, 11089); + dasm_put(Dst, 11092); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11202, LJ_TISNUM); + dasm_put(Dst, 11205, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11214, LJ_TISNUM); + dasm_put(Dst, 11217, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11435); + dasm_put(Dst, 11438); } else { - dasm_put(Dst, 11449); + dasm_put(Dst, 11452); } break; case 1: - dasm_put(Dst, 11247, LJ_TISNUM); + dasm_put(Dst, 11250, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11259, LJ_TISNUM); + dasm_put(Dst, 11262, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11457); + dasm_put(Dst, 11460); } else { - dasm_put(Dst, 11471); + dasm_put(Dst, 11474); } break; default: - dasm_put(Dst, 11292, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11295, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11479); + dasm_put(Dst, 11482); } else { - dasm_put(Dst, 11493); + dasm_put(Dst, 11496); } break; } if (sse) { - dasm_put(Dst, 10958); + dasm_put(Dst, 10961); } else { - dasm_put(Dst, 10970); + dasm_put(Dst, 10973); } - dasm_put(Dst, 10102); + dasm_put(Dst, 10105); } break; case BC_MULVN: case BC_MULNV: case BC_MULVV: if (LJ_DUALNUM) { - dasm_put(Dst, 11089); + dasm_put(Dst, 11092); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11501, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11504, LJ_TISNUM, LJ_TISNUM); break; case 1: - dasm_put(Dst, 11535, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11538, LJ_TISNUM, LJ_TISNUM); break; default: - dasm_put(Dst, 11569, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11572, LJ_TISNUM, LJ_TISNUM); break; } - dasm_put(Dst, 11196, LJ_TISNUM); + dasm_put(Dst, 11199, LJ_TISNUM); if (vk == 1) { - dasm_put(Dst, 10998); + dasm_put(Dst, 11001); } else { - dasm_put(Dst, 10784); + dasm_put(Dst, 10787); } - dasm_put(Dst, 10102); + dasm_put(Dst, 10105); } else { - dasm_put(Dst, 11089); + dasm_put(Dst, 11092); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11202, LJ_TISNUM); + dasm_put(Dst, 11205, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11214, LJ_TISNUM); + dasm_put(Dst, 11217, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11603); + dasm_put(Dst, 11606); } else { - dasm_put(Dst, 11617); + dasm_put(Dst, 11620); } break; case 1: - dasm_put(Dst, 11247, LJ_TISNUM); + dasm_put(Dst, 11250, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11259, LJ_TISNUM); + dasm_put(Dst, 11262, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11625); + dasm_put(Dst, 11628); } else { - dasm_put(Dst, 11639); + dasm_put(Dst, 11642); } break; default: - dasm_put(Dst, 11292, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11295, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11647); + dasm_put(Dst, 11650); } else { - dasm_put(Dst, 11661); + dasm_put(Dst, 11664); } break; } if (sse) { - dasm_put(Dst, 10958); + dasm_put(Dst, 10961); } else { - dasm_put(Dst, 10970); + dasm_put(Dst, 10973); } - dasm_put(Dst, 10102); + dasm_put(Dst, 10105); } break; case BC_DIVVN: case BC_DIVNV: case BC_DIVVV: - dasm_put(Dst, 11089); + dasm_put(Dst, 11092); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11202, LJ_TISNUM); + dasm_put(Dst, 11205, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11214, LJ_TISNUM); + dasm_put(Dst, 11217, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11669); + dasm_put(Dst, 11672); } else { - dasm_put(Dst, 11683); + dasm_put(Dst, 11686); } break; case 1: - dasm_put(Dst, 11247, LJ_TISNUM); + dasm_put(Dst, 11250, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11259, LJ_TISNUM); + dasm_put(Dst, 11262, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11691); + dasm_put(Dst, 11694); } else { - dasm_put(Dst, 11705); + dasm_put(Dst, 11708); } break; default: - dasm_put(Dst, 11292, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11295, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11713); + dasm_put(Dst, 11716); } else { - dasm_put(Dst, 11727); + dasm_put(Dst, 11730); } break; } if (sse) { - dasm_put(Dst, 10958); + dasm_put(Dst, 10961); } else { - dasm_put(Dst, 10970); + dasm_put(Dst, 10973); } - dasm_put(Dst, 10102); + dasm_put(Dst, 10105); break; case BC_MODVN: - dasm_put(Dst, 11089); + dasm_put(Dst, 11092); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11202, LJ_TISNUM); + dasm_put(Dst, 11205, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11214, LJ_TISNUM); + dasm_put(Dst, 11217, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11735); + dasm_put(Dst, 11738); } else { - dasm_put(Dst, 11749); + dasm_put(Dst, 11752); } break; case 1: - dasm_put(Dst, 11247, LJ_TISNUM); + dasm_put(Dst, 11250, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11259, LJ_TISNUM); + dasm_put(Dst, 11262, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11757); + dasm_put(Dst, 11760); } else { - dasm_put(Dst, 11771); + dasm_put(Dst, 11774); } break; default: - dasm_put(Dst, 11292, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11295, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11779); + dasm_put(Dst, 11782); } else { - dasm_put(Dst, 11793); + dasm_put(Dst, 11796); } break; } - dasm_put(Dst, 11801); + dasm_put(Dst, 11804); if (sse) { - dasm_put(Dst, 10958); + dasm_put(Dst, 10961); } else { - dasm_put(Dst, 10970); + dasm_put(Dst, 10973); } - dasm_put(Dst, 10102); + dasm_put(Dst, 10105); break; case BC_MODNV: case BC_MODVV: - dasm_put(Dst, 11089); + dasm_put(Dst, 11092); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11202, LJ_TISNUM); + dasm_put(Dst, 11205, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11214, LJ_TISNUM); + dasm_put(Dst, 11217, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11735); + dasm_put(Dst, 11738); } else { - dasm_put(Dst, 11749); + dasm_put(Dst, 11752); } break; case 1: - dasm_put(Dst, 11247, LJ_TISNUM); + dasm_put(Dst, 11250, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11259, LJ_TISNUM); + dasm_put(Dst, 11262, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11757); + dasm_put(Dst, 11760); } else { - dasm_put(Dst, 11771); + dasm_put(Dst, 11774); } break; default: - dasm_put(Dst, 11292, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11295, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11779); + dasm_put(Dst, 11782); } else { - dasm_put(Dst, 11793); + dasm_put(Dst, 11796); } break; } - dasm_put(Dst, 11807); + dasm_put(Dst, 11810); break; case BC_POW: - dasm_put(Dst, 11089); + dasm_put(Dst, 11092); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11202, LJ_TISNUM); + dasm_put(Dst, 11205, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11214, LJ_TISNUM); + dasm_put(Dst, 11217, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11735); + dasm_put(Dst, 11738); } else { - dasm_put(Dst, 11749); + dasm_put(Dst, 11752); } break; case 1: - dasm_put(Dst, 11247, LJ_TISNUM); + dasm_put(Dst, 11250, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11259, LJ_TISNUM); + dasm_put(Dst, 11262, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11757); + dasm_put(Dst, 11760); } else { - dasm_put(Dst, 11771); + dasm_put(Dst, 11774); } break; default: - dasm_put(Dst, 11292, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11295, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11779); + dasm_put(Dst, 11782); } else { - dasm_put(Dst, 11793); + dasm_put(Dst, 11796); } break; } - dasm_put(Dst, 11812); + dasm_put(Dst, 11815); if (sse) { - dasm_put(Dst, 10958); + dasm_put(Dst, 10961); } else { - dasm_put(Dst, 10970); + dasm_put(Dst, 10973); } - dasm_put(Dst, 10102); + dasm_put(Dst, 10105); break; case BC_CAT: - dasm_put(Dst, 11816, Dt1(->base), Dt1(->base)); + dasm_put(Dst, 11819, Dt1(->base), Dt1(->base)); break; /* -- Constant ops ------------------------------------------------------ */ case BC_KSTR: - dasm_put(Dst, 11899, LJ_TSTR); + dasm_put(Dst, 11902, LJ_TSTR); break; case BC_KCDATA: #if LJ_HASFFI - dasm_put(Dst, 11899, LJ_TCDATA); + dasm_put(Dst, 11902, LJ_TCDATA); #endif break; case BC_KSHORT: if (LJ_DUALNUM) { - dasm_put(Dst, 11934, LJ_TISNUM); + dasm_put(Dst, 11937, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 11946); + dasm_put(Dst, 11949); } else { - dasm_put(Dst, 11961); + dasm_put(Dst, 11964); } - dasm_put(Dst, 10102); + dasm_put(Dst, 10105); break; case BC_KNUM: if (sse) { - dasm_put(Dst, 11969); + dasm_put(Dst, 11972); } else { - dasm_put(Dst, 11982); + dasm_put(Dst, 11985); } - dasm_put(Dst, 10102); + dasm_put(Dst, 10105); break; case BC_KPRI: - dasm_put(Dst, 11989); + dasm_put(Dst, 11992); break; case BC_KNIL: - dasm_put(Dst, 12017, LJ_TNIL); + dasm_put(Dst, 12020, LJ_TNIL); break; /* -- Upvalue and function ops ------------------------------------------ */ case BC_UGET: - dasm_put(Dst, 12064, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12067, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_USETV: #define TV2MARKOFS \ ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv)) - dasm_put(Dst, 12104, 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); - dasm_put(Dst, 12195); + dasm_put(Dst, 12107, 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); + dasm_put(Dst, 12198); break; #undef TV2MARKOFS case BC_USETS: - dasm_put(Dst, 12207, offsetof(GCfuncL, uvptr), DtA(->v), LJ_TSTR, DtA(->marked), LJ_GC_BLACK, Dt4(->gch.marked), LJ_GC_WHITES, DtA(->closed), GG_DISP2G); + dasm_put(Dst, 12210, offsetof(GCfuncL, uvptr), DtA(->v), LJ_TSTR, DtA(->marked), LJ_GC_BLACK, Dt4(->gch.marked), LJ_GC_WHITES, DtA(->closed), GG_DISP2G); break; case BC_USETN: - dasm_put(Dst, 12300); + dasm_put(Dst, 12303); if (sse) { - dasm_put(Dst, 12305); + dasm_put(Dst, 12308); } else { - dasm_put(Dst, 10613); + dasm_put(Dst, 10616); } - dasm_put(Dst, 12312, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12315, offsetof(GCfuncL, uvptr), DtA(->v)); if (sse) { - dasm_put(Dst, 12321); + dasm_put(Dst, 12324); } else { - dasm_put(Dst, 12327); + dasm_put(Dst, 12330); } - dasm_put(Dst, 10102); + dasm_put(Dst, 10105); break; case BC_USETP: - dasm_put(Dst, 12330, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12333, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_UCLO: - dasm_put(Dst, 12369, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 12372, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); break; case BC_FNEW: - dasm_put(Dst, 12424, Dt1(->base), Dt1(->base), LJ_TFUNC); + dasm_put(Dst, 12427, Dt1(->base), Dt1(->base), LJ_TFUNC); break; /* -- Table ops --------------------------------------------------------- */ case BC_TNEW: - dasm_put(Dst, 12490, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 12493, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); break; case BC_TDUP: - dasm_put(Dst, 12612, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 12615, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); break; case BC_GGET: - dasm_put(Dst, 12707, Dt7(->env)); + dasm_put(Dst, 12710, Dt7(->env)); break; case BC_GSET: - dasm_put(Dst, 12726, Dt7(->env)); + dasm_put(Dst, 12729, Dt7(->env)); break; case BC_TGETV: - dasm_put(Dst, 12745, LJ_TTAB); + dasm_put(Dst, 12748, LJ_TTAB); if (LJ_DUALNUM) { - dasm_put(Dst, 12768, LJ_TISNUM); + dasm_put(Dst, 12771, LJ_TISNUM); } else { - dasm_put(Dst, 12782, LJ_TISNUM); + dasm_put(Dst, 12785, LJ_TISNUM); if (sse) { - dasm_put(Dst, 12793); + dasm_put(Dst, 12796); } else { } - dasm_put(Dst, 12814); + dasm_put(Dst, 12817); } - dasm_put(Dst, 12819, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); - dasm_put(Dst, 13012, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); + dasm_put(Dst, 13015, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13226, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETS: - dasm_put(Dst, 13360, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->nomm), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); - dasm_put(Dst, 13436, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); - dasm_put(Dst, 13524, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13363, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->nomm), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); + dasm_put(Dst, 13439, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); + dasm_put(Dst, 13527, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETB: - dasm_put(Dst, 13615, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); - dasm_put(Dst, 13709, Dt6(->metatable), Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13618, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); + dasm_put(Dst, 13712, Dt6(->metatable), Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETM: - dasm_put(Dst, 13755, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); - dasm_put(Dst, 13898, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13758, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 13901, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; /* -- Calls and vararg handling ----------------------------------------- */ case BC_CALL: case BC_CALLM: - dasm_put(Dst, 11093); + dasm_put(Dst, 11096); if (op == BC_CALLM) { - dasm_put(Dst, 13916); + dasm_put(Dst, 13919); } - dasm_put(Dst, 13921, LJ_TFUNC, Dt7(->pc)); + dasm_put(Dst, 13924, LJ_TFUNC, Dt7(->pc)); break; case BC_CALLMT: - dasm_put(Dst, 13916); + dasm_put(Dst, 13919); break; case BC_CALLT: - dasm_put(Dst, 13963, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); - dasm_put(Dst, 14078, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG); + dasm_put(Dst, 13966, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); + dasm_put(Dst, 14081, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG); break; case BC_ITERC: - dasm_put(Dst, 14149, LJ_TFUNC, 2+1, Dt7(->pc)); + dasm_put(Dst, 14152, LJ_TFUNC, 2+1, Dt7(->pc)); break; case BC_ITERN: #if LJ_HASJIT #endif - dasm_put(Dst, 14220, Dt6(->asize), Dt6(->array), LJ_TNIL); + dasm_put(Dst, 14223, Dt6(->asize), Dt6(->array), LJ_TNIL); if (LJ_DUALNUM) { - dasm_put(Dst, 10993, LJ_TISNUM); + dasm_put(Dst, 10996, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 11070); + dasm_put(Dst, 11073); } else { - dasm_put(Dst, 14266); + dasm_put(Dst, 14269); } - dasm_put(Dst, 14272); + dasm_put(Dst, 14275); if (LJ_DUALNUM) { } else if (sse) { - dasm_put(Dst, 10958); + dasm_put(Dst, 10961); } else { - dasm_put(Dst, 10970); + dasm_put(Dst, 10973); } - dasm_put(Dst, 14285, -BCBIAS_J*4); + dasm_put(Dst, 14288, -BCBIAS_J*4); if (!LJ_DUALNUM && !sse) { - dasm_put(Dst, 14337); + dasm_put(Dst, 14340); } - dasm_put(Dst, 14343, Dt6(->hmask), sizeof(Node), Dt6(->node), DtB(->val.it), LJ_TNIL, DtB(->key), DtB(->val)); + dasm_put(Dst, 14346, Dt6(->hmask), sizeof(Node), Dt6(->node), DtB(->val.it), LJ_TNIL, DtB(->key), DtB(->val)); break; case BC_ISNEXT: - dasm_put(Dst, 14415, LJ_TFUNC, LJ_TTAB, LJ_TNIL, Dt8(->ffid), FF_next_N, -BCBIAS_J*4, BC_JMP, -BCBIAS_J*4, BC_ITERC); + dasm_put(Dst, 14418, LJ_TFUNC, LJ_TTAB, LJ_TNIL, Dt8(->ffid), FF_next_N, -BCBIAS_J*4, BC_JMP, -BCBIAS_J*4, BC_ITERC); break; case BC_VARG: - dasm_put(Dst, 14515, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); - dasm_put(Dst, 14675, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 14518, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); + dasm_put(Dst, 14678, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); break; /* -- Returns ----------------------------------------------------------- */ case BC_RETM: - dasm_put(Dst, 13916); + dasm_put(Dst, 13919); break; case BC_RET: case BC_RET0: case BC_RET1: if (op != BC_RET0) { - dasm_put(Dst, 14741); + dasm_put(Dst, 14744); } - dasm_put(Dst, 14745, FRAME_TYPE); + dasm_put(Dst, 14748, FRAME_TYPE); switch (op) { case BC_RET: - dasm_put(Dst, 14764); + dasm_put(Dst, 14767); break; case BC_RET1: - dasm_put(Dst, 14816); + dasm_put(Dst, 14819); /* fallthrough */ case BC_RET0: - dasm_put(Dst, 14826); + dasm_put(Dst, 14829); default: break; } - dasm_put(Dst, 14837, Dt7(->pc), PC2PROTO(k)); + dasm_put(Dst, 14840, Dt7(->pc), PC2PROTO(k)); if (op == BC_RET) { - dasm_put(Dst, 14881, LJ_TNIL); + dasm_put(Dst, 14884, LJ_TNIL); } else { - dasm_put(Dst, 14890, LJ_TNIL); + dasm_put(Dst, 14893, LJ_TNIL); } - dasm_put(Dst, 14897, -FRAME_VARG, FRAME_TYPEP); + dasm_put(Dst, 14900, -FRAME_VARG, FRAME_TYPEP); if (op != BC_RET0) { - dasm_put(Dst, 14921); + dasm_put(Dst, 14924); } dasm_put(Dst, 4646); break; @@ -2737,7 +2746,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORL: #if LJ_HASJIT - dasm_put(Dst, 14925, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 14928, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2749,104 +2758,111 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORI: case BC_IFORL: vk = (op == BC_IFORL || op == BC_JFORL); - dasm_put(Dst, 14946); + dasm_put(Dst, 14949); if (LJ_DUALNUM) { - dasm_put(Dst, 14950, LJ_TISNUM); + dasm_put(Dst, 14953, LJ_TISNUM); if (!vk) { - dasm_put(Dst, 14960, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 14963, LJ_TISNUM, LJ_TISNUM); } else { - dasm_put(Dst, 14989); +#ifdef LUA_USE_ASSERT + dasm_put(Dst, 14992, LJ_TISNUM, LJ_TISNUM); +#endif + dasm_put(Dst, 15011); } - dasm_put(Dst, 15008, LJ_TISNUM); + dasm_put(Dst, 15030, LJ_TISNUM); if (op == BC_FORI) { - dasm_put(Dst, 15019, -BCBIAS_J*4); + dasm_put(Dst, 15041, -BCBIAS_J*4); } else if (op == BC_JFORI) { - dasm_put(Dst, 15033, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 15055, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 15051, -BCBIAS_J*4); + dasm_put(Dst, 15073, -BCBIAS_J*4); } else { - dasm_put(Dst, 15043, BC_JLOOP); + dasm_put(Dst, 15065, BC_JLOOP); } - dasm_put(Dst, 15065); + dasm_put(Dst, 15087); if (vk) { - dasm_put(Dst, 15089); + dasm_put(Dst, 15111); } - dasm_put(Dst, 15008, LJ_TISNUM); + dasm_put(Dst, 15030, LJ_TISNUM); if (op == BC_FORI) { - dasm_put(Dst, 15098); + dasm_put(Dst, 15120); } else if (op == BC_JFORI) { - dasm_put(Dst, 15103, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 15125, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 15117); + dasm_put(Dst, 15139); } else { - dasm_put(Dst, 15113, BC_JLOOP); + dasm_put(Dst, 15135, BC_JLOOP); } - dasm_put(Dst, 15122); + dasm_put(Dst, 15144); } else if (!vk) { - dasm_put(Dst, 15129, LJ_TISNUM); + dasm_put(Dst, 15151, LJ_TISNUM); } if (!vk) { - dasm_put(Dst, 15135, LJ_TISNUM); + dasm_put(Dst, 15157, LJ_TISNUM); + } else { +#ifdef LUA_USE_ASSERT + dasm_put(Dst, 15171, LJ_TISNUM, LJ_TISNUM); +#endif } - dasm_put(Dst, 15149); + dasm_put(Dst, 15190); if (!vk) { - dasm_put(Dst, 15153, LJ_TISNUM); + dasm_put(Dst, 15194, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 15162); + dasm_put(Dst, 15203); if (vk) { - dasm_put(Dst, 15174); + dasm_put(Dst, 15215); } else { - dasm_put(Dst, 15193); + dasm_put(Dst, 15234); } - dasm_put(Dst, 15198); + dasm_put(Dst, 15239); } else { - dasm_put(Dst, 15211); + dasm_put(Dst, 15252); if (vk) { - dasm_put(Dst, 15217); + dasm_put(Dst, 15258); } else { - dasm_put(Dst, 15233); + dasm_put(Dst, 15274); } - dasm_put(Dst, 15241); + dasm_put(Dst, 15282); if (cmov) { - dasm_put(Dst, 10057); + dasm_put(Dst, 10060); } else { - dasm_put(Dst, 10063); + dasm_put(Dst, 10066); } if (!cmov) { - dasm_put(Dst, 15246); + dasm_put(Dst, 15287); } } if (op == BC_FORI) { if (LJ_DUALNUM) { - dasm_put(Dst, 15252); + dasm_put(Dst, 15293); } else { - dasm_put(Dst, 15257, -BCBIAS_J*4); + dasm_put(Dst, 15298, -BCBIAS_J*4); } } else if (op == BC_JFORI) { - dasm_put(Dst, 15267, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 15308, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { if (LJ_DUALNUM) { - dasm_put(Dst, 15281); + dasm_put(Dst, 15322); } else { - dasm_put(Dst, 15286, -BCBIAS_J*4); + dasm_put(Dst, 15327, -BCBIAS_J*4); } } else { - dasm_put(Dst, 15277, BC_JLOOP); + dasm_put(Dst, 15318, BC_JLOOP); } if (LJ_DUALNUM) { - dasm_put(Dst, 9986); + dasm_put(Dst, 9989); } else { - dasm_put(Dst, 10743); + dasm_put(Dst, 10746); } if (sse) { - dasm_put(Dst, 15296); + dasm_put(Dst, 15337); } break; case BC_ITERL: #if LJ_HASJIT - dasm_put(Dst, 14925, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 14928, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2855,33 +2871,33 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IITERL: - dasm_put(Dst, 15307, LJ_TNIL); + dasm_put(Dst, 15348, LJ_TNIL); if (op == BC_JITERL) { - dasm_put(Dst, 15322, BC_JLOOP); + dasm_put(Dst, 15363, BC_JLOOP); } else { - dasm_put(Dst, 15336, -BCBIAS_J*4); + dasm_put(Dst, 15377, -BCBIAS_J*4); } - dasm_put(Dst, 10100); + dasm_put(Dst, 10103); break; case BC_LOOP: #if LJ_HASJIT - dasm_put(Dst, 14925, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 14928, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; case BC_ILOOP: - dasm_put(Dst, 10102); + dasm_put(Dst, 10105); break; case BC_JLOOP: #if LJ_HASJIT - dasm_put(Dst, 15352, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L), 9*16+4*8, -1*16, -2*16, -3*16, -4*16, -5*16, -6*16, -7*16, -8*16, -9*16); + dasm_put(Dst, 15393, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L), 9*16+4*8, -1*16, -2*16, -3*16, -4*16, -5*16, -6*16, -7*16, -8*16, -9*16); #endif break; case BC_JMP: - dasm_put(Dst, 15461, -BCBIAS_J*4); + dasm_put(Dst, 15502, -BCBIAS_J*4); break; /* -- Function headers -------------------------------------------------- */ @@ -2895,7 +2911,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FUNCF: #if LJ_HASJIT - dasm_put(Dst, 15486, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 15527, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif case BC_FUNCV: /* NYI: compiled vararg functions. */ break; @@ -2905,13 +2921,13 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IFUNCF: - dasm_put(Dst, 15507, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); + dasm_put(Dst, 15548, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); if (op == BC_JFUNCF) { - dasm_put(Dst, 15537, BC_JLOOP); + dasm_put(Dst, 15578, BC_JLOOP); } else { - dasm_put(Dst, 10102); + dasm_put(Dst, 10105); } - dasm_put(Dst, 15546, LJ_TNIL); + dasm_put(Dst, 15587, LJ_TNIL); break; case BC_JFUNCV: @@ -2922,30 +2938,30 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; /* NYI: compiled vararg functions. */ case BC_IFUNCV: - dasm_put(Dst, 15568, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); + dasm_put(Dst, 15609, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); if (op == BC_JFUNCV) { - dasm_put(Dst, 15537, BC_JLOOP); + dasm_put(Dst, 15578, BC_JLOOP); } else { - dasm_put(Dst, 15659, -4+PC2PROTO(k)); + dasm_put(Dst, 15700, -4+PC2PROTO(k)); } - dasm_put(Dst, 15682, LJ_TNIL); + dasm_put(Dst, 15723, LJ_TNIL); break; case BC_FUNCC: case BC_FUNCCW: - dasm_put(Dst, 15704, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); + dasm_put(Dst, 15745, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); if (op == BC_FUNCC) { dasm_put(Dst, 2310); } else { - dasm_put(Dst, 15734); + dasm_put(Dst, 15775); } - dasm_put(Dst, 15742, DISPATCH_GL(vmstate), ~LJ_VMST_C); + dasm_put(Dst, 15783, DISPATCH_GL(vmstate), ~LJ_VMST_C); if (op == BC_FUNCC) { - dasm_put(Dst, 15751); + dasm_put(Dst, 15792); } else { - dasm_put(Dst, 15755, DISPATCH_GL(wrapf)); + dasm_put(Dst, 15796, DISPATCH_GL(wrapf)); } - dasm_put(Dst, 15760, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 15801, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); break; /* ---------------------------------------------------------------------- */ @@ -2973,7 +2989,7 @@ static int build_backend(BuildCtx *ctx) build_subroutines(ctx, cmov, sse); - dasm_put(Dst, 15785); + dasm_put(Dst, 15826); for (op = 0; op < BC__MAX; op++) build_ins(ctx, (BCOp)op, op, cmov, sse); diff --git a/src/buildvm_x86.dasc b/src/buildvm_x86.dasc index f7631d62..17dcae2d 100644 --- a/src/buildvm_x86.dasc +++ b/src/buildvm_x86.dasc @@ -3753,6 +3753,16 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse) #endif | |//----------------------------------------------------------------------- + |//-- Assertions --------------------------------------------------------- + |//----------------------------------------------------------------------- + | + |->assert_bad_for_arg_type: +#ifdef LUA_USE_ASSERT + | int3 +#endif + | int3 + | + |//----------------------------------------------------------------------- } /* Generate the code for a single instruction. */ @@ -5534,6 +5544,10 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) | mov RB, dword FOR_IDX | cmp dword FOR_STEP, 0; jl >5 } else { +#ifdef LUA_USE_ASSERT + | cmp FOR_TSTOP, LJ_TISNUM; jne ->assert_bad_for_arg_type + | cmp FOR_TSTEP, LJ_TISNUM; jne ->assert_bad_for_arg_type +#endif | mov RB, dword FOR_STEP | test RB, RB; js >5 | add RB, dword FOR_IDX; jo >1 @@ -5593,6 +5607,11 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) if (!vk) { | jae ->vmeta_for | cmp FOR_TSTOP, LJ_TISNUM; jae ->vmeta_for + } else { +#ifdef LUA_USE_ASSERT + | cmp FOR_TSTOP, LJ_TISNUM; jae ->assert_bad_for_arg_type + | cmp FOR_TSTEP, LJ_TISNUM; jae ->assert_bad_for_arg_type +#endif } | mov RB, FOR_TSTEP // Load type/hiword of for step. if (!vk) { diff --git a/src/buildvm_x86.h b/src/buildvm_x86.h index 0ce64f41..bc2ef125 100644 --- a/src/buildvm_x86.h +++ b/src/buildvm_x86.h @@ -12,7 +12,7 @@ #define DASM_SECTION_CODE_OP 0 #define DASM_SECTION_CODE_SUB 1 #define DASM_MAXSECTION 2 -static const unsigned char build_actionlist[16904] = { +static const unsigned char build_actionlist[16945] = { 254,1,248,10,252,247,198,237,15,132,244,11,131,230,252,248,41,252,242,141, 76,49,252,248,139,114,252,252,199,68,10,4,237,248,12,131,192,1,137,68,36, 20,252,247,198,237,15,132,244,13,248,14,129,252,246,239,252,247,198,237,15, @@ -539,148 +539,148 @@ static const unsigned char build_actionlist[16904] = { 1,15,137,244,1,248,2,139,139,233,139,147,233,252,255,147,233,137,131,233, 137,147,233,128,187,233,1,15,130,244,253,15,132,244,252,221,155,233,252,233, 244,253,248,6,255,217,155,233,248,7,255,41,163,233,255,139,93,252,252,201, - 195,255,249,255,129,124,253,202,4,239,15,133,244,253,129,124,253,194,4,239, - 15,133,244,254,139,44,202,131,198,4,59,44,194,255,15,141,244,255,255,15,140, - 244,255,255,15,143,244,255,255,15,142,244,255,255,248,6,15,183,70,252,254, - 141,180,253,134,233,248,9,139,6,15,182,204,15,182,232,131,198,4,193,232,16, - 252,255,36,171,248,7,15,135,244,41,129,124,253,194,4,239,15,130,244,247,15, - 133,244,41,255,252,242,15,42,4,194,252,233,244,248,255,221,4,202,219,4,194, - 252,233,244,249,255,248,8,15,135,244,41,255,252,242,15,42,12,202,252,242, - 15,16,4,194,131,198,4,102,15,46,193,255,15,134,244,9,255,15,135,244,9,255, - 15,130,244,9,255,15,131,244,9,255,252,233,244,6,255,219,4,202,252,233,244, - 248,255,129,124,253,202,4,239,15,131,244,41,129,124,253,194,4,239,15,131, - 244,41,255,248,1,252,242,15,16,4,194,248,2,131,198,4,102,15,46,4,202,248, - 3,255,248,1,221,4,202,248,2,221,4,194,248,3,131,198,4,255,15,134,244,247, - 255,15,135,244,247,255,15,130,244,247,255,15,131,244,247,255,15,183,70,252, - 254,141,180,253,134,233,248,1,139,6,15,182,204,15,182,232,131,198,4,193,232, - 16,252,255,36,171,255,139,108,194,4,131,198,4,255,129,252,253,239,15,133, - 244,253,129,124,253,202,4,239,15,133,244,254,139,44,194,59,44,202,255,15, - 133,244,255,255,15,132,244,255,255,15,183,70,252,254,141,180,253,134,233, - 248,9,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248, - 7,15,135,244,251,129,124,253,202,4,239,15,130,244,247,15,133,244,251,255, - 252,242,15,42,4,202,255,219,4,202,255,252,233,244,248,248,8,15,135,244,251, - 255,252,242,15,42,4,194,102,15,46,4,202,255,219,4,194,221,4,202,255,252,233, - 244,250,255,129,252,253,239,15,131,244,251,129,124,253,202,4,239,15,131,244, - 251,255,248,1,252,242,15,16,4,202,248,2,102,15,46,4,194,248,4,255,248,1,221, - 4,202,248,2,221,4,194,248,4,255,15,138,244,248,15,133,244,248,255,15,138, - 244,248,15,132,244,247,255,248,1,15,183,70,252,254,141,180,253,134,233,248, - 2,255,248,2,15,183,70,252,254,141,180,253,134,233,248,1,255,252,233,244,9, - 255,248,5,255,129,252,253,239,15,132,244,46,129,124,253,202,4,239,15,132, - 244,46,255,57,108,202,4,15,133,244,2,129,252,253,239,15,131,244,1,139,12, - 202,139,4,194,57,193,15,132,244,1,129,252,253,239,15,135,244,2,139,169,233, - 133,252,237,15,132,244,2,252,246,133,233,235,15,133,244,2,255,49,252,237, - 255,189,1,0,0,0,255,252,233,244,45,255,248,3,129,252,253,239,255,15,133,244, - 9,255,252,233,244,46,255,252,247,208,139,108,202,4,131,198,4,129,252,253, - 239,15,133,244,249,139,12,202,59,12,135,255,139,108,202,4,131,198,4,255,129, - 252,253,239,15,133,244,253,129,124,253,199,4,239,15,133,244,254,139,44,199, - 59,44,202,255,15,183,70,252,254,141,180,253,134,233,248,9,139,6,15,182,204, - 15,182,232,131,198,4,193,232,16,252,255,36,171,248,7,15,135,244,249,129,124, - 253,199,4,239,15,130,244,247,255,252,242,15,42,4,199,255,219,4,199,255,252, - 233,244,248,248,8,255,252,242,15,42,4,202,102,15,46,4,199,255,219,4,202,221, - 4,199,255,129,252,253,239,15,131,244,249,255,248,1,252,242,15,16,4,199,248, - 2,102,15,46,4,202,248,4,255,248,1,221,4,199,248,2,221,4,202,248,4,255,252, - 247,208,139,108,202,4,131,198,4,57,197,255,15,133,244,249,15,183,70,252,254, - 141,180,253,134,233,248,2,139,6,15,182,204,15,182,232,131,198,4,193,232,16, - 252,255,36,171,248,3,129,252,253,239,15,133,244,2,252,233,244,46,255,15,132, - 244,248,129,252,253,239,15,132,244,46,15,183,70,252,254,141,180,253,134,233, - 248,2,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,255, - 139,108,194,4,131,198,4,129,252,253,239,255,137,108,202,4,139,44,194,137, - 44,202,255,139,108,194,4,139,4,194,137,108,202,4,137,4,202,139,6,15,182,204, - 15,182,232,131,198,4,193,232,16,252,255,36,171,255,49,252,237,129,124,253, - 194,4,239,129,213,239,137,108,202,4,139,6,15,182,204,15,182,232,131,198,4, - 193,232,16,252,255,36,171,255,129,124,253,194,4,239,15,133,244,251,139,44, - 194,252,247,221,15,128,244,250,199,68,202,4,237,137,44,202,248,9,139,6,15, - 182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,4,199,68,202,4, - 0,0,224,65,199,4,202,0,0,0,0,252,233,244,9,248,5,15,135,244,51,255,129,124, - 253,194,4,239,15,131,244,51,255,252,242,15,16,4,194,184,0,0,0,128,102,15, - 110,200,102,15,112,201,81,15,87,193,252,242,15,17,4,202,255,221,4,194,217, - 224,221,28,202,255,129,124,253,194,4,239,15,133,244,248,139,4,194,255,139, - 128,233,248,1,199,68,202,4,237,137,4,202,255,15,87,192,252,242,15,42,128, - 233,248,1,252,242,15,17,4,202,255,219,128,233,248,1,221,28,202,255,139,6, - 15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,2,129,124,253, - 194,4,239,15,133,244,54,139,12,194,137,213,232,251,1,20,255,252,242,15,42, - 192,255,137,4,36,219,4,36,255,137,252,234,15,182,78,252,253,252,233,244,1, - 255,15,182,252,236,15,182,192,255,129,124,253,252,234,4,239,15,133,244,48, - 129,124,253,199,4,239,15,133,244,48,139,44,252,234,3,44,199,15,128,244,47, - 255,129,124,253,252,234,4,239,15,133,244,50,129,124,253,199,4,239,15,133, - 244,50,139,4,199,3,4,252,234,15,128,244,49,255,129,124,253,252,234,4,239, - 15,133,244,53,129,124,253,194,4,239,15,133,244,53,139,44,252,234,3,44,194, - 15,128,244,52,255,199,68,202,4,237,255,129,124,253,252,234,4,239,15,131,244, - 48,255,129,124,253,199,4,239,15,131,244,48,255,252,242,15,16,4,252,234,252, - 242,15,88,4,199,255,221,4,252,234,220,4,199,255,129,124,253,252,234,4,239, - 15,131,244,50,255,129,124,253,199,4,239,15,131,244,50,255,252,242,15,16,4, - 199,252,242,15,88,4,252,234,255,221,4,199,220,4,252,234,255,129,124,253,252, - 234,4,239,15,131,244,53,129,124,253,194,4,239,15,131,244,53,255,252,242,15, - 16,4,252,234,252,242,15,88,4,194,255,221,4,252,234,220,4,194,255,129,124, - 253,252,234,4,239,15,133,244,48,129,124,253,199,4,239,15,133,244,48,139,44, - 252,234,43,44,199,15,128,244,47,255,129,124,253,252,234,4,239,15,133,244, - 50,129,124,253,199,4,239,15,133,244,50,139,4,199,43,4,252,234,15,128,244, - 49,255,129,124,253,252,234,4,239,15,133,244,53,129,124,253,194,4,239,15,133, - 244,53,139,44,252,234,43,44,194,15,128,244,52,255,252,242,15,16,4,252,234, - 252,242,15,92,4,199,255,221,4,252,234,220,36,199,255,252,242,15,16,4,199, - 252,242,15,92,4,252,234,255,221,4,199,220,36,252,234,255,252,242,15,16,4, - 252,234,252,242,15,92,4,194,255,221,4,252,234,220,36,194,255,129,124,253, - 252,234,4,239,15,133,244,48,129,124,253,199,4,239,15,133,244,48,139,44,252, - 234,15,175,44,199,15,128,244,47,255,129,124,253,252,234,4,239,15,133,244, - 50,129,124,253,199,4,239,15,133,244,50,139,4,199,15,175,4,252,234,15,128, - 244,49,255,129,124,253,252,234,4,239,15,133,244,53,129,124,253,194,4,239, - 15,133,244,53,139,44,252,234,15,175,44,194,15,128,244,52,255,252,242,15,16, - 4,252,234,252,242,15,89,4,199,255,221,4,252,234,220,12,199,255,252,242,15, - 16,4,199,252,242,15,89,4,252,234,255,221,4,199,220,12,252,234,255,252,242, - 15,16,4,252,234,252,242,15,89,4,194,255,221,4,252,234,220,12,194,255,252, - 242,15,16,4,252,234,252,242,15,94,4,199,255,221,4,252,234,220,52,199,255, - 252,242,15,16,4,199,252,242,15,94,4,252,234,255,221,4,199,220,52,252,234, - 255,252,242,15,16,4,252,234,252,242,15,94,4,194,255,221,4,252,234,220,52, - 194,255,252,242,15,16,4,252,234,252,242,15,16,12,199,255,221,4,252,234,221, - 4,199,255,252,242,15,16,4,199,252,242,15,16,12,252,234,255,221,4,199,221, - 4,252,234,255,252,242,15,16,4,252,234,252,242,15,16,12,194,255,221,4,252, - 234,221,4,194,255,248,162,232,244,153,255,252,233,244,162,255,232,244,113, - 255,15,182,252,236,15,182,192,141,12,194,41,232,137,76,36,4,137,68,36,8,248, - 33,139,108,36,48,137,44,36,137,149,233,137,116,36,24,232,251,1,27,139,149, - 233,133,192,15,133,244,42,15,182,110,252,255,15,182,78,252,253,139,68,252, - 234,4,139,44,252,234,137,68,202,4,137,44,202,139,6,15,182,204,15,182,232, - 131,198,4,193,232,16,252,255,36,171,255,252,247,208,139,4,135,199,68,202, - 4,237,137,4,202,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255, - 36,171,255,15,191,192,199,68,202,4,237,137,4,202,255,15,191,192,252,242,15, - 42,192,252,242,15,17,4,202,255,223,70,252,254,221,28,202,255,252,242,15,16, - 4,199,252,242,15,17,4,202,255,221,4,199,221,28,202,255,252,247,208,137,68, - 202,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,255, - 141,76,202,12,141,68,194,4,189,237,137,105,252,248,248,1,137,41,131,193,8, - 57,193,15,134,244,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, - 255,36,171,255,139,106,252,248,139,172,253,133,233,139,173,233,139,69,4,139, - 109,0,137,68,202,4,137,44,202,139,6,15,182,204,15,182,232,131,198,4,193,232, - 16,252,255,36,171,255,139,106,252,248,139,172,253,141,233,128,189,233,0,139, - 173,233,139,12,194,139,68,194,4,137,77,0,137,69,4,15,132,244,247,252,246, - 133,233,235,15,133,244,248,248,1,139,6,15,182,204,15,182,232,131,198,4,193, - 232,16,252,255,36,171,248,2,129,232,239,129,252,248,239,15,134,244,1,252, - 246,129,233,235,15,132,244,1,135,213,141,139,233,255,232,251,1,28,137,252, - 234,252,233,244,1,255,252,247,208,139,106,252,248,139,172,253,141,233,139, - 12,135,139,133,233,137,8,199,64,4,237,252,246,133,233,235,15,133,244,248, - 248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248, - 2,252,246,129,233,235,15,132,244,1,128,189,233,0,15,132,244,1,137,213,137, - 194,141,139,233,232,251,1,28,137,252,234,252,233,244,1,255,139,106,252,248, - 255,252,242,15,16,4,199,255,139,172,253,141,233,139,141,233,255,252,242,15, - 17,1,255,221,25,255,252,247,208,139,106,252,248,139,172,253,141,233,139,141, - 233,137,65,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36, - 171,255,141,180,253,134,233,139,108,36,48,131,189,233,0,15,132,244,247,137, - 149,233,141,20,202,137,252,233,232,251,1,29,139,149,233,248,1,139,6,15,182, - 204,15,182,232,131,198,4,193,232,16,252,255,36,171,255,252,247,208,139,74, - 252,248,139,4,135,139,108,36,48,137,76,36,8,137,68,36,4,137,44,36,137,149, - 233,137,116,36,24,232,251,1,30,139,149,233,15,182,78,252,253,137,4,202,199, - 68,202,4,237,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36, - 171,255,139,108,36,48,137,149,233,139,139,233,59,139,233,137,116,36,24,15, - 131,244,251,248,1,137,193,37,252,255,7,0,0,193,252,233,11,137,76,36,8,61, - 252,255,7,0,0,15,132,244,249,248,2,137,44,36,137,68,36,4,232,251,1,31,139, - 149,233,15,182,78,252,253,137,4,202,199,68,202,4,237,139,6,15,182,204,15, - 182,232,131,198,4,193,232,16,252,255,36,171,248,3,184,1,8,0,0,252,233,244, - 2,248,5,137,252,233,232,251,1,32,15,183,70,252,254,252,233,244,1,255,252, - 247,208,139,108,36,48,139,139,233,137,116,36,24,59,139,233,137,149,233,15, - 131,244,249,248,2,139,20,135,137,252,233,232,251,1,33,139,149,233,15,182, + 195,255,248,162,255,249,255,129,124,253,202,4,239,15,133,244,253,129,124, + 253,194,4,239,15,133,244,254,139,44,202,131,198,4,59,44,194,255,15,141,244, + 255,255,15,140,244,255,255,15,143,244,255,255,15,142,244,255,255,248,6,15, + 183,70,252,254,141,180,253,134,233,248,9,139,6,15,182,204,15,182,232,131, + 198,4,193,232,16,252,255,36,171,248,7,15,135,244,41,129,124,253,194,4,239, + 15,130,244,247,15,133,244,41,255,252,242,15,42,4,194,252,233,244,248,255, + 221,4,202,219,4,194,252,233,244,249,255,248,8,15,135,244,41,255,252,242,15, + 42,12,202,252,242,15,16,4,194,131,198,4,102,15,46,193,255,15,134,244,9,255, + 15,135,244,9,255,15,130,244,9,255,15,131,244,9,255,252,233,244,6,255,219, + 4,202,252,233,244,248,255,129,124,253,202,4,239,15,131,244,41,129,124,253, + 194,4,239,15,131,244,41,255,248,1,252,242,15,16,4,194,248,2,131,198,4,102, + 15,46,4,202,248,3,255,248,1,221,4,202,248,2,221,4,194,248,3,131,198,4,255, + 15,134,244,247,255,15,135,244,247,255,15,130,244,247,255,15,131,244,247,255, + 15,183,70,252,254,141,180,253,134,233,248,1,139,6,15,182,204,15,182,232,131, + 198,4,193,232,16,252,255,36,171,255,139,108,194,4,131,198,4,255,129,252,253, + 239,15,133,244,253,129,124,253,202,4,239,15,133,244,254,139,44,194,59,44, + 202,255,15,133,244,255,255,15,132,244,255,255,15,183,70,252,254,141,180,253, + 134,233,248,9,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36, + 171,248,7,15,135,244,251,129,124,253,202,4,239,15,130,244,247,15,133,244, + 251,255,252,242,15,42,4,202,255,219,4,202,255,252,233,244,248,248,8,15,135, + 244,251,255,252,242,15,42,4,194,102,15,46,4,202,255,219,4,194,221,4,202,255, + 252,233,244,250,255,129,252,253,239,15,131,244,251,129,124,253,202,4,239, + 15,131,244,251,255,248,1,252,242,15,16,4,202,248,2,102,15,46,4,194,248,4, + 255,248,1,221,4,202,248,2,221,4,194,248,4,255,15,138,244,248,15,133,244,248, + 255,15,138,244,248,15,132,244,247,255,248,1,15,183,70,252,254,141,180,253, + 134,233,248,2,255,248,2,15,183,70,252,254,141,180,253,134,233,248,1,255,252, + 233,244,9,255,248,5,255,129,252,253,239,15,132,244,46,129,124,253,202,4,239, + 15,132,244,46,255,57,108,202,4,15,133,244,2,129,252,253,239,15,131,244,1, + 139,12,202,139,4,194,57,193,15,132,244,1,129,252,253,239,15,135,244,2,139, + 169,233,133,252,237,15,132,244,2,252,246,133,233,235,15,133,244,2,255,49, + 252,237,255,189,1,0,0,0,255,252,233,244,45,255,248,3,129,252,253,239,255, + 15,133,244,9,255,252,233,244,46,255,252,247,208,139,108,202,4,131,198,4,129, + 252,253,239,15,133,244,249,139,12,202,59,12,135,255,139,108,202,4,131,198, + 4,255,129,252,253,239,15,133,244,253,129,124,253,199,4,239,15,133,244,254, + 139,44,199,59,44,202,255,15,183,70,252,254,141,180,253,134,233,248,9,139, + 6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,7,15,135, + 244,249,129,124,253,199,4,239,15,130,244,247,255,252,242,15,42,4,199,255, + 219,4,199,255,252,233,244,248,248,8,255,252,242,15,42,4,202,102,15,46,4,199, + 255,219,4,202,221,4,199,255,129,252,253,239,15,131,244,249,255,248,1,252, + 242,15,16,4,199,248,2,102,15,46,4,202,248,4,255,248,1,221,4,199,248,2,221, + 4,202,248,4,255,252,247,208,139,108,202,4,131,198,4,57,197,255,15,133,244, + 249,15,183,70,252,254,141,180,253,134,233,248,2,139,6,15,182,204,15,182,232, + 131,198,4,193,232,16,252,255,36,171,248,3,129,252,253,239,15,133,244,2,252, + 233,244,46,255,15,132,244,248,129,252,253,239,15,132,244,46,15,183,70,252, + 254,141,180,253,134,233,248,2,139,6,15,182,204,15,182,232,131,198,4,193,232, + 16,252,255,36,171,255,139,108,194,4,131,198,4,129,252,253,239,255,137,108, + 202,4,139,44,194,137,44,202,255,139,108,194,4,139,4,194,137,108,202,4,137, + 4,202,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,255, + 49,252,237,129,124,253,194,4,239,129,213,239,137,108,202,4,139,6,15,182,204, + 15,182,232,131,198,4,193,232,16,252,255,36,171,255,129,124,253,194,4,239, + 15,133,244,251,139,44,194,252,247,221,15,128,244,250,199,68,202,4,237,137, + 44,202,248,9,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36, + 171,248,4,199,68,202,4,0,0,224,65,199,4,202,0,0,0,0,252,233,244,9,248,5,15, + 135,244,51,255,129,124,253,194,4,239,15,131,244,51,255,252,242,15,16,4,194, + 184,0,0,0,128,102,15,110,200,102,15,112,201,81,15,87,193,252,242,15,17,4, + 202,255,221,4,194,217,224,221,28,202,255,129,124,253,194,4,239,15,133,244, + 248,139,4,194,255,139,128,233,248,1,199,68,202,4,237,137,4,202,255,15,87, + 192,252,242,15,42,128,233,248,1,252,242,15,17,4,202,255,219,128,233,248,1, + 221,28,202,255,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36, + 171,248,2,129,124,253,194,4,239,15,133,244,54,139,12,194,137,213,232,251, + 1,20,255,252,242,15,42,192,255,137,4,36,219,4,36,255,137,252,234,15,182,78, + 252,253,252,233,244,1,255,15,182,252,236,15,182,192,255,129,124,253,252,234, + 4,239,15,133,244,48,129,124,253,199,4,239,15,133,244,48,139,44,252,234,3, + 44,199,15,128,244,47,255,129,124,253,252,234,4,239,15,133,244,50,129,124, + 253,199,4,239,15,133,244,50,139,4,199,3,4,252,234,15,128,244,49,255,129,124, + 253,252,234,4,239,15,133,244,53,129,124,253,194,4,239,15,133,244,53,139,44, + 252,234,3,44,194,15,128,244,52,255,199,68,202,4,237,255,129,124,253,252,234, + 4,239,15,131,244,48,255,129,124,253,199,4,239,15,131,244,48,255,252,242,15, + 16,4,252,234,252,242,15,88,4,199,255,221,4,252,234,220,4,199,255,129,124, + 253,252,234,4,239,15,131,244,50,255,129,124,253,199,4,239,15,131,244,50,255, + 252,242,15,16,4,199,252,242,15,88,4,252,234,255,221,4,199,220,4,252,234,255, + 129,124,253,252,234,4,239,15,131,244,53,129,124,253,194,4,239,15,131,244, + 53,255,252,242,15,16,4,252,234,252,242,15,88,4,194,255,221,4,252,234,220, + 4,194,255,129,124,253,252,234,4,239,15,133,244,48,129,124,253,199,4,239,15, + 133,244,48,139,44,252,234,43,44,199,15,128,244,47,255,129,124,253,252,234, + 4,239,15,133,244,50,129,124,253,199,4,239,15,133,244,50,139,4,199,43,4,252, + 234,15,128,244,49,255,129,124,253,252,234,4,239,15,133,244,53,129,124,253, + 194,4,239,15,133,244,53,139,44,252,234,43,44,194,15,128,244,52,255,252,242, + 15,16,4,252,234,252,242,15,92,4,199,255,221,4,252,234,220,36,199,255,252, + 242,15,16,4,199,252,242,15,92,4,252,234,255,221,4,199,220,36,252,234,255, + 252,242,15,16,4,252,234,252,242,15,92,4,194,255,221,4,252,234,220,36,194, + 255,129,124,253,252,234,4,239,15,133,244,48,129,124,253,199,4,239,15,133, + 244,48,139,44,252,234,15,175,44,199,15,128,244,47,255,129,124,253,252,234, + 4,239,15,133,244,50,129,124,253,199,4,239,15,133,244,50,139,4,199,15,175, + 4,252,234,15,128,244,49,255,129,124,253,252,234,4,239,15,133,244,53,129,124, + 253,194,4,239,15,133,244,53,139,44,252,234,15,175,44,194,15,128,244,52,255, + 252,242,15,16,4,252,234,252,242,15,89,4,199,255,221,4,252,234,220,12,199, + 255,252,242,15,16,4,199,252,242,15,89,4,252,234,255,221,4,199,220,12,252, + 234,255,252,242,15,16,4,252,234,252,242,15,89,4,194,255,221,4,252,234,220, + 12,194,255,252,242,15,16,4,252,234,252,242,15,94,4,199,255,221,4,252,234, + 220,52,199,255,252,242,15,16,4,199,252,242,15,94,4,252,234,255,221,4,199, + 220,52,252,234,255,252,242,15,16,4,252,234,252,242,15,94,4,194,255,221,4, + 252,234,220,52,194,255,252,242,15,16,4,252,234,252,242,15,16,12,199,255,221, + 4,252,234,221,4,199,255,252,242,15,16,4,199,252,242,15,16,12,252,234,255, + 221,4,199,221,4,252,234,255,252,242,15,16,4,252,234,252,242,15,16,12,194, + 255,221,4,252,234,221,4,194,255,248,163,232,244,153,255,252,233,244,163,255, + 232,244,113,255,15,182,252,236,15,182,192,141,12,194,41,232,137,76,36,4,137, + 68,36,8,248,33,139,108,36,48,137,44,36,137,149,233,137,116,36,24,232,251, + 1,27,139,149,233,133,192,15,133,244,42,15,182,110,252,255,15,182,78,252,253, + 139,68,252,234,4,139,44,252,234,137,68,202,4,137,44,202,139,6,15,182,204, + 15,182,232,131,198,4,193,232,16,252,255,36,171,255,252,247,208,139,4,135, + 199,68,202,4,237,137,4,202,139,6,15,182,204,15,182,232,131,198,4,193,232, + 16,252,255,36,171,255,15,191,192,199,68,202,4,237,137,4,202,255,15,191,192, + 252,242,15,42,192,252,242,15,17,4,202,255,223,70,252,254,221,28,202,255,252, + 242,15,16,4,199,252,242,15,17,4,202,255,221,4,199,221,28,202,255,252,247, + 208,137,68,202,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255, + 36,171,255,141,76,202,12,141,68,194,4,189,237,137,105,252,248,248,1,137,41, + 131,193,8,57,193,15,134,244,1,139,6,15,182,204,15,182,232,131,198,4,193,232, + 16,252,255,36,171,255,139,106,252,248,139,172,253,133,233,139,173,233,139, + 69,4,139,109,0,137,68,202,4,137,44,202,139,6,15,182,204,15,182,232,131,198, + 4,193,232,16,252,255,36,171,255,139,106,252,248,139,172,253,141,233,128,189, + 233,0,139,173,233,139,12,194,139,68,194,4,137,77,0,137,69,4,15,132,244,247, + 252,246,133,233,235,15,133,244,248,248,1,139,6,15,182,204,15,182,232,131, + 198,4,193,232,16,252,255,36,171,248,2,129,232,239,129,252,248,239,15,134, + 244,1,252,246,129,233,235,15,132,244,1,135,213,141,139,233,255,232,251,1, + 28,137,252,234,252,233,244,1,255,252,247,208,139,106,252,248,139,172,253, + 141,233,139,12,135,139,133,233,137,8,199,64,4,237,252,246,133,233,235,15, + 133,244,248,248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255, + 36,171,248,2,252,246,129,233,235,15,132,244,1,128,189,233,0,15,132,244,1, + 137,213,137,194,141,139,233,232,251,1,28,137,252,234,252,233,244,1,255,139, + 106,252,248,255,252,242,15,16,4,199,255,139,172,253,141,233,139,141,233,255, + 252,242,15,17,1,255,221,25,255,252,247,208,139,106,252,248,139,172,253,141, + 233,139,141,233,137,65,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16, + 252,255,36,171,255,141,180,253,134,233,139,108,36,48,131,189,233,0,15,132, + 244,247,137,149,233,141,20,202,137,252,233,232,251,1,29,139,149,233,248,1, + 139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,255,252,247, + 208,139,74,252,248,139,4,135,139,108,36,48,137,76,36,8,137,68,36,4,137,44, + 36,137,149,233,137,116,36,24,232,251,1,30,139,149,233,15,182,78,252,253,137, + 4,202,199,68,202,4,237,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, + 255,36,171,255,139,108,36,48,137,149,233,139,139,233,59,139,233,137,116,36, + 24,15,131,244,251,248,1,137,193,37,252,255,7,0,0,193,252,233,11,137,76,36, + 8,61,252,255,7,0,0,15,132,244,249,248,2,137,44,36,137,68,36,4,232,251,1,31, + 139,149,233,15,182,78,252,253,137,4,202,199,68,202,4,237,139,6,15,182,204, + 15,182,232,131,198,4,193,232,16,252,255,36,171,248,3,184,1,8,0,0,252,233, + 244,2,248,5,137,252,233,232,251,1,32,15,183,70,252,254,252,233,244,1,255, + 252,247,208,139,108,36,48,139,139,233,137,116,36,24,59,139,233,137,149,233, + 15,131,244,249,248,2,139,20,135,137,252,233,232,251,1,33,139,149,233,15,182, 78,252,253,137,4,202,199,68,202,4,237,139,6,15,182,204,15,182,232,131,198, 4,193,232,16,252,255,36,171,248,3,137,252,233,232,251,1,32,15,183,70,252, 254,252,247,208,252,233,244,2,255,252,247,208,139,106,252,248,139,173,233, - 139,4,135,252,233,244,163,255,252,247,208,139,106,252,248,139,173,233,139, - 4,135,252,233,244,164,255,15,182,252,236,15,182,192,129,124,253,252,234,4, + 139,4,135,252,233,244,164,255,252,247,208,139,106,252,248,139,173,233,139, + 4,135,252,233,244,165,255,15,182,252,236,15,182,192,129,124,253,252,234,4, 239,15,133,244,36,139,44,252,234,255,129,124,253,194,4,239,15,133,244,251, 139,4,194,255,129,124,253,194,4,239,15,131,244,251,255,252,242,15,16,4,194, 252,242,15,45,192,252,242,15,42,200,102,15,46,193,255,221,4,194,219,20,36, @@ -689,9 +689,9 @@ static const unsigned char build_actionlist[16904] = { 248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248, 2,131,189,233,0,15,132,244,249,139,141,233,252,246,129,233,235,15,132,244, 36,15,182,78,252,253,248,3,199,68,202,4,237,252,233,244,1,248,5,255,129,124, - 253,194,4,239,15,133,244,36,139,4,194,252,233,244,163,255,15,182,252,236, + 253,194,4,239,15,133,244,36,139,4,194,252,233,244,164,255,15,182,252,236, 15,182,192,252,247,208,139,4,135,129,124,253,252,234,4,239,15,133,244,34, - 139,44,252,234,248,163,139,141,233,35,136,233,105,201,239,3,141,233,248,1, + 139,44,252,234,248,164,139,141,233,35,136,233,105,201,239,3,141,233,248,1, 129,185,233,239,15,133,244,250,57,129,233,15,133,244,250,129,121,253,4,239, 15,132,244,251,15,182,70,252,253,139,41,139,73,4,137,44,194,137,76,194,4, 248,2,255,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171, @@ -709,10 +709,10 @@ static const unsigned char build_actionlist[16904] = { 248,2,139,108,202,4,139,12,202,137,104,4,137,8,139,6,15,182,204,15,182,232, 131,198,4,193,232,16,252,255,36,171,248,3,131,189,233,0,15,132,244,1,139, 141,233,252,246,129,233,235,255,15,132,244,39,15,182,78,252,253,252,233,244, - 1,248,5,129,124,253,194,4,239,15,133,244,39,139,4,194,252,233,244,164,248, + 1,248,5,129,124,253,194,4,239,15,133,244,39,139,4,194,252,233,244,165,248, 7,128,165,233,235,139,139,233,137,171,233,137,141,233,15,182,78,252,253,252, 233,244,2,255,15,182,252,236,15,182,192,252,247,208,139,4,135,129,124,253, - 252,234,4,239,15,133,244,37,139,44,252,234,248,164,139,141,233,35,136,233, + 252,234,4,239,15,133,244,37,139,44,252,234,248,165,139,141,233,35,136,233, 105,201,239,198,133,233,0,3,141,233,248,1,129,185,233,239,15,133,244,251, 57,129,233,15,133,244,251,129,121,253,4,239,15,132,244,250,248,2,255,252, 246,133,233,235,15,133,244,253,248,3,15,182,70,252,253,139,108,194,4,139, @@ -793,31 +793,33 @@ static const unsigned char build_actionlist[16904] = { 137,252,245,209,252,237,129,229,239,102,131,172,253,43,233,1,15,132,244,145, 255,141,12,202,255,129,121,253,4,239,15,133,244,255,255,129,121,253,12,239, 15,133,244,57,129,121,253,20,239,15,133,244,57,139,41,131,121,16,0,15,140, - 244,251,255,139,105,16,133,252,237,15,136,244,251,3,41,15,128,244,247,137, - 41,255,59,105,8,199,65,28,237,137,105,24,255,15,142,244,253,248,1,248,6,141, + 244,251,255,129,121,253,12,239,15,133,244,162,129,121,253,20,239,15,133,244, + 162,255,139,105,16,133,252,237,15,136,244,251,3,41,15,128,244,247,137,41, + 255,59,105,8,199,65,28,237,137,105,24,255,15,142,244,253,248,1,248,6,141, 180,253,134,233,255,141,180,253,134,233,15,183,70,252,254,15,142,245,248, 1,248,6,255,15,143,244,253,248,6,141,180,253,134,233,248,1,255,248,7,139, 6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,5,255,3,41, 15,128,244,1,137,41,255,15,141,244,7,255,141,180,253,134,233,15,183,70,252, 254,15,141,245,255,15,140,244,7,255,252,233,244,6,248,9,255,129,121,253,4, - 239,255,15,131,244,57,129,121,253,12,239,15,131,244,57,255,139,105,20,255, - 129,252,253,239,15,131,244,57,255,252,242,15,16,1,252,242,15,16,73,8,255, - 252,242,15,88,65,16,252,242,15,17,1,133,252,237,15,136,244,249,255,15,140, - 244,249,255,102,15,46,200,248,1,252,242,15,17,65,24,255,221,65,8,221,1,255, - 220,65,16,221,17,221,81,24,133,252,237,15,136,244,247,255,221,81,24,15,140, - 244,247,255,217,201,248,1,255,15,183,70,252,254,255,15,131,244,7,255,15,131, - 244,248,141,180,253,134,233,255,141,180,253,134,233,15,183,70,252,254,15, - 131,245,255,15,130,244,7,255,15,130,244,248,141,180,253,134,233,255,248,3, - 102,15,46,193,252,233,244,1,255,141,12,202,139,105,4,129,252,253,239,15,132, - 244,247,255,137,105,252,252,139,41,137,105,252,248,252,233,245,255,141,180, - 253,134,233,139,1,137,105,252,252,137,65,252,248,255,139,139,233,139,4,129, - 139,128,233,139,108,36,48,137,147,233,137,171,233,252,255,224,255,141,180, - 253,134,233,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171, - 255,137,252,245,209,252,237,129,229,239,102,131,172,253,43,233,1,15,132,244, - 147,255,139,190,233,139,108,36,48,141,12,202,59,141,233,15,135,244,23,15, - 182,142,233,57,200,15,134,244,249,248,2,255,15,183,70,252,254,252,233,245, - 255,248,3,199,68,194,252,252,237,131,192,1,57,200,15,134,244,3,252,233,244, - 2,255,141,44,197,237,141,4,194,139,122,252,248,137,104,252,252,137,120,252, + 239,255,15,131,244,57,129,121,253,12,239,15,131,244,57,255,129,121,253,12, + 239,15,131,244,162,129,121,253,20,239,15,131,244,162,255,139,105,20,255,129, + 252,253,239,15,131,244,57,255,252,242,15,16,1,252,242,15,16,73,8,255,252, + 242,15,88,65,16,252,242,15,17,1,133,252,237,15,136,244,249,255,15,140,244, + 249,255,102,15,46,200,248,1,252,242,15,17,65,24,255,221,65,8,221,1,255,220, + 65,16,221,17,221,81,24,133,252,237,15,136,244,247,255,221,81,24,15,140,244, + 247,255,217,201,248,1,255,15,183,70,252,254,255,15,131,244,7,255,15,131,244, + 248,141,180,253,134,233,255,141,180,253,134,233,15,183,70,252,254,15,131, + 245,255,15,130,244,7,255,15,130,244,248,141,180,253,134,233,255,248,3,102, + 15,46,193,252,233,244,1,255,141,12,202,139,105,4,129,252,253,239,15,132,244, + 247,255,137,105,252,252,139,41,137,105,252,248,252,233,245,255,141,180,253, + 134,233,139,1,137,105,252,252,137,65,252,248,255,139,139,233,139,4,129,139, + 128,233,139,108,36,48,137,147,233,137,171,233,252,255,224,255,141,180,253, + 134,233,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,255, + 137,252,245,209,252,237,129,229,239,102,131,172,253,43,233,1,15,132,244,147, + 255,139,190,233,139,108,36,48,141,12,202,59,141,233,15,135,244,23,15,182, + 142,233,57,200,15,134,244,249,248,2,255,15,183,70,252,254,252,233,245,255, + 248,3,199,68,194,252,252,237,131,192,1,57,200,15,134,244,3,252,233,244,2, + 255,141,44,197,237,141,4,194,139,122,252,248,137,104,252,252,137,120,252, 248,139,108,36,48,141,12,200,59,141,233,15,135,244,22,137,209,137,194,15, 182,174,233,133,252,237,15,132,244,248,248,1,131,193,8,57,209,15,131,244, 249,139,121,252,248,137,56,139,121,252,252,137,120,4,131,192,8,199,65,252, @@ -983,6 +985,7 @@ enum { GLOB_vm_foldarith, GLOB_vm_cpuid, GLOB_vm_ffi_call, + GLOB_assert_bad_for_arg_type, GLOB_BC_MODVN_Z, GLOB_BC_TGETS_Z, GLOB_BC_TSETS_Z, @@ -1141,6 +1144,7 @@ static const char *const globnames[] = { "vm_foldarith", "vm_cpuid", "vm_ffi_call@4", + "assert_bad_for_arg_type", "BC_MODVN_Z", "BC_TGETS_Z", "BC_TSETS_Z", @@ -1961,13 +1965,18 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse) #endif dasm_put(Dst, 10916); #endif + dasm_put(Dst, 10923); +#ifdef LUA_USE_ASSERT + dasm_put(Dst, 10303); +#endif + dasm_put(Dst, 10303); } /* Generate the code for a single instruction. */ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) { int vk = 0; - dasm_put(Dst, 10923, defop); + dasm_put(Dst, 10926, defop); switch (op) { @@ -1978,57 +1987,57 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_ISLT: case BC_ISGE: case BC_ISLE: case BC_ISGT: if (LJ_DUALNUM) { - dasm_put(Dst, 10925, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10928, LJ_TISNUM, LJ_TISNUM); switch (op) { case BC_ISLT: - dasm_put(Dst, 10955); + dasm_put(Dst, 10958); break; case BC_ISGE: - dasm_put(Dst, 10960); + dasm_put(Dst, 10963); break; case BC_ISLE: - dasm_put(Dst, 10965); + dasm_put(Dst, 10968); break; case BC_ISGT: - dasm_put(Dst, 10970); + dasm_put(Dst, 10973); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 10975, -BCBIAS_J*4, LJ_TISNUM); + dasm_put(Dst, 10978, -BCBIAS_J*4, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11028); + dasm_put(Dst, 11031); } else { - dasm_put(Dst, 11039); + dasm_put(Dst, 11042); } - dasm_put(Dst, 11050); + dasm_put(Dst, 11053); if (sse) { - dasm_put(Dst, 11057); + dasm_put(Dst, 11060); switch (op) { case BC_ISLT: - dasm_put(Dst, 11077); + dasm_put(Dst, 11080); break; case BC_ISGE: - dasm_put(Dst, 11082); + dasm_put(Dst, 11085); break; case BC_ISLE: - dasm_put(Dst, 11087); + dasm_put(Dst, 11090); break; case BC_ISGT: - dasm_put(Dst, 11092); + dasm_put(Dst, 11095); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 11097); + dasm_put(Dst, 11100); } else { - dasm_put(Dst, 11102); + dasm_put(Dst, 11105); } } else { - dasm_put(Dst, 11110, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11113, LJ_TISNUM, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11131); + dasm_put(Dst, 11134); } else { - dasm_put(Dst, 11152); + dasm_put(Dst, 11155); if (cmov) { dasm_put(Dst, 3899); } else { @@ -2038,70 +2047,70 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) if (LJ_DUALNUM) { switch (op) { case BC_ISLT: - dasm_put(Dst, 11077); + dasm_put(Dst, 11080); break; case BC_ISGE: - dasm_put(Dst, 11082); + dasm_put(Dst, 11085); break; case BC_ISLE: - dasm_put(Dst, 11087); + dasm_put(Dst, 11090); break; case BC_ISGT: - dasm_put(Dst, 11092); + dasm_put(Dst, 11095); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 11097); + dasm_put(Dst, 11100); } else { switch (op) { case BC_ISLT: - dasm_put(Dst, 11168); + dasm_put(Dst, 11171); break; case BC_ISGE: - dasm_put(Dst, 11173); + dasm_put(Dst, 11176); break; case BC_ISLE: - dasm_put(Dst, 11178); + dasm_put(Dst, 11181); break; case BC_ISGT: - dasm_put(Dst, 11183); + dasm_put(Dst, 11186); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 11188, -BCBIAS_J*4); + dasm_put(Dst, 11191, -BCBIAS_J*4); } break; case BC_ISEQV: case BC_ISNEV: vk = op == BC_ISEQV; - dasm_put(Dst, 11219); + dasm_put(Dst, 11222); if (LJ_DUALNUM) { - dasm_put(Dst, 11227, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11230, LJ_TISNUM, LJ_TISNUM); if (vk) { - dasm_put(Dst, 11252); + dasm_put(Dst, 11255); } else { - dasm_put(Dst, 11257); + dasm_put(Dst, 11260); } - dasm_put(Dst, 11262, -BCBIAS_J*4, LJ_TISNUM); + dasm_put(Dst, 11265, -BCBIAS_J*4, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11313); + dasm_put(Dst, 11316); } else { - dasm_put(Dst, 11320); + dasm_put(Dst, 11323); } - dasm_put(Dst, 11324); + dasm_put(Dst, 11327); if (sse) { - dasm_put(Dst, 11335); + dasm_put(Dst, 11338); } else { - dasm_put(Dst, 11347); + dasm_put(Dst, 11350); } - dasm_put(Dst, 11354); + dasm_put(Dst, 11357); } else { - dasm_put(Dst, 11359, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11362, LJ_TISNUM, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11378); + dasm_put(Dst, 11381); } else { - dasm_put(Dst, 11396); + dasm_put(Dst, 11399); if (cmov) { dasm_put(Dst, 3899); } else { @@ -2110,13 +2119,13 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) } iseqne_fp: if (vk) { - dasm_put(Dst, 11409); + dasm_put(Dst, 11412); } else { - dasm_put(Dst, 11418); + dasm_put(Dst, 11421); } iseqne_end: if (vk) { - dasm_put(Dst, 11427, -BCBIAS_J*4); + dasm_put(Dst, 11430, -BCBIAS_J*4); if (!LJ_HASFFI) { dasm_put(Dst, 4799); } @@ -2124,76 +2133,76 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) if (!LJ_HASFFI) { dasm_put(Dst, 4799); } - dasm_put(Dst, 11442, -BCBIAS_J*4); + dasm_put(Dst, 11445, -BCBIAS_J*4); } if (LJ_DUALNUM && (op == BC_ISEQV || op == BC_ISNEV || op == BC_ISEQN || op == BC_ISNEN)) { - dasm_put(Dst, 11457); + dasm_put(Dst, 11460); } else { - dasm_put(Dst, 11200); + dasm_put(Dst, 11203); } if (op == BC_ISEQV || op == BC_ISNEV) { - dasm_put(Dst, 11462); + dasm_put(Dst, 11465); if (LJ_HASFFI) { - dasm_put(Dst, 11465, LJ_TCDATA, LJ_TCDATA); + dasm_put(Dst, 11468, LJ_TCDATA, LJ_TCDATA); } - dasm_put(Dst, 11484, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<metatable), Dt6(->nomm), 1<len), LJ_TISNUM); + dasm_put(Dst, 12093, Dt5(->len), LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 12104, Dt5(->len)); + dasm_put(Dst, 12107, Dt5(->len)); } else { - dasm_put(Dst, 12122, Dt5(->len)); + dasm_put(Dst, 12125, Dt5(->len)); } - dasm_put(Dst, 12131, LJ_TTAB); + dasm_put(Dst, 12134, LJ_TTAB); if (LJ_DUALNUM) { } else if (sse) { - dasm_put(Dst, 12171); + dasm_put(Dst, 12174); } else { - dasm_put(Dst, 12177); + dasm_put(Dst, 12180); } - dasm_put(Dst, 12184); + dasm_put(Dst, 12187); break; /* -- Binary ops -------------------------------------------------------- */ @@ -2276,471 +2285,471 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_ADDVN: case BC_ADDNV: case BC_ADDVV: if (LJ_DUALNUM) { - dasm_put(Dst, 12197); + dasm_put(Dst, 12200); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 12205, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 12208, LJ_TISNUM, LJ_TISNUM); break; case 1: - dasm_put(Dst, 12238, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 12241, LJ_TISNUM, LJ_TISNUM); break; default: - dasm_put(Dst, 12271, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 12274, LJ_TISNUM, LJ_TISNUM); break; } - dasm_put(Dst, 12304, LJ_TISNUM); + dasm_put(Dst, 12307, LJ_TISNUM); if (vk == 1) { - dasm_put(Dst, 12100); + dasm_put(Dst, 12103); } else { - dasm_put(Dst, 11878); + dasm_put(Dst, 11881); } - dasm_put(Dst, 11200); + dasm_put(Dst, 11203); } else { - dasm_put(Dst, 12197); + dasm_put(Dst, 12200); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 12310, LJ_TISNUM); + dasm_put(Dst, 12313, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 12322, LJ_TISNUM); + dasm_put(Dst, 12325, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 12333); + dasm_put(Dst, 12336); } else { - dasm_put(Dst, 12347); + dasm_put(Dst, 12350); } break; case 1: - dasm_put(Dst, 12355, LJ_TISNUM); + dasm_put(Dst, 12358, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 12367, LJ_TISNUM); + dasm_put(Dst, 12370, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 12378); + dasm_put(Dst, 12381); } else { - dasm_put(Dst, 12392); + dasm_put(Dst, 12395); } break; default: - dasm_put(Dst, 12400, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 12403, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 12422); + dasm_put(Dst, 12425); } else { - dasm_put(Dst, 12436); + dasm_put(Dst, 12439); } break; } if (sse) { - dasm_put(Dst, 12060); + dasm_put(Dst, 12063); } else { - dasm_put(Dst, 12072); + dasm_put(Dst, 12075); } - dasm_put(Dst, 11200); + dasm_put(Dst, 11203); } break; case BC_SUBVN: case BC_SUBNV: case BC_SUBVV: if (LJ_DUALNUM) { - dasm_put(Dst, 12197); + dasm_put(Dst, 12200); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 12444, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 12447, LJ_TISNUM, LJ_TISNUM); break; case 1: - dasm_put(Dst, 12477, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 12480, LJ_TISNUM, LJ_TISNUM); break; default: - dasm_put(Dst, 12510, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 12513, LJ_TISNUM, LJ_TISNUM); break; } - dasm_put(Dst, 12304, LJ_TISNUM); + dasm_put(Dst, 12307, LJ_TISNUM); if (vk == 1) { - dasm_put(Dst, 12100); + dasm_put(Dst, 12103); } else { - dasm_put(Dst, 11878); + dasm_put(Dst, 11881); } - dasm_put(Dst, 11200); + dasm_put(Dst, 11203); } else { - dasm_put(Dst, 12197); + dasm_put(Dst, 12200); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 12310, LJ_TISNUM); + dasm_put(Dst, 12313, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 12322, LJ_TISNUM); + dasm_put(Dst, 12325, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 12543); + dasm_put(Dst, 12546); } else { - dasm_put(Dst, 12557); + dasm_put(Dst, 12560); } break; case 1: - dasm_put(Dst, 12355, LJ_TISNUM); + dasm_put(Dst, 12358, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 12367, LJ_TISNUM); + dasm_put(Dst, 12370, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 12565); + dasm_put(Dst, 12568); } else { - dasm_put(Dst, 12579); + dasm_put(Dst, 12582); } break; default: - dasm_put(Dst, 12400, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 12403, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 12587); + dasm_put(Dst, 12590); } else { - dasm_put(Dst, 12601); + dasm_put(Dst, 12604); } break; } if (sse) { - dasm_put(Dst, 12060); + dasm_put(Dst, 12063); } else { - dasm_put(Dst, 12072); + dasm_put(Dst, 12075); } - dasm_put(Dst, 11200); + dasm_put(Dst, 11203); } break; case BC_MULVN: case BC_MULNV: case BC_MULVV: if (LJ_DUALNUM) { - dasm_put(Dst, 12197); + dasm_put(Dst, 12200); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 12609, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 12612, LJ_TISNUM, LJ_TISNUM); break; case 1: - dasm_put(Dst, 12643, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 12646, LJ_TISNUM, LJ_TISNUM); break; default: - dasm_put(Dst, 12677, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 12680, LJ_TISNUM, LJ_TISNUM); break; } - dasm_put(Dst, 12304, LJ_TISNUM); + dasm_put(Dst, 12307, LJ_TISNUM); if (vk == 1) { - dasm_put(Dst, 12100); + dasm_put(Dst, 12103); } else { - dasm_put(Dst, 11878); + dasm_put(Dst, 11881); } - dasm_put(Dst, 11200); + dasm_put(Dst, 11203); } else { - dasm_put(Dst, 12197); + dasm_put(Dst, 12200); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 12310, LJ_TISNUM); + dasm_put(Dst, 12313, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 12322, LJ_TISNUM); + dasm_put(Dst, 12325, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 12711); + dasm_put(Dst, 12714); } else { - dasm_put(Dst, 12725); + dasm_put(Dst, 12728); } break; case 1: - dasm_put(Dst, 12355, LJ_TISNUM); + dasm_put(Dst, 12358, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 12367, LJ_TISNUM); + dasm_put(Dst, 12370, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 12733); + dasm_put(Dst, 12736); } else { - dasm_put(Dst, 12747); + dasm_put(Dst, 12750); } break; default: - dasm_put(Dst, 12400, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 12403, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 12755); + dasm_put(Dst, 12758); } else { - dasm_put(Dst, 12769); + dasm_put(Dst, 12772); } break; } if (sse) { - dasm_put(Dst, 12060); + dasm_put(Dst, 12063); } else { - dasm_put(Dst, 12072); + dasm_put(Dst, 12075); } - dasm_put(Dst, 11200); + dasm_put(Dst, 11203); } break; case BC_DIVVN: case BC_DIVNV: case BC_DIVVV: - dasm_put(Dst, 12197); + dasm_put(Dst, 12200); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 12310, LJ_TISNUM); + dasm_put(Dst, 12313, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 12322, LJ_TISNUM); + dasm_put(Dst, 12325, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 12777); + dasm_put(Dst, 12780); } else { - dasm_put(Dst, 12791); + dasm_put(Dst, 12794); } break; case 1: - dasm_put(Dst, 12355, LJ_TISNUM); + dasm_put(Dst, 12358, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 12367, LJ_TISNUM); + dasm_put(Dst, 12370, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 12799); + dasm_put(Dst, 12802); } else { - dasm_put(Dst, 12813); + dasm_put(Dst, 12816); } break; default: - dasm_put(Dst, 12400, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 12403, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 12821); + dasm_put(Dst, 12824); } else { - dasm_put(Dst, 12835); + dasm_put(Dst, 12838); } break; } if (sse) { - dasm_put(Dst, 12060); + dasm_put(Dst, 12063); } else { - dasm_put(Dst, 12072); + dasm_put(Dst, 12075); } - dasm_put(Dst, 11200); + dasm_put(Dst, 11203); break; case BC_MODVN: - dasm_put(Dst, 12197); + dasm_put(Dst, 12200); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 12310, LJ_TISNUM); + dasm_put(Dst, 12313, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 12322, LJ_TISNUM); + dasm_put(Dst, 12325, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 12843); + dasm_put(Dst, 12846); } else { - dasm_put(Dst, 12857); + dasm_put(Dst, 12860); } break; case 1: - dasm_put(Dst, 12355, LJ_TISNUM); + dasm_put(Dst, 12358, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 12367, LJ_TISNUM); + dasm_put(Dst, 12370, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 12865); + dasm_put(Dst, 12868); } else { - dasm_put(Dst, 12879); + dasm_put(Dst, 12882); } break; default: - dasm_put(Dst, 12400, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 12403, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 12887); + dasm_put(Dst, 12890); } else { - dasm_put(Dst, 12901); + dasm_put(Dst, 12904); } break; } - dasm_put(Dst, 12909); + dasm_put(Dst, 12912); if (sse) { - dasm_put(Dst, 12060); + dasm_put(Dst, 12063); } else { - dasm_put(Dst, 12072); + dasm_put(Dst, 12075); } - dasm_put(Dst, 11200); + dasm_put(Dst, 11203); break; case BC_MODNV: case BC_MODVV: - dasm_put(Dst, 12197); + dasm_put(Dst, 12200); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 12310, LJ_TISNUM); + dasm_put(Dst, 12313, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 12322, LJ_TISNUM); + dasm_put(Dst, 12325, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 12843); + dasm_put(Dst, 12846); } else { - dasm_put(Dst, 12857); + dasm_put(Dst, 12860); } break; case 1: - dasm_put(Dst, 12355, LJ_TISNUM); + dasm_put(Dst, 12358, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 12367, LJ_TISNUM); + dasm_put(Dst, 12370, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 12865); + dasm_put(Dst, 12868); } else { - dasm_put(Dst, 12879); + dasm_put(Dst, 12882); } break; default: - dasm_put(Dst, 12400, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 12403, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 12887); + dasm_put(Dst, 12890); } else { - dasm_put(Dst, 12901); + dasm_put(Dst, 12904); } break; } - dasm_put(Dst, 12915); + dasm_put(Dst, 12918); break; case BC_POW: - dasm_put(Dst, 12197); + dasm_put(Dst, 12200); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 12310, LJ_TISNUM); + dasm_put(Dst, 12313, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 12322, LJ_TISNUM); + dasm_put(Dst, 12325, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 12843); + dasm_put(Dst, 12846); } else { - dasm_put(Dst, 12857); + dasm_put(Dst, 12860); } break; case 1: - dasm_put(Dst, 12355, LJ_TISNUM); + dasm_put(Dst, 12358, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 12367, LJ_TISNUM); + dasm_put(Dst, 12370, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 12865); + dasm_put(Dst, 12868); } else { - dasm_put(Dst, 12879); + dasm_put(Dst, 12882); } break; default: - dasm_put(Dst, 12400, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 12403, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 12887); + dasm_put(Dst, 12890); } else { - dasm_put(Dst, 12901); + dasm_put(Dst, 12904); } break; } - dasm_put(Dst, 12920); + dasm_put(Dst, 12923); if (sse) { - dasm_put(Dst, 12060); + dasm_put(Dst, 12063); } else { - dasm_put(Dst, 12072); + dasm_put(Dst, 12075); } - dasm_put(Dst, 11200); + dasm_put(Dst, 11203); break; case BC_CAT: - dasm_put(Dst, 12924, Dt1(->base), Dt1(->base)); + dasm_put(Dst, 12927, Dt1(->base), Dt1(->base)); break; /* -- Constant ops ------------------------------------------------------ */ case BC_KSTR: - dasm_put(Dst, 13018, LJ_TSTR); + dasm_put(Dst, 13021, LJ_TSTR); break; case BC_KCDATA: #if LJ_HASFFI - dasm_put(Dst, 13018, LJ_TCDATA); + dasm_put(Dst, 13021, LJ_TCDATA); #endif break; case BC_KSHORT: if (LJ_DUALNUM) { - dasm_put(Dst, 13051, LJ_TISNUM); + dasm_put(Dst, 13054, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 13063); + dasm_put(Dst, 13066); } else { - dasm_put(Dst, 13078); + dasm_put(Dst, 13081); } - dasm_put(Dst, 11200); + dasm_put(Dst, 11203); break; case BC_KNUM: if (sse) { - dasm_put(Dst, 13086); + dasm_put(Dst, 13089); } else { - dasm_put(Dst, 13099); + dasm_put(Dst, 13102); } - dasm_put(Dst, 11200); + dasm_put(Dst, 11203); break; case BC_KPRI: - dasm_put(Dst, 13106); + dasm_put(Dst, 13109); break; case BC_KNIL: - dasm_put(Dst, 13132, LJ_TNIL); + dasm_put(Dst, 13135, LJ_TNIL); break; /* -- Upvalue and function ops ------------------------------------------ */ case BC_UGET: - dasm_put(Dst, 13178, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 13181, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_USETV: #define TV2MARKOFS \ ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv)) - dasm_put(Dst, 13222, 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); - dasm_put(Dst, 13312); + dasm_put(Dst, 13225, 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); + dasm_put(Dst, 13315); break; #undef TV2MARKOFS case BC_USETS: - dasm_put(Dst, 13324, offsetof(GCfuncL, uvptr), DtA(->v), LJ_TSTR, DtA(->marked), LJ_GC_BLACK, Dt4(->gch.marked), LJ_GC_WHITES, DtA(->closed), GG_DISP2G); + dasm_put(Dst, 13327, offsetof(GCfuncL, uvptr), DtA(->v), LJ_TSTR, DtA(->marked), LJ_GC_BLACK, Dt4(->gch.marked), LJ_GC_WHITES, DtA(->closed), GG_DISP2G); break; case BC_USETN: - dasm_put(Dst, 13415); + dasm_put(Dst, 13418); if (sse) { - dasm_put(Dst, 13420); + dasm_put(Dst, 13423); } else { - dasm_put(Dst, 11710); + dasm_put(Dst, 11713); } - dasm_put(Dst, 13427, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 13430, offsetof(GCfuncL, uvptr), DtA(->v)); if (sse) { - dasm_put(Dst, 13436); + dasm_put(Dst, 13439); } else { - dasm_put(Dst, 13442); + dasm_put(Dst, 13445); } - dasm_put(Dst, 11200); + dasm_put(Dst, 11203); break; case BC_USETP: - dasm_put(Dst, 13445, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 13448, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_UCLO: - dasm_put(Dst, 13482, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 13485, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); break; case BC_FNEW: - dasm_put(Dst, 13536, Dt1(->base), Dt1(->base), LJ_TFUNC); + dasm_put(Dst, 13539, Dt1(->base), Dt1(->base), LJ_TFUNC); break; /* -- Table ops --------------------------------------------------------- */ case BC_TNEW: - dasm_put(Dst, 13607, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 13610, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); break; case BC_TDUP: - dasm_put(Dst, 13733, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 13736, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); break; case BC_GGET: - dasm_put(Dst, 13825, Dt7(->env)); + dasm_put(Dst, 13828, Dt7(->env)); break; case BC_GSET: - dasm_put(Dst, 13843, Dt7(->env)); + dasm_put(Dst, 13846, Dt7(->env)); break; case BC_TGETV: - dasm_put(Dst, 13861, LJ_TTAB); + dasm_put(Dst, 13864, LJ_TTAB); if (LJ_DUALNUM) { - dasm_put(Dst, 13884, LJ_TISNUM); + dasm_put(Dst, 13887, LJ_TISNUM); } else { - dasm_put(Dst, 13898, LJ_TISNUM); + dasm_put(Dst, 13901, LJ_TISNUM); if (sse) { - dasm_put(Dst, 13909); + dasm_put(Dst, 13912); } else { - dasm_put(Dst, 13930); + dasm_put(Dst, 13933); if (cmov) { dasm_put(Dst, 3899); } else { @@ -2748,30 +2757,30 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) } dasm_put(Dst, 2635); } - dasm_put(Dst, 13940); + dasm_put(Dst, 13943); } - dasm_put(Dst, 13945, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); - dasm_put(Dst, 14146, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); + dasm_put(Dst, 14149, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 14363, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETS: - dasm_put(Dst, 14501, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->nomm), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); - dasm_put(Dst, 14576, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); - dasm_put(Dst, 14668, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 14504, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->nomm), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); + dasm_put(Dst, 14579, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); + dasm_put(Dst, 14671, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETB: - dasm_put(Dst, 14764, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); - dasm_put(Dst, 14862, Dt6(->metatable), Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 14767, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); + dasm_put(Dst, 14865, Dt6(->metatable), Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETM: - dasm_put(Dst, 14908, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); - dasm_put(Dst, 15057, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 14911, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 15060, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; /* -- Calls and vararg handling ----------------------------------------- */ case BC_CALL: case BC_CALLM: - dasm_put(Dst, 12201); + dasm_put(Dst, 12204); if (op == BC_CALLM) { - dasm_put(Dst, 15075); + dasm_put(Dst, 15078); } - dasm_put(Dst, 15080, LJ_TFUNC, Dt7(->pc)); + dasm_put(Dst, 15083, LJ_TFUNC, Dt7(->pc)); break; case BC_CALLMT: - dasm_put(Dst, 15075); + dasm_put(Dst, 15078); break; case BC_CALLT: - dasm_put(Dst, 15121, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); - dasm_put(Dst, 15239, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG); + dasm_put(Dst, 15124, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); + dasm_put(Dst, 15242, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG); break; case BC_ITERC: - dasm_put(Dst, 15309, LJ_TFUNC, 2+1, Dt7(->pc)); + dasm_put(Dst, 15312, LJ_TFUNC, 2+1, Dt7(->pc)); break; case BC_ITERN: #if LJ_HASJIT #endif - dasm_put(Dst, 15389, Dt6(->asize), Dt6(->array), LJ_TNIL); + dasm_put(Dst, 15392, Dt6(->asize), Dt6(->array), LJ_TNIL); if (LJ_DUALNUM) { - dasm_put(Dst, 12095, LJ_TISNUM); + dasm_put(Dst, 12098, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 12171); + dasm_put(Dst, 12174); } else { - dasm_put(Dst, 15435); + dasm_put(Dst, 15438); } - dasm_put(Dst, 15441); + dasm_put(Dst, 15444); if (LJ_DUALNUM) { } else if (sse) { - dasm_put(Dst, 12060); + dasm_put(Dst, 12063); } else { - dasm_put(Dst, 12072); + dasm_put(Dst, 12075); } - dasm_put(Dst, 15460, -BCBIAS_J*4); + dasm_put(Dst, 15463, -BCBIAS_J*4); if (!LJ_DUALNUM && !sse) { - dasm_put(Dst, 15511); + dasm_put(Dst, 15514); } - dasm_put(Dst, 15517, Dt6(->hmask), sizeof(Node), Dt6(->node), DtB(->val.it), LJ_TNIL, DtB(->key.gcr), DtB(->key.it), DtB(->val.gcr), DtB(->val.it)); - dasm_put(Dst, 15592); + dasm_put(Dst, 15520, Dt6(->hmask), sizeof(Node), Dt6(->node), DtB(->val.it), LJ_TNIL, DtB(->key.gcr), DtB(->key.it), DtB(->val.gcr), DtB(->val.it)); + dasm_put(Dst, 15595); break; case BC_ISNEXT: - dasm_put(Dst, 15600, LJ_TFUNC, LJ_TTAB, LJ_TNIL, Dt8(->ffid), FF_next_N, -BCBIAS_J*4, BC_JMP, -BCBIAS_J*4, BC_ITERC); + dasm_put(Dst, 15603, LJ_TFUNC, LJ_TTAB, LJ_TNIL, Dt8(->ffid), FF_next_N, -BCBIAS_J*4, BC_JMP, -BCBIAS_J*4, BC_ITERC); break; case BC_VARG: - dasm_put(Dst, 15699, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); - dasm_put(Dst, 15863, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 15702, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); + dasm_put(Dst, 15866, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); break; /* -- Returns ----------------------------------------------------------- */ case BC_RETM: - dasm_put(Dst, 15075); + dasm_put(Dst, 15078); break; case BC_RET: case BC_RET0: case BC_RET1: if (op != BC_RET0) { - dasm_put(Dst, 15934); + dasm_put(Dst, 15937); } - dasm_put(Dst, 15938, FRAME_TYPE); + dasm_put(Dst, 15941, FRAME_TYPE); switch (op) { case BC_RET: - dasm_put(Dst, 15957); + dasm_put(Dst, 15960); break; case BC_RET1: - dasm_put(Dst, 16015); + dasm_put(Dst, 16018); /* fallthrough */ case BC_RET0: - dasm_put(Dst, 16031); + dasm_put(Dst, 16034); default: break; } - dasm_put(Dst, 16042, Dt7(->pc), PC2PROTO(k)); + dasm_put(Dst, 16045, Dt7(->pc), PC2PROTO(k)); if (op == BC_RET) { - dasm_put(Dst, 16084, LJ_TNIL); + dasm_put(Dst, 16087, LJ_TNIL); } else { - dasm_put(Dst, 16093, LJ_TNIL); + dasm_put(Dst, 16096, LJ_TNIL); } - dasm_put(Dst, 16100, -FRAME_VARG, FRAME_TYPEP); + dasm_put(Dst, 16103, -FRAME_VARG, FRAME_TYPEP); if (op != BC_RET0) { - dasm_put(Dst, 16124); + dasm_put(Dst, 16127); } dasm_put(Dst, 4883); break; @@ -2897,7 +2906,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORL: #if LJ_HASJIT - dasm_put(Dst, 16128, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 16131, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2909,104 +2918,111 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORI: case BC_IFORL: vk = (op == BC_IFORL || op == BC_JFORL); - dasm_put(Dst, 16149); + dasm_put(Dst, 16152); if (LJ_DUALNUM) { - dasm_put(Dst, 16153, LJ_TISNUM); + dasm_put(Dst, 16156, LJ_TISNUM); if (!vk) { - dasm_put(Dst, 16163, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 16166, LJ_TISNUM, LJ_TISNUM); } else { - dasm_put(Dst, 16192); +#ifdef LUA_USE_ASSERT + dasm_put(Dst, 16195, LJ_TISNUM, LJ_TISNUM); +#endif + dasm_put(Dst, 16214); } - dasm_put(Dst, 16211, LJ_TISNUM); + dasm_put(Dst, 16233, LJ_TISNUM); if (op == BC_FORI) { - dasm_put(Dst, 16222, -BCBIAS_J*4); + dasm_put(Dst, 16244, -BCBIAS_J*4); } else if (op == BC_JFORI) { - dasm_put(Dst, 16236, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 16258, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 16254, -BCBIAS_J*4); + dasm_put(Dst, 16276, -BCBIAS_J*4); } else { - dasm_put(Dst, 16246, BC_JLOOP); + dasm_put(Dst, 16268, BC_JLOOP); } - dasm_put(Dst, 16268); + dasm_put(Dst, 16290); if (vk) { - dasm_put(Dst, 16291); + dasm_put(Dst, 16313); } - dasm_put(Dst, 16211, LJ_TISNUM); + dasm_put(Dst, 16233, LJ_TISNUM); if (op == BC_FORI) { - dasm_put(Dst, 16300); + dasm_put(Dst, 16322); } else if (op == BC_JFORI) { - dasm_put(Dst, 16305, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 16327, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 16319); + dasm_put(Dst, 16341); } else { - dasm_put(Dst, 16315, BC_JLOOP); + dasm_put(Dst, 16337, BC_JLOOP); } - dasm_put(Dst, 16324); + dasm_put(Dst, 16346); } else if (!vk) { - dasm_put(Dst, 16331, LJ_TISNUM); + dasm_put(Dst, 16353, LJ_TISNUM); } if (!vk) { - dasm_put(Dst, 16337, LJ_TISNUM); + dasm_put(Dst, 16359, LJ_TISNUM); + } else { +#ifdef LUA_USE_ASSERT + dasm_put(Dst, 16373, LJ_TISNUM, LJ_TISNUM); +#endif } - dasm_put(Dst, 16351); + dasm_put(Dst, 16392); if (!vk) { - dasm_put(Dst, 16355, LJ_TISNUM); + dasm_put(Dst, 16396, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 16364); + dasm_put(Dst, 16405); if (vk) { - dasm_put(Dst, 16376); + dasm_put(Dst, 16417); } else { - dasm_put(Dst, 16395); + dasm_put(Dst, 16436); } - dasm_put(Dst, 16400); + dasm_put(Dst, 16441); } else { - dasm_put(Dst, 16413); + dasm_put(Dst, 16454); if (vk) { - dasm_put(Dst, 16419); + dasm_put(Dst, 16460); } else { - dasm_put(Dst, 16435); + dasm_put(Dst, 16476); } - dasm_put(Dst, 16443); + dasm_put(Dst, 16484); if (cmov) { dasm_put(Dst, 3899); } else { dasm_put(Dst, 3905); } if (!cmov) { - dasm_put(Dst, 16448); + dasm_put(Dst, 16489); } } if (op == BC_FORI) { if (LJ_DUALNUM) { - dasm_put(Dst, 16454); + dasm_put(Dst, 16495); } else { - dasm_put(Dst, 16459, -BCBIAS_J*4); + dasm_put(Dst, 16500, -BCBIAS_J*4); } } else if (op == BC_JFORI) { - dasm_put(Dst, 16469, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 16510, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { if (LJ_DUALNUM) { - dasm_put(Dst, 16483); + dasm_put(Dst, 16524); } else { - dasm_put(Dst, 16488, -BCBIAS_J*4); + dasm_put(Dst, 16529, -BCBIAS_J*4); } } else { - dasm_put(Dst, 16479, BC_JLOOP); + dasm_put(Dst, 16520, BC_JLOOP); } if (LJ_DUALNUM) { - dasm_put(Dst, 11097); + dasm_put(Dst, 11100); } else { - dasm_put(Dst, 11838); + dasm_put(Dst, 11841); } if (sse) { - dasm_put(Dst, 16498); + dasm_put(Dst, 16539); } break; case BC_ITERL: #if LJ_HASJIT - dasm_put(Dst, 16128, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 16131, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -3015,33 +3031,33 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IITERL: - dasm_put(Dst, 16509, LJ_TNIL); + dasm_put(Dst, 16550, LJ_TNIL); if (op == BC_JITERL) { - dasm_put(Dst, 16524, BC_JLOOP); + dasm_put(Dst, 16565, BC_JLOOP); } else { - dasm_put(Dst, 16538, -BCBIAS_J*4); + dasm_put(Dst, 16579, -BCBIAS_J*4); } - dasm_put(Dst, 11198); + dasm_put(Dst, 11201); break; case BC_LOOP: #if LJ_HASJIT - dasm_put(Dst, 16128, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 16131, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; case BC_ILOOP: - dasm_put(Dst, 11200); + dasm_put(Dst, 11203); break; case BC_JLOOP: #if LJ_HASJIT - dasm_put(Dst, 16554, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); + dasm_put(Dst, 16595, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); #endif break; case BC_JMP: - dasm_put(Dst, 16577, -BCBIAS_J*4); + dasm_put(Dst, 16618, -BCBIAS_J*4); break; /* -- Function headers -------------------------------------------------- */ @@ -3055,7 +3071,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FUNCF: #if LJ_HASJIT - dasm_put(Dst, 16601, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 16642, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif case BC_FUNCV: /* NYI: compiled vararg functions. */ break; @@ -3065,13 +3081,13 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IFUNCF: - dasm_put(Dst, 16622, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); + dasm_put(Dst, 16663, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); if (op == BC_JFUNCF) { - dasm_put(Dst, 16652, BC_JLOOP); + dasm_put(Dst, 16693, BC_JLOOP); } else { - dasm_put(Dst, 11200); + dasm_put(Dst, 11203); } - dasm_put(Dst, 16661, LJ_TNIL); + dasm_put(Dst, 16702, LJ_TNIL); break; case BC_JFUNCV: @@ -3082,30 +3098,30 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; /* NYI: compiled vararg functions. */ case BC_IFUNCV: - dasm_put(Dst, 16683, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); + dasm_put(Dst, 16724, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); if (op == BC_JFUNCV) { - dasm_put(Dst, 16652, BC_JLOOP); + dasm_put(Dst, 16693, BC_JLOOP); } else { - dasm_put(Dst, 16774, -4+PC2PROTO(k)); + dasm_put(Dst, 16815, -4+PC2PROTO(k)); } - dasm_put(Dst, 16796, LJ_TNIL); + dasm_put(Dst, 16837, LJ_TNIL); break; case BC_FUNCC: case BC_FUNCCW: - dasm_put(Dst, 16818, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); + dasm_put(Dst, 16859, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); if (op == BC_FUNCC) { - dasm_put(Dst, 16847); + dasm_put(Dst, 16888); } else { - dasm_put(Dst, 16851); + dasm_put(Dst, 16892); } - dasm_put(Dst, 16859, DISPATCH_GL(vmstate), ~LJ_VMST_C); + dasm_put(Dst, 16900, DISPATCH_GL(vmstate), ~LJ_VMST_C); if (op == BC_FUNCC) { - dasm_put(Dst, 16868); + dasm_put(Dst, 16909); } else { - dasm_put(Dst, 16872, DISPATCH_GL(wrapf)); + dasm_put(Dst, 16913, DISPATCH_GL(wrapf)); } - dasm_put(Dst, 16877, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 16918, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); break; /* ---------------------------------------------------------------------- */ @@ -3133,7 +3149,7 @@ static int build_backend(BuildCtx *ctx) build_subroutines(ctx, cmov, sse); - dasm_put(Dst, 16902); + dasm_put(Dst, 16943); for (op = 0; op < BC__MAX; op++) build_ins(ctx, (BCOp)op, op, cmov, sse);