diff --git a/src/buildvm_x64.h b/src/buildvm_x64.h index ca235221..927ecc6b 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[15975] = { +static const unsigned char build_actionlist[15992] = { 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, @@ -112,368 +112,368 @@ static const unsigned char build_actionlist[15975] = { 233,239,15,133,244,250,57,129,233,15,132,244,251,248,4,139,137,233,133,201, 15,133,244,3,255,252,233,244,63,248,5,139,105,4,129,252,253,239,15,132,244, 63,139,1,137,106,252,252,137,66,252,248,252,233,244,63,248,6,129,252,253, - 239,15,132,244,1,129,252,253,239,15,135,244,253,189,237,248,7,252,247,213, - 65,139,172,253,174,233,252,233,244,2,248,65,255,129,252,248,239,15,130,244, - 60,129,122,253,4,239,15,133,244,60,139,42,131,189,233,0,15,133,244,60,129, - 122,253,12,239,15,133,244,60,139,66,8,137,133,233,139,90,252,252,199,66,252, - 252,237,137,106,252,248,252,246,133,233,235,15,132,244,247,128,165,233,235, - 255,65,139,134,233,65,137,174,233,137,133,233,248,1,252,233,244,63,248,66, - 129,252,248,239,15,130,244,60,129,122,253,4,239,15,133,244,60,137,213,139, - 50,141,82,8,139,124,36,24,232,251,1,11,137,252,234,72,139,40,139,90,252,252, - 72,137,106,252,248,252,233,244,63,248,67,129,252,248,239,15,133,244,60,129, - 122,253,4,239,255,15,133,244,247,139,42,252,233,244,68,248,1,15,135,244,60, - 255,15,131,244,60,255,252,242,15,16,2,252,233,244,69,255,221,2,252,233,244, - 70,255,248,71,129,252,248,239,15,130,244,60,139,90,252,252,129,122,253,4, - 239,15,133,244,249,139,2,248,2,199,66,252,252,237,137,66,252,248,252,233, - 244,63,248,3,129,122,253,4,239,15,135,244,60,65,131,190,233,0,15,133,244, - 60,65,139,174,233,65,59,174,233,255,15,130,244,247,232,244,72,248,1,139,108, - 36,24,137,149,233,137,92,36,28,137,214,137,252,239,255,232,251,1,12,255,232, - 251,1,13,255,139,149,233,252,233,244,2,248,73,129,252,248,239,15,130,244, - 60,15,132,244,248,248,1,129,122,253,4,239,15,133,244,60,139,108,36,24,137, - 149,233,137,149,233,139,90,252,252,139,50,141,82,8,137,252,239,137,92,36, - 28,232,251,1,14,139,149,233,133,192,15,132,244,249,72,139,106,8,72,139,66, - 16,72,137,106,252,248,72,137,2,248,74,184,237,255,252,233,244,75,248,2,199, - 66,12,237,252,233,244,1,248,3,199,66,252,252,237,252,233,244,63,248,76,129, - 252,248,239,15,130,244,60,139,42,129,122,253,4,239,15,133,244,60,255,131, - 189,233,0,15,133,244,60,255,139,106,252,248,139,133,233,139,90,252,252,199, - 66,252,252,237,137,66,252,248,199,66,12,237,184,237,252,233,244,75,248,77, - 129,252,248,239,15,130,244,60,129,122,253,4,239,15,133,244,60,129,122,253, - 12,239,255,139,90,252,252,255,139,66,8,131,192,1,199,66,252,252,237,137,66, - 252,248,255,252,242,15,16,66,8,72,189,237,237,102,72,15,110,205,252,242,15, - 88,193,252,242,15,45,192,252,242,15,17,66,252,248,255,139,42,59,133,233,15, - 131,244,248,193,224,3,3,133,233,248,1,129,120,253,4,239,15,132,244,78,72, - 139,40,72,137,42,252,233,244,74,248,2,131,189,233,0,15,132,244,78,137,252, - 239,137,213,137,198,232,251,1,15,137,252,234,133,192,15,133,244,1,248,78, - 184,237,252,233,244,75,248,79,255,139,106,252,248,139,133,233,139,90,252, - 252,199,66,252,252,237,137,66,252,248,255,199,66,12,237,199,66,8,0,0,0,0, - 255,15,87,192,252,242,15,17,66,8,255,217,252,238,221,90,8,255,184,237,252, - 233,244,75,248,80,129,252,248,239,15,130,244,60,141,74,8,131,232,1,187,237, - 248,1,65,15,182,174,233,193,252,237,235,131,229,1,1,252,235,252,233,244,28, - 248,81,129,252,248,239,15,130,244,60,129,122,253,12,239,15,133,244,60,255, - 139,106,4,137,106,12,199,66,4,237,139,42,139,90,8,137,106,8,137,26,141,74, - 16,131,232,2,187,237,252,233,244,1,248,82,129,252,248,239,15,130,244,60,139, - 42,139,90,252,252,137,92,36,28,137,44,36,129,122,253,4,239,15,133,244,60, - 72,131,189,233,0,15,133,244,60,128,189,233,235,15,135,244,60,139,141,233, - 15,132,244,247,255,59,141,233,15,132,244,60,248,1,141,92,193,252,240,59,157, - 233,15,135,244,60,137,157,233,139,108,36,24,137,149,233,131,194,8,137,149, - 233,141,108,194,232,72,41,221,57,203,15,132,244,249,248,2,72,139,4,43,72, - 137,67,252,248,131,252,235,8,57,203,15,133,244,2,248,3,137,206,139,60,36, - 232,244,25,65,199,134,233,237,255,139,108,36,24,139,28,36,139,149,233,129, - 252,248,239,15,135,244,254,248,4,139,139,233,68,139,187,233,137,139,233,68, - 137,252,251,41,203,15,132,244,252,141,4,26,193,252,235,3,59,133,233,15,135, - 244,255,137,213,72,41,205,248,5,72,139,1,72,137,4,41,131,193,8,68,57,252, - 249,15,133,244,5,248,6,141,67,2,199,66,252,252,237,248,7,139,92,36,28,137, - 68,36,4,72,199,193,252,248,252,255,252,255,252,255,252,247,195,237,255,15, - 132,244,13,252,233,244,14,248,8,199,66,252,252,237,139,139,233,131,252,233, - 8,137,139,233,72,139,1,72,137,2,184,237,252,233,244,7,248,9,139,12,36,68, - 137,185,233,137,222,137,252,239,232,251,1,0,139,28,36,139,149,233,252,233, - 244,4,248,83,139,106,252,248,139,173,233,139,90,252,252,137,92,36,28,137, - 44,36,72,131,189,233,0,15,133,244,60,255,128,189,233,235,15,135,244,60,139, - 141,233,15,132,244,247,59,141,233,15,132,244,60,248,1,141,92,193,252,248, - 59,157,233,15,135,244,60,137,157,233,139,108,36,24,137,149,233,137,149,233, - 141,108,194,252,240,72,41,221,57,203,15,132,244,249,248,2,255,72,139,4,43, - 72,137,67,252,248,131,252,235,8,57,203,15,133,244,2,248,3,137,206,139,60, - 36,232,244,25,65,199,134,233,237,139,108,36,24,139,28,36,139,149,233,129, - 252,248,239,15,135,244,254,248,4,139,139,233,68,139,187,233,137,139,233,68, - 137,252,251,41,203,15,132,244,252,141,4,26,193,252,235,3,59,133,233,15,135, - 244,255,255,137,213,72,41,205,248,5,72,139,1,72,137,4,41,131,193,8,68,57, - 252,249,15,133,244,5,248,6,141,67,1,248,7,139,92,36,28,137,68,36,4,49,201, - 252,247,195,237,15,132,244,13,252,233,244,14,248,8,137,222,137,252,239,232, - 251,1,16,248,9,139,12,36,68,137,185,233,137,222,137,252,239,232,251,1,0,139, - 28,36,139,149,233,252,233,244,4,248,84,139,108,36,24,72,252,247,133,233,237, - 15,132,244,60,255,137,149,233,141,68,194,252,248,137,133,233,49,192,72,137, - 133,233,176,235,136,133,233,252,233,244,16,255,248,68,255,248,70,139,90,252, - 252,221,90,252,248,252,233,244,63,255,248,85,129,252,248,239,15,130,244,60, - 255,129,122,253,4,239,15,133,244,248,139,42,131,252,253,0,15,137,244,68,252, - 247,221,15,136,244,247,248,86,248,68,139,90,252,252,199,66,252,252,237,137, - 106,252,248,252,233,244,63,248,1,139,90,252,252,199,66,252,252,0,0,224,65, - 199,66,252,248,0,0,0,0,252,233,244,63,248,2,15,135,244,60,255,129,122,253, - 4,239,15,131,244,60,255,252,242,15,16,2,72,184,237,237,102,72,15,110,200, - 15,84,193,248,69,139,90,252,252,252,242,15,17,66,252,248,255,221,2,217,225, - 248,69,248,70,139,90,252,252,221,90,252,248,255,248,63,184,237,248,75,137, - 68,36,4,248,61,252,247,195,237,15,133,244,253,248,5,56,67,252,255,15,135, - 244,252,15,182,75,252,253,72,252,247,209,141,20,202,139,3,15,182,204,15,182, - 232,131,195,4,193,232,16,65,252,255,36,252,238,248,6,199,68,194,252,244,237, - 131,192,1,252,233,244,5,248,7,72,199,193,252,248,252,255,252,255,252,255, - 252,233,244,14,248,87,255,129,122,253,4,239,15,133,244,247,139,42,252,233, - 244,68,248,1,15,135,244,60,255,252,242,15,16,2,232,244,88,255,252,242,15, - 45,232,129,252,253,0,0,0,128,15,133,244,68,252,242,15,42,205,102,15,46,193, - 15,138,244,69,15,132,244,68,255,221,2,232,244,88,255,248,89,255,252,242,15, - 16,2,232,244,90,255,221,2,232,244,90,255,248,91,129,252,248,239,15,130,244, - 60,129,122,253,4,239,15,131,244,60,252,242,15,81,2,252,233,244,69,255,248, - 91,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131,244,60,221,2,217, - 252,250,252,233,244,70,255,248,92,129,252,248,239,15,130,244,60,129,122,253, - 4,239,15,131,244,60,217,252,237,221,2,217,252,241,252,233,244,70,248,93,129, - 252,248,239,15,130,244,60,129,122,253,4,239,15,131,244,60,217,252,236,221, - 2,217,252,241,252,233,244,70,248,94,129,252,248,239,255,15,130,244,60,129, - 122,253,4,239,15,131,244,60,221,2,232,244,95,252,233,244,70,248,96,129,252, - 248,239,15,130,244,60,129,122,253,4,239,15,131,244,60,221,2,217,252,254,252, - 233,244,70,248,97,129,252,248,239,255,15,130,244,60,129,122,253,4,239,15, - 131,244,60,221,2,217,252,255,252,233,244,70,248,98,129,252,248,239,15,130, - 244,60,129,122,253,4,239,15,131,244,60,221,2,217,252,242,221,216,252,233, - 244,70,248,99,129,252,248,239,15,130,244,60,255,129,122,253,4,239,15,131, - 244,60,221,2,217,192,216,200,217,232,222,225,217,252,250,217,252,243,252, - 233,244,70,248,100,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131, - 244,60,221,2,217,192,216,200,217,232,222,225,217,252,250,217,201,217,252, - 243,252,233,244,70,248,101,129,252,248,239,15,130,244,60,129,122,253,4,239, - 15,131,244,60,255,221,2,217,232,217,252,243,252,233,244,70,255,248,102,129, - 252,248,239,15,130,244,60,129,122,253,4,239,15,131,244,60,252,242,15,16,2, - 255,137,213,232,251,1,17,137,252,234,252,233,244,69,255,248,103,129,252,248, - 239,15,130,244,60,129,122,253,4,239,15,131,244,60,252,242,15,16,2,255,137, - 213,232,251,1,18,137,252,234,252,233,244,69,255,248,104,129,252,248,239,15, - 130,244,60,129,122,253,4,239,15,131,244,60,252,242,15,16,2,255,137,213,232, - 251,1,19,137,252,234,252,233,244,69,248,105,255,248,106,129,252,248,239,15, - 130,244,60,129,122,253,4,239,15,131,244,60,252,242,15,16,2,139,106,252,248, - 252,242,15,89,133,233,252,233,244,69,255,248,106,129,252,248,239,15,130,244, - 60,129,122,253,4,239,15,131,244,60,221,2,139,106,252,248,220,141,233,252, - 233,244,70,255,248,107,129,252,248,239,15,130,244,60,129,122,253,4,239,15, - 131,244,60,129,122,253,12,239,15,131,244,60,221,2,221,66,8,217,252,243,252, - 233,244,70,248,108,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131, - 244,60,129,122,253,12,239,255,15,131,244,60,221,66,8,221,2,217,252,253,221, - 217,252,233,244,70,248,109,129,252,248,239,15,130,244,60,139,106,4,129,252, - 253,239,15,131,244,60,139,90,252,252,139,2,137,106,252,252,137,66,252,248, - 209,229,129,252,253,0,0,224,252,255,15,131,244,249,9,232,15,132,244,249,184, - 252,254,3,0,0,129,252,253,0,0,32,0,15,130,244,250,248,1,193,252,237,21,41, - 197,255,252,242,15,42,197,255,137,44,36,219,4,36,255,139,106,252,252,129, - 229,252,255,252,255,15,128,129,205,0,0,224,63,137,106,252,252,248,2,255,252, - 242,15,17,2,255,221,26,255,184,237,252,233,244,75,248,3,255,15,87,192,252, - 233,244,2,255,217,252,238,252,233,244,2,255,248,4,255,252,242,15,16,2,72, - 189,237,237,102,72,15,110,205,252,242,15,89,193,252,242,15,17,66,252,248, - 255,221,2,199,4,36,0,0,128,90,216,12,36,221,90,252,248,255,139,106,252,252, - 184,52,4,0,0,209,229,252,233,244,1,255,248,110,129,252,248,239,15,130,244, - 60,129,122,253,4,239,15,131,244,60,252,242,15,16,2,255,248,110,129,252,248, - 239,15,130,244,60,129,122,253,4,239,15,131,244,60,221,2,255,139,106,4,139, - 90,252,252,209,229,129,252,253,0,0,224,252,255,15,132,244,250,255,15,40,224, - 232,244,111,252,242,15,92,224,248,1,252,242,15,17,66,252,248,252,242,15,17, - 34,255,217,192,232,244,111,220,252,233,248,1,221,90,252,248,221,26,255,139, - 66,252,252,139,106,4,49,232,15,136,244,249,248,2,184,237,252,233,244,75,248, - 3,129,252,245,0,0,0,128,137,106,4,252,233,244,2,248,4,255,15,87,228,252,233, - 244,1,255,217,252,238,217,201,252,233,244,1,255,248,112,129,252,248,239,15, - 130,244,60,129,122,253,4,239,15,131,244,60,129,122,253,12,239,15,131,244, - 60,221,66,8,221,2,248,1,217,252,248,223,224,158,15,138,244,1,221,217,252, - 233,244,70,255,248,113,129,252,248,239,15,130,244,60,129,122,253,4,239,15, - 131,244,60,129,122,253,12,239,15,131,244,60,252,242,15,16,2,252,242,15,16, - 74,8,232,244,114,252,233,244,69,255,248,113,129,252,248,239,15,130,244,60, - 129,122,253,4,239,15,131,244,60,129,122,253,12,239,15,131,244,60,221,2,221, - 66,8,232,244,114,252,233,244,70,255,248,115,185,2,0,0,0,129,122,253,4,239, - 255,15,133,244,250,139,42,248,1,57,193,15,131,244,68,129,124,253,202,252, - 252,239,15,133,244,249,59,108,202,252,248,15,79,108,202,252,248,131,193,1, - 252,233,244,1,248,3,15,135,244,60,255,252,233,244,252,248,4,15,135,244,60, - 255,252,242,15,16,2,248,5,57,193,15,131,244,69,129,124,253,202,252,252,239, - 255,15,130,244,252,15,135,244,60,252,242,15,42,76,202,252,248,252,233,244, - 253,255,248,6,252,242,15,16,76,202,252,248,248,7,252,242,15,93,193,131,193, - 1,252,233,244,5,255,248,116,185,2,0,0,0,129,122,253,4,239,255,15,133,244, - 250,139,42,248,1,57,193,15,131,244,68,129,124,253,202,252,252,239,15,133, - 244,249,59,108,202,252,248,15,76,108,202,252,248,131,193,1,252,233,244,1, - 248,3,15,135,244,60,255,248,6,252,242,15,16,76,202,252,248,248,7,252,242, - 15,95,193,131,193,1,252,233,244,5,255,248,9,221,216,252,233,244,60,255,248, - 117,129,252,248,239,15,130,244,60,129,122,253,4,239,15,133,244,60,139,42, - 255,139,173,233,252,233,244,68,255,252,242,15,42,133,233,252,233,244,69,255, - 219,133,233,252,233,244,70,255,248,118,129,252,248,239,15,133,244,60,129, - 122,253,4,239,15,133,244,60,139,42,139,90,252,252,131,189,233,1,15,130,244, - 78,15,182,173,233,255,252,242,15,42,197,252,233,244,69,255,137,44,36,219, - 4,36,252,233,244,70,255,248,119,65,139,174,233,65,59,174,233,15,130,244,247, - 232,244,72,248,1,129,252,248,239,15,133,244,60,129,122,253,4,239,255,15,133, - 244,60,139,42,129,252,253,252,255,0,0,0,15,135,244,60,137,108,36,4,255,15, - 131,244,60,252,242,15,44,42,129,252,253,252,255,0,0,0,15,135,244,60,137,108, - 36,4,255,15,131,244,60,221,2,219,92,36,4,129,124,36,4,252,255,0,0,0,15,135, - 244,60,255,199,68,36,8,1,0,0,0,72,141,68,36,4,248,120,139,108,36,24,137,149, - 233,139,84,36,8,72,137,198,137,252,239,137,92,36,28,232,251,1,20,139,149, - 233,139,90,252,252,199,66,252,252,237,137,66,252,248,252,233,244,63,248,121, - 65,139,174,233,65,59,174,233,15,130,244,247,232,244,72,248,1,199,68,36,4, - 252,255,252,255,252,255,252,255,129,252,248,239,15,130,244,60,15,134,244, - 247,129,122,253,20,239,255,15,133,244,60,139,106,16,137,108,36,4,255,15,131, - 244,60,252,242,15,44,106,16,137,108,36,4,255,15,131,244,60,221,66,16,219, - 92,36,4,255,248,1,129,122,253,4,239,15,133,244,60,129,122,253,12,239,255, - 139,42,137,108,36,8,139,173,233,255,139,74,8,255,252,242,15,44,74,8,255,139, - 68,36,4,57,197,15,130,244,251,248,2,133,201,15,142,244,253,248,3,139,108, - 36,8,41,200,15,140,244,122,141,172,253,13,233,131,192,1,248,4,137,68,36,8, - 137,232,252,233,244,120,248,5,15,140,244,252,141,68,40,1,252,233,244,2,248, - 6,137,232,252,233,244,2,248,7,255,15,132,244,254,1,252,233,131,193,1,15,143, - 244,3,248,8,185,1,0,0,0,252,233,244,3,248,122,49,192,252,233,244,4,248,123, - 129,252,248,239,15,130,244,60,65,139,174,233,65,59,174,233,15,130,244,247, - 232,244,72,248,1,255,129,122,253,4,239,15,133,244,60,129,122,253,12,239,139, - 42,255,15,133,244,60,139,66,8,255,15,131,244,60,252,242,15,44,66,8,255,15, - 131,244,60,221,66,8,219,92,36,4,139,68,36,4,255,133,192,15,142,244,122,131, - 189,233,1,15,130,244,122,15,133,244,124,65,57,134,233,15,130,244,124,15,182, - 141,233,65,139,174,233,137,68,36,8,248,1,136,77,0,131,197,1,131,232,1,15, - 133,244,1,65,139,134,233,252,233,244,120,248,125,129,252,248,239,255,15,130, - 244,60,65,139,174,233,65,59,174,233,15,130,244,247,232,244,72,248,1,129,122, - 253,4,239,15,133,244,60,139,42,139,133,233,133,192,15,132,244,122,65,57,134, - 233,15,130,244,126,129,197,239,137,92,36,4,137,68,36,8,65,139,158,233,248, - 1,255,15,182,77,0,131,197,1,131,232,1,136,12,3,15,133,244,1,137,216,139,92, - 36,4,252,233,244,120,248,127,129,252,248,239,15,130,244,60,65,139,174,233, - 65,59,174,233,15,130,244,247,232,244,72,248,1,129,122,253,4,239,15,133,244, - 60,139,42,139,133,233,65,57,134,233,255,15,130,244,126,129,197,239,137,92, - 36,4,137,68,36,8,65,139,158,233,252,233,244,249,248,1,15,182,76,5,0,131,252, - 249,65,15,130,244,248,131,252,249,90,15,135,244,248,131,252,241,32,248,2, - 136,12,3,248,3,131,232,1,15,137,244,1,137,216,139,92,36,4,252,233,244,120, - 248,128,129,252,248,239,15,130,244,60,255,65,139,174,233,65,59,174,233,15, - 130,244,247,232,244,72,248,1,129,122,253,4,239,15,133,244,60,139,42,139,133, - 233,65,57,134,233,15,130,244,126,129,197,239,137,92,36,4,137,68,36,8,65,139, - 158,233,252,233,244,249,248,1,15,182,76,5,0,131,252,249,97,15,130,244,248, - 255,131,252,249,122,15,135,244,248,131,252,241,32,248,2,136,12,3,248,3,131, - 232,1,15,137,244,1,137,216,139,92,36,4,252,233,244,120,248,129,129,252,248, - 239,15,130,244,60,129,122,253,4,239,15,133,244,60,137,213,139,58,232,251, - 1,21,137,252,234,255,137,197,252,233,244,68,255,252,242,15,42,192,252,233, - 244,69,255,248,130,129,122,253,4,239,255,15,133,244,247,139,42,252,233,244, - 86,248,1,15,135,244,60,255,252,242,15,16,2,72,189,237,237,102,72,15,110,205, - 252,242,15,88,193,102,15,126,197,255,252,233,244,86,255,248,131,255,72,189, - 237,237,102,72,15,110,205,255,199,4,36,0,0,192,89,255,15,133,244,247,139, - 42,252,233,244,248,248,1,15,135,244,60,255,252,242,15,16,2,252,242,15,88, - 193,102,15,126,197,255,248,2,137,68,36,4,141,68,194,252,240,248,1,57,208, - 15,134,244,86,129,120,253,4,239,255,15,133,244,248,35,40,131,232,8,252,233, - 244,1,248,2,15,135,244,132,255,15,131,244,132,255,252,242,15,16,0,252,242, - 15,88,193,102,15,126,193,33,205,255,131,232,8,252,233,244,1,248,133,255,15, - 133,244,248,11,40,131,232,8,252,233,244,1,248,2,15,135,244,132,255,252,242, - 15,16,0,252,242,15,88,193,102,15,126,193,9,205,255,131,232,8,252,233,244, - 1,248,134,255,15,133,244,248,51,40,131,232,8,252,233,244,1,248,2,15,135,244, - 132,255,252,242,15,16,0,252,242,15,88,193,102,15,126,193,49,205,255,131,232, - 8,252,233,244,1,248,135,129,122,253,4,239,255,248,2,15,205,252,233,244,86, - 248,136,129,122,253,4,239,255,248,2,252,247,213,255,248,86,252,242,15,42, - 197,252,233,244,69,255,248,132,139,68,36,4,252,233,244,60,255,248,137,129, - 122,253,4,239,255,248,2,129,122,253,12,239,15,133,244,60,139,74,8,255,248, - 137,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131,244,60,129,122, - 253,12,239,15,131,244,60,252,242,15,16,2,252,242,15,16,74,8,72,189,237,237, - 102,72,15,110,213,252,242,15,88,194,252,242,15,88,202,102,15,126,197,102, - 15,126,201,255,211,229,252,233,244,86,255,248,138,129,122,253,4,239,255,248, - 138,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131,244,60,129,122, - 253,12,239,15,131,244,60,252,242,15,16,2,252,242,15,16,74,8,72,189,237,237, - 102,72,15,110,213,252,242,15,88,194,252,242,15,88,202,102,15,126,197,102, - 15,126,201,255,211,252,237,252,233,244,86,255,248,139,129,122,253,4,239,255, - 248,139,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131,244,60,129, - 122,253,12,239,15,131,244,60,252,242,15,16,2,252,242,15,16,74,8,72,189,237, - 237,102,72,15,110,213,252,242,15,88,194,252,242,15,88,202,102,15,126,197, - 102,15,126,201,255,211,252,253,252,233,244,86,255,248,140,129,122,253,4,239, - 255,248,140,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131,244,60, - 129,122,253,12,239,15,131,244,60,252,242,15,16,2,252,242,15,16,74,8,72,189, - 237,237,102,72,15,110,213,252,242,15,88,194,252,242,15,88,202,102,15,126, - 197,102,15,126,201,255,211,197,252,233,244,86,255,248,141,129,122,253,4,239, - 255,248,141,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131,244,60, - 129,122,253,12,239,15,131,244,60,252,242,15,16,2,252,242,15,16,74,8,72,189, - 237,237,102,72,15,110,213,252,242,15,88,194,252,242,15,88,202,102,15,126, - 197,102,15,126,201,255,211,205,252,233,244,86,248,124,184,237,252,233,244, - 60,248,126,184,237,248,60,139,108,36,24,139,90,252,252,137,92,36,28,137,149, - 233,141,68,194,252,248,141,136,233,137,133,233,139,66,252,248,59,141,233, - 15,135,244,251,137,252,239,252,255,144,233,139,149,233,133,192,15,143,244, - 75,248,1,255,139,141,233,41,209,193,252,233,3,133,192,141,65,1,139,106,252, - 248,15,133,244,248,139,157,233,139,11,15,182,252,233,15,182,205,131,195,4, - 65,252,255,36,252,238,248,2,137,209,252,247,195,237,15,133,244,249,15,182, - 107,252,253,72,252,247,213,141,20,252,234,252,233,244,28,248,3,137,221,131, - 229,252,248,41,252,234,252,233,244,28,248,5,190,237,137,252,239,232,251,1, - 0,139,149,233,49,192,252,233,244,1,248,72,93,72,137,108,36,8,139,108,36,24, - 137,92,36,28,137,149,233,255,141,68,194,252,248,137,252,239,137,133,233,232, - 251,1,22,139,149,233,139,133,233,41,208,193,232,3,131,192,1,72,139,108,36, - 8,85,195,248,142,255,65,15,182,134,233,168,235,15,133,244,251,168,235,15, - 133,244,247,168,235,15,132,244,247,65,252,255,142,233,252,233,244,247,255, - 248,143,65,15,182,134,233,168,235,15,133,244,251,252,233,244,247,248,144, - 65,15,182,134,233,168,235,15,133,244,251,168,235,15,132,244,251,65,252,255, - 142,233,15,132,244,247,168,235,15,132,244,251,248,1,255,139,108,36,24,137, - 149,233,137,222,137,252,239,232,251,1,23,248,3,139,149,233,248,4,15,182,75, - 252,253,248,5,15,182,107,252,252,15,183,67,252,254,65,252,255,164,253,252, - 238,233,248,145,131,195,4,139,77,232,137,76,36,4,252,233,244,4,248,146,255, - 139,106,252,248,139,173,233,15,182,133,233,141,4,194,139,108,36,24,137,149, - 233,137,133,233,137,222,65,141,190,233,73,137,174,233,137,92,36,28,232,251, - 1,24,252,233,244,3,255,248,147,137,92,36,28,255,248,148,255,137,92,36,28, - 131,203,1,248,1,255,141,68,194,252,248,139,108,36,24,137,149,233,137,133, - 233,137,222,137,252,239,232,251,1,25,199,68,36,28,0,0,0,0,255,131,227,252, - 254,255,139,149,233,72,137,193,139,133,233,41,208,72,137,205,15,182,75,252, - 253,193,232,3,131,192,1,252,255,229,248,149,255,65,85,65,84,65,83,65,82,65, - 81,65,80,87,86,85,72,141,108,36,88,85,83,82,81,80,15,182,69,252,248,138,101, - 252,240,76,137,125,252,248,76,137,117,252,240,68,139,117,0,65,139,142,233, - 65,199,134,233,237,65,137,134,233,65,137,142,233,72,129,252,236,239,72,131, - 197,128,252,242,68,15,17,125,252,248,252,242,68,15,17,117,252,240,252,242, - 68,15,17,109,232,252,242,68,15,17,101,224,252,242,68,15,17,93,216,252,242, - 68,15,17,85,208,252,242,68,15,17,77,200,252,242,68,15,17,69,192,252,242,15, - 17,125,184,252,242,15,17,117,176,252,242,15,17,109,168,252,242,15,17,101, - 160,252,242,15,17,93,152,252,242,15,17,85,144,252,242,15,17,77,136,252,242, - 15,17,69,128,65,139,174,233,65,139,150,233,73,137,174,233,65,199,134,233, - 0,0,0,0,137,149,233,72,137,230,65,141,190,233,232,251,1,26,72,139,141,233, - 72,129,225,239,72,137,204,137,169,233,139,149,233,139,153,233,252,233,244, - 247,255,248,150,255,72,131,196,16,248,1,76,139,108,36,8,76,139,36,36,133, - 192,15,136,244,249,137,68,36,4,68,139,122,252,248,69,139,191,233,69,139,191, - 233,65,199,134,233,0,0,0,0,65,199,134,233,237,139,3,15,182,204,15,182,232, - 131,195,4,193,232,16,129,252,253,239,15,130,244,248,139,68,36,4,248,2,65, - 252,255,36,252,238,248,3,252,247,216,137,252,239,137,198,232,251,1,1,255, - 248,88,255,217,124,36,4,137,68,36,8,102,184,0,4,102,11,68,36,4,102,37,252, - 255,252,247,102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,139,68, - 36,8,195,255,248,151,72,184,237,237,102,72,15,110,208,72,184,237,237,102, - 72,15,110,216,15,40,200,102,15,84,202,102,15,46,217,15,134,244,247,102,15, - 85,208,252,242,15,88,203,252,242,15,92,203,102,15,86,202,72,184,237,237,102, - 72,15,110,208,252,242,15,194,193,1,102,15,84,194,252,242,15,92,200,15,40, - 193,248,1,195,248,90,255,217,124,36,4,137,68,36,8,102,184,0,8,102,11,68,36, - 4,102,37,252,255,252,251,102,137,68,36,6,217,108,36,6,217,252,252,217,108, - 36,4,139,68,36,8,195,255,248,152,72,184,237,237,102,72,15,110,208,72,184, - 237,237,102,72,15,110,216,15,40,200,102,15,84,202,102,15,46,217,15,134,244, - 247,102,15,85,208,252,242,15,88,203,252,242,15,92,203,102,15,86,202,72,184, - 237,237,102,72,15,110,208,252,242,15,194,193,6,102,15,84,194,252,242,15,92, - 200,15,40,193,248,1,195,248,111,255,217,124,36,4,137,68,36,8,102,184,0,12, - 102,11,68,36,4,102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,139, - 68,36,8,195,255,248,153,72,184,237,237,102,72,15,110,208,72,184,237,237,102, - 72,15,110,216,15,40,200,102,15,84,202,102,15,46,217,15,134,244,247,102,15, - 85,208,15,40,193,252,242,15,88,203,252,242,15,92,203,72,184,237,237,102,72, - 15,110,216,252,242,15,194,193,1,102,15,84,195,252,242,15,92,200,102,15,86, - 202,15,40,193,248,1,195,248,154,255,15,40,232,252,242,15,94,193,72,184,237, - 237,102,72,15,110,208,72,184,237,237,102,72,15,110,216,15,40,224,102,15,84, - 226,102,15,46,220,15,134,244,247,102,15,85,208,252,242,15,88,227,252,242, - 15,92,227,102,15,86,226,72,184,237,237,102,72,15,110,208,252,242,15,194,196, - 1,102,15,84,194,252,242,15,92,224,15,40,197,252,242,15,89,204,252,242,15, - 92,193,195,248,1,252,242,15,89,200,15,40,197,252,242,15,92,193,195,255,217, - 193,216,252,241,217,124,36,4,102,184,0,4,102,11,68,36,4,102,37,252,255,252, - 247,102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,222,201,222,252, - 233,195,255,248,95,217,252,234,222,201,248,155,217,84,36,252,248,129,124, - 36,252,248,0,0,128,127,15,132,244,247,129,124,36,252,248,0,0,128,252,255, - 15,132,244,248,248,156,217,192,217,252,252,220,252,233,217,201,217,252,240, - 217,232,222,193,217,252,253,221,217,248,1,195,248,2,221,216,217,252,238,195, - 255,248,114,255,248,157,252,242,15,45,193,252,242,15,42,208,102,15,46,202, - 15,133,244,254,15,138,244,255,248,158,131,252,248,1,15,142,244,252,248,1, - 169,1,0,0,0,15,133,244,248,252,242,15,89,192,209,232,252,233,244,1,248,2, - 209,232,15,132,244,251,15,40,200,248,3,252,242,15,89,192,209,232,15,132,244, - 250,15,131,244,3,255,252,242,15,89,200,252,233,244,3,248,4,252,242,15,89, - 193,248,5,195,248,6,15,132,244,5,15,130,244,253,252,247,216,232,244,1,72, - 184,237,237,102,72,15,110,200,252,242,15,94,200,15,40,193,195,248,7,72,184, - 237,237,102,72,15,110,192,195,248,8,102,72,15,126,200,72,209,224,72,193,192, - 12,72,61,252,254,15,0,0,15,132,244,248,102,72,15,126,192,72,209,224,15,132, - 244,250,255,72,193,192,12,72,61,252,254,15,0,0,15,132,244,251,252,242,15, - 17,76,36,252,240,252,242,15,17,68,36,252,248,221,68,36,252,240,221,68,36, - 252,248,217,252,241,217,192,217,252,252,220,252,233,217,201,217,252,240,217, - 232,222,193,217,252,253,221,217,221,92,36,252,248,252,242,15,16,68,36,252, - 248,195,248,9,72,184,237,237,102,72,15,110,208,102,15,46,194,15,132,244,247, - 15,40,193,248,1,195,248,2,72,184,237,237,102,72,15,110,208,102,15,84,194, - 72,184,237,237,102,72,15,110,208,102,15,46,194,15,132,244,1,102,15,80,193, - 15,87,192,136,196,15,146,208,48,224,15,133,244,1,248,3,72,184,237,237,255, - 102,72,15,110,192,195,248,4,102,15,80,193,133,192,15,133,244,3,15,87,192, - 195,248,5,102,15,80,193,133,192,15,132,244,3,15,87,192,195,248,159,255,131, - 252,255,1,15,130,244,88,15,132,244,90,131,252,255,3,15,130,244,111,15,135, - 244,248,252,242,15,81,192,195,248,2,252,242,15,17,68,36,252,248,221,68,36, - 252,248,131,252,255,5,15,135,244,248,15,132,244,247,232,244,95,252,233,244, - 253,248,1,232,244,155,255,252,233,244,253,248,2,131,252,255,7,15,132,244, - 247,15,135,244,248,217,252,237,217,201,217,252,241,252,233,244,253,248,1, - 217,232,217,201,217,252,241,252,233,244,253,248,2,131,252,255,9,15,132,244, - 247,15,135,244,248,217,252,236,217,201,217,252,241,252,233,244,253,248,1, - 255,217,252,254,252,233,244,253,248,2,131,252,255,11,15,132,244,247,15,135, - 244,255,217,252,255,252,233,244,253,248,1,217,252,242,221,216,248,7,221,92, - 36,252,248,252,242,15,16,68,36,252,248,195,255,139,124,36,12,221,68,36,4, - 131,252,255,1,15,130,244,88,15,132,244,90,131,252,255,3,15,130,244,111,15, - 135,244,248,217,252,250,195,248,2,131,252,255,5,15,130,244,95,15,132,244, - 155,131,252,255,7,15,132,244,247,15,135,244,248,217,252,237,217,201,217,252, - 241,195,248,1,217,232,217,201,217,252,241,195,248,2,131,252,255,9,15,132, - 244,247,255,15,135,244,248,217,252,236,217,201,217,252,241,195,248,1,217, - 252,254,195,248,2,131,252,255,11,15,132,244,247,15,135,244,255,217,252,255, - 195,248,1,217,252,242,221,216,195,255,248,9,204,255,248,160,255,131,252,255, - 1,15,132,244,247,15,135,244,248,252,242,15,88,193,195,248,1,252,242,15,92, - 193,195,248,2,131,252,255,3,15,132,244,247,15,135,244,248,252,242,15,89,193, - 195,248,1,252,242,15,94,193,195,248,2,131,252,255,5,15,130,244,154,15,132, - 244,114,131,252,255,7,15,132,244,247,15,135,244,248,72,184,237,237,255,102, - 72,15,110,200,15,87,193,195,248,1,72,184,237,237,102,72,15,110,200,15,84, - 193,195,248,2,131,252,255,9,15,135,244,248,252,242,15,17,68,36,252,248,252, - 242,15,17,76,36,252,240,221,68,36,252,248,221,68,36,252,240,15,132,244,247, - 217,252,243,248,7,221,92,36,252,248,252,242,15,16,68,36,252,248,195,248,1, - 217,201,217,252,253,221,217,252,233,244,7,248,2,131,252,255,11,15,132,244, - 247,15,135,244,255,252,242,15,93,193,195,248,1,252,242,15,95,193,195,248, - 9,204,255,139,68,36,20,221,68,36,4,221,68,36,12,131,252,248,1,15,132,244, - 247,15,135,244,248,222,193,195,248,1,222,252,233,195,248,2,131,252,248,3, - 15,132,244,247,15,135,244,248,222,201,195,248,1,222,252,249,195,248,2,131, + 239,15,132,244,1,129,252,253,239,15,135,244,254,129,252,253,239,15,134,244, + 253,189,237,252,233,244,254,248,7,255,189,237,248,8,252,247,213,65,139,172, + 253,174,233,252,233,244,2,248,65,129,252,248,239,15,130,244,60,129,122,253, + 4,239,15,133,244,60,139,42,131,189,233,0,15,133,244,60,129,122,253,12,239, + 15,133,244,60,139,66,8,137,133,233,139,90,252,252,199,66,252,252,237,255, + 137,106,252,248,252,246,133,233,235,15,132,244,247,128,165,233,235,65,139, + 134,233,65,137,174,233,137,133,233,248,1,252,233,244,63,248,66,129,252,248, + 239,15,130,244,60,129,122,253,4,239,15,133,244,60,137,213,139,50,141,82,8, + 139,124,36,24,232,251,1,11,137,252,234,72,139,40,139,90,252,252,72,137,106, + 252,248,252,233,244,63,248,67,255,129,252,248,239,15,133,244,60,129,122,253, + 4,239,255,15,133,244,247,139,42,252,233,244,68,248,1,15,135,244,60,255,15, + 131,244,60,255,252,242,15,16,2,252,233,244,69,255,221,2,252,233,244,70,255, + 248,71,129,252,248,239,15,130,244,60,139,90,252,252,129,122,253,4,239,15, + 133,244,249,139,2,248,2,199,66,252,252,237,137,66,252,248,252,233,244,63, + 248,3,129,122,253,4,239,15,135,244,60,65,131,190,233,0,15,133,244,60,65,139, + 174,233,65,59,174,233,255,15,130,244,247,232,244,72,248,1,139,108,36,24,137, + 149,233,137,92,36,28,137,214,137,252,239,255,232,251,1,12,255,232,251,1,13, + 255,139,149,233,252,233,244,2,248,73,129,252,248,239,15,130,244,60,15,132, + 244,248,248,1,129,122,253,4,239,15,133,244,60,139,108,36,24,137,149,233,137, + 149,233,139,90,252,252,139,50,141,82,8,137,252,239,137,92,36,28,232,251,1, + 14,139,149,233,133,192,15,132,244,249,72,139,106,8,72,139,66,16,72,137,106, + 252,248,72,137,2,248,74,184,237,255,252,233,244,75,248,2,199,66,12,237,252, + 233,244,1,248,3,199,66,252,252,237,252,233,244,63,248,76,129,252,248,239, + 15,130,244,60,139,42,129,122,253,4,239,15,133,244,60,255,131,189,233,0,15, + 133,244,60,255,139,106,252,248,139,133,233,139,90,252,252,199,66,252,252, + 237,137,66,252,248,199,66,12,237,184,237,252,233,244,75,248,77,129,252,248, + 239,15,130,244,60,129,122,253,4,239,15,133,244,60,129,122,253,12,239,255, + 139,90,252,252,255,139,66,8,131,192,1,199,66,252,252,237,137,66,252,248,255, + 252,242,15,16,66,8,72,189,237,237,102,72,15,110,205,252,242,15,88,193,252, + 242,15,45,192,252,242,15,17,66,252,248,255,139,42,59,133,233,15,131,244,248, + 193,224,3,3,133,233,248,1,129,120,253,4,239,15,132,244,78,72,139,40,72,137, + 42,252,233,244,74,248,2,131,189,233,0,15,132,244,78,137,252,239,137,213,137, + 198,232,251,1,15,137,252,234,133,192,15,133,244,1,248,78,184,237,252,233, + 244,75,248,79,255,139,106,252,248,139,133,233,139,90,252,252,199,66,252,252, + 237,137,66,252,248,255,199,66,12,237,199,66,8,0,0,0,0,255,15,87,192,252,242, + 15,17,66,8,255,217,252,238,221,90,8,255,184,237,252,233,244,75,248,80,129, + 252,248,239,15,130,244,60,141,74,8,131,232,1,187,237,248,1,65,15,182,174, + 233,193,252,237,235,131,229,1,1,252,235,252,233,244,28,248,81,129,252,248, + 239,15,130,244,60,129,122,253,12,239,15,133,244,60,255,139,106,4,137,106, + 12,199,66,4,237,139,42,139,90,8,137,106,8,137,26,141,74,16,131,232,2,187, + 237,252,233,244,1,248,82,129,252,248,239,15,130,244,60,139,42,139,90,252, + 252,137,92,36,28,137,44,36,129,122,253,4,239,15,133,244,60,72,131,189,233, + 0,15,133,244,60,128,189,233,235,15,135,244,60,139,141,233,15,132,244,247, + 255,59,141,233,15,132,244,60,248,1,141,92,193,252,240,59,157,233,15,135,244, + 60,137,157,233,139,108,36,24,137,149,233,131,194,8,137,149,233,141,108,194, + 232,72,41,221,57,203,15,132,244,249,248,2,72,139,4,43,72,137,67,252,248,131, + 252,235,8,57,203,15,133,244,2,248,3,137,206,139,60,36,232,244,25,65,199,134, + 233,237,255,139,108,36,24,139,28,36,139,149,233,129,252,248,239,15,135,244, + 254,248,4,139,139,233,68,139,187,233,137,139,233,68,137,252,251,41,203,15, + 132,244,252,141,4,26,193,252,235,3,59,133,233,15,135,244,255,137,213,72,41, + 205,248,5,72,139,1,72,137,4,41,131,193,8,68,57,252,249,15,133,244,5,248,6, + 141,67,2,199,66,252,252,237,248,7,139,92,36,28,137,68,36,4,72,199,193,252, + 248,252,255,252,255,252,255,252,247,195,237,255,15,132,244,13,252,233,244, + 14,248,8,199,66,252,252,237,139,139,233,131,252,233,8,137,139,233,72,139, + 1,72,137,2,184,237,252,233,244,7,248,9,139,12,36,68,137,185,233,137,222,137, + 252,239,232,251,1,0,139,28,36,139,149,233,252,233,244,4,248,83,139,106,252, + 248,139,173,233,139,90,252,252,137,92,36,28,137,44,36,72,131,189,233,0,15, + 133,244,60,255,128,189,233,235,15,135,244,60,139,141,233,15,132,244,247,59, + 141,233,15,132,244,60,248,1,141,92,193,252,248,59,157,233,15,135,244,60,137, + 157,233,139,108,36,24,137,149,233,137,149,233,141,108,194,252,240,72,41,221, + 57,203,15,132,244,249,248,2,255,72,139,4,43,72,137,67,252,248,131,252,235, + 8,57,203,15,133,244,2,248,3,137,206,139,60,36,232,244,25,65,199,134,233,237, + 139,108,36,24,139,28,36,139,149,233,129,252,248,239,15,135,244,254,248,4, + 139,139,233,68,139,187,233,137,139,233,68,137,252,251,41,203,15,132,244,252, + 141,4,26,193,252,235,3,59,133,233,15,135,244,255,255,137,213,72,41,205,248, + 5,72,139,1,72,137,4,41,131,193,8,68,57,252,249,15,133,244,5,248,6,141,67, + 1,248,7,139,92,36,28,137,68,36,4,49,201,252,247,195,237,15,132,244,13,252, + 233,244,14,248,8,137,222,137,252,239,232,251,1,16,248,9,139,12,36,68,137, + 185,233,137,222,137,252,239,232,251,1,0,139,28,36,139,149,233,252,233,244, + 4,248,84,139,108,36,24,72,252,247,133,233,237,15,132,244,60,255,137,149,233, + 141,68,194,252,248,137,133,233,49,192,72,137,133,233,176,235,136,133,233, + 252,233,244,16,255,248,68,255,248,70,139,90,252,252,221,90,252,248,252,233, + 244,63,255,248,85,129,252,248,239,15,130,244,60,255,129,122,253,4,239,15, + 133,244,248,139,42,131,252,253,0,15,137,244,68,252,247,221,15,136,244,247, + 248,86,248,68,139,90,252,252,199,66,252,252,237,137,106,252,248,252,233,244, + 63,248,1,139,90,252,252,199,66,252,252,0,0,224,65,199,66,252,248,0,0,0,0, + 252,233,244,63,248,2,15,135,244,60,255,129,122,253,4,239,15,131,244,60,255, + 252,242,15,16,2,72,184,237,237,102,72,15,110,200,15,84,193,248,69,139,90, + 252,252,252,242,15,17,66,252,248,255,221,2,217,225,248,69,248,70,139,90,252, + 252,221,90,252,248,255,248,63,184,237,248,75,137,68,36,4,248,61,252,247,195, + 237,15,133,244,253,248,5,56,67,252,255,15,135,244,252,15,182,75,252,253,72, + 252,247,209,141,20,202,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65, + 252,255,36,252,238,248,6,199,68,194,252,244,237,131,192,1,252,233,244,5,248, + 7,72,199,193,252,248,252,255,252,255,252,255,252,233,244,14,248,87,255,129, + 122,253,4,239,15,133,244,247,139,42,252,233,244,68,248,1,15,135,244,60,255, + 252,242,15,16,2,232,244,88,255,252,242,15,45,232,129,252,253,0,0,0,128,15, + 133,244,68,252,242,15,42,205,102,15,46,193,15,138,244,69,15,132,244,68,255, + 221,2,232,244,88,255,248,89,255,252,242,15,16,2,232,244,90,255,221,2,232, + 244,90,255,248,91,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131, + 244,60,252,242,15,81,2,252,233,244,69,255,248,91,129,252,248,239,15,130,244, + 60,129,122,253,4,239,15,131,244,60,221,2,217,252,250,252,233,244,70,255,248, + 92,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131,244,60,217,252, + 237,221,2,217,252,241,252,233,244,70,248,93,129,252,248,239,15,130,244,60, + 129,122,253,4,239,15,131,244,60,217,252,236,221,2,217,252,241,252,233,244, + 70,248,94,129,252,248,239,255,15,130,244,60,129,122,253,4,239,15,131,244, + 60,221,2,232,244,95,252,233,244,70,248,96,129,252,248,239,15,130,244,60,129, + 122,253,4,239,15,131,244,60,221,2,217,252,254,252,233,244,70,248,97,129,252, + 248,239,255,15,130,244,60,129,122,253,4,239,15,131,244,60,221,2,217,252,255, + 252,233,244,70,248,98,129,252,248,239,15,130,244,60,129,122,253,4,239,15, + 131,244,60,221,2,217,252,242,221,216,252,233,244,70,248,99,129,252,248,239, + 15,130,244,60,255,129,122,253,4,239,15,131,244,60,221,2,217,192,216,200,217, + 232,222,225,217,252,250,217,252,243,252,233,244,70,248,100,129,252,248,239, + 15,130,244,60,129,122,253,4,239,15,131,244,60,221,2,217,192,216,200,217,232, + 222,225,217,252,250,217,201,217,252,243,252,233,244,70,248,101,129,252,248, + 239,15,130,244,60,129,122,253,4,239,15,131,244,60,255,221,2,217,232,217,252, + 243,252,233,244,70,255,248,102,129,252,248,239,15,130,244,60,129,122,253, + 4,239,15,131,244,60,252,242,15,16,2,255,137,213,232,251,1,17,137,252,234, + 252,233,244,69,255,248,103,129,252,248,239,15,130,244,60,129,122,253,4,239, + 15,131,244,60,252,242,15,16,2,255,137,213,232,251,1,18,137,252,234,252,233, + 244,69,255,248,104,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131, + 244,60,252,242,15,16,2,255,137,213,232,251,1,19,137,252,234,252,233,244,69, + 248,105,255,248,106,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131, + 244,60,252,242,15,16,2,139,106,252,248,252,242,15,89,133,233,252,233,244, + 69,255,248,106,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131,244, + 60,221,2,139,106,252,248,220,141,233,252,233,244,70,255,248,107,129,252,248, + 239,15,130,244,60,129,122,253,4,239,15,131,244,60,129,122,253,12,239,15,131, + 244,60,221,2,221,66,8,217,252,243,252,233,244,70,248,108,129,252,248,239, + 15,130,244,60,129,122,253,4,239,15,131,244,60,129,122,253,12,239,255,15,131, + 244,60,221,66,8,221,2,217,252,253,221,217,252,233,244,70,248,109,129,252, + 248,239,15,130,244,60,139,106,4,129,252,253,239,15,131,244,60,139,90,252, + 252,139,2,137,106,252,252,137,66,252,248,209,229,129,252,253,0,0,224,252, + 255,15,131,244,249,9,232,15,132,244,249,184,252,254,3,0,0,129,252,253,0,0, + 32,0,15,130,244,250,248,1,193,252,237,21,41,197,255,252,242,15,42,197,255, + 137,44,36,219,4,36,255,139,106,252,252,129,229,252,255,252,255,15,128,129, + 205,0,0,224,63,137,106,252,252,248,2,255,252,242,15,17,2,255,221,26,255,184, + 237,252,233,244,75,248,3,255,15,87,192,252,233,244,2,255,217,252,238,252, + 233,244,2,255,248,4,255,252,242,15,16,2,72,189,237,237,102,72,15,110,205, + 252,242,15,89,193,252,242,15,17,66,252,248,255,221,2,199,4,36,0,0,128,90, + 216,12,36,221,90,252,248,255,139,106,252,252,184,52,4,0,0,209,229,252,233, + 244,1,255,248,110,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131, + 244,60,252,242,15,16,2,255,248,110,129,252,248,239,15,130,244,60,129,122, + 253,4,239,15,131,244,60,221,2,255,139,106,4,139,90,252,252,209,229,129,252, + 253,0,0,224,252,255,15,132,244,250,255,15,40,224,232,244,111,252,242,15,92, + 224,248,1,252,242,15,17,66,252,248,252,242,15,17,34,255,217,192,232,244,111, + 220,252,233,248,1,221,90,252,248,221,26,255,139,66,252,252,139,106,4,49,232, + 15,136,244,249,248,2,184,237,252,233,244,75,248,3,129,252,245,0,0,0,128,137, + 106,4,252,233,244,2,248,4,255,15,87,228,252,233,244,1,255,217,252,238,217, + 201,252,233,244,1,255,248,112,129,252,248,239,15,130,244,60,129,122,253,4, + 239,15,131,244,60,129,122,253,12,239,15,131,244,60,221,66,8,221,2,248,1,217, + 252,248,223,224,158,15,138,244,1,221,217,252,233,244,70,255,248,113,129,252, + 248,239,15,130,244,60,129,122,253,4,239,15,131,244,60,129,122,253,12,239, + 15,131,244,60,252,242,15,16,2,252,242,15,16,74,8,232,244,114,252,233,244, + 69,255,248,113,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131,244, + 60,129,122,253,12,239,15,131,244,60,221,2,221,66,8,232,244,114,252,233,244, + 70,255,248,115,185,2,0,0,0,129,122,253,4,239,255,15,133,244,250,139,42,248, + 1,57,193,15,131,244,68,129,124,253,202,252,252,239,15,133,244,249,59,108, + 202,252,248,15,79,108,202,252,248,131,193,1,252,233,244,1,248,3,15,135,244, + 60,255,252,233,244,252,248,4,15,135,244,60,255,252,242,15,16,2,248,5,57,193, + 15,131,244,69,129,124,253,202,252,252,239,255,15,130,244,252,15,135,244,60, + 252,242,15,42,76,202,252,248,252,233,244,253,255,248,6,252,242,15,16,76,202, + 252,248,248,7,252,242,15,93,193,131,193,1,252,233,244,5,255,248,116,185,2, + 0,0,0,129,122,253,4,239,255,15,133,244,250,139,42,248,1,57,193,15,131,244, + 68,129,124,253,202,252,252,239,15,133,244,249,59,108,202,252,248,15,76,108, + 202,252,248,131,193,1,252,233,244,1,248,3,15,135,244,60,255,248,6,252,242, + 15,16,76,202,252,248,248,7,252,242,15,95,193,131,193,1,252,233,244,5,255, + 248,9,221,216,252,233,244,60,255,248,117,129,252,248,239,15,130,244,60,129, + 122,253,4,239,15,133,244,60,139,42,255,139,173,233,252,233,244,68,255,252, + 242,15,42,133,233,252,233,244,69,255,219,133,233,252,233,244,70,255,248,118, + 129,252,248,239,15,133,244,60,129,122,253,4,239,15,133,244,60,139,42,139, + 90,252,252,131,189,233,1,15,130,244,78,15,182,173,233,255,252,242,15,42,197, + 252,233,244,69,255,137,44,36,219,4,36,252,233,244,70,255,248,119,65,139,174, + 233,65,59,174,233,15,130,244,247,232,244,72,248,1,129,252,248,239,15,133, + 244,60,129,122,253,4,239,255,15,133,244,60,139,42,129,252,253,252,255,0,0, + 0,15,135,244,60,137,108,36,4,255,15,131,244,60,252,242,15,44,42,129,252,253, + 252,255,0,0,0,15,135,244,60,137,108,36,4,255,15,131,244,60,221,2,219,92,36, + 4,129,124,36,4,252,255,0,0,0,15,135,244,60,255,199,68,36,8,1,0,0,0,72,141, + 68,36,4,248,120,139,108,36,24,137,149,233,139,84,36,8,72,137,198,137,252, + 239,137,92,36,28,232,251,1,20,139,149,233,139,90,252,252,199,66,252,252,237, + 137,66,252,248,252,233,244,63,248,121,65,139,174,233,65,59,174,233,15,130, + 244,247,232,244,72,248,1,199,68,36,4,252,255,252,255,252,255,252,255,129, + 252,248,239,15,130,244,60,15,134,244,247,129,122,253,20,239,255,15,133,244, + 60,139,106,16,137,108,36,4,255,15,131,244,60,252,242,15,44,106,16,137,108, + 36,4,255,15,131,244,60,221,66,16,219,92,36,4,255,248,1,129,122,253,4,239, + 15,133,244,60,129,122,253,12,239,255,139,42,137,108,36,8,139,173,233,255, + 139,74,8,255,252,242,15,44,74,8,255,139,68,36,4,57,197,15,130,244,251,248, + 2,133,201,15,142,244,253,248,3,139,108,36,8,41,200,15,140,244,122,141,172, + 253,13,233,131,192,1,248,4,137,68,36,8,137,232,252,233,244,120,248,5,15,140, + 244,252,141,68,40,1,252,233,244,2,248,6,137,232,252,233,244,2,248,7,255,15, + 132,244,254,1,252,233,131,193,1,15,143,244,3,248,8,185,1,0,0,0,252,233,244, + 3,248,122,49,192,252,233,244,4,248,123,129,252,248,239,15,130,244,60,65,139, + 174,233,65,59,174,233,15,130,244,247,232,244,72,248,1,255,129,122,253,4,239, + 15,133,244,60,129,122,253,12,239,139,42,255,15,133,244,60,139,66,8,255,15, + 131,244,60,252,242,15,44,66,8,255,15,131,244,60,221,66,8,219,92,36,4,139, + 68,36,4,255,133,192,15,142,244,122,131,189,233,1,15,130,244,122,15,133,244, + 124,65,57,134,233,15,130,244,124,15,182,141,233,65,139,174,233,137,68,36, + 8,248,1,136,77,0,131,197,1,131,232,1,15,133,244,1,65,139,134,233,252,233, + 244,120,248,125,129,252,248,239,255,15,130,244,60,65,139,174,233,65,59,174, + 233,15,130,244,247,232,244,72,248,1,129,122,253,4,239,15,133,244,60,139,42, + 139,133,233,133,192,15,132,244,122,65,57,134,233,15,130,244,126,129,197,239, + 137,92,36,4,137,68,36,8,65,139,158,233,248,1,255,15,182,77,0,131,197,1,131, + 232,1,136,12,3,15,133,244,1,137,216,139,92,36,4,252,233,244,120,248,127,129, + 252,248,239,15,130,244,60,65,139,174,233,65,59,174,233,15,130,244,247,232, + 244,72,248,1,129,122,253,4,239,15,133,244,60,139,42,139,133,233,65,57,134, + 233,255,15,130,244,126,129,197,239,137,92,36,4,137,68,36,8,65,139,158,233, + 252,233,244,249,248,1,15,182,76,5,0,131,252,249,65,15,130,244,248,131,252, + 249,90,15,135,244,248,131,252,241,32,248,2,136,12,3,248,3,131,232,1,15,137, + 244,1,137,216,139,92,36,4,252,233,244,120,248,128,129,252,248,239,15,130, + 244,60,255,65,139,174,233,65,59,174,233,15,130,244,247,232,244,72,248,1,129, + 122,253,4,239,15,133,244,60,139,42,139,133,233,65,57,134,233,15,130,244,126, + 129,197,239,137,92,36,4,137,68,36,8,65,139,158,233,252,233,244,249,248,1, + 15,182,76,5,0,131,252,249,97,15,130,244,248,255,131,252,249,122,15,135,244, + 248,131,252,241,32,248,2,136,12,3,248,3,131,232,1,15,137,244,1,137,216,139, + 92,36,4,252,233,244,120,248,129,129,252,248,239,15,130,244,60,129,122,253, + 4,239,15,133,244,60,137,213,139,58,232,251,1,21,137,252,234,255,137,197,252, + 233,244,68,255,252,242,15,42,192,252,233,244,69,255,248,130,129,122,253,4, + 239,255,15,133,244,247,139,42,252,233,244,86,248,1,15,135,244,60,255,252, + 242,15,16,2,72,189,237,237,102,72,15,110,205,252,242,15,88,193,102,15,126, + 197,255,252,233,244,86,255,248,131,255,72,189,237,237,102,72,15,110,205,255, + 199,4,36,0,0,192,89,255,15,133,244,247,139,42,252,233,244,248,248,1,15,135, + 244,60,255,252,242,15,16,2,252,242,15,88,193,102,15,126,197,255,248,2,137, + 68,36,4,141,68,194,252,240,248,1,57,208,15,134,244,86,129,120,253,4,239,255, + 15,133,244,248,35,40,131,232,8,252,233,244,1,248,2,15,135,244,132,255,15, + 131,244,132,255,252,242,15,16,0,252,242,15,88,193,102,15,126,193,33,205,255, + 131,232,8,252,233,244,1,248,133,255,15,133,244,248,11,40,131,232,8,252,233, + 244,1,248,2,15,135,244,132,255,252,242,15,16,0,252,242,15,88,193,102,15,126, + 193,9,205,255,131,232,8,252,233,244,1,248,134,255,15,133,244,248,51,40,131, + 232,8,252,233,244,1,248,2,15,135,244,132,255,252,242,15,16,0,252,242,15,88, + 193,102,15,126,193,49,205,255,131,232,8,252,233,244,1,248,135,129,122,253, + 4,239,255,248,2,15,205,252,233,244,86,248,136,129,122,253,4,239,255,248,2, + 252,247,213,255,248,86,252,242,15,42,197,252,233,244,69,255,248,132,139,68, + 36,4,252,233,244,60,255,248,137,129,122,253,4,239,255,248,2,129,122,253,12, + 239,15,133,244,60,139,74,8,255,248,137,129,252,248,239,15,130,244,60,129, + 122,253,4,239,15,131,244,60,129,122,253,12,239,15,131,244,60,252,242,15,16, + 2,252,242,15,16,74,8,72,189,237,237,102,72,15,110,213,252,242,15,88,194,252, + 242,15,88,202,102,15,126,197,102,15,126,201,255,211,229,252,233,244,86,255, + 248,138,129,122,253,4,239,255,248,138,129,252,248,239,15,130,244,60,129,122, + 253,4,239,15,131,244,60,129,122,253,12,239,15,131,244,60,252,242,15,16,2, + 252,242,15,16,74,8,72,189,237,237,102,72,15,110,213,252,242,15,88,194,252, + 242,15,88,202,102,15,126,197,102,15,126,201,255,211,252,237,252,233,244,86, + 255,248,139,129,122,253,4,239,255,248,139,129,252,248,239,15,130,244,60,129, + 122,253,4,239,15,131,244,60,129,122,253,12,239,15,131,244,60,252,242,15,16, + 2,252,242,15,16,74,8,72,189,237,237,102,72,15,110,213,252,242,15,88,194,252, + 242,15,88,202,102,15,126,197,102,15,126,201,255,211,252,253,252,233,244,86, + 255,248,140,129,122,253,4,239,255,248,140,129,252,248,239,15,130,244,60,129, + 122,253,4,239,15,131,244,60,129,122,253,12,239,15,131,244,60,252,242,15,16, + 2,252,242,15,16,74,8,72,189,237,237,102,72,15,110,213,252,242,15,88,194,252, + 242,15,88,202,102,15,126,197,102,15,126,201,255,211,197,252,233,244,86,255, + 248,141,129,122,253,4,239,255,248,141,129,252,248,239,15,130,244,60,129,122, + 253,4,239,15,131,244,60,129,122,253,12,239,15,131,244,60,252,242,15,16,2, + 252,242,15,16,74,8,72,189,237,237,102,72,15,110,213,252,242,15,88,194,252, + 242,15,88,202,102,15,126,197,102,15,126,201,255,211,205,252,233,244,86,248, + 124,184,237,252,233,244,60,248,126,184,237,248,60,139,108,36,24,139,90,252, + 252,137,92,36,28,137,149,233,141,68,194,252,248,141,136,233,137,133,233,139, + 66,252,248,59,141,233,15,135,244,251,137,252,239,252,255,144,233,139,149, + 233,133,192,15,143,244,75,248,1,255,139,141,233,41,209,193,252,233,3,133, + 192,141,65,1,139,106,252,248,15,133,244,248,139,157,233,139,11,15,182,252, + 233,15,182,205,131,195,4,65,252,255,36,252,238,248,2,137,209,252,247,195, + 237,15,133,244,249,15,182,107,252,253,72,252,247,213,141,20,252,234,252,233, + 244,28,248,3,137,221,131,229,252,248,41,252,234,252,233,244,28,248,5,190, + 237,137,252,239,232,251,1,0,139,149,233,49,192,252,233,244,1,248,72,93,72, + 137,108,36,8,139,108,36,24,137,92,36,28,137,149,233,255,141,68,194,252,248, + 137,252,239,137,133,233,232,251,1,22,139,149,233,139,133,233,41,208,193,232, + 3,131,192,1,72,139,108,36,8,85,195,248,142,255,65,15,182,134,233,168,235, + 15,133,244,251,168,235,15,133,244,247,168,235,15,132,244,247,65,252,255,142, + 233,252,233,244,247,255,248,143,65,15,182,134,233,168,235,15,133,244,251, + 252,233,244,247,248,144,65,15,182,134,233,168,235,15,133,244,251,168,235, + 15,132,244,251,65,252,255,142,233,15,132,244,247,168,235,15,132,244,251,248, + 1,255,139,108,36,24,137,149,233,137,222,137,252,239,232,251,1,23,248,3,139, + 149,233,248,4,15,182,75,252,253,248,5,15,182,107,252,252,15,183,67,252,254, + 65,252,255,164,253,252,238,233,248,145,131,195,4,139,77,232,137,76,36,4,252, + 233,244,4,248,146,255,139,106,252,248,139,173,233,15,182,133,233,141,4,194, + 139,108,36,24,137,149,233,137,133,233,137,222,65,141,190,233,73,137,174,233, + 137,92,36,28,232,251,1,24,252,233,244,3,255,248,147,137,92,36,28,255,248, + 148,255,137,92,36,28,131,203,1,248,1,255,141,68,194,252,248,139,108,36,24, + 137,149,233,137,133,233,137,222,137,252,239,232,251,1,25,199,68,36,28,0,0, + 0,0,255,131,227,252,254,255,139,149,233,72,137,193,139,133,233,41,208,72, + 137,205,15,182,75,252,253,193,232,3,131,192,1,252,255,229,248,149,255,65, + 85,65,84,65,83,65,82,65,81,65,80,87,86,85,72,141,108,36,88,85,83,82,81,80, + 15,182,69,252,248,138,101,252,240,76,137,125,252,248,76,137,117,252,240,68, + 139,117,0,65,139,142,233,65,199,134,233,237,65,137,134,233,65,137,142,233, + 72,129,252,236,239,72,131,197,128,252,242,68,15,17,125,252,248,252,242,68, + 15,17,117,252,240,252,242,68,15,17,109,232,252,242,68,15,17,101,224,252,242, + 68,15,17,93,216,252,242,68,15,17,85,208,252,242,68,15,17,77,200,252,242,68, + 15,17,69,192,252,242,15,17,125,184,252,242,15,17,117,176,252,242,15,17,109, + 168,252,242,15,17,101,160,252,242,15,17,93,152,252,242,15,17,85,144,252,242, + 15,17,77,136,252,242,15,17,69,128,65,139,174,233,65,139,150,233,73,137,174, + 233,65,199,134,233,0,0,0,0,137,149,233,72,137,230,65,141,190,233,232,251, + 1,26,72,139,141,233,72,129,225,239,72,137,204,137,169,233,139,149,233,139, + 153,233,252,233,244,247,255,248,150,255,72,131,196,16,248,1,76,139,108,36, + 8,76,139,36,36,133,192,15,136,244,249,137,68,36,4,68,139,122,252,248,69,139, + 191,233,69,139,191,233,65,199,134,233,0,0,0,0,65,199,134,233,237,139,3,15, + 182,204,15,182,232,131,195,4,193,232,16,129,252,253,239,15,130,244,248,139, + 68,36,4,248,2,65,252,255,36,252,238,248,3,252,247,216,137,252,239,137,198, + 232,251,1,1,255,248,88,255,217,124,36,4,137,68,36,8,102,184,0,4,102,11,68, + 36,4,102,37,252,255,252,247,102,137,68,36,6,217,108,36,6,217,252,252,217, + 108,36,4,139,68,36,8,195,255,248,151,72,184,237,237,102,72,15,110,208,72, + 184,237,237,102,72,15,110,216,15,40,200,102,15,84,202,102,15,46,217,15,134, + 244,247,102,15,85,208,252,242,15,88,203,252,242,15,92,203,102,15,86,202,72, + 184,237,237,102,72,15,110,208,252,242,15,194,193,1,102,15,84,194,252,242, + 15,92,200,15,40,193,248,1,195,248,90,255,217,124,36,4,137,68,36,8,102,184, + 0,8,102,11,68,36,4,102,37,252,255,252,251,102,137,68,36,6,217,108,36,6,217, + 252,252,217,108,36,4,139,68,36,8,195,255,248,152,72,184,237,237,102,72,15, + 110,208,72,184,237,237,102,72,15,110,216,15,40,200,102,15,84,202,102,15,46, + 217,15,134,244,247,102,15,85,208,252,242,15,88,203,252,242,15,92,203,102, + 15,86,202,72,184,237,237,102,72,15,110,208,252,242,15,194,193,6,102,15,84, + 194,252,242,15,92,200,15,40,193,248,1,195,248,111,255,217,124,36,4,137,68, + 36,8,102,184,0,12,102,11,68,36,4,102,137,68,36,6,217,108,36,6,217,252,252, + 217,108,36,4,139,68,36,8,195,255,248,153,72,184,237,237,102,72,15,110,208, + 72,184,237,237,102,72,15,110,216,15,40,200,102,15,84,202,102,15,46,217,15, + 134,244,247,102,15,85,208,15,40,193,252,242,15,88,203,252,242,15,92,203,72, + 184,237,237,102,72,15,110,216,252,242,15,194,193,1,102,15,84,195,252,242, + 15,92,200,102,15,86,202,15,40,193,248,1,195,248,154,255,15,40,232,252,242, + 15,94,193,72,184,237,237,102,72,15,110,208,72,184,237,237,102,72,15,110,216, + 15,40,224,102,15,84,226,102,15,46,220,15,134,244,247,102,15,85,208,252,242, + 15,88,227,252,242,15,92,227,102,15,86,226,72,184,237,237,102,72,15,110,208, + 252,242,15,194,196,1,102,15,84,194,252,242,15,92,224,15,40,197,252,242,15, + 89,204,252,242,15,92,193,195,248,1,252,242,15,89,200,15,40,197,252,242,15, + 92,193,195,255,217,193,216,252,241,217,124,36,4,102,184,0,4,102,11,68,36, + 4,102,37,252,255,252,247,102,137,68,36,6,217,108,36,6,217,252,252,217,108, + 36,4,222,201,222,252,233,195,255,248,95,217,252,234,222,201,248,155,217,84, + 36,252,248,129,124,36,252,248,0,0,128,127,15,132,244,247,129,124,36,252,248, + 0,0,128,252,255,15,132,244,248,248,156,217,192,217,252,252,220,252,233,217, + 201,217,252,240,217,232,222,193,217,252,253,221,217,248,1,195,248,2,221,216, + 217,252,238,195,255,248,114,255,248,157,252,242,15,45,193,252,242,15,42,208, + 102,15,46,202,15,133,244,254,15,138,244,255,248,158,131,252,248,1,15,142, + 244,252,248,1,169,1,0,0,0,15,133,244,248,252,242,15,89,192,209,232,252,233, + 244,1,248,2,209,232,15,132,244,251,15,40,200,248,3,252,242,15,89,192,209, + 232,15,132,244,250,15,131,244,3,255,252,242,15,89,200,252,233,244,3,248,4, + 252,242,15,89,193,248,5,195,248,6,15,132,244,5,15,130,244,253,252,247,216, + 232,244,1,72,184,237,237,102,72,15,110,200,252,242,15,94,200,15,40,193,195, + 248,7,72,184,237,237,102,72,15,110,192,195,248,8,102,72,15,126,200,72,209, + 224,72,193,192,12,72,61,252,254,15,0,0,15,132,244,248,102,72,15,126,192,72, + 209,224,15,132,244,250,255,72,193,192,12,72,61,252,254,15,0,0,15,132,244, + 251,252,242,15,17,76,36,252,240,252,242,15,17,68,36,252,248,221,68,36,252, + 240,221,68,36,252,248,217,252,241,217,192,217,252,252,220,252,233,217,201, + 217,252,240,217,232,222,193,217,252,253,221,217,221,92,36,252,248,252,242, + 15,16,68,36,252,248,195,248,9,72,184,237,237,102,72,15,110,208,102,15,46, + 194,15,132,244,247,15,40,193,248,1,195,248,2,72,184,237,237,102,72,15,110, + 208,102,15,84,194,72,184,237,237,102,72,15,110,208,102,15,46,194,15,132,244, + 1,102,15,80,193,15,87,192,136,196,15,146,208,48,224,15,133,244,1,248,3,72, + 184,237,237,255,102,72,15,110,192,195,248,4,102,15,80,193,133,192,15,133, + 244,3,15,87,192,195,248,5,102,15,80,193,133,192,15,132,244,3,15,87,192,195, + 248,159,255,131,252,255,1,15,130,244,88,15,132,244,90,131,252,255,3,15,130, + 244,111,15,135,244,248,252,242,15,81,192,195,248,2,252,242,15,17,68,36,252, + 248,221,68,36,252,248,131,252,255,5,15,135,244,248,15,132,244,247,232,244, + 95,252,233,244,253,248,1,232,244,155,255,252,233,244,253,248,2,131,252,255, + 7,15,132,244,247,15,135,244,248,217,252,237,217,201,217,252,241,252,233,244, + 253,248,1,217,232,217,201,217,252,241,252,233,244,253,248,2,131,252,255,9, + 15,132,244,247,15,135,244,248,217,252,236,217,201,217,252,241,252,233,244, + 253,248,1,255,217,252,254,252,233,244,253,248,2,131,252,255,11,15,132,244, + 247,15,135,244,255,217,252,255,252,233,244,253,248,1,217,252,242,221,216, + 248,7,221,92,36,252,248,252,242,15,16,68,36,252,248,195,255,139,124,36,12, + 221,68,36,4,131,252,255,1,15,130,244,88,15,132,244,90,131,252,255,3,15,130, + 244,111,15,135,244,248,217,252,250,195,248,2,131,252,255,5,15,130,244,95, + 15,132,244,155,131,252,255,7,15,132,244,247,15,135,244,248,217,252,237,217, + 201,217,252,241,195,248,1,217,232,217,201,217,252,241,195,248,2,131,252,255, + 9,15,132,244,247,255,15,135,244,248,217,252,236,217,201,217,252,241,195,248, + 1,217,252,254,195,248,2,131,252,255,11,15,132,244,247,15,135,244,255,217, + 252,255,195,248,1,217,252,242,221,216,195,255,248,9,204,255,248,160,255,131, + 252,255,1,15,132,244,247,15,135,244,248,252,242,15,88,193,195,248,1,252,242, + 15,92,193,195,248,2,131,252,255,3,15,132,244,247,15,135,244,248,252,242,15, + 89,193,195,248,1,252,242,15,94,193,195,248,2,131,252,255,5,15,130,244,154, + 15,132,244,114,131,252,255,7,15,132,244,247,15,135,244,248,72,184,237,237, + 255,102,72,15,110,200,15,87,193,195,248,1,72,184,237,237,102,72,15,110,200, + 15,84,193,195,248,2,131,252,255,9,15,135,244,248,252,242,15,17,68,36,252, + 248,252,242,15,17,76,36,252,240,221,68,36,252,248,221,68,36,252,240,15,132, + 244,247,217,252,243,248,7,221,92,36,252,248,252,242,15,16,68,36,252,248,195, + 248,1,217,201,217,252,253,221,217,252,233,244,7,248,2,131,252,255,11,15,132, + 244,247,15,135,244,255,252,242,15,93,193,195,248,1,252,242,15,95,193,195, + 248,9,204,255,139,68,36,20,221,68,36,4,221,68,36,12,131,252,248,1,15,132, + 244,247,15,135,244,248,222,193,195,248,1,222,252,233,195,248,2,131,252,248, + 3,15,132,244,247,15,135,244,248,222,201,195,248,1,222,252,249,195,248,2,131, 252,248,5,15,130,244,154,15,132,244,114,131,252,248,7,15,132,244,247,15,135, 244,248,255,221,216,217,224,195,248,1,221,216,217,225,195,248,2,131,252,248, 9,15,132,244,247,15,135,244,248,217,252,243,195,248,1,217,201,217,252,253, @@ -1217,626 +1217,627 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse) } dasm_put(Dst, 1873, ((char *)(&((GCfuncC *)0)->upvalue)), LJ_TSTR, ~LJ_TLIGHTUD, 1+1, LJ_TTAB, Dt6(->metatable), LJ_TNIL); dasm_put(Dst, 1952, DISPATCH_GL(gcroot)+4*(GCROOT_MMNAME+MM_metatable), LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), DtB(->next)); - dasm_put(Dst, 2010, LJ_TNIL, LJ_TUDATA, LJ_TISNUM, LJ_TNUMX, DISPATCH_GL(gcroot[GCROOT_BASEMT])); - dasm_put(Dst, 2079, 2+1, LJ_TTAB, Dt6(->metatable), LJ_TTAB, Dt6(->metatable), LJ_TTAB, Dt6(->marked), LJ_GC_BLACK, Dt6(->marked), (uint8_t)~LJ_GC_BLACK); - dasm_put(Dst, 2148, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist), 2+1, LJ_TTAB, 1+1, LJ_TISNUM); + dasm_put(Dst, 2010, LJ_TNIL, LJ_TUDATA, LJ_TNUMX, LJ_TISNUM, LJ_TLIGHTUD); + dasm_put(Dst, 2076, LJ_TNUMX, DISPATCH_GL(gcroot[GCROOT_BASEMT]), 2+1, LJ_TTAB, Dt6(->metatable), LJ_TTAB, Dt6(->metatable), LJ_TTAB); + dasm_put(Dst, 2147, Dt6(->marked), LJ_GC_BLACK, Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist), 2+1, LJ_TTAB); + dasm_put(Dst, 2237, 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 2234); - } else { dasm_put(Dst, 2251); + } else { + dasm_put(Dst, 2268); } if (sse) { - dasm_put(Dst, 2256); + dasm_put(Dst, 2273); } else { - dasm_put(Dst, 2266); + dasm_put(Dst, 2283); } - dasm_put(Dst, 2273, 1+1, LJ_TSTR, LJ_TSTR, LJ_TISNUM, DISPATCH_GL(gcroot[GCROOT_BASEMT_NUM]), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); - dasm_put(Dst, 2342, Dt1(->base)); + dasm_put(Dst, 2290, 1+1, LJ_TSTR, LJ_TSTR, LJ_TISNUM, DISPATCH_GL(gcroot[GCROOT_BASEMT_NUM]), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); + dasm_put(Dst, 2359, Dt1(->base)); if (LJ_DUALNUM) { - dasm_put(Dst, 2368); + dasm_put(Dst, 2385); } else { - dasm_put(Dst, 2373); + dasm_put(Dst, 2390); } - dasm_put(Dst, 2378, Dt1(->base), 1+1, LJ_TTAB, Dt1(->base), Dt1(->top), Dt1(->base), 1+2); - dasm_put(Dst, 2470, LJ_TNIL, LJ_TNIL, 1+1, LJ_TTAB); + dasm_put(Dst, 2395, Dt1(->base), 1+1, LJ_TTAB, Dt1(->base), Dt1(->top), Dt1(->base), 1+2); + dasm_put(Dst, 2487, LJ_TNIL, LJ_TNIL, 1+1, LJ_TTAB); #ifdef LUAJIT_ENABLE_LUA52COMPAT - dasm_put(Dst, 2517, Dt6(->metatable)); + dasm_put(Dst, 2534, Dt6(->metatable)); #endif - dasm_put(Dst, 2526, Dt8(->upvalue[0]), LJ_TFUNC, LJ_TNIL, 1+3, 1+1, LJ_TTAB, LJ_TISNUM); + dasm_put(Dst, 2543, Dt8(->upvalue[0]), LJ_TFUNC, LJ_TNIL, 1+3, 1+1, LJ_TTAB, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 2512); + dasm_put(Dst, 2529); } else { - dasm_put(Dst, 2251); + dasm_put(Dst, 2268); } - dasm_put(Dst, 2581); + dasm_put(Dst, 2598); if (LJ_DUALNUM) { - dasm_put(Dst, 2586, LJ_TISNUM); + dasm_put(Dst, 2603, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 2602, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); + dasm_put(Dst, 2619, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); } else { } - dasm_put(Dst, 2635, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->hmask), 1+0); - dasm_put(Dst, 2497, 1+1, LJ_TTAB); + dasm_put(Dst, 2652, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->hmask), 1+0); + dasm_put(Dst, 2514, 1+1, LJ_TTAB); #ifdef LUAJIT_ENABLE_LUA52COMPAT - dasm_put(Dst, 2517, Dt6(->metatable)); + dasm_put(Dst, 2534, Dt6(->metatable)); #endif - dasm_put(Dst, 2712, Dt8(->upvalue[0]), LJ_TFUNC); + dasm_put(Dst, 2729, Dt8(->upvalue[0]), LJ_TFUNC); if (LJ_DUALNUM) { - dasm_put(Dst, 2733, LJ_TISNUM); + dasm_put(Dst, 2750, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 2745); + dasm_put(Dst, 2762); } else { - dasm_put(Dst, 2755); + dasm_put(Dst, 2772); } - dasm_put(Dst, 2762, 1+3, 1+1, 8+FRAME_PCALL, DISPATCH_GL(hookmask), HOOK_ACTIVE_SHIFT, 2+1, LJ_TFUNC); - dasm_put(Dst, 2827, LJ_TFUNC, 16+FRAME_PCALL, 1+1, LJ_TTHREAD, Dt1(->cframe), Dt1(->status), LUA_YIELD, Dt1(->top)); - dasm_put(Dst, 2916, Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP); - dasm_put(Dst, 3003, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack), LJ_TTRUE, FRAME_TYPE); - dasm_put(Dst, 3118, LJ_TFALSE, Dt1(->top), Dt1(->top), 1+2, Dt1(->top), Dt1(->base), Dt8(->upvalue[0].gcr), Dt1(->cframe)); - dasm_put(Dst, 3213, Dt1(->status), LUA_YIELD, Dt1(->top), Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top)); - dasm_put(Dst, 3279, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack)); - dasm_put(Dst, 3368, FRAME_TYPE, Dt1(->top), Dt1(->base), Dt1(->cframe), CFRAME_RESUME); - dasm_put(Dst, 3478, Dt1(->base), Dt1(->top), Dt1(->cframe), LUA_YIELD, Dt1(->status)); + dasm_put(Dst, 2779, 1+3, 1+1, 8+FRAME_PCALL, DISPATCH_GL(hookmask), HOOK_ACTIVE_SHIFT, 2+1, LJ_TFUNC); + dasm_put(Dst, 2844, LJ_TFUNC, 16+FRAME_PCALL, 1+1, LJ_TTHREAD, Dt1(->cframe), Dt1(->status), LUA_YIELD, Dt1(->top)); + dasm_put(Dst, 2933, Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP); + dasm_put(Dst, 3020, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack), LJ_TTRUE, FRAME_TYPE); + dasm_put(Dst, 3135, LJ_TFALSE, Dt1(->top), Dt1(->top), 1+2, Dt1(->top), Dt1(->base), Dt8(->upvalue[0].gcr), Dt1(->cframe)); + dasm_put(Dst, 3230, Dt1(->status), LUA_YIELD, Dt1(->top), Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 3296, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack)); + dasm_put(Dst, 3385, FRAME_TYPE, Dt1(->top), Dt1(->base), Dt1(->cframe), CFRAME_RESUME); + dasm_put(Dst, 3495, Dt1(->base), Dt1(->top), Dt1(->cframe), LUA_YIELD, Dt1(->status)); if (!LJ_DUALNUM) { - dasm_put(Dst, 3505); + dasm_put(Dst, 3522); } if (sse) { - dasm_put(Dst, 3508); + dasm_put(Dst, 3525); } - dasm_put(Dst, 3523, 1+1); + dasm_put(Dst, 3540, 1+1); if (LJ_DUALNUM) { - dasm_put(Dst, 3534, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 3551, LJ_TISNUM, LJ_TISNUM); } else { - dasm_put(Dst, 3614, LJ_TISNUM); + dasm_put(Dst, 3631, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 3624, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); + dasm_put(Dst, 3641, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); } else { - dasm_put(Dst, 3655); + dasm_put(Dst, 3672); } - dasm_put(Dst, 3672, 1+1, FRAME_TYPE, LJ_TNIL); + dasm_put(Dst, 3689, 1+1, FRAME_TYPE, LJ_TNIL); if (LJ_DUALNUM) { - dasm_put(Dst, 3769, LJ_TISNUM); + dasm_put(Dst, 3786, LJ_TISNUM); } else { - dasm_put(Dst, 3614, LJ_TISNUM); + dasm_put(Dst, 3631, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 3791); + dasm_put(Dst, 3808); if (LJ_DUALNUM) { - dasm_put(Dst, 3800); + dasm_put(Dst, 3817); } - dasm_put(Dst, 2261); + dasm_put(Dst, 2278); } else { - dasm_put(Dst, 3834); + dasm_put(Dst, 3851); if (LJ_DUALNUM) { } else { - dasm_put(Dst, 2268); + dasm_put(Dst, 2285); } } - dasm_put(Dst, 3840); + dasm_put(Dst, 3857); if (LJ_DUALNUM) { - dasm_put(Dst, 3769, LJ_TISNUM); + dasm_put(Dst, 3786, LJ_TISNUM); } else { - dasm_put(Dst, 3614, LJ_TISNUM); + dasm_put(Dst, 3631, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 3843); + dasm_put(Dst, 3860); if (LJ_DUALNUM) { - dasm_put(Dst, 3800); + dasm_put(Dst, 3817); } - dasm_put(Dst, 2261); + dasm_put(Dst, 2278); } else { - dasm_put(Dst, 3852); + dasm_put(Dst, 3869); if (LJ_DUALNUM) { } else { - dasm_put(Dst, 2268); + dasm_put(Dst, 2285); } } if (sse) { - dasm_put(Dst, 3858, 1+1, LJ_TISNUM); + dasm_put(Dst, 3875, 1+1, LJ_TISNUM); } else { - dasm_put(Dst, 3887, 1+1, LJ_TISNUM); + dasm_put(Dst, 3904, 1+1, LJ_TISNUM); } - dasm_put(Dst, 3916, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); - dasm_put(Dst, 3985, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); - dasm_put(Dst, 4042, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); - dasm_put(Dst, 4105, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM); - dasm_put(Dst, 4195); + dasm_put(Dst, 3933, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); + dasm_put(Dst, 4002, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); + dasm_put(Dst, 4059, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); + dasm_put(Dst, 4122, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM); + dasm_put(Dst, 4212); if (sse) { - dasm_put(Dst, 4207, 1+1, LJ_TISNUM); + dasm_put(Dst, 4224, 1+1, LJ_TISNUM); } else { } - dasm_put(Dst, 4232); + dasm_put(Dst, 4249); if (sse) { - dasm_put(Dst, 4246, 1+1, LJ_TISNUM); + dasm_put(Dst, 4263, 1+1, LJ_TISNUM); } else { } - dasm_put(Dst, 4271); + dasm_put(Dst, 4288); if (sse) { - dasm_put(Dst, 4285, 1+1, LJ_TISNUM); + dasm_put(Dst, 4302, 1+1, LJ_TISNUM); } else { } - dasm_put(Dst, 4310); + dasm_put(Dst, 4327); if (sse) { - dasm_put(Dst, 4326, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); + dasm_put(Dst, 4343, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); } else { - dasm_put(Dst, 4365, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); + dasm_put(Dst, 4382, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); } - dasm_put(Dst, 4398, 2+1, LJ_TISNUM, LJ_TISNUM, 2+1, LJ_TISNUM, LJ_TISNUM); - dasm_put(Dst, 4463, 1+1, LJ_TISNUM); + dasm_put(Dst, 4415, 2+1, LJ_TISNUM, LJ_TISNUM, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 4480, 1+1, LJ_TISNUM); if (sse) { - dasm_put(Dst, 4562); + dasm_put(Dst, 4579); } else { - dasm_put(Dst, 4568); + dasm_put(Dst, 4585); } - dasm_put(Dst, 4575); + dasm_put(Dst, 4592); if (sse) { - dasm_put(Dst, 4600); + dasm_put(Dst, 4617); } else { - dasm_put(Dst, 4606); + dasm_put(Dst, 4623); } - dasm_put(Dst, 4609, 1+2); + dasm_put(Dst, 4626, 1+2); if (sse) { - dasm_put(Dst, 4618); + dasm_put(Dst, 4635); } else { - dasm_put(Dst, 4626); + dasm_put(Dst, 4643); } - dasm_put(Dst, 4634); + dasm_put(Dst, 4651); if (sse) { - dasm_put(Dst, 4637, (unsigned int)(U64x(43500000,00000000)), (unsigned int)((U64x(43500000,00000000))>>32)); + dasm_put(Dst, 4654, (unsigned int)(U64x(43500000,00000000)), (unsigned int)((U64x(43500000,00000000))>>32)); } else { - dasm_put(Dst, 4664); + dasm_put(Dst, 4681); } - dasm_put(Dst, 4681); + dasm_put(Dst, 4698); if (sse) { - dasm_put(Dst, 4697, 1+1, LJ_TISNUM); + dasm_put(Dst, 4714, 1+1, LJ_TISNUM); } else { - dasm_put(Dst, 4722, 1+1, LJ_TISNUM); + dasm_put(Dst, 4739, 1+1, LJ_TISNUM); } - dasm_put(Dst, 4744); + dasm_put(Dst, 4761); if (sse) { - dasm_put(Dst, 4766); + dasm_put(Dst, 4783); } else { - dasm_put(Dst, 4792); + dasm_put(Dst, 4809); } - dasm_put(Dst, 4809, 1+2); + dasm_put(Dst, 4826, 1+2); if (sse) { - dasm_put(Dst, 4849); + dasm_put(Dst, 4866); } else { - dasm_put(Dst, 4857); + dasm_put(Dst, 4874); } - dasm_put(Dst, 4867, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 4884, 2+1, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 4919, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 4936, 2+1, LJ_TISNUM, LJ_TISNUM); } else { - dasm_put(Dst, 4966, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 4983, 2+1, LJ_TISNUM, LJ_TISNUM); } - dasm_put(Dst, 5007, LJ_TISNUM); + dasm_put(Dst, 5024, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5020, LJ_TISNUM); + dasm_put(Dst, 5037, LJ_TISNUM); if (sse) { - dasm_put(Dst, 4562); + dasm_put(Dst, 4579); } else { } - dasm_put(Dst, 5070); + dasm_put(Dst, 5087); } else { - dasm_put(Dst, 2251); + dasm_put(Dst, 2268); } if (sse) { - dasm_put(Dst, 5081, LJ_TISNUM); + dasm_put(Dst, 5098, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5102); + dasm_put(Dst, 5119); } else { - dasm_put(Dst, 2251); + dasm_put(Dst, 2268); } - dasm_put(Dst, 5123); + dasm_put(Dst, 5140); } else { } - dasm_put(Dst, 5148, LJ_TISNUM); + dasm_put(Dst, 5165, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5161, LJ_TISNUM); + dasm_put(Dst, 5178, LJ_TISNUM); if (sse) { - dasm_put(Dst, 4562); + dasm_put(Dst, 4579); } else { } - dasm_put(Dst, 5070); + dasm_put(Dst, 5087); } else { - dasm_put(Dst, 2251); + dasm_put(Dst, 2268); } if (sse) { - dasm_put(Dst, 5081, LJ_TISNUM); + dasm_put(Dst, 5098, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5102); + dasm_put(Dst, 5119); } else { - dasm_put(Dst, 2251); + dasm_put(Dst, 2268); } - dasm_put(Dst, 5211); + dasm_put(Dst, 5228); } else { } if (!sse) { - dasm_put(Dst, 5236); + dasm_put(Dst, 5253); } - dasm_put(Dst, 5245, 1+1, LJ_TSTR); + dasm_put(Dst, 5262, 1+1, LJ_TSTR); if (LJ_DUALNUM) { - dasm_put(Dst, 5267, Dt5(->len)); + dasm_put(Dst, 5284, Dt5(->len)); } else if (sse) { - dasm_put(Dst, 5275, Dt5(->len)); + dasm_put(Dst, 5292, Dt5(->len)); } else { - dasm_put(Dst, 5286, Dt5(->len)); + dasm_put(Dst, 5303, Dt5(->len)); } - dasm_put(Dst, 5294, 1+1, LJ_TSTR, Dt5(->len), Dt5([1])); + dasm_put(Dst, 5311, 1+1, LJ_TSTR, Dt5(->len), Dt5([1])); if (LJ_DUALNUM) { - dasm_put(Dst, 5270); + dasm_put(Dst, 5287); } else if (sse) { - dasm_put(Dst, 5332); + dasm_put(Dst, 5349); } else { - dasm_put(Dst, 5342); + dasm_put(Dst, 5359); } - dasm_put(Dst, 5353, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+1, LJ_TISNUM); + dasm_put(Dst, 5370, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5386); + dasm_put(Dst, 5403); } else if (sse) { - dasm_put(Dst, 5409); + dasm_put(Dst, 5426); } else { - dasm_put(Dst, 5435); + dasm_put(Dst, 5452); } - dasm_put(Dst, 5459, Dt1(->base), Dt1(->base), LJ_TSTR, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+2, LJ_TISNUM); + dasm_put(Dst, 5476, Dt1(->base), Dt1(->base), LJ_TSTR, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+2, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5568); + dasm_put(Dst, 5585); } else if (sse) { - dasm_put(Dst, 5580); + dasm_put(Dst, 5597); } else { - dasm_put(Dst, 5595); + dasm_put(Dst, 5612); } - dasm_put(Dst, 5607, LJ_TSTR, LJ_TISNUM); + dasm_put(Dst, 5624, LJ_TSTR, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 2512); + dasm_put(Dst, 2529); } else { - dasm_put(Dst, 2251); + dasm_put(Dst, 2268); } - dasm_put(Dst, 5624, Dt5(->len)); + dasm_put(Dst, 5641, Dt5(->len)); if (LJ_DUALNUM) { - dasm_put(Dst, 5634); + dasm_put(Dst, 5651); } else if (sse) { - dasm_put(Dst, 5638); + dasm_put(Dst, 5655); } else { } - dasm_put(Dst, 5645, sizeof(GCstr)-1); - dasm_put(Dst, 5720, 2+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); - dasm_put(Dst, 5781, LJ_TSTR, LJ_TISNUM); + dasm_put(Dst, 5662, sizeof(GCstr)-1); + dasm_put(Dst, 5737, 2+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); + dasm_put(Dst, 5798, LJ_TSTR, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5798); + dasm_put(Dst, 5815); } else if (sse) { - dasm_put(Dst, 5806); + dasm_put(Dst, 5823); } else { - dasm_put(Dst, 5817); + dasm_put(Dst, 5834); } - dasm_put(Dst, 5833, Dt5(->len), DISPATCH_GL(tmpbuf.sz), Dt5([1]), DISPATCH_GL(tmpbuf.buf), DISPATCH_GL(tmpbuf.buf), 1+1); - dasm_put(Dst, 5901, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz), sizeof(GCstr), DISPATCH_GL(tmpbuf.buf)); - dasm_put(Dst, 5968, 1+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz)); - dasm_put(Dst, 6041, sizeof(GCstr), DISPATCH_GL(tmpbuf.buf), 1+1); - dasm_put(Dst, 6126, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz), sizeof(GCstr), DISPATCH_GL(tmpbuf.buf)); - dasm_put(Dst, 6200, 1+1, LJ_TTAB); + dasm_put(Dst, 5850, Dt5(->len), DISPATCH_GL(tmpbuf.sz), Dt5([1]), DISPATCH_GL(tmpbuf.buf), DISPATCH_GL(tmpbuf.buf), 1+1); + dasm_put(Dst, 5918, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz), sizeof(GCstr), DISPATCH_GL(tmpbuf.buf)); + dasm_put(Dst, 5985, 1+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz)); + dasm_put(Dst, 6058, sizeof(GCstr), DISPATCH_GL(tmpbuf.buf), 1+1); + dasm_put(Dst, 6143, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz), sizeof(GCstr), DISPATCH_GL(tmpbuf.buf)); + dasm_put(Dst, 6217, 1+1, LJ_TTAB); if (LJ_DUALNUM) { - dasm_put(Dst, 6267); + dasm_put(Dst, 6284); } else if (sse) { - dasm_put(Dst, 6274); + dasm_put(Dst, 6291); } else { } - dasm_put(Dst, 6284, LJ_TISNUM); + dasm_put(Dst, 6301, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6292); + dasm_put(Dst, 6309); } else { - dasm_put(Dst, 2251); + dasm_put(Dst, 2268); } if (sse) { - dasm_put(Dst, 6309, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6326, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } dasm_put(Dst, 106); if (LJ_DUALNUM || sse) { if (!sse) { } - dasm_put(Dst, 6333); + dasm_put(Dst, 6350); } else { } - dasm_put(Dst, 6338); + dasm_put(Dst, 6355); if (sse) { - dasm_put(Dst, 6341, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6358, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { - dasm_put(Dst, 6351); + dasm_put(Dst, 6368); } - dasm_put(Dst, 2228, LJ_TISNUM); + dasm_put(Dst, 2245, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6359); - } else { - dasm_put(Dst, 2251); - } - if (sse) { dasm_put(Dst, 6376); } else { - } - dasm_put(Dst, 6391, LJ_TISNUM); - if (LJ_DUALNUM) { - dasm_put(Dst, 6416); - } else { - dasm_put(Dst, 6436); + dasm_put(Dst, 2268); } if (sse) { - dasm_put(Dst, 6441); + dasm_put(Dst, 6393); } else { } + dasm_put(Dst, 6408, LJ_TISNUM); + if (LJ_DUALNUM) { + dasm_put(Dst, 6433); + } else { + dasm_put(Dst, 6453); + } + if (sse) { dasm_put(Dst, 6458); - if (sse) { - dasm_put(Dst, 6341, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { - dasm_put(Dst, 6351); } - dasm_put(Dst, 2228, LJ_TISNUM); + dasm_put(Dst, 6475); + if (sse) { + dasm_put(Dst, 6358, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + } else { + dasm_put(Dst, 6368); + } + dasm_put(Dst, 2245, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6359); - } else { - dasm_put(Dst, 2251); - } - if (sse) { dasm_put(Dst, 6376); } else { - } - dasm_put(Dst, 6391, LJ_TISNUM); - if (LJ_DUALNUM) { - dasm_put(Dst, 6468); - } else { - dasm_put(Dst, 6436); + dasm_put(Dst, 2268); } if (sse) { - dasm_put(Dst, 6488); + dasm_put(Dst, 6393); } else { } + dasm_put(Dst, 6408, LJ_TISNUM); + if (LJ_DUALNUM) { + dasm_put(Dst, 6485); + } else { + dasm_put(Dst, 6453); + } + if (sse) { dasm_put(Dst, 6505); - if (sse) { - dasm_put(Dst, 6341, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { - dasm_put(Dst, 6351); } - dasm_put(Dst, 2228, LJ_TISNUM); + dasm_put(Dst, 6522); + if (sse) { + dasm_put(Dst, 6358, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + } else { + dasm_put(Dst, 6368); + } + dasm_put(Dst, 2245, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6359); - } else { - dasm_put(Dst, 2251); - } - if (sse) { dasm_put(Dst, 6376); } else { - } - dasm_put(Dst, 6391, LJ_TISNUM); - if (LJ_DUALNUM) { - dasm_put(Dst, 6515); - } else { - dasm_put(Dst, 6436); + dasm_put(Dst, 2268); } if (sse) { - dasm_put(Dst, 6535); + dasm_put(Dst, 6393); } else { } - dasm_put(Dst, 6552, LJ_TISNUM); + dasm_put(Dst, 6408, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6359); + dasm_put(Dst, 6532); } else { - dasm_put(Dst, 2251); + dasm_put(Dst, 6453); } if (sse) { - dasm_put(Dst, 6309, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6552); } else { } - dasm_put(Dst, 6567, LJ_TISNUM); + dasm_put(Dst, 6569, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6359); + dasm_put(Dst, 6376); } else { - dasm_put(Dst, 2251); + dasm_put(Dst, 2268); } if (sse) { - dasm_put(Dst, 6309, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6326, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6583); + dasm_put(Dst, 6584, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6333); + dasm_put(Dst, 6376); + } else { + dasm_put(Dst, 2268); + } + if (sse) { + dasm_put(Dst, 6326, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + } else { + } + dasm_put(Dst, 6600); + if (LJ_DUALNUM) { + dasm_put(Dst, 6350); } else if (sse) { - dasm_put(Dst, 6589); + dasm_put(Dst, 6606); } else { } - dasm_put(Dst, 6601); + dasm_put(Dst, 6618); if (LJ_DUALNUM) { - dasm_put(Dst, 6612, LJ_TISNUM); + dasm_put(Dst, 6629, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6359); + dasm_put(Dst, 6376); } else { - dasm_put(Dst, 2251); + dasm_put(Dst, 2268); } if (sse) { - dasm_put(Dst, 6309, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6326, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6620, LJ_TISNUM); + dasm_put(Dst, 6637, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 6635, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6652, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6702); + dasm_put(Dst, 6719); if (LJ_DUALNUM) { - dasm_put(Dst, 6709, LJ_TISNUM); + dasm_put(Dst, 6726, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6359); + dasm_put(Dst, 6376); } else { - dasm_put(Dst, 2251); + dasm_put(Dst, 2268); } if (sse) { - dasm_put(Dst, 6309, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6326, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6620, LJ_TISNUM); + dasm_put(Dst, 6637, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 6717, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6734, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6784); + dasm_put(Dst, 6801); if (LJ_DUALNUM) { - dasm_put(Dst, 6792, LJ_TISNUM); + dasm_put(Dst, 6809, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6359); + dasm_put(Dst, 6376); } else { - dasm_put(Dst, 2251); + dasm_put(Dst, 2268); } if (sse) { - dasm_put(Dst, 6309, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6326, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6620, LJ_TISNUM); + dasm_put(Dst, 6637, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 6800, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6817, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6867); + dasm_put(Dst, 6884); if (LJ_DUALNUM) { - dasm_put(Dst, 6875, LJ_TISNUM); + dasm_put(Dst, 6892, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6359); + dasm_put(Dst, 6376); } else { - dasm_put(Dst, 2251); + dasm_put(Dst, 2268); } if (sse) { - dasm_put(Dst, 6309, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6326, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6620, LJ_TISNUM); + dasm_put(Dst, 6637, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 6883, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6900, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6950); + dasm_put(Dst, 6967); if (LJ_DUALNUM) { - dasm_put(Dst, 6957, LJ_TISNUM); + dasm_put(Dst, 6974, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6359); + dasm_put(Dst, 6376); } else { - dasm_put(Dst, 2251); + dasm_put(Dst, 2268); } if (sse) { - dasm_put(Dst, 6309, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6326, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6620, LJ_TISNUM); + dasm_put(Dst, 6637, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 6965, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6982, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 7032, 1+2, 1+1, Dt1(->base), 8*LUA_MINSTACK, Dt1(->top), Dt1(->maxstack), Dt8(->f), Dt1(->base)); - dasm_put(Dst, 7108, Dt1(->top), Dt7(->pc), FRAME_TYPE, LUA_MINSTACK, Dt1(->base), Dt1(->base)); - dasm_put(Dst, 7235, Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 7049, 1+2, 1+1, Dt1(->base), 8*LUA_MINSTACK, Dt1(->top), Dt1(->maxstack), Dt8(->f), Dt1(->base)); + dasm_put(Dst, 7125, Dt1(->top), Dt7(->pc), FRAME_TYPE, LUA_MINSTACK, Dt1(->base), Dt1(->base)); + dasm_put(Dst, 7252, Dt1(->top), Dt1(->base), Dt1(->top)); #if LJ_HASJIT - dasm_put(Dst, 7274, DISPATCH_GL(hookmask), HOOK_VMEVENT, HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount)); + dasm_put(Dst, 7291, DISPATCH_GL(hookmask), HOOK_VMEVENT, HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount)); #endif - dasm_put(Dst, 7307, DISPATCH_GL(hookmask), HOOK_ACTIVE, DISPATCH_GL(hookmask), HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount), LUA_MASKLINE); - dasm_put(Dst, 7361, Dt1(->base), Dt1(->base), GG_DISP2STATIC); + dasm_put(Dst, 7324, DISPATCH_GL(hookmask), HOOK_ACTIVE, DISPATCH_GL(hookmask), HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount), LUA_MASKLINE); + dasm_put(Dst, 7378, Dt1(->base), Dt1(->base), GG_DISP2STATIC); #if LJ_HASJIT - dasm_put(Dst, 7428, Dt7(->pc), PC2PROTO(framesize), Dt1(->base), Dt1(->top), GG_DISP2J, DISPATCH_J(L)); + dasm_put(Dst, 7445, Dt7(->pc), PC2PROTO(framesize), Dt1(->base), Dt1(->top), GG_DISP2J, DISPATCH_J(L)); #endif - dasm_put(Dst, 7475); + dasm_put(Dst, 7492); #if LJ_HASJIT - dasm_put(Dst, 7302); + dasm_put(Dst, 7319); #endif - dasm_put(Dst, 7482); + dasm_put(Dst, 7499); #if LJ_HASJIT - dasm_put(Dst, 7485); + dasm_put(Dst, 7502); #endif - dasm_put(Dst, 7495, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 7512, Dt1(->base), Dt1(->top)); #if LJ_HASJIT - dasm_put(Dst, 7528); + dasm_put(Dst, 7545); #endif - dasm_put(Dst, 7533, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 7550, Dt1(->base), Dt1(->top)); #if LJ_HASJIT - dasm_put(Dst, 7564, DISPATCH_GL(vmstate), DISPATCH_GL(vmstate), ~LJ_VMST_EXIT, DISPATCH_J(exitno), DISPATCH_J(parent), 16*8, DISPATCH_GL(jit_L), DISPATCH_GL(jit_base), DISPATCH_J(L), DISPATCH_GL(jit_L), Dt1(->base), GG_DISP2J, Dt1(->cframe), CFRAME_RAWMASK, CFRAME_OFS_L, Dt1(->base), CFRAME_OFS_PC); + dasm_put(Dst, 7581, DISPATCH_GL(vmstate), DISPATCH_GL(vmstate), ~LJ_VMST_EXIT, DISPATCH_J(exitno), DISPATCH_J(parent), 16*8, DISPATCH_GL(jit_L), DISPATCH_GL(jit_base), DISPATCH_J(L), DISPATCH_GL(jit_L), Dt1(->base), GG_DISP2J, Dt1(->cframe), CFRAME_RAWMASK, CFRAME_OFS_L, Dt1(->base), CFRAME_OFS_PC); #endif - dasm_put(Dst, 7803); + dasm_put(Dst, 7820); #if LJ_HASJIT - dasm_put(Dst, 7806, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, BC_FUNCF); + dasm_put(Dst, 7823, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, BC_FUNCF); #endif - dasm_put(Dst, 7906); + dasm_put(Dst, 7923); if (!sse) { - dasm_put(Dst, 7909); + dasm_put(Dst, 7926); } - dasm_put(Dst, 7954, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); + dasm_put(Dst, 7971, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); if (!sse) { - dasm_put(Dst, 8040); + dasm_put(Dst, 8057); } - dasm_put(Dst, 8085, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(bff00000,00000000)), (unsigned int)((U64x(bff00000,00000000))>>32)); + dasm_put(Dst, 8102, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(bff00000,00000000)), (unsigned int)((U64x(bff00000,00000000))>>32)); if (!sse) { - dasm_put(Dst, 8171); + dasm_put(Dst, 8188); } - dasm_put(Dst, 8210, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); + dasm_put(Dst, 8227, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); if (sse) { - dasm_put(Dst, 8299, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); + dasm_put(Dst, 8316, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); } else { - dasm_put(Dst, 8413); + dasm_put(Dst, 8430); } - dasm_put(Dst, 8460); + dasm_put(Dst, 8477); if (!sse) { } else { - dasm_put(Dst, 8537); + dasm_put(Dst, 8554); } - dasm_put(Dst, 8540); - dasm_put(Dst, 8625, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); - dasm_put(Dst, 8728, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(7ff00000,00000000)), (unsigned int)((U64x(7ff00000,00000000))>>32)); - dasm_put(Dst, 8890); + dasm_put(Dst, 8557); + dasm_put(Dst, 8642, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); + dasm_put(Dst, 8745, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(7ff00000,00000000)), (unsigned int)((U64x(7ff00000,00000000))>>32)); + dasm_put(Dst, 8907); #if LJ_HASJIT if (sse) { - dasm_put(Dst, 8931); - dasm_put(Dst, 9001); - dasm_put(Dst, 9073); + dasm_put(Dst, 8948); + dasm_put(Dst, 9018); + dasm_put(Dst, 9090); } else { - dasm_put(Dst, 9125); - dasm_put(Dst, 9217); + dasm_put(Dst, 9142); + dasm_put(Dst, 9234); } - dasm_put(Dst, 9263); + dasm_put(Dst, 9280); #endif - dasm_put(Dst, 9267); + dasm_put(Dst, 9284); if (sse) { - dasm_put(Dst, 9270, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); - dasm_put(Dst, 9355, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); + dasm_put(Dst, 9287, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); + dasm_put(Dst, 9372, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); } else { - dasm_put(Dst, 9483); - dasm_put(Dst, 9566); + dasm_put(Dst, 9500); + dasm_put(Dst, 9583); if (cmov) { - dasm_put(Dst, 9621); + dasm_put(Dst, 9638); } else { - dasm_put(Dst, 9640); + dasm_put(Dst, 9657); } - dasm_put(Dst, 9263); + dasm_put(Dst, 9280); } - dasm_put(Dst, 9681); + dasm_put(Dst, 9698); #if LJ_HASFFI #define DtE(_V) (int)(ptrdiff_t)&(((CCallState *)0)_V) - dasm_put(Dst, 9705, DtE(->spadj)); + dasm_put(Dst, 9722, DtE(->spadj)); #if LJ_TARGET_WINDOWS #endif - dasm_put(Dst, 9721, DtE(->nsp), offsetof(CCallState, stack), CCALL_SPS_EXTRA*8, DtE(->nfpr), DtE(->gpr[0]), DtE(->gpr[1]), DtE(->gpr[2]), DtE(->gpr[3]), DtE(->gpr[4]), DtE(->gpr[5]), DtE(->fpr[0]), DtE(->fpr[1])); - dasm_put(Dst, 9800, DtE(->fpr[2]), DtE(->fpr[3]), DtE(->fpr[4]), DtE(->fpr[5]), DtE(->fpr[6]), DtE(->fpr[7]), DtE(->func), DtE(->gpr[0]), DtE(->fpr[0]), DtE(->gpr[1]), DtE(->fpr[1])); + dasm_put(Dst, 9738, DtE(->nsp), offsetof(CCallState, stack), CCALL_SPS_EXTRA*8, DtE(->nfpr), DtE(->gpr[0]), DtE(->gpr[1]), DtE(->gpr[2]), DtE(->gpr[3]), DtE(->gpr[4]), DtE(->gpr[5]), DtE(->fpr[0]), DtE(->fpr[1])); + dasm_put(Dst, 9817, DtE(->fpr[2]), DtE(->fpr[3]), DtE(->fpr[4]), DtE(->fpr[5]), DtE(->fpr[6]), DtE(->fpr[7]), DtE(->func), DtE(->gpr[0]), DtE(->fpr[0]), DtE(->gpr[1]), DtE(->fpr[1])); #if LJ_TARGET_WINDOWS #endif - dasm_put(Dst, 9855); + dasm_put(Dst, 9872); #endif - dasm_put(Dst, 9863); + dasm_put(Dst, 9880); #ifdef LUA_USE_ASSERT - dasm_put(Dst, 9265); + dasm_put(Dst, 9282); #endif - dasm_put(Dst, 9265); + dasm_put(Dst, 9282); } /* 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, 9866, defop); + dasm_put(Dst, 9883, defop); switch (op) { @@ -1847,296 +1848,296 @@ 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, 9868, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 9885, LJ_TISNUM, LJ_TISNUM); switch (op) { case BC_ISLT: - dasm_put(Dst, 9898); + dasm_put(Dst, 9915); break; case BC_ISGE: - dasm_put(Dst, 9903); + dasm_put(Dst, 9920); break; case BC_ISLE: - dasm_put(Dst, 9908); + dasm_put(Dst, 9925); break; case BC_ISGT: - dasm_put(Dst, 9913); + dasm_put(Dst, 9930); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 9918, -BCBIAS_J*4, LJ_TISNUM); + dasm_put(Dst, 9935, -BCBIAS_J*4, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9973); + dasm_put(Dst, 9990); } else { - dasm_put(Dst, 9984); + dasm_put(Dst, 10001); } - dasm_put(Dst, 9995); + dasm_put(Dst, 10012); if (sse) { - dasm_put(Dst, 10002); + dasm_put(Dst, 10019); switch (op) { case BC_ISLT: - dasm_put(Dst, 10022); + dasm_put(Dst, 10039); break; case BC_ISGE: - dasm_put(Dst, 10027); + dasm_put(Dst, 10044); break; case BC_ISLE: - dasm_put(Dst, 10032); + dasm_put(Dst, 10049); break; case BC_ISGT: - dasm_put(Dst, 10037); + dasm_put(Dst, 10054); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 10042); + dasm_put(Dst, 10059); } else { - dasm_put(Dst, 10047); + dasm_put(Dst, 10064); } } else { - dasm_put(Dst, 10055, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10072, LJ_TISNUM, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 10076); + dasm_put(Dst, 10093); } else { - dasm_put(Dst, 10097); + dasm_put(Dst, 10114); if (cmov) { - dasm_put(Dst, 10113); + dasm_put(Dst, 10130); } else { - dasm_put(Dst, 10119); + dasm_put(Dst, 10136); } } if (LJ_DUALNUM) { switch (op) { case BC_ISLT: - dasm_put(Dst, 10022); + dasm_put(Dst, 10039); break; case BC_ISGE: - dasm_put(Dst, 10027); + dasm_put(Dst, 10044); break; case BC_ISLE: - dasm_put(Dst, 10032); + dasm_put(Dst, 10049); break; case BC_ISGT: - dasm_put(Dst, 10037); + dasm_put(Dst, 10054); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 10042); + dasm_put(Dst, 10059); } else { switch (op) { case BC_ISLT: - dasm_put(Dst, 10126); + dasm_put(Dst, 10143); break; case BC_ISGE: - dasm_put(Dst, 10131); + dasm_put(Dst, 10148); break; case BC_ISLE: - dasm_put(Dst, 10136); + dasm_put(Dst, 10153); break; case BC_ISGT: - dasm_put(Dst, 10141); + dasm_put(Dst, 10158); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 10146, -BCBIAS_J*4); + dasm_put(Dst, 10163, -BCBIAS_J*4); } break; case BC_ISEQV: case BC_ISNEV: vk = op == BC_ISEQV; - dasm_put(Dst, 10179); + dasm_put(Dst, 10196); if (LJ_DUALNUM) { - dasm_put(Dst, 10187, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10204, LJ_TISNUM, LJ_TISNUM); if (vk) { - dasm_put(Dst, 10212); + dasm_put(Dst, 10229); } else { - dasm_put(Dst, 10217); + dasm_put(Dst, 10234); } - dasm_put(Dst, 10222, -BCBIAS_J*4, LJ_TISNUM); + dasm_put(Dst, 10239, -BCBIAS_J*4, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10275); + dasm_put(Dst, 10292); } else { - dasm_put(Dst, 10282); + dasm_put(Dst, 10299); } - dasm_put(Dst, 10286); + dasm_put(Dst, 10303); if (sse) { - dasm_put(Dst, 10297); + dasm_put(Dst, 10314); } else { - dasm_put(Dst, 10309); + dasm_put(Dst, 10326); } - dasm_put(Dst, 10316); + dasm_put(Dst, 10333); } else { - dasm_put(Dst, 10321, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10338, LJ_TISNUM, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 10340); + dasm_put(Dst, 10357); } else { - dasm_put(Dst, 10358); + dasm_put(Dst, 10375); if (cmov) { - dasm_put(Dst, 10113); + dasm_put(Dst, 10130); } else { - dasm_put(Dst, 10119); + dasm_put(Dst, 10136); } } iseqne_fp: if (vk) { - dasm_put(Dst, 10371); + dasm_put(Dst, 10388); } else { - dasm_put(Dst, 10380); + dasm_put(Dst, 10397); } iseqne_end: if (vk) { - dasm_put(Dst, 10389, -BCBIAS_J*4); + dasm_put(Dst, 10406, -BCBIAS_J*4); if (!LJ_HASFFI) { - dasm_put(Dst, 4615); + dasm_put(Dst, 4632); } } else { if (!LJ_HASFFI) { - dasm_put(Dst, 4615); + dasm_put(Dst, 4632); } - dasm_put(Dst, 10404, -BCBIAS_J*4); + dasm_put(Dst, 10421, -BCBIAS_J*4); } if (LJ_DUALNUM && (op == BC_ISEQV || op == BC_ISNEV || op == BC_ISEQN || op == BC_ISNEN)) { - dasm_put(Dst, 10419); + dasm_put(Dst, 10436); } else { - dasm_put(Dst, 10158); + dasm_put(Dst, 10175); } if (op == BC_ISEQV || op == BC_ISNEV) { - dasm_put(Dst, 10424); + dasm_put(Dst, 10441); if (LJ_HASFFI) { - dasm_put(Dst, 10427, LJ_TCDATA, LJ_TCDATA); + dasm_put(Dst, 10444, LJ_TCDATA, LJ_TCDATA); } - dasm_put(Dst, 10446, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<metatable), Dt6(->nomm), 1<>32)); + dasm_put(Dst, 11034, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); } else { - dasm_put(Dst, 11042); + dasm_put(Dst, 11059); } if (LJ_DUALNUM) { - dasm_put(Dst, 10419); + dasm_put(Dst, 10436); } else { - dasm_put(Dst, 10158); + dasm_put(Dst, 10175); } break; case BC_LEN: - dasm_put(Dst, 11051, LJ_TSTR); + dasm_put(Dst, 11068, LJ_TSTR); if (LJ_DUALNUM) { - dasm_put(Dst, 11065, Dt5(->len), LJ_TISNUM); + dasm_put(Dst, 11082, Dt5(->len), LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 11079, Dt5(->len)); + dasm_put(Dst, 11096, Dt5(->len)); } else { - dasm_put(Dst, 11097, Dt5(->len)); + dasm_put(Dst, 11114, Dt5(->len)); } - dasm_put(Dst, 11106, LJ_TTAB); + dasm_put(Dst, 11123, LJ_TTAB); if (LJ_DUALNUM) { } else if (sse) { - dasm_put(Dst, 11148); + dasm_put(Dst, 11165); } else { } - dasm_put(Dst, 11154); + dasm_put(Dst, 11171); break; /* -- Binary ops -------------------------------------------------------- */ @@ -2144,605 +2145,605 @@ 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, 11167); + dasm_put(Dst, 11184); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11175, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11192, LJ_TISNUM, LJ_TISNUM); break; case 1: - dasm_put(Dst, 11210, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11227, LJ_TISNUM, LJ_TISNUM); break; default: - dasm_put(Dst, 11245, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11262, LJ_TISNUM, LJ_TISNUM); break; } - dasm_put(Dst, 11278, LJ_TISNUM); + dasm_put(Dst, 11295, LJ_TISNUM); if (vk == 1) { - dasm_put(Dst, 11075); + dasm_put(Dst, 11092); } else { - dasm_put(Dst, 10858); + dasm_put(Dst, 10875); } - dasm_put(Dst, 10158); + dasm_put(Dst, 10175); } else { - dasm_put(Dst, 11167); + dasm_put(Dst, 11184); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11284, LJ_TISNUM); + dasm_put(Dst, 11301, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11296, LJ_TISNUM); + dasm_put(Dst, 11313, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11308); + dasm_put(Dst, 11325); } else { - dasm_put(Dst, 11323); + dasm_put(Dst, 11340); } break; case 1: - dasm_put(Dst, 11332, LJ_TISNUM); + dasm_put(Dst, 11349, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11344, LJ_TISNUM); + dasm_put(Dst, 11361, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11356); + dasm_put(Dst, 11373); } else { - dasm_put(Dst, 11371); + dasm_put(Dst, 11388); } break; default: - dasm_put(Dst, 11380, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11397, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11402); + dasm_put(Dst, 11419); } else { - dasm_put(Dst, 11416); + dasm_put(Dst, 11433); } break; } if (sse) { - dasm_put(Dst, 11035); + dasm_put(Dst, 11052); } else { - dasm_put(Dst, 11047); + dasm_put(Dst, 11064); } - dasm_put(Dst, 10158); + dasm_put(Dst, 10175); } break; case BC_SUBVN: case BC_SUBNV: case BC_SUBVV: if (LJ_DUALNUM) { - dasm_put(Dst, 11167); + dasm_put(Dst, 11184); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11424, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11441, LJ_TISNUM, LJ_TISNUM); break; case 1: - dasm_put(Dst, 11459, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11476, LJ_TISNUM, LJ_TISNUM); break; default: - dasm_put(Dst, 11494, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11511, LJ_TISNUM, LJ_TISNUM); break; } - dasm_put(Dst, 11278, LJ_TISNUM); + dasm_put(Dst, 11295, LJ_TISNUM); if (vk == 1) { - dasm_put(Dst, 11075); + dasm_put(Dst, 11092); } else { - dasm_put(Dst, 10858); + dasm_put(Dst, 10875); } - dasm_put(Dst, 10158); + dasm_put(Dst, 10175); } else { - dasm_put(Dst, 11167); + dasm_put(Dst, 11184); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11284, LJ_TISNUM); + dasm_put(Dst, 11301, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11296, LJ_TISNUM); + dasm_put(Dst, 11313, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11527); + dasm_put(Dst, 11544); } else { - dasm_put(Dst, 11542); + dasm_put(Dst, 11559); } break; case 1: - dasm_put(Dst, 11332, LJ_TISNUM); + dasm_put(Dst, 11349, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11344, LJ_TISNUM); + dasm_put(Dst, 11361, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11551); + dasm_put(Dst, 11568); } else { - dasm_put(Dst, 11566); + dasm_put(Dst, 11583); } break; default: - dasm_put(Dst, 11380, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11397, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11575); + dasm_put(Dst, 11592); } else { - dasm_put(Dst, 11589); + dasm_put(Dst, 11606); } break; } if (sse) { - dasm_put(Dst, 11035); + dasm_put(Dst, 11052); } else { - dasm_put(Dst, 11047); + dasm_put(Dst, 11064); } - dasm_put(Dst, 10158); + dasm_put(Dst, 10175); } break; case BC_MULVN: case BC_MULNV: case BC_MULVV: if (LJ_DUALNUM) { - dasm_put(Dst, 11167); + dasm_put(Dst, 11184); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11597, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11614, LJ_TISNUM, LJ_TISNUM); break; case 1: - dasm_put(Dst, 11633, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11650, LJ_TISNUM, LJ_TISNUM); break; default: - dasm_put(Dst, 11669, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11686, LJ_TISNUM, LJ_TISNUM); break; } - dasm_put(Dst, 11278, LJ_TISNUM); + dasm_put(Dst, 11295, LJ_TISNUM); if (vk == 1) { - dasm_put(Dst, 11075); + dasm_put(Dst, 11092); } else { - dasm_put(Dst, 10858); + dasm_put(Dst, 10875); } - dasm_put(Dst, 10158); + dasm_put(Dst, 10175); } else { - dasm_put(Dst, 11167); + dasm_put(Dst, 11184); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11284, LJ_TISNUM); + dasm_put(Dst, 11301, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11296, LJ_TISNUM); + dasm_put(Dst, 11313, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11703); + dasm_put(Dst, 11720); } else { - dasm_put(Dst, 11718); + dasm_put(Dst, 11735); } break; case 1: - dasm_put(Dst, 11332, LJ_TISNUM); + dasm_put(Dst, 11349, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11344, LJ_TISNUM); + dasm_put(Dst, 11361, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11727); + dasm_put(Dst, 11744); } else { - dasm_put(Dst, 11742); + dasm_put(Dst, 11759); } break; default: - dasm_put(Dst, 11380, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11397, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11751); + dasm_put(Dst, 11768); } else { - dasm_put(Dst, 11765); + dasm_put(Dst, 11782); } break; } if (sse) { - dasm_put(Dst, 11035); + dasm_put(Dst, 11052); } else { - dasm_put(Dst, 11047); + dasm_put(Dst, 11064); } - dasm_put(Dst, 10158); + dasm_put(Dst, 10175); } break; case BC_DIVVN: case BC_DIVNV: case BC_DIVVV: - dasm_put(Dst, 11167); + dasm_put(Dst, 11184); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11284, LJ_TISNUM); + dasm_put(Dst, 11301, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11296, LJ_TISNUM); + dasm_put(Dst, 11313, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11773); + dasm_put(Dst, 11790); } else { - dasm_put(Dst, 11788); + dasm_put(Dst, 11805); } break; case 1: - dasm_put(Dst, 11332, LJ_TISNUM); + dasm_put(Dst, 11349, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11344, LJ_TISNUM); + dasm_put(Dst, 11361, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11797); + dasm_put(Dst, 11814); } else { - dasm_put(Dst, 11812); + dasm_put(Dst, 11829); } break; default: - dasm_put(Dst, 11380, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11397, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11821); + dasm_put(Dst, 11838); } else { - dasm_put(Dst, 11835); + dasm_put(Dst, 11852); } break; } if (sse) { - dasm_put(Dst, 11035); + dasm_put(Dst, 11052); } else { - dasm_put(Dst, 11047); + dasm_put(Dst, 11064); } - dasm_put(Dst, 10158); + dasm_put(Dst, 10175); break; case BC_MODVN: - dasm_put(Dst, 11167); + dasm_put(Dst, 11184); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11284, LJ_TISNUM); + dasm_put(Dst, 11301, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11296, LJ_TISNUM); + dasm_put(Dst, 11313, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11843); + dasm_put(Dst, 11860); } else { - dasm_put(Dst, 11858); + dasm_put(Dst, 11875); } break; case 1: - dasm_put(Dst, 11332, LJ_TISNUM); + dasm_put(Dst, 11349, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11344, LJ_TISNUM); + dasm_put(Dst, 11361, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11867); + dasm_put(Dst, 11884); } else { - dasm_put(Dst, 11882); + dasm_put(Dst, 11899); } break; default: - dasm_put(Dst, 11380, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11397, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11891); + dasm_put(Dst, 11908); } else { - dasm_put(Dst, 11905); + dasm_put(Dst, 11922); } break; } - dasm_put(Dst, 11913); + dasm_put(Dst, 11930); if (sse) { - dasm_put(Dst, 11035); + dasm_put(Dst, 11052); } else { - dasm_put(Dst, 11047); + dasm_put(Dst, 11064); } - dasm_put(Dst, 10158); + dasm_put(Dst, 10175); break; case BC_MODNV: case BC_MODVV: - dasm_put(Dst, 11167); + dasm_put(Dst, 11184); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11284, LJ_TISNUM); + dasm_put(Dst, 11301, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11296, LJ_TISNUM); + dasm_put(Dst, 11313, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11843); + dasm_put(Dst, 11860); } else { - dasm_put(Dst, 11858); + dasm_put(Dst, 11875); } break; case 1: - dasm_put(Dst, 11332, LJ_TISNUM); + dasm_put(Dst, 11349, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11344, LJ_TISNUM); + dasm_put(Dst, 11361, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11867); + dasm_put(Dst, 11884); } else { - dasm_put(Dst, 11882); + dasm_put(Dst, 11899); } break; default: - dasm_put(Dst, 11380, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11397, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11891); + dasm_put(Dst, 11908); } else { - dasm_put(Dst, 11905); + dasm_put(Dst, 11922); } break; } - dasm_put(Dst, 11919); + dasm_put(Dst, 11936); break; case BC_POW: - dasm_put(Dst, 11167); + dasm_put(Dst, 11184); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11284, LJ_TISNUM); + dasm_put(Dst, 11301, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11296, LJ_TISNUM); + dasm_put(Dst, 11313, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11843); + dasm_put(Dst, 11860); } else { - dasm_put(Dst, 11858); + dasm_put(Dst, 11875); } break; case 1: - dasm_put(Dst, 11332, LJ_TISNUM); + dasm_put(Dst, 11349, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11344, LJ_TISNUM); + dasm_put(Dst, 11361, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11867); + dasm_put(Dst, 11884); } else { - dasm_put(Dst, 11882); + dasm_put(Dst, 11899); } break; default: - dasm_put(Dst, 11380, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11397, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11891); + dasm_put(Dst, 11908); } else { - dasm_put(Dst, 11905); + dasm_put(Dst, 11922); } break; } - dasm_put(Dst, 11924); + dasm_put(Dst, 11941); if (sse) { - dasm_put(Dst, 11035); + dasm_put(Dst, 11052); } else { - dasm_put(Dst, 11047); + dasm_put(Dst, 11064); } - dasm_put(Dst, 10158); + dasm_put(Dst, 10175); break; case BC_CAT: - dasm_put(Dst, 11928, Dt1(->base), Dt1(->base)); + dasm_put(Dst, 11945, Dt1(->base), Dt1(->base)); break; /* -- Constant ops ------------------------------------------------------ */ case BC_KSTR: - dasm_put(Dst, 12012, LJ_TSTR); + dasm_put(Dst, 12029, LJ_TSTR); break; case BC_KCDATA: #if LJ_HASFFI - dasm_put(Dst, 12012, LJ_TCDATA); + dasm_put(Dst, 12029, LJ_TCDATA); #endif break; case BC_KSHORT: if (LJ_DUALNUM) { - dasm_put(Dst, 12049, LJ_TISNUM); + dasm_put(Dst, 12066, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 12061); + dasm_put(Dst, 12078); } else { - dasm_put(Dst, 12076); + dasm_put(Dst, 12093); } - dasm_put(Dst, 10158); + dasm_put(Dst, 10175); break; case BC_KNUM: if (sse) { - dasm_put(Dst, 12084); + dasm_put(Dst, 12101); } else { - dasm_put(Dst, 12098); + dasm_put(Dst, 12115); } - dasm_put(Dst, 10158); + dasm_put(Dst, 10175); break; case BC_KPRI: - dasm_put(Dst, 12106); + dasm_put(Dst, 12123); break; case BC_KNIL: - dasm_put(Dst, 12135, LJ_TNIL); + dasm_put(Dst, 12152, LJ_TNIL); break; /* -- Upvalue and function ops ------------------------------------------ */ case BC_UGET: - dasm_put(Dst, 12183, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12200, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_USETV: #define TV2MARKOFS \ ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv)) - dasm_put(Dst, 12224, 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, 12320); + dasm_put(Dst, 12241, 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, 12337); break; #undef TV2MARKOFS case BC_USETS: - dasm_put(Dst, 12332, 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, 12349, 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, 12428); - if (sse) { - dasm_put(Dst, 12433); - } else { - dasm_put(Dst, 10682); - } - dasm_put(Dst, 12441, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12445); if (sse) { dasm_put(Dst, 12450); } else { - dasm_put(Dst, 12456); + dasm_put(Dst, 10699); } - dasm_put(Dst, 10158); + dasm_put(Dst, 12458, offsetof(GCfuncL, uvptr), DtA(->v)); + if (sse) { + dasm_put(Dst, 12467); + } else { + dasm_put(Dst, 12473); + } + dasm_put(Dst, 10175); break; case BC_USETP: - dasm_put(Dst, 12459, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12476, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_UCLO: - dasm_put(Dst, 12499, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 12516, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); break; case BC_FNEW: - dasm_put(Dst, 12555, Dt1(->base), Dt1(->base), LJ_TFUNC); + dasm_put(Dst, 12572, Dt1(->base), Dt1(->base), LJ_TFUNC); break; /* -- Table ops --------------------------------------------------------- */ case BC_TNEW: - dasm_put(Dst, 12622, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 12639, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); break; case BC_TDUP: - dasm_put(Dst, 12746, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 12763, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); break; case BC_GGET: - dasm_put(Dst, 12845, Dt7(->env)); + dasm_put(Dst, 12862, Dt7(->env)); break; case BC_GSET: - dasm_put(Dst, 12865, Dt7(->env)); + dasm_put(Dst, 12882, Dt7(->env)); break; case BC_TGETV: - dasm_put(Dst, 12885, LJ_TTAB); + dasm_put(Dst, 12902, LJ_TTAB); if (LJ_DUALNUM) { - dasm_put(Dst, 12908, LJ_TISNUM); + dasm_put(Dst, 12925, LJ_TISNUM); } else { - dasm_put(Dst, 12922, LJ_TISNUM); + dasm_put(Dst, 12939, LJ_TISNUM); if (sse) { - dasm_put(Dst, 12933); + dasm_put(Dst, 12950); } else { } - dasm_put(Dst, 12954); + dasm_put(Dst, 12971); } - dasm_put(Dst, 12959, 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, 13154, 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, 13171, 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), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13384, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETS: - dasm_put(Dst, 13507, 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, 13584, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); - dasm_put(Dst, 13671, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13524, 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, 13601, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); + dasm_put(Dst, 13688, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETB: - dasm_put(Dst, 13763, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); - dasm_put(Dst, 13858, Dt6(->metatable), Dt6(->nomm), 1<marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13780, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); + dasm_put(Dst, 13875, Dt6(->metatable), Dt6(->nomm), 1<marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETM: - dasm_put(Dst, 13906, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); - dasm_put(Dst, 14056, Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13923, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 14073, Dt6(->marked), (uint8_t)~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, 11171); + dasm_put(Dst, 11188); if (op == BC_CALLM) { - dasm_put(Dst, 14076); + dasm_put(Dst, 14093); } - dasm_put(Dst, 14081, LJ_TFUNC, Dt7(->pc)); + dasm_put(Dst, 14098, LJ_TFUNC, Dt7(->pc)); break; case BC_CALLMT: - dasm_put(Dst, 14076); + dasm_put(Dst, 14093); break; case BC_CALLT: - dasm_put(Dst, 14124, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); - dasm_put(Dst, 14242, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG); + dasm_put(Dst, 14141, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); + dasm_put(Dst, 14259, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG); break; case BC_ITERC: - dasm_put(Dst, 14316, LJ_TFUNC, 2+1, Dt7(->pc)); + dasm_put(Dst, 14333, LJ_TFUNC, 2+1, Dt7(->pc)); break; case BC_ITERN: #if LJ_HASJIT #endif - dasm_put(Dst, 14388, Dt6(->asize), Dt6(->array), LJ_TNIL); + dasm_put(Dst, 14405, Dt6(->asize), Dt6(->array), LJ_TNIL); if (LJ_DUALNUM) { - dasm_put(Dst, 11070, LJ_TISNUM); + dasm_put(Dst, 11087, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 11148); + dasm_put(Dst, 11165); } else { - dasm_put(Dst, 14440); + dasm_put(Dst, 14457); } - dasm_put(Dst, 14446); + dasm_put(Dst, 14463); if (LJ_DUALNUM) { } else if (sse) { - dasm_put(Dst, 11035); + dasm_put(Dst, 11052); } else { - dasm_put(Dst, 11047); + dasm_put(Dst, 11064); } - dasm_put(Dst, 14459, -BCBIAS_J*4); + dasm_put(Dst, 14476, -BCBIAS_J*4); if (!LJ_DUALNUM && !sse) { - dasm_put(Dst, 14513); + dasm_put(Dst, 14530); } - dasm_put(Dst, 14519, Dt6(->hmask), sizeof(Node), Dt6(->node), DtB(->val.it), LJ_TNIL, DtB(->key), DtB(->val)); + dasm_put(Dst, 14536, Dt6(->hmask), sizeof(Node), Dt6(->node), DtB(->val.it), LJ_TNIL, DtB(->key), DtB(->val)); break; case BC_ISNEXT: - dasm_put(Dst, 14598, LJ_TFUNC, LJ_TTAB, LJ_TNIL, Dt8(->ffid), FF_next_N, -BCBIAS_J*4, BC_JMP, -BCBIAS_J*4, BC_ITERC); + dasm_put(Dst, 14615, 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, 14699, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); - dasm_put(Dst, 14866, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 14716, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); + dasm_put(Dst, 14883, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); break; /* -- Returns ----------------------------------------------------------- */ case BC_RETM: - dasm_put(Dst, 14076); + dasm_put(Dst, 14093); break; case BC_RET: case BC_RET0: case BC_RET1: if (op != BC_RET0) { - dasm_put(Dst, 14936); + dasm_put(Dst, 14953); } - dasm_put(Dst, 14940, FRAME_TYPE); + dasm_put(Dst, 14957, FRAME_TYPE); switch (op) { case BC_RET: - dasm_put(Dst, 14959); + dasm_put(Dst, 14976); break; case BC_RET1: - dasm_put(Dst, 15013); + dasm_put(Dst, 15030); /* fallthrough */ case BC_RET0: - dasm_put(Dst, 15023); + dasm_put(Dst, 15040); default: break; } - dasm_put(Dst, 15034, Dt7(->pc), PC2PROTO(k)); + dasm_put(Dst, 15051, Dt7(->pc), PC2PROTO(k)); if (op == BC_RET) { - dasm_put(Dst, 15082, LJ_TNIL); + dasm_put(Dst, 15099, LJ_TNIL); } else { - dasm_put(Dst, 15093, LJ_TNIL); + dasm_put(Dst, 15110, LJ_TNIL); } - dasm_put(Dst, 15100, -FRAME_VARG, FRAME_TYPEP); + dasm_put(Dst, 15117, -FRAME_VARG, FRAME_TYPEP); if (op != BC_RET0) { - dasm_put(Dst, 15124); + dasm_put(Dst, 15141); } - dasm_put(Dst, 4692); + dasm_put(Dst, 4709); break; /* -- Loops and branches ------------------------------------------------ */ @@ -2750,7 +2751,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORL: #if LJ_HASJIT - dasm_put(Dst, 15128, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 15145, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2762,111 +2763,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, 15149); + dasm_put(Dst, 15166); if (LJ_DUALNUM) { - dasm_put(Dst, 15153, LJ_TISNUM); + dasm_put(Dst, 15170, LJ_TISNUM); if (!vk) { - dasm_put(Dst, 15163, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 15180, LJ_TISNUM, LJ_TISNUM); } else { #ifdef LUA_USE_ASSERT - dasm_put(Dst, 15192, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 15209, LJ_TISNUM, LJ_TISNUM); #endif - dasm_put(Dst, 15211); + dasm_put(Dst, 15228); } - dasm_put(Dst, 15230, LJ_TISNUM); + dasm_put(Dst, 15247, LJ_TISNUM); if (op == BC_FORI) { - dasm_put(Dst, 15241, -BCBIAS_J*4); + dasm_put(Dst, 15258, -BCBIAS_J*4); } else if (op == BC_JFORI) { - dasm_put(Dst, 15255, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 15272, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 15273, -BCBIAS_J*4); + dasm_put(Dst, 15290, -BCBIAS_J*4); } else { - dasm_put(Dst, 15265, BC_JLOOP); + dasm_put(Dst, 15282, BC_JLOOP); } - dasm_put(Dst, 15287); + dasm_put(Dst, 15304); if (vk) { - dasm_put(Dst, 15312); + dasm_put(Dst, 15329); } - dasm_put(Dst, 15230, LJ_TISNUM); + dasm_put(Dst, 15247, LJ_TISNUM); if (op == BC_FORI) { - dasm_put(Dst, 15321); + dasm_put(Dst, 15338); } else if (op == BC_JFORI) { - dasm_put(Dst, 15326, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 15343, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 15340); + dasm_put(Dst, 15357); } else { - dasm_put(Dst, 15336, BC_JLOOP); + dasm_put(Dst, 15353, BC_JLOOP); } - dasm_put(Dst, 15345); + dasm_put(Dst, 15362); } else if (!vk) { - dasm_put(Dst, 15352, LJ_TISNUM); + dasm_put(Dst, 15369, LJ_TISNUM); } if (!vk) { - dasm_put(Dst, 15358, LJ_TISNUM); + dasm_put(Dst, 15375, LJ_TISNUM); } else { #ifdef LUA_USE_ASSERT - dasm_put(Dst, 15372, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 15389, LJ_TISNUM, LJ_TISNUM); #endif } - dasm_put(Dst, 15391); + dasm_put(Dst, 15408); if (!vk) { - dasm_put(Dst, 15395, LJ_TISNUM); + dasm_put(Dst, 15412, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 15404); + dasm_put(Dst, 15421); if (vk) { - dasm_put(Dst, 15416); + dasm_put(Dst, 15433); } else { - dasm_put(Dst, 15435); + dasm_put(Dst, 15452); } - dasm_put(Dst, 15440); + dasm_put(Dst, 15457); } else { - dasm_put(Dst, 15453); + dasm_put(Dst, 15470); if (vk) { - dasm_put(Dst, 15459); + dasm_put(Dst, 15476); } else { - dasm_put(Dst, 15475); + dasm_put(Dst, 15492); } - dasm_put(Dst, 15483); + dasm_put(Dst, 15500); if (cmov) { - dasm_put(Dst, 10113); + dasm_put(Dst, 10130); } else { - dasm_put(Dst, 10119); + dasm_put(Dst, 10136); } if (!cmov) { - dasm_put(Dst, 15488); + dasm_put(Dst, 15505); } } if (op == BC_FORI) { if (LJ_DUALNUM) { - dasm_put(Dst, 15494); + dasm_put(Dst, 15511); } else { - dasm_put(Dst, 15499, -BCBIAS_J*4); + dasm_put(Dst, 15516, -BCBIAS_J*4); } } else if (op == BC_JFORI) { - dasm_put(Dst, 15509, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 15526, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { if (LJ_DUALNUM) { - dasm_put(Dst, 15523); + dasm_put(Dst, 15540); } else { - dasm_put(Dst, 15528, -BCBIAS_J*4); + dasm_put(Dst, 15545, -BCBIAS_J*4); } } else { - dasm_put(Dst, 15519, BC_JLOOP); + dasm_put(Dst, 15536, BC_JLOOP); } if (LJ_DUALNUM) { - dasm_put(Dst, 10042); + dasm_put(Dst, 10059); } else { - dasm_put(Dst, 10816); + dasm_put(Dst, 10833); } if (sse) { - dasm_put(Dst, 15538); + dasm_put(Dst, 15555); } break; case BC_ITERL: #if LJ_HASJIT - dasm_put(Dst, 15128, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 15145, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2875,33 +2876,33 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IITERL: - dasm_put(Dst, 15549, LJ_TNIL); + dasm_put(Dst, 15566, LJ_TNIL); if (op == BC_JITERL) { - dasm_put(Dst, 15564, BC_JLOOP); + dasm_put(Dst, 15581, BC_JLOOP); } else { - dasm_put(Dst, 15578, -BCBIAS_J*4); + dasm_put(Dst, 15595, -BCBIAS_J*4); } - dasm_put(Dst, 10156); + dasm_put(Dst, 10173); break; case BC_LOOP: #if LJ_HASJIT - dasm_put(Dst, 15128, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 15145, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; case BC_ILOOP: - dasm_put(Dst, 10158); + dasm_put(Dst, 10175); break; case BC_JLOOP: #if LJ_HASJIT - dasm_put(Dst, 15594, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); + dasm_put(Dst, 15611, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); #endif break; case BC_JMP: - dasm_put(Dst, 15635, -BCBIAS_J*4); + dasm_put(Dst, 15652, -BCBIAS_J*4); break; /* -- Function headers -------------------------------------------------- */ @@ -2915,7 +2916,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FUNCF: #if LJ_HASJIT - dasm_put(Dst, 15661, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 15678, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif case BC_FUNCV: /* NYI: compiled vararg functions. */ break; @@ -2925,47 +2926,47 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IFUNCF: - dasm_put(Dst, 15682, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); + dasm_put(Dst, 15699, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); if (op == BC_JFUNCF) { - dasm_put(Dst, 15713, BC_JLOOP); + dasm_put(Dst, 15730, BC_JLOOP); } else { - dasm_put(Dst, 10158); + dasm_put(Dst, 10175); } - dasm_put(Dst, 15722, LJ_TNIL); + dasm_put(Dst, 15739, LJ_TNIL); break; case BC_JFUNCV: #if !LJ_HASJIT break; #endif - dasm_put(Dst, 9265); + dasm_put(Dst, 9282); break; /* NYI: compiled vararg functions. */ case BC_IFUNCV: - dasm_put(Dst, 15744, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); + dasm_put(Dst, 15761, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); if (op == BC_JFUNCV) { - dasm_put(Dst, 15713, BC_JLOOP); + dasm_put(Dst, 15730, BC_JLOOP); } else { - dasm_put(Dst, 15841, -4+PC2PROTO(k)); + dasm_put(Dst, 15858, -4+PC2PROTO(k)); } - dasm_put(Dst, 15866, LJ_TNIL); + dasm_put(Dst, 15883, LJ_TNIL); break; case BC_FUNCC: case BC_FUNCCW: - dasm_put(Dst, 15888, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); + dasm_put(Dst, 15905, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); if (op == BC_FUNCC) { - dasm_put(Dst, 2364); + dasm_put(Dst, 2381); } else { - dasm_put(Dst, 15918); + dasm_put(Dst, 15935); } - dasm_put(Dst, 15926, DISPATCH_GL(vmstate), ~LJ_VMST_C); + dasm_put(Dst, 15943, DISPATCH_GL(vmstate), ~LJ_VMST_C); if (op == BC_FUNCC) { - dasm_put(Dst, 15936); + dasm_put(Dst, 15953); } else { - dasm_put(Dst, 15941, DISPATCH_GL(wrapf)); + dasm_put(Dst, 15958, DISPATCH_GL(wrapf)); } - dasm_put(Dst, 15947, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 15964, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); break; /* ---------------------------------------------------------------------- */ @@ -2993,7 +2994,7 @@ static int build_backend(BuildCtx *ctx) build_subroutines(ctx, cmov, sse); - dasm_put(Dst, 15973); + dasm_put(Dst, 15990); 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 244225f3..461f768c 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[15830] = { +static const unsigned char build_actionlist[15847] = { 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, @@ -111,134 +111,135 @@ static const unsigned char build_actionlist[15830] = { 250,57,129,233,15,132,244,251,248,4,139,137,233,133,201,15,133,244,3,255, 252,233,244,63,248,5,139,105,4,129,252,253,239,15,132,244,63,139,1,137,106, 252,252,137,66,252,248,252,233,244,63,248,6,129,252,253,239,15,132,244,1, - 129,252,253,239,15,135,244,253,189,237,248,7,252,247,213,139,172,253,171, - 233,252,233,244,2,248,65,255,129,252,248,239,15,130,244,60,129,122,253,4, - 239,15,133,244,60,139,42,131,189,233,0,15,133,244,60,129,122,253,12,239,15, - 133,244,60,139,66,8,137,133,233,139,114,252,252,199,66,252,252,237,137,106, - 252,248,252,246,133,233,235,15,132,244,247,128,165,233,235,255,139,131,233, - 137,171,233,137,133,233,248,1,252,233,244,63,248,66,129,252,248,239,15,130, - 244,60,129,122,253,4,239,15,133,244,60,137,213,68,141,66,8,139,18,139,76, - 36,96,232,251,1,10,137,252,234,72,139,40,139,114,252,252,72,137,106,252,248, - 252,233,244,63,248,67,129,252,248,239,15,133,244,60,129,122,253,4,239,255, - 15,133,244,247,139,42,252,233,244,68,248,1,15,135,244,60,255,15,131,244,60, - 255,252,242,15,16,2,252,233,244,69,255,221,2,252,233,244,70,255,248,71,129, - 252,248,239,15,130,244,60,139,114,252,252,129,122,253,4,239,15,133,244,249, - 139,2,248,2,199,66,252,252,237,137,66,252,248,252,233,244,63,248,3,129,122, - 253,4,239,15,135,244,60,131,187,233,0,15,133,244,60,139,171,233,59,171,233, - 255,15,130,244,247,232,244,72,248,1,139,108,36,96,137,149,233,137,116,36, - 100,137,252,233,255,232,251,1,11,255,232,251,1,12,255,139,149,233,252,233, - 244,2,248,73,129,252,248,239,15,130,244,60,15,132,244,248,248,1,129,122,253, - 4,239,15,133,244,60,139,108,36,96,137,149,233,137,149,233,139,114,252,252, - 68,141,66,8,139,18,137,252,233,137,116,36,100,232,251,1,13,139,149,233,133, - 192,15,132,244,249,72,139,106,8,72,139,66,16,72,137,106,252,248,72,137,2, - 248,74,184,237,255,252,233,244,75,248,2,199,66,12,237,252,233,244,1,248,3, - 199,66,252,252,237,252,233,244,63,248,76,129,252,248,239,15,130,244,60,139, - 42,129,122,253,4,239,15,133,244,60,255,131,189,233,0,15,133,244,60,255,139, - 106,252,248,139,133,233,139,114,252,252,199,66,252,252,237,137,66,252,248, - 199,66,12,237,184,237,252,233,244,75,248,77,129,252,248,239,15,130,244,60, - 129,122,253,4,239,15,133,244,60,129,122,253,12,239,255,139,114,252,252,255, - 139,66,8,131,192,1,199,66,252,252,237,137,66,252,248,255,252,242,15,16,66, - 8,72,189,237,237,102,72,15,110,205,252,242,15,88,193,252,242,15,45,192,252, - 242,15,17,66,252,248,255,139,42,59,133,233,15,131,244,248,193,224,3,3,133, - 233,248,1,129,120,253,4,239,15,132,244,78,72,139,40,72,137,42,252,233,244, - 74,248,2,131,189,233,0,15,132,244,78,137,252,233,137,213,137,194,232,251, - 1,14,137,252,234,133,192,15,133,244,1,248,78,184,237,252,233,244,75,248,79, - 255,139,106,252,248,139,133,233,139,114,252,252,199,66,252,252,237,137,66, - 252,248,255,199,66,12,237,199,66,8,0,0,0,0,255,15,87,192,252,242,15,17,66, - 8,255,217,252,238,221,90,8,255,184,237,252,233,244,75,248,80,129,252,248, - 239,15,130,244,60,141,74,8,131,232,1,190,237,248,1,15,182,171,233,193,252, - 237,235,131,229,1,1,252,238,252,233,244,28,248,81,129,252,248,239,15,130, - 244,60,129,122,253,12,239,15,133,244,60,255,139,106,4,137,106,12,199,66,4, - 237,139,42,139,114,8,137,106,8,137,50,141,74,16,131,232,2,190,237,252,233, - 244,1,248,82,129,252,248,239,15,130,244,60,139,42,139,114,252,252,137,116, - 36,100,137,108,36,80,129,122,253,4,239,15,133,244,60,72,131,189,233,0,15, - 133,244,60,128,189,233,235,15,135,244,60,139,141,233,15,132,244,247,255,59, - 141,233,15,132,244,60,248,1,141,116,193,252,240,59,181,233,15,135,244,60, - 137,181,233,139,108,36,96,137,149,233,131,194,8,137,149,233,141,108,194,232, - 72,41,252,245,57,206,15,132,244,249,248,2,72,139,4,46,72,137,70,252,248,131, - 252,238,8,57,206,15,133,244,2,248,3,137,202,139,76,36,80,232,244,25,199,131, - 233,237,255,139,108,36,96,139,116,36,80,139,149,233,129,252,248,239,15,135, - 244,254,248,4,139,142,233,139,190,233,137,142,233,137,252,254,41,206,15,132, - 244,252,141,4,50,193,252,238,3,59,133,233,15,135,244,255,137,213,72,41,205, - 248,5,72,139,1,72,137,4,41,131,193,8,57,252,249,15,133,244,5,248,6,141,70, - 2,199,66,252,252,237,248,7,139,116,36,100,137,68,36,84,72,199,193,252,248, - 252,255,252,255,252,255,252,247,198,237,255,15,132,244,13,252,233,244,14, - 248,8,199,66,252,252,237,139,142,233,131,252,233,8,137,142,233,72,139,1,72, - 137,2,184,237,252,233,244,7,248,9,139,76,36,80,137,185,233,137,252,242,137, - 252,233,232,251,1,0,139,116,36,80,139,149,233,252,233,244,4,248,83,139,106, - 252,248,139,173,233,139,114,252,252,137,116,36,100,137,108,36,80,72,131,189, - 233,0,15,133,244,60,255,128,189,233,235,15,135,244,60,139,141,233,15,132, - 244,247,59,141,233,15,132,244,60,248,1,141,116,193,252,248,59,181,233,15, - 135,244,60,137,181,233,139,108,36,96,137,149,233,137,149,233,141,108,194, - 252,240,72,41,252,245,57,206,15,132,244,249,248,2,255,72,139,4,46,72,137, - 70,252,248,131,252,238,8,57,206,15,133,244,2,248,3,137,202,139,76,36,80,232, - 244,25,199,131,233,237,139,108,36,96,139,116,36,80,139,149,233,129,252,248, - 239,15,135,244,254,248,4,139,142,233,139,190,233,137,142,233,137,252,254, - 41,206,15,132,244,252,141,4,50,193,252,238,3,59,133,233,15,135,244,255,255, - 137,213,72,41,205,248,5,72,139,1,72,137,4,41,131,193,8,57,252,249,15,133, - 244,5,248,6,141,70,1,248,7,139,116,36,100,137,68,36,84,49,201,252,247,198, - 237,15,132,244,13,252,233,244,14,248,8,137,252,242,137,252,233,232,251,1, - 15,248,9,139,76,36,80,137,185,233,137,252,242,137,252,233,232,251,1,0,139, - 116,36,80,139,149,233,252,233,244,4,248,84,139,108,36,96,72,252,247,133,233, - 237,15,132,244,60,255,137,149,233,141,68,194,252,248,137,133,233,49,192,72, - 137,133,233,176,235,136,133,233,252,233,244,16,255,248,68,255,248,70,139, - 114,252,252,221,90,252,248,252,233,244,63,255,248,85,129,252,248,239,15,130, - 244,60,255,129,122,253,4,239,15,133,244,248,139,42,131,252,253,0,15,137,244, - 68,252,247,221,15,136,244,247,248,86,248,68,139,114,252,252,199,66,252,252, - 237,137,106,252,248,252,233,244,63,248,1,139,114,252,252,199,66,252,252,0, - 0,224,65,199,66,252,248,0,0,0,0,252,233,244,63,248,2,15,135,244,60,255,129, - 122,253,4,239,15,131,244,60,255,252,242,15,16,2,72,184,237,237,102,72,15, - 110,200,15,84,193,248,69,139,114,252,252,252,242,15,17,66,252,248,255,221, - 2,217,225,248,69,248,70,139,114,252,252,221,90,252,248,255,248,63,184,237, - 248,75,137,68,36,84,248,61,252,247,198,237,15,133,244,253,248,5,56,70,252, - 255,15,135,244,252,15,182,78,252,253,72,252,247,209,141,20,202,139,6,15,182, - 204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,6,199,68,194,252, - 244,237,131,192,1,252,233,244,5,248,7,72,199,193,252,248,252,255,252,255, - 252,255,252,233,244,14,248,87,255,129,122,253,4,239,15,133,244,247,139,42, - 252,233,244,68,248,1,15,135,244,60,255,252,242,15,16,2,232,244,88,255,252, - 242,15,45,232,129,252,253,0,0,0,128,15,133,244,68,252,242,15,42,205,102,15, - 46,193,15,138,244,69,15,132,244,68,255,221,2,232,244,88,255,248,89,255,252, - 242,15,16,2,232,244,90,255,221,2,232,244,90,255,248,91,129,252,248,239,15, - 130,244,60,129,122,253,4,239,15,131,244,60,252,242,15,81,2,252,233,244,69, - 255,248,91,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131,244,60, - 221,2,217,252,250,252,233,244,70,255,248,92,129,252,248,239,15,130,244,60, - 129,122,253,4,239,15,131,244,60,217,252,237,221,2,217,252,241,252,233,244, - 70,248,93,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131,244,60,217, - 252,236,221,2,217,252,241,252,233,244,70,248,94,129,252,248,239,255,15,130, - 244,60,129,122,253,4,239,15,131,244,60,221,2,232,244,95,252,233,244,70,248, - 96,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131,244,60,221,2,217, - 252,254,252,233,244,70,248,97,129,252,248,239,255,15,130,244,60,129,122,253, - 4,239,15,131,244,60,221,2,217,252,255,252,233,244,70,248,98,129,252,248,239, - 15,130,244,60,129,122,253,4,239,15,131,244,60,221,2,217,252,242,221,216,252, - 233,244,70,248,99,129,252,248,239,15,130,244,60,255,129,122,253,4,239,15, - 131,244,60,221,2,217,192,216,200,217,232,222,225,217,252,250,217,252,243, - 252,233,244,70,248,100,129,252,248,239,15,130,244,60,129,122,253,4,239,15, - 131,244,60,221,2,217,192,216,200,217,232,222,225,217,252,250,217,201,217, - 252,243,252,233,244,70,248,101,129,252,248,239,15,130,244,60,129,122,253, - 4,239,15,131,244,60,255,221,2,217,232,217,252,243,252,233,244,70,255,248, - 102,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131,244,60,252,242, - 15,16,2,255,137,213,232,251,1,16,137,252,234,252,233,244,69,255,248,103,129, + 129,252,253,239,15,135,244,254,129,252,253,239,15,134,244,253,189,237,252, + 233,244,254,248,7,255,189,237,248,8,252,247,213,139,172,253,171,233,252,233, + 244,2,248,65,129,252,248,239,15,130,244,60,129,122,253,4,239,15,133,244,60, + 139,42,131,189,233,0,15,133,244,60,129,122,253,12,239,15,133,244,60,139,66, + 8,137,133,233,139,114,252,252,199,66,252,252,237,255,137,106,252,248,252, + 246,133,233,235,15,132,244,247,128,165,233,235,139,131,233,137,171,233,137, + 133,233,248,1,252,233,244,63,248,66,129,252,248,239,15,130,244,60,129,122, + 253,4,239,15,133,244,60,137,213,68,141,66,8,139,18,139,76,36,96,232,251,1, + 10,137,252,234,72,139,40,139,114,252,252,72,137,106,252,248,252,233,244,63, + 248,67,255,129,252,248,239,15,133,244,60,129,122,253,4,239,255,15,133,244, + 247,139,42,252,233,244,68,248,1,15,135,244,60,255,15,131,244,60,255,252,242, + 15,16,2,252,233,244,69,255,221,2,252,233,244,70,255,248,71,129,252,248,239, + 15,130,244,60,139,114,252,252,129,122,253,4,239,15,133,244,249,139,2,248, + 2,199,66,252,252,237,137,66,252,248,252,233,244,63,248,3,129,122,253,4,239, + 15,135,244,60,131,187,233,0,15,133,244,60,139,171,233,59,171,233,255,15,130, + 244,247,232,244,72,248,1,139,108,36,96,137,149,233,137,116,36,100,137,252, + 233,255,232,251,1,11,255,232,251,1,12,255,139,149,233,252,233,244,2,248,73, + 129,252,248,239,15,130,244,60,15,132,244,248,248,1,129,122,253,4,239,15,133, + 244,60,139,108,36,96,137,149,233,137,149,233,139,114,252,252,68,141,66,8, + 139,18,137,252,233,137,116,36,100,232,251,1,13,139,149,233,133,192,15,132, + 244,249,72,139,106,8,72,139,66,16,72,137,106,252,248,72,137,2,248,74,184, + 237,255,252,233,244,75,248,2,199,66,12,237,252,233,244,1,248,3,199,66,252, + 252,237,252,233,244,63,248,76,129,252,248,239,15,130,244,60,139,42,129,122, + 253,4,239,15,133,244,60,255,131,189,233,0,15,133,244,60,255,139,106,252,248, + 139,133,233,139,114,252,252,199,66,252,252,237,137,66,252,248,199,66,12,237, + 184,237,252,233,244,75,248,77,129,252,248,239,15,130,244,60,129,122,253,4, + 239,15,133,244,60,129,122,253,12,239,255,139,114,252,252,255,139,66,8,131, + 192,1,199,66,252,252,237,137,66,252,248,255,252,242,15,16,66,8,72,189,237, + 237,102,72,15,110,205,252,242,15,88,193,252,242,15,45,192,252,242,15,17,66, + 252,248,255,139,42,59,133,233,15,131,244,248,193,224,3,3,133,233,248,1,129, + 120,253,4,239,15,132,244,78,72,139,40,72,137,42,252,233,244,74,248,2,131, + 189,233,0,15,132,244,78,137,252,233,137,213,137,194,232,251,1,14,137,252, + 234,133,192,15,133,244,1,248,78,184,237,252,233,244,75,248,79,255,139,106, + 252,248,139,133,233,139,114,252,252,199,66,252,252,237,137,66,252,248,255, + 199,66,12,237,199,66,8,0,0,0,0,255,15,87,192,252,242,15,17,66,8,255,217,252, + 238,221,90,8,255,184,237,252,233,244,75,248,80,129,252,248,239,15,130,244, + 60,141,74,8,131,232,1,190,237,248,1,15,182,171,233,193,252,237,235,131,229, + 1,1,252,238,252,233,244,28,248,81,129,252,248,239,15,130,244,60,129,122,253, + 12,239,15,133,244,60,255,139,106,4,137,106,12,199,66,4,237,139,42,139,114, + 8,137,106,8,137,50,141,74,16,131,232,2,190,237,252,233,244,1,248,82,129,252, + 248,239,15,130,244,60,139,42,139,114,252,252,137,116,36,100,137,108,36,80, + 129,122,253,4,239,15,133,244,60,72,131,189,233,0,15,133,244,60,128,189,233, + 235,15,135,244,60,139,141,233,15,132,244,247,255,59,141,233,15,132,244,60, + 248,1,141,116,193,252,240,59,181,233,15,135,244,60,137,181,233,139,108,36, + 96,137,149,233,131,194,8,137,149,233,141,108,194,232,72,41,252,245,57,206, + 15,132,244,249,248,2,72,139,4,46,72,137,70,252,248,131,252,238,8,57,206,15, + 133,244,2,248,3,137,202,139,76,36,80,232,244,25,199,131,233,237,255,139,108, + 36,96,139,116,36,80,139,149,233,129,252,248,239,15,135,244,254,248,4,139, + 142,233,139,190,233,137,142,233,137,252,254,41,206,15,132,244,252,141,4,50, + 193,252,238,3,59,133,233,15,135,244,255,137,213,72,41,205,248,5,72,139,1, + 72,137,4,41,131,193,8,57,252,249,15,133,244,5,248,6,141,70,2,199,66,252,252, + 237,248,7,139,116,36,100,137,68,36,84,72,199,193,252,248,252,255,252,255, + 252,255,252,247,198,237,255,15,132,244,13,252,233,244,14,248,8,199,66,252, + 252,237,139,142,233,131,252,233,8,137,142,233,72,139,1,72,137,2,184,237,252, + 233,244,7,248,9,139,76,36,80,137,185,233,137,252,242,137,252,233,232,251, + 1,0,139,116,36,80,139,149,233,252,233,244,4,248,83,139,106,252,248,139,173, + 233,139,114,252,252,137,116,36,100,137,108,36,80,72,131,189,233,0,15,133, + 244,60,255,128,189,233,235,15,135,244,60,139,141,233,15,132,244,247,59,141, + 233,15,132,244,60,248,1,141,116,193,252,248,59,181,233,15,135,244,60,137, + 181,233,139,108,36,96,137,149,233,137,149,233,141,108,194,252,240,72,41,252, + 245,57,206,15,132,244,249,248,2,255,72,139,4,46,72,137,70,252,248,131,252, + 238,8,57,206,15,133,244,2,248,3,137,202,139,76,36,80,232,244,25,199,131,233, + 237,139,108,36,96,139,116,36,80,139,149,233,129,252,248,239,15,135,244,254, + 248,4,139,142,233,139,190,233,137,142,233,137,252,254,41,206,15,132,244,252, + 141,4,50,193,252,238,3,59,133,233,15,135,244,255,255,137,213,72,41,205,248, + 5,72,139,1,72,137,4,41,131,193,8,57,252,249,15,133,244,5,248,6,141,70,1,248, + 7,139,116,36,100,137,68,36,84,49,201,252,247,198,237,15,132,244,13,252,233, + 244,14,248,8,137,252,242,137,252,233,232,251,1,15,248,9,139,76,36,80,137, + 185,233,137,252,242,137,252,233,232,251,1,0,139,116,36,80,139,149,233,252, + 233,244,4,248,84,139,108,36,96,72,252,247,133,233,237,15,132,244,60,255,137, + 149,233,141,68,194,252,248,137,133,233,49,192,72,137,133,233,176,235,136, + 133,233,252,233,244,16,255,248,68,255,248,70,139,114,252,252,221,90,252,248, + 252,233,244,63,255,248,85,129,252,248,239,15,130,244,60,255,129,122,253,4, + 239,15,133,244,248,139,42,131,252,253,0,15,137,244,68,252,247,221,15,136, + 244,247,248,86,248,68,139,114,252,252,199,66,252,252,237,137,106,252,248, + 252,233,244,63,248,1,139,114,252,252,199,66,252,252,0,0,224,65,199,66,252, + 248,0,0,0,0,252,233,244,63,248,2,15,135,244,60,255,129,122,253,4,239,15,131, + 244,60,255,252,242,15,16,2,72,184,237,237,102,72,15,110,200,15,84,193,248, + 69,139,114,252,252,252,242,15,17,66,252,248,255,221,2,217,225,248,69,248, + 70,139,114,252,252,221,90,252,248,255,248,63,184,237,248,75,137,68,36,84, + 248,61,252,247,198,237,15,133,244,253,248,5,56,70,252,255,15,135,244,252, + 15,182,78,252,253,72,252,247,209,141,20,202,139,6,15,182,204,15,182,232,131, + 198,4,193,232,16,252,255,36,252,235,248,6,199,68,194,252,244,237,131,192, + 1,252,233,244,5,248,7,72,199,193,252,248,252,255,252,255,252,255,252,233, + 244,14,248,87,255,129,122,253,4,239,15,133,244,247,139,42,252,233,244,68, + 248,1,15,135,244,60,255,252,242,15,16,2,232,244,88,255,252,242,15,45,232, + 129,252,253,0,0,0,128,15,133,244,68,252,242,15,42,205,102,15,46,193,15,138, + 244,69,15,132,244,68,255,221,2,232,244,88,255,248,89,255,252,242,15,16,2, + 232,244,90,255,221,2,232,244,90,255,248,91,129,252,248,239,15,130,244,60, + 129,122,253,4,239,15,131,244,60,252,242,15,81,2,252,233,244,69,255,248,91, + 129,252,248,239,15,130,244,60,129,122,253,4,239,15,131,244,60,221,2,217,252, + 250,252,233,244,70,255,248,92,129,252,248,239,15,130,244,60,129,122,253,4, + 239,15,131,244,60,217,252,237,221,2,217,252,241,252,233,244,70,248,93,129, + 252,248,239,15,130,244,60,129,122,253,4,239,15,131,244,60,217,252,236,221, + 2,217,252,241,252,233,244,70,248,94,129,252,248,239,255,15,130,244,60,129, + 122,253,4,239,15,131,244,60,221,2,232,244,95,252,233,244,70,248,96,129,252, + 248,239,15,130,244,60,129,122,253,4,239,15,131,244,60,221,2,217,252,254,252, + 233,244,70,248,97,129,252,248,239,255,15,130,244,60,129,122,253,4,239,15, + 131,244,60,221,2,217,252,255,252,233,244,70,248,98,129,252,248,239,15,130, + 244,60,129,122,253,4,239,15,131,244,60,221,2,217,252,242,221,216,252,233, + 244,70,248,99,129,252,248,239,15,130,244,60,255,129,122,253,4,239,15,131, + 244,60,221,2,217,192,216,200,217,232,222,225,217,252,250,217,252,243,252, + 233,244,70,248,100,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131, + 244,60,221,2,217,192,216,200,217,232,222,225,217,252,250,217,201,217,252, + 243,252,233,244,70,248,101,129,252,248,239,15,130,244,60,129,122,253,4,239, + 15,131,244,60,255,221,2,217,232,217,252,243,252,233,244,70,255,248,102,129, 252,248,239,15,130,244,60,129,122,253,4,239,15,131,244,60,252,242,15,16,2, - 255,137,213,232,251,1,17,137,252,234,252,233,244,69,255,248,104,129,252,248, + 255,137,213,232,251,1,16,137,252,234,252,233,244,69,255,248,103,129,252,248, 239,15,130,244,60,129,122,253,4,239,15,131,244,60,252,242,15,16,2,255,137, - 213,232,251,1,18,137,252,234,252,233,244,69,248,105,255,248,106,129,252,248, - 239,15,130,244,60,129,122,253,4,239,15,131,244,60,252,242,15,16,2,139,106, - 252,248,252,242,15,89,133,233,252,233,244,69,255,248,106,129,252,248,239, - 15,130,244,60,129,122,253,4,239,15,131,244,60,221,2,139,106,252,248,220,141, - 233,252,233,244,70,255,248,107,129,252,248,239,15,130,244,60,129,122,253, - 4,239,15,131,244,60,129,122,253,12,239,15,131,244,60,221,2,221,66,8,217,252, - 243,252,233,244,70,248,108,129,252,248,239,15,130,244,60,129,122,253,4,239, - 15,131,244,60,129,122,253,12,239,255,15,131,244,60,221,66,8,221,2,217,252, - 253,221,217,252,233,244,70,248,109,129,252,248,239,15,130,244,60,139,106, - 4,129,252,253,239,15,131,244,60,139,114,252,252,139,2,137,106,252,252,137, - 66,252,248,209,229,129,252,253,0,0,224,252,255,15,131,244,249,9,232,15,132, - 244,249,184,252,254,3,0,0,129,252,253,0,0,32,0,15,130,244,250,248,1,193,252, - 237,21,41,197,255,252,242,15,42,197,255,137,108,36,80,219,68,36,80,255,139, - 106,252,252,129,229,252,255,252,255,15,128,129,205,0,0,224,63,137,106,252, - 252,248,2,255,252,242,15,17,2,255,221,26,255,184,237,252,233,244,75,248,3, - 255,15,87,192,252,233,244,2,255,217,252,238,252,233,244,2,255,248,4,255,252, - 242,15,16,2,72,189,237,237,102,72,15,110,205,252,242,15,89,193,252,242,15, - 17,66,252,248,255,221,2,199,68,36,80,0,0,128,90,216,76,36,80,221,90,252,248, + 213,232,251,1,17,137,252,234,252,233,244,69,255,248,104,129,252,248,239,15, + 130,244,60,129,122,253,4,239,15,131,244,60,252,242,15,16,2,255,137,213,232, + 251,1,18,137,252,234,252,233,244,69,248,105,255,248,106,129,252,248,239,15, + 130,244,60,129,122,253,4,239,15,131,244,60,252,242,15,16,2,139,106,252,248, + 252,242,15,89,133,233,252,233,244,69,255,248,106,129,252,248,239,15,130,244, + 60,129,122,253,4,239,15,131,244,60,221,2,139,106,252,248,220,141,233,252, + 233,244,70,255,248,107,129,252,248,239,15,130,244,60,129,122,253,4,239,15, + 131,244,60,129,122,253,12,239,15,131,244,60,221,2,221,66,8,217,252,243,252, + 233,244,70,248,108,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131, + 244,60,129,122,253,12,239,255,15,131,244,60,221,66,8,221,2,217,252,253,221, + 217,252,233,244,70,248,109,129,252,248,239,15,130,244,60,139,106,4,129,252, + 253,239,15,131,244,60,139,114,252,252,139,2,137,106,252,252,137,66,252,248, + 209,229,129,252,253,0,0,224,252,255,15,131,244,249,9,232,15,132,244,249,184, + 252,254,3,0,0,129,252,253,0,0,32,0,15,130,244,250,248,1,193,252,237,21,41, + 197,255,252,242,15,42,197,255,137,108,36,80,219,68,36,80,255,139,106,252, + 252,129,229,252,255,252,255,15,128,129,205,0,0,224,63,137,106,252,252,248, + 2,255,252,242,15,17,2,255,221,26,255,184,237,252,233,244,75,248,3,255,15, + 87,192,252,233,244,2,255,217,252,238,252,233,244,2,255,248,4,255,252,242, + 15,16,2,72,189,237,237,102,72,15,110,205,252,242,15,89,193,252,242,15,17, + 66,252,248,255,221,2,199,68,36,80,0,0,128,90,216,76,36,80,221,90,252,248, 255,139,106,252,252,184,52,4,0,0,209,229,252,233,244,1,255,248,110,129,252, 248,239,15,130,244,60,129,122,253,4,239,15,131,244,60,252,242,15,16,2,255, 248,110,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131,244,60,221, @@ -1214,627 +1215,628 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse) } dasm_put(Dst, 1829, ((char *)(&((GCfuncC *)0)->upvalue)), LJ_TSTR, ~LJ_TLIGHTUD, 1+1, LJ_TTAB, Dt6(->metatable), LJ_TNIL); dasm_put(Dst, 1908, DISPATCH_GL(gcroot)+4*(GCROOT_MMNAME+MM_metatable), LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), DtB(->next)); - dasm_put(Dst, 1965, LJ_TNIL, LJ_TUDATA, LJ_TISNUM, LJ_TNUMX, DISPATCH_GL(gcroot[GCROOT_BASEMT])); - dasm_put(Dst, 2033, 2+1, LJ_TTAB, Dt6(->metatable), LJ_TTAB, Dt6(->metatable), LJ_TTAB, Dt6(->marked), LJ_GC_BLACK, Dt6(->marked), (uint8_t)~LJ_GC_BLACK); - dasm_put(Dst, 2102, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist), 2+1, LJ_TTAB, 1+1, LJ_TISNUM); + dasm_put(Dst, 1965, LJ_TNIL, LJ_TUDATA, LJ_TNUMX, LJ_TISNUM, LJ_TLIGHTUD); + dasm_put(Dst, 2031, LJ_TNUMX, DISPATCH_GL(gcroot[GCROOT_BASEMT]), 2+1, LJ_TTAB, Dt6(->metatable), LJ_TTAB, Dt6(->metatable), LJ_TTAB); + dasm_put(Dst, 2101, Dt6(->marked), LJ_GC_BLACK, Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist), 2+1, LJ_TTAB); + dasm_put(Dst, 2190, 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 2187); - } else { dasm_put(Dst, 2204); + } else { + dasm_put(Dst, 2221); } if (sse) { - dasm_put(Dst, 2209); + dasm_put(Dst, 2226); } else { - dasm_put(Dst, 2219); + dasm_put(Dst, 2236); } - dasm_put(Dst, 2226, 1+1, LJ_TSTR, LJ_TSTR, LJ_TISNUM, DISPATCH_GL(gcroot[GCROOT_BASEMT_NUM]), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); - dasm_put(Dst, 2292, Dt1(->base)); + dasm_put(Dst, 2243, 1+1, LJ_TSTR, LJ_TSTR, LJ_TISNUM, DISPATCH_GL(gcroot[GCROOT_BASEMT_NUM]), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); + dasm_put(Dst, 2309, Dt1(->base)); if (LJ_DUALNUM) { - dasm_put(Dst, 2316); + dasm_put(Dst, 2333); } else { - dasm_put(Dst, 2321); + dasm_put(Dst, 2338); } - dasm_put(Dst, 2326, Dt1(->base), 1+1, LJ_TTAB, Dt1(->base), Dt1(->top), Dt1(->base), 1+2); - dasm_put(Dst, 2419, LJ_TNIL, LJ_TNIL, 1+1, LJ_TTAB); + dasm_put(Dst, 2343, Dt1(->base), 1+1, LJ_TTAB, Dt1(->base), Dt1(->top), Dt1(->base), 1+2); + dasm_put(Dst, 2436, LJ_TNIL, LJ_TNIL, 1+1, LJ_TTAB); #ifdef LUAJIT_ENABLE_LUA52COMPAT - dasm_put(Dst, 2466, Dt6(->metatable)); + dasm_put(Dst, 2483, Dt6(->metatable)); #endif - dasm_put(Dst, 2475, Dt8(->upvalue[0]), LJ_TFUNC, LJ_TNIL, 1+3, 1+1, LJ_TTAB, LJ_TISNUM); + dasm_put(Dst, 2492, Dt8(->upvalue[0]), LJ_TFUNC, LJ_TNIL, 1+3, 1+1, LJ_TTAB, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 2461); + dasm_put(Dst, 2478); } else { - dasm_put(Dst, 2204); + dasm_put(Dst, 2221); } - dasm_put(Dst, 2530); + dasm_put(Dst, 2547); if (LJ_DUALNUM) { - dasm_put(Dst, 2535, LJ_TISNUM); + dasm_put(Dst, 2552, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 2551, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); + dasm_put(Dst, 2568, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); } else { } - dasm_put(Dst, 2584, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->hmask), 1+0); - dasm_put(Dst, 2446, 1+1, LJ_TTAB); + dasm_put(Dst, 2601, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->hmask), 1+0); + dasm_put(Dst, 2463, 1+1, LJ_TTAB); #ifdef LUAJIT_ENABLE_LUA52COMPAT - dasm_put(Dst, 2466, Dt6(->metatable)); + dasm_put(Dst, 2483, Dt6(->metatable)); #endif - dasm_put(Dst, 2661, Dt8(->upvalue[0]), LJ_TFUNC); + dasm_put(Dst, 2678, Dt8(->upvalue[0]), LJ_TFUNC); if (LJ_DUALNUM) { - dasm_put(Dst, 2682, LJ_TISNUM); + dasm_put(Dst, 2699, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 2694); + dasm_put(Dst, 2711); } else { - dasm_put(Dst, 2704); + dasm_put(Dst, 2721); } - dasm_put(Dst, 2711, 1+3, 1+1, 8+FRAME_PCALL, DISPATCH_GL(hookmask), HOOK_ACTIVE_SHIFT, 2+1, LJ_TFUNC); - dasm_put(Dst, 2775, LJ_TFUNC, 16+FRAME_PCALL, 1+1, LJ_TTHREAD, Dt1(->cframe), Dt1(->status), LUA_YIELD, Dt1(->top)); - dasm_put(Dst, 2865, Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP); - dasm_put(Dst, 2953, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack), LJ_TTRUE, FRAME_TYPE); - dasm_put(Dst, 3066, LJ_TFALSE, Dt1(->top), Dt1(->top), 1+2, Dt1(->top), Dt1(->base), Dt8(->upvalue[0].gcr), Dt1(->cframe)); - dasm_put(Dst, 3164, Dt1(->status), LUA_YIELD, Dt1(->top), Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top)); - dasm_put(Dst, 3231, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack)); - dasm_put(Dst, 3319, FRAME_TYPE, Dt1(->top), Dt1(->base), Dt1(->cframe), CFRAME_RESUME); - dasm_put(Dst, 3431, Dt1(->base), Dt1(->top), Dt1(->cframe), LUA_YIELD, Dt1(->status)); + dasm_put(Dst, 2728, 1+3, 1+1, 8+FRAME_PCALL, DISPATCH_GL(hookmask), HOOK_ACTIVE_SHIFT, 2+1, LJ_TFUNC); + dasm_put(Dst, 2792, LJ_TFUNC, 16+FRAME_PCALL, 1+1, LJ_TTHREAD, Dt1(->cframe), Dt1(->status), LUA_YIELD, Dt1(->top)); + dasm_put(Dst, 2882, Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP); + dasm_put(Dst, 2970, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack), LJ_TTRUE, FRAME_TYPE); + dasm_put(Dst, 3083, LJ_TFALSE, Dt1(->top), Dt1(->top), 1+2, Dt1(->top), Dt1(->base), Dt8(->upvalue[0].gcr), Dt1(->cframe)); + dasm_put(Dst, 3181, Dt1(->status), LUA_YIELD, Dt1(->top), Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 3248, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack)); + dasm_put(Dst, 3336, FRAME_TYPE, Dt1(->top), Dt1(->base), Dt1(->cframe), CFRAME_RESUME); + dasm_put(Dst, 3448, Dt1(->base), Dt1(->top), Dt1(->cframe), LUA_YIELD, Dt1(->status)); if (!LJ_DUALNUM) { - dasm_put(Dst, 3458); + dasm_put(Dst, 3475); } if (sse) { - dasm_put(Dst, 3461); + dasm_put(Dst, 3478); } - dasm_put(Dst, 3476, 1+1); + dasm_put(Dst, 3493, 1+1); if (LJ_DUALNUM) { - dasm_put(Dst, 3487, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 3504, LJ_TISNUM, LJ_TISNUM); } else { - dasm_put(Dst, 3567, LJ_TISNUM); + dasm_put(Dst, 3584, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 3577, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); + dasm_put(Dst, 3594, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); } else { - dasm_put(Dst, 3608); + dasm_put(Dst, 3625); } - dasm_put(Dst, 3625, 1+1, FRAME_TYPE, LJ_TNIL); + dasm_put(Dst, 3642, 1+1, FRAME_TYPE, LJ_TNIL); if (LJ_DUALNUM) { - dasm_put(Dst, 3721, LJ_TISNUM); + dasm_put(Dst, 3738, LJ_TISNUM); } else { - dasm_put(Dst, 3567, LJ_TISNUM); + dasm_put(Dst, 3584, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 3743); + dasm_put(Dst, 3760); if (LJ_DUALNUM) { - dasm_put(Dst, 3752); + dasm_put(Dst, 3769); } - dasm_put(Dst, 2214); + dasm_put(Dst, 2231); } else { - dasm_put(Dst, 3786); + dasm_put(Dst, 3803); if (LJ_DUALNUM) { } else { - dasm_put(Dst, 2221); + dasm_put(Dst, 2238); } } - dasm_put(Dst, 3792); + dasm_put(Dst, 3809); if (LJ_DUALNUM) { - dasm_put(Dst, 3721, LJ_TISNUM); + dasm_put(Dst, 3738, LJ_TISNUM); } else { - dasm_put(Dst, 3567, LJ_TISNUM); + dasm_put(Dst, 3584, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 3795); + dasm_put(Dst, 3812); if (LJ_DUALNUM) { - dasm_put(Dst, 3752); + dasm_put(Dst, 3769); } - dasm_put(Dst, 2214); + dasm_put(Dst, 2231); } else { - dasm_put(Dst, 3804); + dasm_put(Dst, 3821); if (LJ_DUALNUM) { } else { - dasm_put(Dst, 2221); + dasm_put(Dst, 2238); } } if (sse) { - dasm_put(Dst, 3810, 1+1, LJ_TISNUM); + dasm_put(Dst, 3827, 1+1, LJ_TISNUM); } else { - dasm_put(Dst, 3839, 1+1, LJ_TISNUM); + dasm_put(Dst, 3856, 1+1, LJ_TISNUM); } - dasm_put(Dst, 3868, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); - dasm_put(Dst, 3937, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); - dasm_put(Dst, 3994, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); - dasm_put(Dst, 4057, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM); - dasm_put(Dst, 4147); + dasm_put(Dst, 3885, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); + dasm_put(Dst, 3954, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); + dasm_put(Dst, 4011, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); + dasm_put(Dst, 4074, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM); + dasm_put(Dst, 4164); if (sse) { - dasm_put(Dst, 4159, 1+1, LJ_TISNUM); + dasm_put(Dst, 4176, 1+1, LJ_TISNUM); } else { } - dasm_put(Dst, 4184); + dasm_put(Dst, 4201); if (sse) { - dasm_put(Dst, 4198, 1+1, LJ_TISNUM); + dasm_put(Dst, 4215, 1+1, LJ_TISNUM); } else { } - dasm_put(Dst, 4223); + dasm_put(Dst, 4240); if (sse) { - dasm_put(Dst, 4237, 1+1, LJ_TISNUM); + dasm_put(Dst, 4254, 1+1, LJ_TISNUM); } else { } - dasm_put(Dst, 4262); + dasm_put(Dst, 4279); if (sse) { - dasm_put(Dst, 4278, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); + dasm_put(Dst, 4295, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); } else { - dasm_put(Dst, 4317, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); + dasm_put(Dst, 4334, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); } - dasm_put(Dst, 4350, 2+1, LJ_TISNUM, LJ_TISNUM, 2+1, LJ_TISNUM, LJ_TISNUM); - dasm_put(Dst, 4415, 1+1, LJ_TISNUM); + dasm_put(Dst, 4367, 2+1, LJ_TISNUM, LJ_TISNUM, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 4432, 1+1, LJ_TISNUM); if (sse) { - dasm_put(Dst, 4514); + dasm_put(Dst, 4531); } else { - dasm_put(Dst, 4520); + dasm_put(Dst, 4537); } - dasm_put(Dst, 4529); + dasm_put(Dst, 4546); if (sse) { - dasm_put(Dst, 4554); + dasm_put(Dst, 4571); } else { - dasm_put(Dst, 4560); + dasm_put(Dst, 4577); } - dasm_put(Dst, 4563, 1+2); + dasm_put(Dst, 4580, 1+2); if (sse) { - dasm_put(Dst, 4572); + dasm_put(Dst, 4589); } else { - dasm_put(Dst, 4580); + dasm_put(Dst, 4597); } - dasm_put(Dst, 4588); + dasm_put(Dst, 4605); if (sse) { - dasm_put(Dst, 4591, (unsigned int)(U64x(43500000,00000000)), (unsigned int)((U64x(43500000,00000000))>>32)); + dasm_put(Dst, 4608, (unsigned int)(U64x(43500000,00000000)), (unsigned int)((U64x(43500000,00000000))>>32)); } else { - dasm_put(Dst, 4618); + dasm_put(Dst, 4635); } - dasm_put(Dst, 4637); + dasm_put(Dst, 4654); if (sse) { - dasm_put(Dst, 4653, 1+1, LJ_TISNUM); + dasm_put(Dst, 4670, 1+1, LJ_TISNUM); } else { - dasm_put(Dst, 4678, 1+1, LJ_TISNUM); + dasm_put(Dst, 4695, 1+1, LJ_TISNUM); } - dasm_put(Dst, 4700); + dasm_put(Dst, 4717); if (sse) { - dasm_put(Dst, 4722); + dasm_put(Dst, 4739); } else { - dasm_put(Dst, 4748); + dasm_put(Dst, 4765); } - dasm_put(Dst, 4765, 1+2); + dasm_put(Dst, 4782, 1+2); if (sse) { - dasm_put(Dst, 4805); + dasm_put(Dst, 4822); } else { - dasm_put(Dst, 4813); + dasm_put(Dst, 4830); } - dasm_put(Dst, 4823, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 4840, 2+1, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 4875, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 4892, 2+1, LJ_TISNUM, LJ_TISNUM); } else { - dasm_put(Dst, 4922, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 4939, 2+1, LJ_TISNUM, LJ_TISNUM); } - dasm_put(Dst, 4963, LJ_TISNUM); + dasm_put(Dst, 4980, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 4976, LJ_TISNUM); + dasm_put(Dst, 4993, LJ_TISNUM); if (sse) { - dasm_put(Dst, 4514); + dasm_put(Dst, 4531); } else { } - dasm_put(Dst, 5026); + dasm_put(Dst, 5043); } else { - dasm_put(Dst, 2204); + dasm_put(Dst, 2221); } if (sse) { - dasm_put(Dst, 5037, LJ_TISNUM); + dasm_put(Dst, 5054, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5058); + dasm_put(Dst, 5075); } else { - dasm_put(Dst, 2204); + dasm_put(Dst, 2221); } - dasm_put(Dst, 5079); + dasm_put(Dst, 5096); } else { } - dasm_put(Dst, 5104, LJ_TISNUM); + dasm_put(Dst, 5121, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5117, LJ_TISNUM); + dasm_put(Dst, 5134, LJ_TISNUM); if (sse) { - dasm_put(Dst, 4514); + dasm_put(Dst, 4531); } else { } - dasm_put(Dst, 5026); + dasm_put(Dst, 5043); } else { - dasm_put(Dst, 2204); + dasm_put(Dst, 2221); } if (sse) { - dasm_put(Dst, 5037, LJ_TISNUM); + dasm_put(Dst, 5054, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5058); + dasm_put(Dst, 5075); } else { - dasm_put(Dst, 2204); + dasm_put(Dst, 2221); } - dasm_put(Dst, 5167); + dasm_put(Dst, 5184); } else { } if (!sse) { - dasm_put(Dst, 5192); + dasm_put(Dst, 5209); } - dasm_put(Dst, 5201, 1+1, LJ_TSTR); + dasm_put(Dst, 5218, 1+1, LJ_TSTR); if (LJ_DUALNUM) { - dasm_put(Dst, 5223, Dt5(->len)); + dasm_put(Dst, 5240, Dt5(->len)); } else if (sse) { - dasm_put(Dst, 5231, Dt5(->len)); + dasm_put(Dst, 5248, Dt5(->len)); } else { - dasm_put(Dst, 5242, Dt5(->len)); + dasm_put(Dst, 5259, Dt5(->len)); } - dasm_put(Dst, 5250, 1+1, LJ_TSTR, Dt5(->len), Dt5([1])); + dasm_put(Dst, 5267, 1+1, LJ_TSTR, Dt5(->len), Dt5([1])); if (LJ_DUALNUM) { - dasm_put(Dst, 5226); + dasm_put(Dst, 5243); } else if (sse) { - dasm_put(Dst, 5288); + dasm_put(Dst, 5305); } else { - dasm_put(Dst, 5298); + dasm_put(Dst, 5315); } - dasm_put(Dst, 5311, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+1, LJ_TISNUM); + dasm_put(Dst, 5328, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5342); + dasm_put(Dst, 5359); } else if (sse) { - dasm_put(Dst, 5365); + dasm_put(Dst, 5382); } else { - dasm_put(Dst, 5391); + dasm_put(Dst, 5408); } - dasm_put(Dst, 5415, Dt1(->base), Dt1(->base), LJ_TSTR, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+2, LJ_TISNUM); + dasm_put(Dst, 5432, Dt1(->base), Dt1(->base), LJ_TSTR, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+2, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5523); + dasm_put(Dst, 5540); } else if (sse) { - dasm_put(Dst, 5535); + dasm_put(Dst, 5552); } else { - dasm_put(Dst, 5550); + dasm_put(Dst, 5567); } - dasm_put(Dst, 5562, LJ_TSTR, LJ_TISNUM); + dasm_put(Dst, 5579, LJ_TSTR, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 2461); + dasm_put(Dst, 2478); } else { - dasm_put(Dst, 2204); + dasm_put(Dst, 2221); } - dasm_put(Dst, 5579, Dt5(->len)); + dasm_put(Dst, 5596, Dt5(->len)); if (LJ_DUALNUM) { - dasm_put(Dst, 5589); + dasm_put(Dst, 5606); } else if (sse) { - dasm_put(Dst, 5593); + dasm_put(Dst, 5610); } else { } - dasm_put(Dst, 5600, sizeof(GCstr)-1); - dasm_put(Dst, 5675, 2+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); - dasm_put(Dst, 5734, LJ_TSTR, LJ_TISNUM); + dasm_put(Dst, 5617, sizeof(GCstr)-1); + dasm_put(Dst, 5692, 2+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); + dasm_put(Dst, 5751, LJ_TSTR, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5751); + dasm_put(Dst, 5768); } else if (sse) { - dasm_put(Dst, 5759); + dasm_put(Dst, 5776); } else { - dasm_put(Dst, 5770); + dasm_put(Dst, 5787); } - dasm_put(Dst, 5786, Dt5(->len), DISPATCH_GL(tmpbuf.sz), Dt5([1]), DISPATCH_GL(tmpbuf.buf), DISPATCH_GL(tmpbuf.buf), 1+1); - dasm_put(Dst, 5851, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz), sizeof(GCstr), DISPATCH_GL(tmpbuf.buf)); - dasm_put(Dst, 5914, 1+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz)); - dasm_put(Dst, 5985, sizeof(GCstr), DISPATCH_GL(tmpbuf.buf), 1+1); - dasm_put(Dst, 6070, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz), sizeof(GCstr), DISPATCH_GL(tmpbuf.buf)); - dasm_put(Dst, 6140, 1+1, LJ_TTAB); + dasm_put(Dst, 5803, Dt5(->len), DISPATCH_GL(tmpbuf.sz), Dt5([1]), DISPATCH_GL(tmpbuf.buf), DISPATCH_GL(tmpbuf.buf), 1+1); + dasm_put(Dst, 5868, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz), sizeof(GCstr), DISPATCH_GL(tmpbuf.buf)); + dasm_put(Dst, 5931, 1+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz)); + dasm_put(Dst, 6002, sizeof(GCstr), DISPATCH_GL(tmpbuf.buf), 1+1); + dasm_put(Dst, 6087, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz), sizeof(GCstr), DISPATCH_GL(tmpbuf.buf)); + dasm_put(Dst, 6157, 1+1, LJ_TTAB); if (LJ_DUALNUM) { - dasm_put(Dst, 6208); + dasm_put(Dst, 6225); } else if (sse) { - dasm_put(Dst, 6215); + dasm_put(Dst, 6232); } else { } - dasm_put(Dst, 6225, LJ_TISNUM); + dasm_put(Dst, 6242, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6233); + dasm_put(Dst, 6250); } else { - dasm_put(Dst, 2204); + dasm_put(Dst, 2221); } if (sse) { - dasm_put(Dst, 6250, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6267, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } dasm_put(Dst, 106); if (LJ_DUALNUM || sse) { if (!sse) { } - dasm_put(Dst, 6274); + dasm_put(Dst, 6291); } else { } - dasm_put(Dst, 6279); + dasm_put(Dst, 6296); if (sse) { - dasm_put(Dst, 6282, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6299, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { - dasm_put(Dst, 6292); + dasm_put(Dst, 6309); } - dasm_put(Dst, 2181, LJ_TISNUM); + dasm_put(Dst, 2198, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6301); - } else { - dasm_put(Dst, 2204); - } - if (sse) { dasm_put(Dst, 6318); } else { - } - dasm_put(Dst, 6333, LJ_TISNUM); - if (LJ_DUALNUM) { - dasm_put(Dst, 6358); - } else { - dasm_put(Dst, 6378); + dasm_put(Dst, 2221); } if (sse) { - dasm_put(Dst, 6383); + dasm_put(Dst, 6335); } else { } + dasm_put(Dst, 6350, LJ_TISNUM); + if (LJ_DUALNUM) { + dasm_put(Dst, 6375); + } else { + dasm_put(Dst, 6395); + } + if (sse) { dasm_put(Dst, 6400); - if (sse) { - dasm_put(Dst, 6282, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { - dasm_put(Dst, 6292); } - dasm_put(Dst, 2181, LJ_TISNUM); + dasm_put(Dst, 6417); + if (sse) { + dasm_put(Dst, 6299, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + } else { + dasm_put(Dst, 6309); + } + dasm_put(Dst, 2198, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6301); - } else { - dasm_put(Dst, 2204); - } - if (sse) { dasm_put(Dst, 6318); } else { - } - dasm_put(Dst, 6333, LJ_TISNUM); - if (LJ_DUALNUM) { - dasm_put(Dst, 6410); - } else { - dasm_put(Dst, 6378); + dasm_put(Dst, 2221); } if (sse) { - dasm_put(Dst, 6430); + dasm_put(Dst, 6335); } else { } + dasm_put(Dst, 6350, LJ_TISNUM); + if (LJ_DUALNUM) { + dasm_put(Dst, 6427); + } else { + dasm_put(Dst, 6395); + } + if (sse) { dasm_put(Dst, 6447); - if (sse) { - dasm_put(Dst, 6282, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { - dasm_put(Dst, 6292); } - dasm_put(Dst, 2181, LJ_TISNUM); + dasm_put(Dst, 6464); + if (sse) { + dasm_put(Dst, 6299, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + } else { + dasm_put(Dst, 6309); + } + dasm_put(Dst, 2198, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6301); - } else { - dasm_put(Dst, 2204); - } - if (sse) { dasm_put(Dst, 6318); } else { - } - dasm_put(Dst, 6333, LJ_TISNUM); - if (LJ_DUALNUM) { - dasm_put(Dst, 6457); - } else { - dasm_put(Dst, 6378); + dasm_put(Dst, 2221); } if (sse) { - dasm_put(Dst, 6477); + dasm_put(Dst, 6335); } else { } - dasm_put(Dst, 6494, LJ_TISNUM); + dasm_put(Dst, 6350, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6301); + dasm_put(Dst, 6474); } else { - dasm_put(Dst, 2204); + dasm_put(Dst, 6395); } if (sse) { - dasm_put(Dst, 6250, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6494); } else { } - dasm_put(Dst, 6509, LJ_TISNUM); + dasm_put(Dst, 6511, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6301); + dasm_put(Dst, 6318); } else { - dasm_put(Dst, 2204); + dasm_put(Dst, 2221); } if (sse) { - dasm_put(Dst, 6250, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6267, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6525); + dasm_put(Dst, 6526, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6274); + dasm_put(Dst, 6318); + } else { + dasm_put(Dst, 2221); + } + if (sse) { + dasm_put(Dst, 6267, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + } else { + } + dasm_put(Dst, 6542); + if (LJ_DUALNUM) { + dasm_put(Dst, 6291); } else if (sse) { - dasm_put(Dst, 6531); + dasm_put(Dst, 6548); } else { } - dasm_put(Dst, 6543); + dasm_put(Dst, 6560); if (LJ_DUALNUM) { - dasm_put(Dst, 6554, LJ_TISNUM); + dasm_put(Dst, 6571, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6301); + dasm_put(Dst, 6318); } else { - dasm_put(Dst, 2204); + dasm_put(Dst, 2221); } if (sse) { - dasm_put(Dst, 6250, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6267, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6562, LJ_TISNUM); + dasm_put(Dst, 6579, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 6577, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6594, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6644); + dasm_put(Dst, 6661); if (LJ_DUALNUM) { - dasm_put(Dst, 6651, LJ_TISNUM); + dasm_put(Dst, 6668, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6301); + dasm_put(Dst, 6318); } else { - dasm_put(Dst, 2204); + dasm_put(Dst, 2221); } if (sse) { - dasm_put(Dst, 6250, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6267, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6562, LJ_TISNUM); + dasm_put(Dst, 6579, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 6659, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6676, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6726); + dasm_put(Dst, 6743); if (LJ_DUALNUM) { - dasm_put(Dst, 6734, LJ_TISNUM); + dasm_put(Dst, 6751, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6301); + dasm_put(Dst, 6318); } else { - dasm_put(Dst, 2204); + dasm_put(Dst, 2221); } if (sse) { - dasm_put(Dst, 6250, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6267, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6562, LJ_TISNUM); + dasm_put(Dst, 6579, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 6742, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6759, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6809); + dasm_put(Dst, 6826); if (LJ_DUALNUM) { - dasm_put(Dst, 6817, LJ_TISNUM); + dasm_put(Dst, 6834, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6301); + dasm_put(Dst, 6318); } else { - dasm_put(Dst, 2204); + dasm_put(Dst, 2221); } if (sse) { - dasm_put(Dst, 6250, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6267, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6562, LJ_TISNUM); + dasm_put(Dst, 6579, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 6825, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6842, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6892); + dasm_put(Dst, 6909); if (LJ_DUALNUM) { - dasm_put(Dst, 6899, LJ_TISNUM); + dasm_put(Dst, 6916, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6301); + dasm_put(Dst, 6318); } else { - dasm_put(Dst, 2204); + dasm_put(Dst, 2221); } if (sse) { - dasm_put(Dst, 6250, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6267, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6562, LJ_TISNUM); + dasm_put(Dst, 6579, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 6907, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6924, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6974, 1+2, 1+1, Dt1(->base), 8*LUA_MINSTACK, Dt1(->top), Dt1(->maxstack), Dt8(->f), Dt1(->base)); - dasm_put(Dst, 7050, Dt1(->top), Dt7(->pc), FRAME_TYPE, LUA_MINSTACK, Dt1(->base), Dt1(->base)); - dasm_put(Dst, 7177, Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 6991, 1+2, 1+1, Dt1(->base), 8*LUA_MINSTACK, Dt1(->top), Dt1(->maxstack), Dt8(->f), Dt1(->base)); + dasm_put(Dst, 7067, Dt1(->top), Dt7(->pc), FRAME_TYPE, LUA_MINSTACK, Dt1(->base), Dt1(->base)); + dasm_put(Dst, 7194, Dt1(->top), Dt1(->base), Dt1(->top)); #if LJ_HASJIT - dasm_put(Dst, 7216, DISPATCH_GL(hookmask), HOOK_VMEVENT, HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount)); + dasm_put(Dst, 7233, DISPATCH_GL(hookmask), HOOK_VMEVENT, HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount)); #endif - dasm_put(Dst, 7247, DISPATCH_GL(hookmask), HOOK_ACTIVE, DISPATCH_GL(hookmask), HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount), LUA_MASKLINE); - dasm_put(Dst, 7298, Dt1(->base), Dt1(->base), GG_DISP2STATIC); + dasm_put(Dst, 7264, DISPATCH_GL(hookmask), HOOK_ACTIVE, DISPATCH_GL(hookmask), HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount), LUA_MASKLINE); + dasm_put(Dst, 7315, Dt1(->base), Dt1(->base), GG_DISP2STATIC); #if LJ_HASJIT - dasm_put(Dst, 7365, Dt7(->pc), PC2PROTO(framesize), Dt1(->base), Dt1(->top), GG_DISP2J, DISPATCH_J(L)); + dasm_put(Dst, 7382, Dt7(->pc), PC2PROTO(framesize), Dt1(->base), Dt1(->top), GG_DISP2J, DISPATCH_J(L)); #endif - dasm_put(Dst, 7412); + dasm_put(Dst, 7429); #if LJ_HASJIT - dasm_put(Dst, 7242); + dasm_put(Dst, 7259); #endif - dasm_put(Dst, 7419); + dasm_put(Dst, 7436); #if LJ_HASJIT - dasm_put(Dst, 7422); + dasm_put(Dst, 7439); #endif - dasm_put(Dst, 7432, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 7449, Dt1(->base), Dt1(->top)); #if LJ_HASJIT - dasm_put(Dst, 7466); + dasm_put(Dst, 7483); #endif - dasm_put(Dst, 7471, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 7488, Dt1(->base), Dt1(->top)); #if LJ_HASJIT - dasm_put(Dst, 7502, DISPATCH_GL(vmstate), DISPATCH_GL(vmstate), ~LJ_VMST_EXIT, DISPATCH_J(exitno), DISPATCH_J(parent), 16*8+4*8, DISPATCH_GL(jit_L), DISPATCH_GL(jit_base), DISPATCH_J(L), DISPATCH_GL(jit_L), Dt1(->base), 4*8, GG_DISP2J, Dt1(->cframe), CFRAME_RAWMASK, CFRAME_OFS_L, Dt1(->base), CFRAME_OFS_PC); + dasm_put(Dst, 7519, DISPATCH_GL(vmstate), DISPATCH_GL(vmstate), ~LJ_VMST_EXIT, DISPATCH_J(exitno), DISPATCH_J(parent), 16*8+4*8, DISPATCH_GL(jit_L), DISPATCH_GL(jit_base), DISPATCH_J(L), DISPATCH_GL(jit_L), Dt1(->base), 4*8, GG_DISP2J, Dt1(->cframe), CFRAME_RAWMASK, CFRAME_OFS_L, Dt1(->base), CFRAME_OFS_PC); #endif - dasm_put(Dst, 7732); + dasm_put(Dst, 7749); #if LJ_HASJIT - dasm_put(Dst, 7735, 9*16+4*8, -9*16, -8*16, -7*16, -6*16, -5*16, -4*16, -3*16, -2*16, -1*16, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, BC_FUNCF); - dasm_put(Dst, 7877); + dasm_put(Dst, 7752, 9*16+4*8, -9*16, -8*16, -7*16, -6*16, -5*16, -4*16, -3*16, -2*16, -1*16, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, BC_FUNCF); + dasm_put(Dst, 7894); #endif - dasm_put(Dst, 7903); + dasm_put(Dst, 7920); if (!sse) { - dasm_put(Dst, 7906); + dasm_put(Dst, 7923); } - dasm_put(Dst, 7951, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); + dasm_put(Dst, 7968, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); if (!sse) { - dasm_put(Dst, 8037); + dasm_put(Dst, 8054); } - dasm_put(Dst, 8082, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(bff00000,00000000)), (unsigned int)((U64x(bff00000,00000000))>>32)); + dasm_put(Dst, 8099, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(bff00000,00000000)), (unsigned int)((U64x(bff00000,00000000))>>32)); if (!sse) { - dasm_put(Dst, 8168); + dasm_put(Dst, 8185); } - dasm_put(Dst, 8207, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); + dasm_put(Dst, 8224, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); if (sse) { - dasm_put(Dst, 8296, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); + dasm_put(Dst, 8313, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); } else { - dasm_put(Dst, 8410); + dasm_put(Dst, 8427); } - dasm_put(Dst, 8457); + dasm_put(Dst, 8474); if (!sse) { } else { - dasm_put(Dst, 8531); + dasm_put(Dst, 8548); } - dasm_put(Dst, 8534); - dasm_put(Dst, 8619, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); - dasm_put(Dst, 8722, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(7ff00000,00000000)), (unsigned int)((U64x(7ff00000,00000000))>>32)); - dasm_put(Dst, 8878); + dasm_put(Dst, 8551); + dasm_put(Dst, 8636, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); + dasm_put(Dst, 8739, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(7ff00000,00000000)), (unsigned int)((U64x(7ff00000,00000000))>>32)); + dasm_put(Dst, 8895); #if LJ_HASJIT if (sse) { - dasm_put(Dst, 8919); - dasm_put(Dst, 8989); - dasm_put(Dst, 9062); + dasm_put(Dst, 8936); + dasm_put(Dst, 9006); + dasm_put(Dst, 9079); } else { - dasm_put(Dst, 9112); - dasm_put(Dst, 9204); + dasm_put(Dst, 9129); + dasm_put(Dst, 9221); } - dasm_put(Dst, 9250); + dasm_put(Dst, 9267); #endif - dasm_put(Dst, 9254); + dasm_put(Dst, 9271); if (sse) { - dasm_put(Dst, 9257, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); - dasm_put(Dst, 9346, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); + dasm_put(Dst, 9274, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); + dasm_put(Dst, 9363, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); } else { - dasm_put(Dst, 9470); - dasm_put(Dst, 9553); + dasm_put(Dst, 9487); + dasm_put(Dst, 9570); if (cmov) { - dasm_put(Dst, 9608); + dasm_put(Dst, 9625); } else { - dasm_put(Dst, 9627); + dasm_put(Dst, 9644); } - dasm_put(Dst, 9250); + dasm_put(Dst, 9267); } - dasm_put(Dst, 9668); + dasm_put(Dst, 9685); #if LJ_HASFFI #define DtE(_V) (int)(ptrdiff_t)&(((CCallState *)0)_V) - dasm_put(Dst, 9696, DtE(->spadj)); + dasm_put(Dst, 9713, DtE(->spadj)); #if LJ_TARGET_WINDOWS #endif - dasm_put(Dst, 9711, DtE(->nsp), offsetof(CCallState, stack), CCALL_SPS_EXTRA*8, DtE(->nfpr), DtE(->gpr[0]), DtE(->gpr[1]), DtE(->gpr[2]), DtE(->gpr[3]), DtE(->fpr[0]), DtE(->fpr[1]), DtE(->fpr[2]), DtE(->fpr[3])); - dasm_put(Dst, 9792, DtE(->func), DtE(->gpr[0]), DtE(->fpr[0])); + dasm_put(Dst, 9728, DtE(->nsp), offsetof(CCallState, stack), CCALL_SPS_EXTRA*8, DtE(->nfpr), DtE(->gpr[0]), DtE(->gpr[1]), DtE(->gpr[2]), DtE(->gpr[3]), DtE(->fpr[0]), DtE(->fpr[1]), DtE(->fpr[2]), DtE(->fpr[3])); + dasm_put(Dst, 9809, DtE(->func), DtE(->gpr[0]), DtE(->fpr[0])); #if LJ_TARGET_WINDOWS #endif - dasm_put(Dst, 9805); + dasm_put(Dst, 9822); #endif - dasm_put(Dst, 9813); + dasm_put(Dst, 9830); #ifdef LUA_USE_ASSERT - dasm_put(Dst, 9252); + dasm_put(Dst, 9269); #endif - dasm_put(Dst, 9252); + dasm_put(Dst, 9269); } /* 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, 9816, defop); + dasm_put(Dst, 9833, defop); switch (op) { @@ -1845,296 +1847,296 @@ 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, 9818, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 9835, LJ_TISNUM, LJ_TISNUM); switch (op) { case BC_ISLT: - dasm_put(Dst, 9848); + dasm_put(Dst, 9865); break; case BC_ISGE: - dasm_put(Dst, 9853); + dasm_put(Dst, 9870); break; case BC_ISLE: - dasm_put(Dst, 9858); + dasm_put(Dst, 9875); break; case BC_ISGT: - dasm_put(Dst, 9863); + dasm_put(Dst, 9880); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 9868, -BCBIAS_J*4, LJ_TISNUM); + dasm_put(Dst, 9885, -BCBIAS_J*4, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9922); + dasm_put(Dst, 9939); } else { - dasm_put(Dst, 9933); + dasm_put(Dst, 9950); } - dasm_put(Dst, 9944); + dasm_put(Dst, 9961); if (sse) { - dasm_put(Dst, 9951); + dasm_put(Dst, 9968); switch (op) { case BC_ISLT: - dasm_put(Dst, 9971); + dasm_put(Dst, 9988); break; case BC_ISGE: - dasm_put(Dst, 9976); + dasm_put(Dst, 9993); break; case BC_ISLE: - dasm_put(Dst, 9981); + dasm_put(Dst, 9998); break; case BC_ISGT: - dasm_put(Dst, 9986); + dasm_put(Dst, 10003); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 9991); + dasm_put(Dst, 10008); } else { - dasm_put(Dst, 9996); + dasm_put(Dst, 10013); } } else { - dasm_put(Dst, 10004, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10021, LJ_TISNUM, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 10025); + dasm_put(Dst, 10042); } else { - dasm_put(Dst, 10046); + dasm_put(Dst, 10063); if (cmov) { - dasm_put(Dst, 10062); + dasm_put(Dst, 10079); } else { - dasm_put(Dst, 10068); + dasm_put(Dst, 10085); } } if (LJ_DUALNUM) { switch (op) { case BC_ISLT: - dasm_put(Dst, 9971); + dasm_put(Dst, 9988); break; case BC_ISGE: - dasm_put(Dst, 9976); + dasm_put(Dst, 9993); break; case BC_ISLE: - dasm_put(Dst, 9981); + dasm_put(Dst, 9998); break; case BC_ISGT: - dasm_put(Dst, 9986); + dasm_put(Dst, 10003); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 9991); + dasm_put(Dst, 10008); } else { switch (op) { case BC_ISLT: - dasm_put(Dst, 10075); + dasm_put(Dst, 10092); break; case BC_ISGE: - dasm_put(Dst, 10080); + dasm_put(Dst, 10097); break; case BC_ISLE: - dasm_put(Dst, 10085); + dasm_put(Dst, 10102); break; case BC_ISGT: - dasm_put(Dst, 10090); + dasm_put(Dst, 10107); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 10095, -BCBIAS_J*4); + dasm_put(Dst, 10112, -BCBIAS_J*4); } break; case BC_ISEQV: case BC_ISNEV: vk = op == BC_ISEQV; - dasm_put(Dst, 10127); + dasm_put(Dst, 10144); if (LJ_DUALNUM) { - dasm_put(Dst, 10135, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10152, LJ_TISNUM, LJ_TISNUM); if (vk) { - dasm_put(Dst, 10160); + dasm_put(Dst, 10177); } else { - dasm_put(Dst, 10165); + dasm_put(Dst, 10182); } - dasm_put(Dst, 10170, -BCBIAS_J*4, LJ_TISNUM); + dasm_put(Dst, 10187, -BCBIAS_J*4, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10222); + dasm_put(Dst, 10239); } else { - dasm_put(Dst, 10229); + dasm_put(Dst, 10246); } - dasm_put(Dst, 10233); + dasm_put(Dst, 10250); if (sse) { - dasm_put(Dst, 10244); + dasm_put(Dst, 10261); } else { - dasm_put(Dst, 10256); + dasm_put(Dst, 10273); } - dasm_put(Dst, 10263); + dasm_put(Dst, 10280); } else { - dasm_put(Dst, 10268, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10285, LJ_TISNUM, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 10287); + dasm_put(Dst, 10304); } else { - dasm_put(Dst, 10305); + dasm_put(Dst, 10322); if (cmov) { - dasm_put(Dst, 10062); + dasm_put(Dst, 10079); } else { - dasm_put(Dst, 10068); + dasm_put(Dst, 10085); } } iseqne_fp: if (vk) { - dasm_put(Dst, 10318); + dasm_put(Dst, 10335); } else { - dasm_put(Dst, 10327); + dasm_put(Dst, 10344); } iseqne_end: if (vk) { - dasm_put(Dst, 10336, -BCBIAS_J*4); + dasm_put(Dst, 10353, -BCBIAS_J*4); if (!LJ_HASFFI) { - dasm_put(Dst, 4569); + dasm_put(Dst, 4586); } } else { if (!LJ_HASFFI) { - dasm_put(Dst, 4569); + dasm_put(Dst, 4586); } - dasm_put(Dst, 10351, -BCBIAS_J*4); + dasm_put(Dst, 10368, -BCBIAS_J*4); } if (LJ_DUALNUM && (op == BC_ISEQV || op == BC_ISNEV || op == BC_ISEQN || op == BC_ISNEN)) { - dasm_put(Dst, 10366); + dasm_put(Dst, 10383); } else { - dasm_put(Dst, 10107); + dasm_put(Dst, 10124); } if (op == BC_ISEQV || op == BC_ISNEV) { - dasm_put(Dst, 9789); + dasm_put(Dst, 9806); if (LJ_HASFFI) { - dasm_put(Dst, 10371, LJ_TCDATA, LJ_TCDATA); + dasm_put(Dst, 10388, LJ_TCDATA, LJ_TCDATA); } - dasm_put(Dst, 10390, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<metatable), Dt6(->nomm), 1<>32)); + dasm_put(Dst, 10962, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); } else { - dasm_put(Dst, 10970); + dasm_put(Dst, 10987); } if (LJ_DUALNUM) { - dasm_put(Dst, 10366); + dasm_put(Dst, 10383); } else { - dasm_put(Dst, 10107); + dasm_put(Dst, 10124); } break; case BC_LEN: - dasm_put(Dst, 10979, LJ_TSTR); + dasm_put(Dst, 10996, LJ_TSTR); if (LJ_DUALNUM) { - dasm_put(Dst, 10993, Dt5(->len), LJ_TISNUM); + dasm_put(Dst, 11010, Dt5(->len), LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 11007, Dt5(->len)); + dasm_put(Dst, 11024, Dt5(->len)); } else { - dasm_put(Dst, 11025, Dt5(->len)); + dasm_put(Dst, 11042, Dt5(->len)); } - dasm_put(Dst, 11034, LJ_TTAB); + dasm_put(Dst, 11051, LJ_TTAB); if (LJ_DUALNUM) { } else if (sse) { - dasm_put(Dst, 11075); + dasm_put(Dst, 11092); } else { } - dasm_put(Dst, 11081); + dasm_put(Dst, 11098); break; /* -- Binary ops -------------------------------------------------------- */ @@ -2142,605 +2144,605 @@ 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, 11094); + dasm_put(Dst, 11111); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11102, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11119, LJ_TISNUM, LJ_TISNUM); break; case 1: - dasm_put(Dst, 11135, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11152, LJ_TISNUM, LJ_TISNUM); break; default: - dasm_put(Dst, 11168, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11185, LJ_TISNUM, LJ_TISNUM); break; } - dasm_put(Dst, 11201, LJ_TISNUM); + dasm_put(Dst, 11218, LJ_TISNUM); if (vk == 1) { - dasm_put(Dst, 11003); + dasm_put(Dst, 11020); } else { - dasm_put(Dst, 10789); + dasm_put(Dst, 10806); } - dasm_put(Dst, 10107); + dasm_put(Dst, 10124); } else { - dasm_put(Dst, 11094); + dasm_put(Dst, 11111); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11207, LJ_TISNUM); + dasm_put(Dst, 11224, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11219, LJ_TISNUM); + dasm_put(Dst, 11236, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11230); + dasm_put(Dst, 11247); } else { - dasm_put(Dst, 11244); + dasm_put(Dst, 11261); } break; case 1: - dasm_put(Dst, 11252, LJ_TISNUM); + dasm_put(Dst, 11269, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11264, LJ_TISNUM); + dasm_put(Dst, 11281, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11275); + dasm_put(Dst, 11292); } else { - dasm_put(Dst, 11289); + dasm_put(Dst, 11306); } break; default: - dasm_put(Dst, 11297, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11314, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11319); + dasm_put(Dst, 11336); } else { - dasm_put(Dst, 11333); + dasm_put(Dst, 11350); } break; } if (sse) { - dasm_put(Dst, 10963); + dasm_put(Dst, 10980); } else { - dasm_put(Dst, 10975); + dasm_put(Dst, 10992); } - dasm_put(Dst, 10107); + dasm_put(Dst, 10124); } break; case BC_SUBVN: case BC_SUBNV: case BC_SUBVV: if (LJ_DUALNUM) { - dasm_put(Dst, 11094); + dasm_put(Dst, 11111); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11341, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11358, LJ_TISNUM, LJ_TISNUM); break; case 1: - dasm_put(Dst, 11374, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11391, LJ_TISNUM, LJ_TISNUM); break; default: - dasm_put(Dst, 11407, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11424, LJ_TISNUM, LJ_TISNUM); break; } - dasm_put(Dst, 11201, LJ_TISNUM); + dasm_put(Dst, 11218, LJ_TISNUM); if (vk == 1) { - dasm_put(Dst, 11003); + dasm_put(Dst, 11020); } else { - dasm_put(Dst, 10789); + dasm_put(Dst, 10806); } - dasm_put(Dst, 10107); + dasm_put(Dst, 10124); } else { - dasm_put(Dst, 11094); + dasm_put(Dst, 11111); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11207, LJ_TISNUM); + dasm_put(Dst, 11224, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11219, LJ_TISNUM); + dasm_put(Dst, 11236, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11440); + dasm_put(Dst, 11457); } else { - dasm_put(Dst, 11454); + dasm_put(Dst, 11471); } break; case 1: - dasm_put(Dst, 11252, LJ_TISNUM); + dasm_put(Dst, 11269, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11264, LJ_TISNUM); + dasm_put(Dst, 11281, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11462); + dasm_put(Dst, 11479); } else { - dasm_put(Dst, 11476); + dasm_put(Dst, 11493); } break; default: - dasm_put(Dst, 11297, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11314, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11484); + dasm_put(Dst, 11501); } else { - dasm_put(Dst, 11498); + dasm_put(Dst, 11515); } break; } if (sse) { - dasm_put(Dst, 10963); + dasm_put(Dst, 10980); } else { - dasm_put(Dst, 10975); + dasm_put(Dst, 10992); } - dasm_put(Dst, 10107); + dasm_put(Dst, 10124); } break; case BC_MULVN: case BC_MULNV: case BC_MULVV: if (LJ_DUALNUM) { - dasm_put(Dst, 11094); + dasm_put(Dst, 11111); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11506, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11523, LJ_TISNUM, LJ_TISNUM); break; case 1: - dasm_put(Dst, 11540, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11557, LJ_TISNUM, LJ_TISNUM); break; default: - dasm_put(Dst, 11574, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11591, LJ_TISNUM, LJ_TISNUM); break; } - dasm_put(Dst, 11201, LJ_TISNUM); + dasm_put(Dst, 11218, LJ_TISNUM); if (vk == 1) { - dasm_put(Dst, 11003); + dasm_put(Dst, 11020); } else { - dasm_put(Dst, 10789); + dasm_put(Dst, 10806); } - dasm_put(Dst, 10107); + dasm_put(Dst, 10124); } else { - dasm_put(Dst, 11094); + dasm_put(Dst, 11111); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11207, LJ_TISNUM); + dasm_put(Dst, 11224, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11219, LJ_TISNUM); + dasm_put(Dst, 11236, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11608); + dasm_put(Dst, 11625); } else { - dasm_put(Dst, 11622); + dasm_put(Dst, 11639); } break; case 1: - dasm_put(Dst, 11252, LJ_TISNUM); + dasm_put(Dst, 11269, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11264, LJ_TISNUM); + dasm_put(Dst, 11281, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11630); + dasm_put(Dst, 11647); } else { - dasm_put(Dst, 11644); + dasm_put(Dst, 11661); } break; default: - dasm_put(Dst, 11297, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11314, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11652); + dasm_put(Dst, 11669); } else { - dasm_put(Dst, 11666); + dasm_put(Dst, 11683); } break; } if (sse) { - dasm_put(Dst, 10963); + dasm_put(Dst, 10980); } else { - dasm_put(Dst, 10975); + dasm_put(Dst, 10992); } - dasm_put(Dst, 10107); + dasm_put(Dst, 10124); } break; case BC_DIVVN: case BC_DIVNV: case BC_DIVVV: - dasm_put(Dst, 11094); + dasm_put(Dst, 11111); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11207, LJ_TISNUM); + dasm_put(Dst, 11224, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11219, LJ_TISNUM); + dasm_put(Dst, 11236, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11674); + dasm_put(Dst, 11691); } else { - dasm_put(Dst, 11688); + dasm_put(Dst, 11705); } break; case 1: - dasm_put(Dst, 11252, LJ_TISNUM); + dasm_put(Dst, 11269, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11264, LJ_TISNUM); + dasm_put(Dst, 11281, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11696); + dasm_put(Dst, 11713); } else { - dasm_put(Dst, 11710); + dasm_put(Dst, 11727); } break; default: - dasm_put(Dst, 11297, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11314, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11718); + dasm_put(Dst, 11735); } else { - dasm_put(Dst, 11732); + dasm_put(Dst, 11749); } break; } if (sse) { - dasm_put(Dst, 10963); + dasm_put(Dst, 10980); } else { - dasm_put(Dst, 10975); + dasm_put(Dst, 10992); } - dasm_put(Dst, 10107); + dasm_put(Dst, 10124); break; case BC_MODVN: - dasm_put(Dst, 11094); + dasm_put(Dst, 11111); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11207, LJ_TISNUM); + dasm_put(Dst, 11224, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11219, LJ_TISNUM); + dasm_put(Dst, 11236, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11740); + dasm_put(Dst, 11757); } else { - dasm_put(Dst, 11754); + dasm_put(Dst, 11771); } break; case 1: - dasm_put(Dst, 11252, LJ_TISNUM); + dasm_put(Dst, 11269, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11264, LJ_TISNUM); + dasm_put(Dst, 11281, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11762); + dasm_put(Dst, 11779); } else { - dasm_put(Dst, 11776); + dasm_put(Dst, 11793); } break; default: - dasm_put(Dst, 11297, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11314, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11784); + dasm_put(Dst, 11801); } else { - dasm_put(Dst, 11798); + dasm_put(Dst, 11815); } break; } - dasm_put(Dst, 11806); + dasm_put(Dst, 11823); if (sse) { - dasm_put(Dst, 10963); + dasm_put(Dst, 10980); } else { - dasm_put(Dst, 10975); + dasm_put(Dst, 10992); } - dasm_put(Dst, 10107); + dasm_put(Dst, 10124); break; case BC_MODNV: case BC_MODVV: - dasm_put(Dst, 11094); + dasm_put(Dst, 11111); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11207, LJ_TISNUM); + dasm_put(Dst, 11224, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11219, LJ_TISNUM); + dasm_put(Dst, 11236, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11740); + dasm_put(Dst, 11757); } else { - dasm_put(Dst, 11754); + dasm_put(Dst, 11771); } break; case 1: - dasm_put(Dst, 11252, LJ_TISNUM); + dasm_put(Dst, 11269, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11264, LJ_TISNUM); + dasm_put(Dst, 11281, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11762); + dasm_put(Dst, 11779); } else { - dasm_put(Dst, 11776); + dasm_put(Dst, 11793); } break; default: - dasm_put(Dst, 11297, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11314, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11784); + dasm_put(Dst, 11801); } else { - dasm_put(Dst, 11798); + dasm_put(Dst, 11815); } break; } - dasm_put(Dst, 11812); + dasm_put(Dst, 11829); break; case BC_POW: - dasm_put(Dst, 11094); + dasm_put(Dst, 11111); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11207, LJ_TISNUM); + dasm_put(Dst, 11224, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11219, LJ_TISNUM); + dasm_put(Dst, 11236, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11740); + dasm_put(Dst, 11757); } else { - dasm_put(Dst, 11754); + dasm_put(Dst, 11771); } break; case 1: - dasm_put(Dst, 11252, LJ_TISNUM); + dasm_put(Dst, 11269, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11264, LJ_TISNUM); + dasm_put(Dst, 11281, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11762); + dasm_put(Dst, 11779); } else { - dasm_put(Dst, 11776); + dasm_put(Dst, 11793); } break; default: - dasm_put(Dst, 11297, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11314, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11784); + dasm_put(Dst, 11801); } else { - dasm_put(Dst, 11798); + dasm_put(Dst, 11815); } break; } - dasm_put(Dst, 11817); + dasm_put(Dst, 11834); if (sse) { - dasm_put(Dst, 10963); + dasm_put(Dst, 10980); } else { - dasm_put(Dst, 10975); + dasm_put(Dst, 10992); } - dasm_put(Dst, 10107); + dasm_put(Dst, 10124); break; case BC_CAT: - dasm_put(Dst, 11821, Dt1(->base), Dt1(->base)); + dasm_put(Dst, 11838, Dt1(->base), Dt1(->base)); break; /* -- Constant ops ------------------------------------------------------ */ case BC_KSTR: - dasm_put(Dst, 11904, LJ_TSTR); + dasm_put(Dst, 11921, LJ_TSTR); break; case BC_KCDATA: #if LJ_HASFFI - dasm_put(Dst, 11904, LJ_TCDATA); + dasm_put(Dst, 11921, LJ_TCDATA); #endif break; case BC_KSHORT: if (LJ_DUALNUM) { - dasm_put(Dst, 11939, LJ_TISNUM); + dasm_put(Dst, 11956, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 11951); + dasm_put(Dst, 11968); } else { - dasm_put(Dst, 11966); + dasm_put(Dst, 11983); } - dasm_put(Dst, 10107); + dasm_put(Dst, 10124); break; case BC_KNUM: if (sse) { - dasm_put(Dst, 11974); + dasm_put(Dst, 11991); } else { - dasm_put(Dst, 11987); + dasm_put(Dst, 12004); } - dasm_put(Dst, 10107); + dasm_put(Dst, 10124); break; case BC_KPRI: - dasm_put(Dst, 11994); + dasm_put(Dst, 12011); break; case BC_KNIL: - dasm_put(Dst, 12022, LJ_TNIL); + dasm_put(Dst, 12039, LJ_TNIL); break; /* -- Upvalue and function ops ------------------------------------------ */ case BC_UGET: - dasm_put(Dst, 12069, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12086, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_USETV: #define TV2MARKOFS \ ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv)) - dasm_put(Dst, 12109, 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, 12200); + dasm_put(Dst, 12126, 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, 12217); break; #undef TV2MARKOFS case BC_USETS: - dasm_put(Dst, 12212, 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, 12229, 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, 12305); + dasm_put(Dst, 12322); if (sse) { - dasm_put(Dst, 12310); + dasm_put(Dst, 12327); } else { - dasm_put(Dst, 10618); + dasm_put(Dst, 10635); } - dasm_put(Dst, 12317, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12334, offsetof(GCfuncL, uvptr), DtA(->v)); if (sse) { - dasm_put(Dst, 12326); + dasm_put(Dst, 12343); } else { - dasm_put(Dst, 12332); + dasm_put(Dst, 12349); } - dasm_put(Dst, 10107); + dasm_put(Dst, 10124); break; case BC_USETP: - dasm_put(Dst, 12335, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12352, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_UCLO: - dasm_put(Dst, 12374, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 12391, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); break; case BC_FNEW: - dasm_put(Dst, 12429, Dt1(->base), Dt1(->base), LJ_TFUNC); + dasm_put(Dst, 12446, Dt1(->base), Dt1(->base), LJ_TFUNC); break; /* -- Table ops --------------------------------------------------------- */ case BC_TNEW: - dasm_put(Dst, 12495, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 12512, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); break; case BC_TDUP: - dasm_put(Dst, 12617, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 12634, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); break; case BC_GGET: - dasm_put(Dst, 12712, Dt7(->env)); + dasm_put(Dst, 12729, Dt7(->env)); break; case BC_GSET: - dasm_put(Dst, 12731, Dt7(->env)); + dasm_put(Dst, 12748, Dt7(->env)); break; case BC_TGETV: - dasm_put(Dst, 12750, LJ_TTAB); + dasm_put(Dst, 12767, LJ_TTAB); if (LJ_DUALNUM) { - dasm_put(Dst, 12773, LJ_TISNUM); + dasm_put(Dst, 12790, LJ_TISNUM); } else { - dasm_put(Dst, 12787, LJ_TISNUM); + dasm_put(Dst, 12804, LJ_TISNUM); if (sse) { - dasm_put(Dst, 12798); + dasm_put(Dst, 12815); } else { } - dasm_put(Dst, 12819); + dasm_put(Dst, 12836); } - dasm_put(Dst, 12824, 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, 13017, 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, 13034, 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), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13245, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETS: - dasm_put(Dst, 13365, 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, 13441, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); - dasm_put(Dst, 13529, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13382, 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, 13458, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); + dasm_put(Dst, 13546, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETB: - dasm_put(Dst, 13620, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); - dasm_put(Dst, 13714, Dt6(->metatable), Dt6(->nomm), 1<marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13637, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); + dasm_put(Dst, 13731, Dt6(->metatable), Dt6(->nomm), 1<marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETM: - dasm_put(Dst, 13760, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); - dasm_put(Dst, 13903, Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13777, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 13920, Dt6(->marked), (uint8_t)~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, 11098); + dasm_put(Dst, 11115); if (op == BC_CALLM) { - dasm_put(Dst, 13921); + dasm_put(Dst, 13938); } - dasm_put(Dst, 13926, LJ_TFUNC, Dt7(->pc)); + dasm_put(Dst, 13943, LJ_TFUNC, Dt7(->pc)); break; case BC_CALLMT: - dasm_put(Dst, 13921); + dasm_put(Dst, 13938); break; case BC_CALLT: - dasm_put(Dst, 13968, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); - dasm_put(Dst, 14083, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG); + dasm_put(Dst, 13985, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); + dasm_put(Dst, 14100, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG); break; case BC_ITERC: - dasm_put(Dst, 14154, LJ_TFUNC, 2+1, Dt7(->pc)); + dasm_put(Dst, 14171, LJ_TFUNC, 2+1, Dt7(->pc)); break; case BC_ITERN: #if LJ_HASJIT #endif - dasm_put(Dst, 14225, Dt6(->asize), Dt6(->array), LJ_TNIL); + dasm_put(Dst, 14242, Dt6(->asize), Dt6(->array), LJ_TNIL); if (LJ_DUALNUM) { - dasm_put(Dst, 10998, LJ_TISNUM); + dasm_put(Dst, 11015, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 11075); + dasm_put(Dst, 11092); } else { - dasm_put(Dst, 14271); + dasm_put(Dst, 14288); } - dasm_put(Dst, 14277); + dasm_put(Dst, 14294); if (LJ_DUALNUM) { } else if (sse) { - dasm_put(Dst, 10963); + dasm_put(Dst, 10980); } else { - dasm_put(Dst, 10975); + dasm_put(Dst, 10992); } - dasm_put(Dst, 14290, -BCBIAS_J*4); + dasm_put(Dst, 14307, -BCBIAS_J*4); if (!LJ_DUALNUM && !sse) { - dasm_put(Dst, 14342); + dasm_put(Dst, 14359); } - dasm_put(Dst, 14348, Dt6(->hmask), sizeof(Node), Dt6(->node), DtB(->val.it), LJ_TNIL, DtB(->key), DtB(->val)); + dasm_put(Dst, 14365, Dt6(->hmask), sizeof(Node), Dt6(->node), DtB(->val.it), LJ_TNIL, DtB(->key), DtB(->val)); break; case BC_ISNEXT: - dasm_put(Dst, 14420, LJ_TFUNC, LJ_TTAB, LJ_TNIL, Dt8(->ffid), FF_next_N, -BCBIAS_J*4, BC_JMP, -BCBIAS_J*4, BC_ITERC); + dasm_put(Dst, 14437, 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, 14520, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); - dasm_put(Dst, 14680, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 14537, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); + dasm_put(Dst, 14697, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); break; /* -- Returns ----------------------------------------------------------- */ case BC_RETM: - dasm_put(Dst, 13921); + dasm_put(Dst, 13938); break; case BC_RET: case BC_RET0: case BC_RET1: if (op != BC_RET0) { - dasm_put(Dst, 14746); + dasm_put(Dst, 14763); } - dasm_put(Dst, 14750, FRAME_TYPE); + dasm_put(Dst, 14767, FRAME_TYPE); switch (op) { case BC_RET: - dasm_put(Dst, 14769); + dasm_put(Dst, 14786); break; case BC_RET1: - dasm_put(Dst, 14821); + dasm_put(Dst, 14838); /* fallthrough */ case BC_RET0: - dasm_put(Dst, 14831); + dasm_put(Dst, 14848); default: break; } - dasm_put(Dst, 14842, Dt7(->pc), PC2PROTO(k)); + dasm_put(Dst, 14859, Dt7(->pc), PC2PROTO(k)); if (op == BC_RET) { - dasm_put(Dst, 14886, LJ_TNIL); + dasm_put(Dst, 14903, LJ_TNIL); } else { - dasm_put(Dst, 14895, LJ_TNIL); + dasm_put(Dst, 14912, LJ_TNIL); } - dasm_put(Dst, 14902, -FRAME_VARG, FRAME_TYPEP); + dasm_put(Dst, 14919, -FRAME_VARG, FRAME_TYPEP); if (op != BC_RET0) { - dasm_put(Dst, 14926); + dasm_put(Dst, 14943); } - dasm_put(Dst, 4648); + dasm_put(Dst, 4665); break; /* -- Loops and branches ------------------------------------------------ */ @@ -2748,7 +2750,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORL: #if LJ_HASJIT - dasm_put(Dst, 14930, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 14947, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2760,111 +2762,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, 14951); + dasm_put(Dst, 14968); if (LJ_DUALNUM) { - dasm_put(Dst, 14955, LJ_TISNUM); + dasm_put(Dst, 14972, LJ_TISNUM); if (!vk) { - dasm_put(Dst, 14965, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 14982, LJ_TISNUM, LJ_TISNUM); } else { #ifdef LUA_USE_ASSERT - dasm_put(Dst, 14994, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 15011, LJ_TISNUM, LJ_TISNUM); #endif - dasm_put(Dst, 15013); + dasm_put(Dst, 15030); } - dasm_put(Dst, 15032, LJ_TISNUM); + dasm_put(Dst, 15049, LJ_TISNUM); if (op == BC_FORI) { - dasm_put(Dst, 15043, -BCBIAS_J*4); + dasm_put(Dst, 15060, -BCBIAS_J*4); } else if (op == BC_JFORI) { - dasm_put(Dst, 15057, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 15074, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 15075, -BCBIAS_J*4); + dasm_put(Dst, 15092, -BCBIAS_J*4); } else { - dasm_put(Dst, 15067, BC_JLOOP); + dasm_put(Dst, 15084, BC_JLOOP); } - dasm_put(Dst, 15089); + dasm_put(Dst, 15106); if (vk) { - dasm_put(Dst, 15113); + dasm_put(Dst, 15130); } - dasm_put(Dst, 15032, LJ_TISNUM); + dasm_put(Dst, 15049, LJ_TISNUM); if (op == BC_FORI) { - dasm_put(Dst, 15122); + dasm_put(Dst, 15139); } else if (op == BC_JFORI) { - dasm_put(Dst, 15127, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 15144, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 15141); + dasm_put(Dst, 15158); } else { - dasm_put(Dst, 15137, BC_JLOOP); + dasm_put(Dst, 15154, BC_JLOOP); } - dasm_put(Dst, 15146); + dasm_put(Dst, 15163); } else if (!vk) { - dasm_put(Dst, 15153, LJ_TISNUM); + dasm_put(Dst, 15170, LJ_TISNUM); } if (!vk) { - dasm_put(Dst, 15159, LJ_TISNUM); + dasm_put(Dst, 15176, LJ_TISNUM); } else { #ifdef LUA_USE_ASSERT - dasm_put(Dst, 15173, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 15190, LJ_TISNUM, LJ_TISNUM); #endif } - dasm_put(Dst, 15192); + dasm_put(Dst, 15209); if (!vk) { - dasm_put(Dst, 15196, LJ_TISNUM); + dasm_put(Dst, 15213, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 15205); + dasm_put(Dst, 15222); if (vk) { - dasm_put(Dst, 15217); + dasm_put(Dst, 15234); } else { - dasm_put(Dst, 15236); + dasm_put(Dst, 15253); } - dasm_put(Dst, 15241); + dasm_put(Dst, 15258); } else { - dasm_put(Dst, 15254); + dasm_put(Dst, 15271); if (vk) { - dasm_put(Dst, 15260); + dasm_put(Dst, 15277); } else { - dasm_put(Dst, 15276); + dasm_put(Dst, 15293); } - dasm_put(Dst, 15284); + dasm_put(Dst, 15301); if (cmov) { - dasm_put(Dst, 10062); + dasm_put(Dst, 10079); } else { - dasm_put(Dst, 10068); + dasm_put(Dst, 10085); } if (!cmov) { - dasm_put(Dst, 15289); + dasm_put(Dst, 15306); } } if (op == BC_FORI) { if (LJ_DUALNUM) { - dasm_put(Dst, 15295); + dasm_put(Dst, 15312); } else { - dasm_put(Dst, 15300, -BCBIAS_J*4); + dasm_put(Dst, 15317, -BCBIAS_J*4); } } else if (op == BC_JFORI) { - dasm_put(Dst, 15310, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 15327, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { if (LJ_DUALNUM) { - dasm_put(Dst, 15324); + dasm_put(Dst, 15341); } else { - dasm_put(Dst, 15329, -BCBIAS_J*4); + dasm_put(Dst, 15346, -BCBIAS_J*4); } } else { - dasm_put(Dst, 15320, BC_JLOOP); + dasm_put(Dst, 15337, BC_JLOOP); } if (LJ_DUALNUM) { - dasm_put(Dst, 9991); + dasm_put(Dst, 10008); } else { - dasm_put(Dst, 10748); + dasm_put(Dst, 10765); } if (sse) { - dasm_put(Dst, 15339); + dasm_put(Dst, 15356); } break; case BC_ITERL: #if LJ_HASJIT - dasm_put(Dst, 14930, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 14947, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2873,33 +2875,33 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IITERL: - dasm_put(Dst, 15350, LJ_TNIL); + dasm_put(Dst, 15367, LJ_TNIL); if (op == BC_JITERL) { - dasm_put(Dst, 15365, BC_JLOOP); + dasm_put(Dst, 15382, BC_JLOOP); } else { - dasm_put(Dst, 15379, -BCBIAS_J*4); + dasm_put(Dst, 15396, -BCBIAS_J*4); } - dasm_put(Dst, 10105); + dasm_put(Dst, 10122); break; case BC_LOOP: #if LJ_HASJIT - dasm_put(Dst, 14930, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 14947, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; case BC_ILOOP: - dasm_put(Dst, 10107); + dasm_put(Dst, 10124); break; case BC_JLOOP: #if LJ_HASJIT - dasm_put(Dst, 15395, 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, 15412, 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, 15504, -BCBIAS_J*4); + dasm_put(Dst, 15521, -BCBIAS_J*4); break; /* -- Function headers -------------------------------------------------- */ @@ -2913,7 +2915,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FUNCF: #if LJ_HASJIT - dasm_put(Dst, 15529, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 15546, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif case BC_FUNCV: /* NYI: compiled vararg functions. */ break; @@ -2923,47 +2925,47 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IFUNCF: - dasm_put(Dst, 15550, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); + dasm_put(Dst, 15567, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); if (op == BC_JFUNCF) { - dasm_put(Dst, 15580, BC_JLOOP); + dasm_put(Dst, 15597, BC_JLOOP); } else { - dasm_put(Dst, 10107); + dasm_put(Dst, 10124); } - dasm_put(Dst, 15589, LJ_TNIL); + dasm_put(Dst, 15606, LJ_TNIL); break; case BC_JFUNCV: #if !LJ_HASJIT break; #endif - dasm_put(Dst, 9252); + dasm_put(Dst, 9269); break; /* NYI: compiled vararg functions. */ case BC_IFUNCV: - dasm_put(Dst, 15611, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); + dasm_put(Dst, 15628, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); if (op == BC_JFUNCV) { - dasm_put(Dst, 15580, BC_JLOOP); + dasm_put(Dst, 15597, BC_JLOOP); } else { - dasm_put(Dst, 15702, -4+PC2PROTO(k)); + dasm_put(Dst, 15719, -4+PC2PROTO(k)); } - dasm_put(Dst, 15725, LJ_TNIL); + dasm_put(Dst, 15742, LJ_TNIL); break; case BC_FUNCC: case BC_FUNCCW: - dasm_put(Dst, 15747, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); + dasm_put(Dst, 15764, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); if (op == BC_FUNCC) { - dasm_put(Dst, 2312); + dasm_put(Dst, 2329); } else { - dasm_put(Dst, 15777); - } - dasm_put(Dst, 15785, DISPATCH_GL(vmstate), ~LJ_VMST_C); - if (op == BC_FUNCC) { dasm_put(Dst, 15794); - } else { - dasm_put(Dst, 15798, DISPATCH_GL(wrapf)); } - dasm_put(Dst, 15803, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 15802, DISPATCH_GL(vmstate), ~LJ_VMST_C); + if (op == BC_FUNCC) { + dasm_put(Dst, 15811); + } else { + dasm_put(Dst, 15815, DISPATCH_GL(wrapf)); + } + dasm_put(Dst, 15820, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); break; /* ---------------------------------------------------------------------- */ @@ -2991,7 +2993,7 @@ static int build_backend(BuildCtx *ctx) build_subroutines(ctx, cmov, sse); - dasm_put(Dst, 15828); + dasm_put(Dst, 15845); 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 98998d83..b64617f9 100644 --- a/src/buildvm_x86.dasc +++ b/src/buildvm_x86.dasc @@ -1390,9 +1390,17 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse) | |6: | cmp RB, LJ_TUDATA; je <1 - | cmp RB, LJ_TISNUM; ja >7 - | mov RB, LJ_TNUMX + |.if X64 + | cmp RB, LJ_TNUMX; ja >8 + | cmp RB, LJ_TISNUM; jbe >7 + | mov RB, LJ_TLIGHTUD + | jmp >8 |7: + |.else + | cmp RB, LJ_TISNUM; ja >8 + |.endif + | mov RB, LJ_TNUMX + |8: | not RB | mov TAB:RB, [DISPATCH+RB*4+DISPATCH_GL(gcroot[GCROOT_BASEMT])] | jmp <2 diff --git a/src/buildvm_x86.h b/src/buildvm_x86.h index b7b86cfd..2df74098 100644 --- a/src/buildvm_x86.h +++ b/src/buildvm_x86.h @@ -110,7 +110,7 @@ static const unsigned char build_actionlist[16947] = { 15,133,244,250,57,129,233,15,132,244,251,248,4,139,137,233,133,201,15,133, 244,3,252,233,244,63,248,5,139,105,4,129,252,253,239,255,15,132,244,63,139, 1,137,106,252,252,137,66,252,248,252,233,244,63,248,6,129,252,253,239,15, - 132,244,1,129,252,253,239,15,135,244,253,189,237,248,7,252,247,213,139,172, + 132,244,1,129,252,253,239,15,135,244,254,189,237,248,8,252,247,213,139,172, 253,171,233,252,233,244,2,248,65,129,252,248,239,15,130,244,60,255,129,122, 253,4,239,15,133,244,60,139,42,131,189,233,0,15,133,244,60,129,122,253,12, 239,15,133,244,60,139,66,8,137,133,233,139,114,252,252,199,66,252,252,237,