diff --git a/src/buildvm_x64.h b/src/buildvm_x64.h index ea4a0c7d..b8d8f60a 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[14053] = { +static const unsigned char build_actionlist[14067] = { 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,252,247,195,237,15,132,244,10,65,199, @@ -380,318 +380,319 @@ static const unsigned char build_actionlist[14053] = { 233,137,149,233,72,137,230,65,141,190,233,232,251,1,23,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,144,255,72,131,196,16,248,1,76,139,108,36,8,76,139,36,36,133,192, - 15,136,244,248,137,68,36,4,68,139,122,252,248,69,139,191,233,69,139,191,233, + 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,65,252,255,36,252,238,248,2,252,247,216,137,252,239,137, - 198,232,251,1,24,255,248,82,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,145,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,84,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,146,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,104,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,147,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,148,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,88,217,252,234,222,201,248,149,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,150,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,107,255,248,151,252,242,15,45,193,252,242,15,42,208, - 102,15,46,202,15,133,244,254,15,138,244,255,248,152,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,80,72,184,237, - 237,102,72,15,110,200,252,242,15,94,200,88,15,40,193,252,247,216,131,252, - 248,1,15,132,244,5,252,233,244,1,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,255,102,72,15,126,192,72,209,224,15,132,244,250,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,153,255,131,252,255,1,15,130,244,82,15, - 132,244,84,131,252,255,3,15,130,244,104,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,88,252,233,244,253,248,1,232,244,149,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,82, - 15,132,244,84,131,252,255,3,15,130,244,104,15,135,244,248,217,252,250,195, - 248,2,131,252,255,5,15,130,244,88,15,132,244,149,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,248,154,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,148,15,132,244,107,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,148,15,132, - 244,107,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,221,217,195,248,2,131,252,248,11, - 15,132,244,247,15,135,244,255,255,219,252,233,219,209,221,217,195,248,1,219, - 252,233,218,209,221,217,195,255,221,225,223,224,252,246,196,1,15,132,244, - 248,217,201,248,2,221,216,195,248,1,221,225,223,224,252,246,196,1,15,133, - 244,248,217,201,248,2,221,216,195,255,248,155,137,252,248,83,15,162,137,6, - 137,94,4,137,78,8,137,86,12,91,195,255,129,124,253,202,4,239,15,135,244,41, - 129,124,253,194,4,239,15,135,244,41,255,252,242,15,16,4,194,131,195,4,102, - 15,46,4,202,255,221,4,202,221,4,194,131,195,4,255,223,252,233,221,216,255, - 218,252,233,223,224,158,255,15,134,244,248,255,15,131,244,248,255,248,1,15, - 183,67,252,254,141,156,253,131,233,248,2,139,3,15,182,204,15,182,232,131, - 195,4,193,232,16,65,252,255,36,252,238,255,139,108,194,4,131,195,4,129,252, - 253,239,15,135,244,251,129,124,253,202,4,239,15,135,244,251,255,252,242,15, - 16,4,194,102,15,46,4,202,255,221,4,202,221,4,194,255,15,138,244,248,15,133, - 244,248,255,15,138,244,248,15,132,244,247,255,248,1,15,183,67,252,254,141, - 156,253,131,233,248,2,255,248,2,15,183,67,252,254,141,156,253,131,233,248, - 1,255,248,5,57,108,202,4,15,133,244,2,129,252,253,239,15,131,244,1,139,12, - 202,139,4,194,57,193,15,132,244,1,129,252,253,239,15,135,244,2,139,169,233, - 133,252,237,15,132,244,2,252,246,133,233,235,15,133,244,2,255,49,252,237, - 255,189,1,0,0,0,255,252,233,244,45,255,72,252,247,208,131,195,4,129,124,253, - 202,4,239,15,133,244,248,139,12,202,65,59,12,135,255,131,195,4,129,124,253, - 202,4,239,15,135,244,248,255,252,242,65,15,16,4,199,102,15,46,4,202,255,221, - 4,202,65,221,4,199,255,72,252,247,208,131,195,4,57,68,202,4,255,139,108,194, - 4,131,195,4,129,252,253,239,255,15,131,244,247,255,15,130,244,247,255,137, - 108,202,4,139,44,194,137,44,202,255,15,183,67,252,254,141,156,253,131,233, - 248,1,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252, - 238,255,139,108,194,4,139,4,194,137,108,202,4,137,4,202,139,3,15,182,204, - 15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,49,252,237,129, - 124,253,194,4,239,129,213,239,137,108,202,4,139,3,15,182,204,15,182,232,131, - 195,4,193,232,16,65,252,255,36,252,238,255,129,124,253,194,4,239,15,135,244, - 48,255,252,242,15,16,4,194,72,184,237,237,102,72,15,110,200,15,87,193,252, - 242,15,17,4,202,255,221,4,194,217,224,221,28,202,255,129,124,253,194,4,239, - 15,133,244,248,139,4,194,255,15,87,192,252,242,15,42,128,233,248,1,252,242, - 15,17,4,202,255,219,128,233,248,1,221,28,202,255,139,3,15,182,204,15,182, - 232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,129,124,253,194,4,239, - 15,133,244,50,139,60,194,137,213,232,251,1,18,255,252,242,15,42,192,137,252, - 234,255,15,182,75,252,253,252,233,244,1,255,15,182,252,236,15,182,192,255, - 129,124,253,252,234,4,239,15,135,244,46,255,252,242,15,16,4,252,234,252,242, - 65,15,88,4,199,255,221,4,252,234,65,220,4,199,255,129,124,253,252,234,4,239, - 15,135,244,47,255,252,242,65,15,16,4,199,252,242,15,88,4,252,234,255,65,221, - 4,199,220,4,252,234,255,129,124,253,252,234,4,239,15,135,244,49,129,124,253, - 194,4,239,15,135,244,49,255,252,242,15,16,4,252,234,252,242,15,88,4,194,255, - 221,4,252,234,220,4,194,255,252,242,15,16,4,252,234,252,242,65,15,92,4,199, - 255,221,4,252,234,65,220,36,199,255,252,242,65,15,16,4,199,252,242,15,92, - 4,252,234,255,65,221,4,199,220,36,252,234,255,252,242,15,16,4,252,234,252, - 242,15,92,4,194,255,221,4,252,234,220,36,194,255,252,242,15,16,4,252,234, - 252,242,65,15,89,4,199,255,221,4,252,234,65,220,12,199,255,252,242,65,15, - 16,4,199,252,242,15,89,4,252,234,255,65,221,4,199,220,12,252,234,255,252, - 242,15,16,4,252,234,252,242,15,89,4,194,255,221,4,252,234,220,12,194,255, - 252,242,15,16,4,252,234,252,242,65,15,94,4,199,255,221,4,252,234,65,220,52, - 199,255,252,242,65,15,16,4,199,252,242,15,94,4,252,234,255,65,221,4,199,220, - 52,252,234,255,252,242,15,16,4,252,234,252,242,15,94,4,194,255,221,4,252, - 234,220,52,194,255,252,242,15,16,4,252,234,252,242,65,15,16,12,199,255,221, - 4,252,234,65,221,4,199,255,252,242,65,15,16,4,199,252,242,15,16,12,252,234, - 255,65,221,4,199,221,4,252,234,255,252,242,15,16,4,252,234,252,242,15,16, - 12,194,255,221,4,252,234,221,4,194,255,248,156,232,244,148,255,252,233,244, - 156,255,232,244,107,255,15,182,252,236,15,182,192,139,124,36,24,137,151,233, - 141,52,194,137,194,41,252,234,248,33,137,252,253,137,92,36,28,232,251,1,25, - 139,149,233,133,192,15,133,244,42,15,182,107,252,255,15,182,75,252,253,139, - 68,252,234,4,139,44,252,234,137,68,202,4,137,44,202,139,3,15,182,204,15,182, - 232,131,195,4,193,232,16,65,252,255,36,252,238,255,72,252,247,208,65,139, - 4,135,199,68,202,4,237,137,4,202,139,3,15,182,204,15,182,232,131,195,4,193, - 232,16,65,252,255,36,252,238,255,15,191,192,252,242,15,42,192,252,242,15, - 17,4,202,255,223,67,252,254,221,28,202,255,252,242,65,15,16,4,199,252,242, - 15,17,4,202,255,65,221,4,199,221,28,202,255,72,252,247,208,137,68,202,4,139, - 3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,141, - 76,202,12,141,68,194,4,189,237,137,105,252,248,248,1,137,41,131,193,8,57, - 193,15,134,244,1,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252, - 255,36,252,238,255,139,106,252,248,139,172,253,133,233,139,173,233,139,69, - 4,139,109,0,137,68,202,4,137,44,202,139,3,15,182,204,15,182,232,131,195,4, - 193,232,16,65,252,255,36,252,238,255,139,106,252,248,139,172,253,141,233, - 128,189,233,0,139,173,233,139,12,194,139,68,194,4,137,77,0,137,69,4,15,132, - 244,247,252,246,133,233,235,15,133,244,248,248,1,139,3,15,182,204,15,182, - 232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,129,232,239,129,252, - 248,239,15,134,244,1,252,246,129,233,235,15,132,244,1,137,252,238,137,213, - 65,141,190,233,255,232,251,1,26,137,252,234,252,233,244,1,255,72,252,247, - 208,139,106,252,248,139,172,253,141,233,65,139,12,135,139,133,233,137,8,199, - 64,4,237,252,246,133,233,235,15,133,244,248,248,1,139,3,15,182,204,15,182, - 232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,252,246,129,233,235, - 15,132,244,1,128,189,233,0,15,132,244,1,137,213,137,198,65,141,190,233,232, - 251,1,26,137,252,234,252,233,244,1,255,139,106,252,248,255,252,242,65,15, - 16,4,199,255,139,172,253,141,233,139,141,233,255,252,242,15,17,1,255,221, - 25,255,72,252,247,208,139,106,252,248,139,172,253,141,233,139,141,233,137, - 65,4,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238, - 255,141,156,253,131,233,139,108,36,24,131,189,233,0,15,132,244,247,137,149, - 233,141,52,202,137,252,239,232,251,1,27,139,149,233,248,1,139,3,15,182,204, - 15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,72,252,247,208, - 139,108,36,24,137,149,233,139,82,252,248,65,139,52,135,137,252,239,137,92, - 36,28,232,251,1,28,139,149,233,15,182,75,252,253,137,4,202,199,68,202,4,237, + 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,24,255,248, + 82,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,145,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,84,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,146,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,104,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,147,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,148,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,88,217,252,234,222,201,248,149,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,150,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,107,255, + 248,151,252,242,15,45,193,252,242,15,42,208,102,15,46,202,15,133,244,254, + 15,138,244,255,248,152,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,80,72,184,237,237,102,72,15,110,200,252,242, + 15,94,200,88,15,40,193,252,247,216,131,252,248,1,15,132,244,5,252,233,244, + 1,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,255,102,72,15,126,192, + 72,209,224,15,132,244,250,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, + 153,255,131,252,255,1,15,130,244,82,15,132,244,84,131,252,255,3,15,130,244, + 104,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,88, + 252,233,244,253,248,1,232,244,149,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,82,15,132,244,84,131,252,255,3,15,130, + 244,104,15,135,244,248,217,252,250,195,248,2,131,252,255,5,15,130,244,88, + 15,132,244,149,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,248,154,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,148,15, + 132,244,107,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,148,15,132,244,107,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, + 221,217,195,248,2,131,252,248,11,15,132,244,247,15,135,244,255,255,219,252, + 233,219,209,221,217,195,248,1,219,252,233,218,209,221,217,195,255,221,225, + 223,224,252,246,196,1,15,132,244,248,217,201,248,2,221,216,195,248,1,221, + 225,223,224,252,246,196,1,15,133,244,248,217,201,248,2,221,216,195,255,248, + 155,137,252,248,83,15,162,137,6,137,94,4,137,78,8,137,86,12,91,195,255,129, + 124,253,202,4,239,15,135,244,41,129,124,253,194,4,239,15,135,244,41,255,252, + 242,15,16,4,194,131,195,4,102,15,46,4,202,255,221,4,202,221,4,194,131,195, + 4,255,223,252,233,221,216,255,218,252,233,223,224,158,255,15,134,244,248, + 255,15,131,244,248,255,248,1,15,183,67,252,254,141,156,253,131,233,248,2, 139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255, - 139,124,36,24,137,151,233,248,1,137,194,37,252,255,7,0,0,193,252,234,11,61, - 252,255,7,0,0,15,132,244,249,248,2,137,198,65,139,134,233,137,252,253,65, - 59,134,233,137,92,36,28,15,131,244,251,232,251,1,29,139,149,233,15,182,75, - 252,253,137,4,202,199,68,202,4,237,139,3,15,182,204,15,182,232,131,195,4, - 193,232,16,65,252,255,36,252,238,248,3,184,1,8,0,0,252,233,244,2,248,5,232, - 251,1,30,15,183,67,252,254,137,252,239,252,233,244,1,255,72,252,247,208,139, - 108,36,24,65,139,142,233,137,92,36,28,65,59,142,233,137,149,233,15,131,244, - 249,248,2,65,139,52,135,137,252,239,232,251,1,31,139,149,233,15,182,75,252, - 253,137,4,202,199,68,202,4,237,139,3,15,182,204,15,182,232,131,195,4,193, - 232,16,65,252,255,36,252,238,248,3,137,252,239,232,251,1,30,15,183,67,252, - 254,72,252,247,208,252,233,244,2,255,72,252,247,208,139,106,252,248,139,173, - 233,65,139,4,135,252,233,244,157,255,72,252,247,208,139,106,252,248,139,173, - 233,65,139,4,135,252,233,244,158,255,15,182,252,236,15,182,192,129,124,253, - 252,234,4,239,15,133,244,36,139,44,252,234,129,124,253,194,4,239,15,135,244, - 251,255,252,242,15,16,4,194,252,242,15,45,192,252,242,15,42,200,102,15,46, - 193,255,15,133,244,36,59,133,233,15,131,244,36,193,224,3,3,133,233,129,120, - 253,4,239,15,132,244,248,248,1,139,40,139,64,4,137,44,202,137,68,202,4,139, - 3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,2, - 131,189,233,0,15,132,244,1,139,141,233,252,246,129,233,235,15,132,244,36, - 15,182,75,252,253,252,233,244,1,248,5,255,129,124,253,194,4,239,15,133,244, - 36,139,4,194,252,233,244,157,255,15,182,252,236,15,182,192,72,252,247,208, - 65,139,4,135,129,124,253,252,234,4,239,15,133,244,34,139,44,252,234,248,157, - 139,141,233,35,136,233,105,201,239,3,141,233,248,1,129,185,233,239,15,133, - 244,250,57,129,233,15,133,244,250,129,121,253,4,239,15,132,244,251,15,182, - 67,252,253,139,41,139,73,4,137,44,194,248,2,255,137,76,194,4,139,3,15,182, - 204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,15,182,67, - 252,253,185,237,252,233,244,2,248,4,139,137,233,133,201,15,133,244,1,248, - 5,139,141,233,133,201,15,132,244,3,252,246,129,233,235,15,133,244,3,252,233, - 244,34,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244, - 35,139,44,252,234,59,133,233,15,131,244,35,193,224,3,3,133,233,129,120,253, - 4,239,15,132,244,248,248,1,139,40,139,64,4,137,44,202,137,68,202,4,139,3, - 15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,131, - 189,233,0,15,132,244,1,139,141,233,252,246,129,233,235,15,132,244,35,255, - 15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,39,139,44, - 252,234,129,124,253,194,4,239,15,135,244,251,255,15,133,244,39,59,133,233, - 15,131,244,39,193,224,3,3,133,233,129,120,253,4,239,15,132,244,249,248,1, - 252,246,133,233,235,15,133,244,253,248,2,139,108,202,4,139,12,202,137,104, + 139,108,194,4,131,195,4,129,252,253,239,15,135,244,251,129,124,253,202,4, + 239,15,135,244,251,255,252,242,15,16,4,194,102,15,46,4,202,255,221,4,202, + 221,4,194,255,15,138,244,248,15,133,244,248,255,15,138,244,248,15,132,244, + 247,255,248,1,15,183,67,252,254,141,156,253,131,233,248,2,255,248,2,15,183, + 67,252,254,141,156,253,131,233,248,1,255,248,5,57,108,202,4,15,133,244,2, + 129,252,253,239,15,131,244,1,139,12,202,139,4,194,57,193,15,132,244,1,129, + 252,253,239,15,135,244,2,139,169,233,133,252,237,15,132,244,2,252,246,133, + 233,235,15,133,244,2,255,49,252,237,255,189,1,0,0,0,255,252,233,244,45,255, + 72,252,247,208,131,195,4,129,124,253,202,4,239,15,133,244,248,139,12,202, + 65,59,12,135,255,131,195,4,129,124,253,202,4,239,15,135,244,248,255,252,242, + 65,15,16,4,199,102,15,46,4,202,255,221,4,202,65,221,4,199,255,72,252,247, + 208,131,195,4,57,68,202,4,255,139,108,194,4,131,195,4,129,252,253,239,255, + 15,131,244,247,255,15,130,244,247,255,137,108,202,4,139,44,194,137,44,202, + 255,15,183,67,252,254,141,156,253,131,233,248,1,139,3,15,182,204,15,182,232, + 131,195,4,193,232,16,65,252,255,36,252,238,255,139,108,194,4,139,4,194,137, + 108,202,4,137,4,202,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252, + 255,36,252,238,255,49,252,237,129,124,253,194,4,239,129,213,239,137,108,202, + 4,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238, + 255,129,124,253,194,4,239,15,135,244,48,255,252,242,15,16,4,194,72,184,237, + 237,102,72,15,110,200,15,87,193,252,242,15,17,4,202,255,221,4,194,217,224, + 221,28,202,255,129,124,253,194,4,239,15,133,244,248,139,4,194,255,15,87,192, + 252,242,15,42,128,233,248,1,252,242,15,17,4,202,255,219,128,233,248,1,221, + 28,202,255,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36, + 252,238,248,2,129,124,253,194,4,239,15,133,244,50,139,60,194,137,213,232, + 251,1,18,255,252,242,15,42,192,137,252,234,255,15,182,75,252,253,252,233, + 244,1,255,15,182,252,236,15,182,192,255,129,124,253,252,234,4,239,15,135, + 244,46,255,252,242,15,16,4,252,234,252,242,65,15,88,4,199,255,221,4,252,234, + 65,220,4,199,255,129,124,253,252,234,4,239,15,135,244,47,255,252,242,65,15, + 16,4,199,252,242,15,88,4,252,234,255,65,221,4,199,220,4,252,234,255,129,124, + 253,252,234,4,239,15,135,244,49,129,124,253,194,4,239,15,135,244,49,255,252, + 242,15,16,4,252,234,252,242,15,88,4,194,255,221,4,252,234,220,4,194,255,252, + 242,15,16,4,252,234,252,242,65,15,92,4,199,255,221,4,252,234,65,220,36,199, + 255,252,242,65,15,16,4,199,252,242,15,92,4,252,234,255,65,221,4,199,220,36, + 252,234,255,252,242,15,16,4,252,234,252,242,15,92,4,194,255,221,4,252,234, + 220,36,194,255,252,242,15,16,4,252,234,252,242,65,15,89,4,199,255,221,4,252, + 234,65,220,12,199,255,252,242,65,15,16,4,199,252,242,15,89,4,252,234,255, + 65,221,4,199,220,12,252,234,255,252,242,15,16,4,252,234,252,242,15,89,4,194, + 255,221,4,252,234,220,12,194,255,252,242,15,16,4,252,234,252,242,65,15,94, + 4,199,255,221,4,252,234,65,220,52,199,255,252,242,65,15,16,4,199,252,242, + 15,94,4,252,234,255,65,221,4,199,220,52,252,234,255,252,242,15,16,4,252,234, + 252,242,15,94,4,194,255,221,4,252,234,220,52,194,255,252,242,15,16,4,252, + 234,252,242,65,15,16,12,199,255,221,4,252,234,65,221,4,199,255,252,242,65, + 15,16,4,199,252,242,15,16,12,252,234,255,65,221,4,199,221,4,252,234,255,252, + 242,15,16,4,252,234,252,242,15,16,12,194,255,221,4,252,234,221,4,194,255, + 248,156,232,244,148,255,252,233,244,156,255,232,244,107,255,15,182,252,236, + 15,182,192,139,124,36,24,137,151,233,141,52,194,137,194,41,252,234,248,33, + 137,252,253,137,92,36,28,232,251,1,25,139,149,233,133,192,15,133,244,42,15, + 182,107,252,255,15,182,75,252,253,139,68,252,234,4,139,44,252,234,137,68, + 202,4,137,44,202,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252, + 255,36,252,238,255,72,252,247,208,65,139,4,135,199,68,202,4,237,137,4,202, + 139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255, + 15,191,192,252,242,15,42,192,252,242,15,17,4,202,255,223,67,252,254,221,28, + 202,255,252,242,65,15,16,4,199,252,242,15,17,4,202,255,65,221,4,199,221,28, + 202,255,72,252,247,208,137,68,202,4,139,3,15,182,204,15,182,232,131,195,4, + 193,232,16,65,252,255,36,252,238,255,141,76,202,12,141,68,194,4,189,237,137, + 105,252,248,248,1,137,41,131,193,8,57,193,15,134,244,1,139,3,15,182,204,15, + 182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,139,106,252,248,139, + 172,253,133,233,139,173,233,139,69,4,139,109,0,137,68,202,4,137,44,202,139, + 3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,139, + 106,252,248,139,172,253,141,233,128,189,233,0,139,173,233,139,12,194,139, + 68,194,4,137,77,0,137,69,4,15,132,244,247,252,246,133,233,235,15,133,244, + 248,248,1,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36, + 252,238,248,2,129,232,239,129,252,248,239,15,134,244,1,252,246,129,233,235, + 15,132,244,1,137,252,238,137,213,65,141,190,233,255,232,251,1,26,137,252, + 234,252,233,244,1,255,72,252,247,208,139,106,252,248,139,172,253,141,233, + 65,139,12,135,139,133,233,137,8,199,64,4,237,252,246,133,233,235,15,133,244, + 248,248,1,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36, + 252,238,248,2,252,246,129,233,235,15,132,244,1,128,189,233,0,15,132,244,1, + 137,213,137,198,65,141,190,233,232,251,1,26,137,252,234,252,233,244,1,255, + 139,106,252,248,255,252,242,65,15,16,4,199,255,139,172,253,141,233,139,141, + 233,255,252,242,15,17,1,255,221,25,255,72,252,247,208,139,106,252,248,139, + 172,253,141,233,139,141,233,137,65,4,139,3,15,182,204,15,182,232,131,195, + 4,193,232,16,65,252,255,36,252,238,255,141,156,253,131,233,139,108,36,24, + 131,189,233,0,15,132,244,247,137,149,233,141,52,202,137,252,239,232,251,1, + 27,139,149,233,248,1,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65, + 252,255,36,252,238,255,72,252,247,208,139,108,36,24,137,149,233,139,82,252, + 248,65,139,52,135,137,252,239,137,92,36,28,232,251,1,28,139,149,233,15,182, + 75,252,253,137,4,202,199,68,202,4,237,139,3,15,182,204,15,182,232,131,195, + 4,193,232,16,65,252,255,36,252,238,255,139,124,36,24,137,151,233,248,1,137, + 194,37,252,255,7,0,0,193,252,234,11,61,252,255,7,0,0,15,132,244,249,248,2, + 137,198,65,139,134,233,137,252,253,65,59,134,233,137,92,36,28,15,131,244, + 251,232,251,1,29,139,149,233,15,182,75,252,253,137,4,202,199,68,202,4,237, + 139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248, + 3,184,1,8,0,0,252,233,244,2,248,5,232,251,1,30,15,183,67,252,254,137,252, + 239,252,233,244,1,255,72,252,247,208,139,108,36,24,65,139,142,233,137,92, + 36,28,65,59,142,233,137,149,233,15,131,244,249,248,2,65,139,52,135,137,252, + 239,232,251,1,31,139,149,233,15,182,75,252,253,137,4,202,199,68,202,4,237, + 139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248, + 3,137,252,239,232,251,1,30,15,183,67,252,254,72,252,247,208,252,233,244,2, + 255,72,252,247,208,139,106,252,248,139,173,233,65,139,4,135,252,233,244,157, + 255,72,252,247,208,139,106,252,248,139,173,233,65,139,4,135,252,233,244,158, + 255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,36,139, + 44,252,234,129,124,253,194,4,239,15,135,244,251,255,252,242,15,16,4,194,252, + 242,15,45,192,252,242,15,42,200,102,15,46,193,255,15,133,244,36,59,133,233, + 15,131,244,36,193,224,3,3,133,233,129,120,253,4,239,15,132,244,248,248,1, + 139,40,139,64,4,137,44,202,137,68,202,4,139,3,15,182,204,15,182,232,131,195, + 4,193,232,16,65,252,255,36,252,238,248,2,131,189,233,0,15,132,244,1,139,141, + 233,252,246,129,233,235,15,132,244,36,15,182,75,252,253,252,233,244,1,248, + 5,255,129,124,253,194,4,239,15,133,244,36,139,4,194,252,233,244,157,255,15, + 182,252,236,15,182,192,72,252,247,208,65,139,4,135,129,124,253,252,234,4, + 239,15,133,244,34,139,44,252,234,248,157,139,141,233,35,136,233,105,201,239, + 3,141,233,248,1,129,185,233,239,15,133,244,250,57,129,233,15,133,244,250, + 129,121,253,4,239,15,132,244,251,15,182,67,252,253,139,41,139,73,4,137,44, + 194,248,2,255,137,76,194,4,139,3,15,182,204,15,182,232,131,195,4,193,232, + 16,65,252,255,36,252,238,248,3,15,182,67,252,253,185,237,252,233,244,2,248, + 4,139,137,233,133,201,15,133,244,1,248,5,139,141,233,133,201,15,132,244,3, + 252,246,129,233,235,15,133,244,3,252,233,244,34,255,15,182,252,236,15,182, + 192,129,124,253,252,234,4,239,15,133,244,35,139,44,252,234,59,133,233,15, + 131,244,35,193,224,3,3,133,233,129,120,253,4,239,15,132,244,248,248,1,139, + 40,139,64,4,137,44,202,137,68,202,4,139,3,15,182,204,15,182,232,131,195,4, + 193,232,16,65,252,255,36,252,238,248,2,131,189,233,0,15,132,244,1,139,141, + 233,252,246,129,233,235,15,132,244,35,255,15,182,252,236,15,182,192,129,124, + 253,252,234,4,239,15,133,244,39,139,44,252,234,129,124,253,194,4,239,15,135, + 244,251,255,15,133,244,39,59,133,233,15,131,244,39,193,224,3,3,133,233,129, + 120,253,4,239,15,132,244,249,248,1,252,246,133,233,235,15,133,244,253,248, + 2,139,108,202,4,139,12,202,137,104,4,137,8,139,3,15,182,204,15,182,232,131, + 195,4,193,232,16,65,252,255,36,252,238,248,3,131,189,233,0,15,132,244,1,139, + 141,233,255,252,246,129,233,235,15,132,244,39,15,182,75,252,253,252,233,244, + 1,248,5,129,124,253,194,4,239,15,133,244,39,139,4,194,252,233,244,158,248, + 7,128,165,233,235,65,139,142,233,65,137,174,233,137,141,233,15,182,75,252, + 253,252,233,244,2,255,15,182,252,236,15,182,192,72,252,247,208,65,139,4,135, + 129,124,253,252,234,4,239,15,133,244,37,139,44,252,234,248,158,139,141,233, + 35,136,233,105,201,239,198,133,233,0,3,141,233,248,1,129,185,233,239,15,133, + 244,251,57,129,233,15,133,244,251,129,121,253,4,239,15,132,244,250,248,2, + 255,252,246,133,233,235,15,133,244,253,248,3,15,182,67,252,253,139,108,194, + 4,139,4,194,137,105,4,137,1,139,3,15,182,204,15,182,232,131,195,4,193,232, + 16,65,252,255,36,252,238,248,4,131,189,233,0,15,132,244,2,137,12,36,139,141, + 233,252,246,129,233,235,15,132,244,37,139,12,36,252,233,244,2,248,5,139,137, + 233,133,201,15,133,244,1,255,139,141,233,133,201,15,132,244,252,252,246,129, + 233,235,15,132,244,37,248,6,137,4,36,199,68,36,4,237,137,108,36,8,139,124, + 36,24,137,151,233,72,141,20,36,137,252,238,137,252,253,137,92,36,28,232,251, + 1,32,139,149,233,139,108,36,8,137,193,252,233,244,2,248,7,128,165,233,235, + 65,139,134,233,65,137,174,233,137,133,233,252,233,244,3,255,15,182,252,236, + 15,182,192,129,124,253,252,234,4,239,15,133,244,38,139,44,252,234,59,133, + 233,15,131,244,38,193,224,3,3,133,233,129,120,253,4,239,15,132,244,249,248, + 1,252,246,133,233,235,15,133,244,253,248,2,139,108,202,4,139,12,202,137,104, 4,137,8,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252, - 238,248,3,131,189,233,0,15,132,244,1,139,141,233,255,252,246,129,233,235, - 15,132,244,39,15,182,75,252,253,252,233,244,1,248,5,129,124,253,194,4,239, - 15,133,244,39,139,4,194,252,233,244,158,248,7,128,165,233,235,65,139,142, - 233,65,137,174,233,137,141,233,15,182,75,252,253,252,233,244,2,255,15,182, - 252,236,15,182,192,72,252,247,208,65,139,4,135,129,124,253,252,234,4,239, - 15,133,244,37,139,44,252,234,248,158,139,141,233,35,136,233,105,201,239,198, - 133,233,0,3,141,233,248,1,129,185,233,239,15,133,244,251,57,129,233,15,133, - 244,251,129,121,253,4,239,15,132,244,250,248,2,255,252,246,133,233,235,15, - 133,244,253,248,3,15,182,67,252,253,139,108,194,4,139,4,194,137,105,4,137, - 1,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238, - 248,4,131,189,233,0,15,132,244,2,137,12,36,139,141,233,252,246,129,233,235, - 15,132,244,37,139,12,36,252,233,244,2,248,5,139,137,233,133,201,15,133,244, - 1,255,139,141,233,133,201,15,132,244,252,252,246,129,233,235,15,132,244,37, - 248,6,137,4,36,199,68,36,4,237,137,108,36,8,139,124,36,24,137,151,233,72, - 141,20,36,137,252,238,137,252,253,137,92,36,28,232,251,1,32,139,149,233,139, - 108,36,8,137,193,252,233,244,2,248,7,128,165,233,235,65,139,134,233,65,137, - 174,233,137,133,233,252,233,244,3,255,15,182,252,236,15,182,192,129,124,253, - 252,234,4,239,15,133,244,38,139,44,252,234,59,133,233,15,131,244,38,193,224, - 3,3,133,233,129,120,253,4,239,15,132,244,249,248,1,252,246,133,233,235,15, - 133,244,253,248,2,139,108,202,4,139,12,202,137,104,4,137,8,139,3,15,182,204, - 15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,131,189,233,0, - 15,132,244,1,255,139,141,233,252,246,129,233,235,15,132,244,38,15,182,75, - 252,253,252,233,244,1,248,7,128,165,233,235,65,139,142,233,65,137,174,233, - 137,141,233,15,182,75,252,253,252,233,244,2,255,68,137,60,36,255,252,242, - 69,15,45,60,199,255,248,1,141,12,202,139,105,252,248,252,246,133,233,235, - 15,133,244,253,248,2,139,68,36,4,131,232,1,15,132,244,250,68,1,252,248,59, - 133,233,15,131,244,251,68,41,252,248,65,193,231,3,68,3,189,233,248,3,139, - 41,65,137,47,139,105,4,131,193,8,65,137,111,4,65,131,199,8,131,232,1,15,133, - 244,3,248,4,68,139,60,36,139,3,15,182,204,15,182,232,131,195,4,193,232,16, - 65,252,255,36,252,238,248,5,139,124,36,24,137,151,233,137,252,238,137,194, - 137,252,253,137,92,36,28,232,251,1,33,139,149,233,15,182,75,252,253,252,233, - 244,1,248,7,255,128,165,233,235,65,139,134,233,65,137,174,233,137,133,233, - 252,233,244,2,255,3,68,36,4,255,129,124,253,202,4,239,139,44,202,15,133,244, - 51,141,84,202,8,137,90,252,252,139,157,233,139,11,15,182,252,233,15,182,205, - 131,195,4,65,252,255,36,252,238,255,141,76,202,8,65,137,215,139,105,252,248, - 129,121,253,252,252,239,15,133,244,28,248,52,139,90,252,252,252,247,195,237, - 15,133,244,253,248,1,137,106,252,248,137,68,36,4,131,232,1,15,132,244,249, - 248,2,139,41,65,137,47,139,105,4,65,137,111,4,65,131,199,8,131,193,8,131, - 232,1,15,133,244,2,139,106,252,248,248,3,139,68,36,4,128,189,233,1,15,135, - 244,251,248,4,139,157,233,139,11,15,182,252,233,15,182,205,131,195,4,65,252, - 255,36,252,238,248,5,255,252,247,195,237,15,133,244,4,15,182,75,252,253,72, - 252,247,209,141,12,202,68,139,121,252,248,69,139,191,233,69,139,191,233,252, - 233,244,4,248,7,15,139,244,1,131,227,252,248,41,218,65,137,215,139,90,252, - 252,252,233,244,1,255,141,76,202,8,139,105,232,139,65,252,236,137,41,137, - 65,4,139,105,252,240,139,65,252,244,137,105,8,137,65,12,139,105,224,139,65, - 228,137,105,252,248,137,65,252,252,129,252,248,239,184,237,15,133,244,28, - 137,202,137,90,252,252,139,157,233,139,11,15,182,252,233,15,182,205,131,195, - 4,65,252,255,36,252,238,255,15,182,252,236,139,66,252,248,141,12,202,139, - 128,233,15,182,128,233,68,137,60,36,68,141,188,253,194,233,68,43,122,252, - 252,133,252,237,15,132,244,251,141,108,252,233,252,248,65,57,215,15,131,244, - 248,248,1,65,139,71,252,248,137,1,65,139,71,252,252,65,131,199,8,137,65,4, - 131,193,8,57,252,233,15,131,244,249,65,57,215,15,130,244,1,248,2,199,65,4, - 237,131,193,8,57,252,233,15,130,244,2,248,3,68,139,60,36,139,3,15,182,204, - 15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,5,199,68,36,4,1, - 0,0,0,137,208,68,41,252,248,15,134,244,3,255,137,197,193,252,237,3,131,197, - 1,137,108,36,4,139,108,36,24,1,200,59,133,233,15,135,244,253,248,6,65,139, - 71,252,248,137,1,65,139,71,252,252,65,131,199,8,137,65,4,131,193,8,65,57, - 215,15,130,244,6,252,233,244,3,248,7,137,149,233,137,141,233,137,92,36,28, - 65,41,215,139,116,36,4,131,252,238,1,137,252,239,232,251,1,0,139,149,233, - 139,141,233,65,1,215,252,233,244,6,255,193,225,3,255,248,1,139,90,252,252, - 137,68,36,4,252,247,195,237,15,133,244,253,255,248,13,65,137,215,131,232, - 1,15,132,244,249,248,2,65,139,44,15,65,137,111,252,248,65,139,108,15,4,65, - 137,111,252,252,65,131,199,8,131,232,1,15,133,244,2,248,3,139,68,36,4,15, - 182,107,252,255,248,5,57,197,15,135,244,252,255,139,108,10,4,137,106,252, - 252,139,44,10,137,106,252,248,255,248,5,56,67,252,255,15,135,244,252,255, - 15,182,75,252,253,72,252,247,209,141,20,202,68,139,122,252,248,69,139,191, - 233,69,139,191,233,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252, - 255,36,252,238,248,6,255,65,199,71,252,252,237,65,131,199,8,255,199,68,194, - 252,244,237,255,131,192,1,252,233,244,5,248,7,15,139,244,14,131,227,252,248, - 41,218,255,1,217,255,137,221,209,252,237,129,229,239,102,65,131,172,253,46, - 233,1,15,132,244,140,255,141,12,202,255,129,121,253,4,239,15,135,244,53,129, - 121,253,12,239,15,135,244,53,255,139,105,20,255,129,252,253,239,15,135,244, - 53,255,252,242,15,16,1,252,242,15,16,73,8,255,252,242,15,88,65,16,252,242, - 15,17,1,133,252,237,15,136,244,249,255,15,140,244,249,255,102,15,46,200,248, - 1,252,242,15,17,65,24,255,221,65,8,221,1,255,220,65,16,221,17,221,81,24,133, - 252,237,15,136,244,247,255,221,81,24,15,140,244,247,255,217,201,248,1,255, - 15,183,67,252,254,255,15,131,244,248,141,156,253,131,233,255,141,156,253, - 131,233,15,183,67,252,254,15,131,245,255,15,130,244,248,141,156,253,131,233, - 255,248,3,102,15,46,193,252,233,244,1,255,141,12,202,139,105,4,129,252,253, - 239,15,132,244,247,255,137,105,252,252,139,41,137,105,252,248,252,233,245, - 255,141,156,253,131,233,139,1,137,105,252,252,137,65,252,248,255,65,139,142, - 233,139,4,193,72,139,128,233,139,108,36,24,65,137,150,233,65,137,174,233, - 76,137,36,36,76,137,108,36,8,72,131,252,236,16,252,255,224,255,141,156,253, - 131,233,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252, - 238,255,137,221,209,252,237,129,229,239,102,65,131,172,253,46,233,1,15,132, - 244,142,255,68,139,187,233,139,108,36,24,141,12,202,59,141,233,15,135,244, - 23,15,182,139,233,57,200,15,134,244,249,248,2,255,15,183,67,252,254,252,233, - 245,255,248,3,199,68,194,252,252,237,131,192,1,57,200,15,134,244,3,252,233, - 244,2,255,141,44,197,237,141,4,194,68,139,122,252,248,137,104,252,252,68, - 137,120,252,248,139,108,36,24,141,12,200,59,141,233,15,135,244,22,137,209, - 137,194,15,182,171,233,133,252,237,15,132,244,248,248,1,131,193,8,57,209, - 15,131,244,249,68,139,121,252,248,68,137,56,68,139,121,252,252,68,137,120, - 4,131,192,8,199,65,252,252,237,131,252,237,1,15,133,244,1,248,2,255,68,139, - 187,233,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252, - 238,255,248,3,199,64,4,237,131,192,8,131,252,237,1,15,133,244,3,252,233,244, - 2,255,139,106,252,248,76,139,189,233,139,108,36,24,141,68,194,252,248,137, - 149,233,141,136,233,59,141,233,137,133,233,255,137,252,239,255,76,137,252, - 254,137,252,239,255,15,135,244,21,65,199,134,233,237,255,65,252,255,215,255, - 65,252,255,150,233,255,65,199,134,233,237,139,149,233,141,12,194,252,247, - 217,3,141,233,139,90,252,252,252,233,244,12,255,254,0 + 238,248,3,131,189,233,0,15,132,244,1,255,139,141,233,252,246,129,233,235, + 15,132,244,38,15,182,75,252,253,252,233,244,1,248,7,128,165,233,235,65,139, + 142,233,65,137,174,233,137,141,233,15,182,75,252,253,252,233,244,2,255,68, + 137,60,36,255,252,242,69,15,45,60,199,255,248,1,141,12,202,139,105,252,248, + 252,246,133,233,235,15,133,244,253,248,2,139,68,36,4,131,232,1,15,132,244, + 250,68,1,252,248,59,133,233,15,131,244,251,68,41,252,248,65,193,231,3,68, + 3,189,233,248,3,139,41,65,137,47,139,105,4,131,193,8,65,137,111,4,65,131, + 199,8,131,232,1,15,133,244,3,248,4,68,139,60,36,139,3,15,182,204,15,182,232, + 131,195,4,193,232,16,65,252,255,36,252,238,248,5,139,124,36,24,137,151,233, + 137,252,238,137,194,137,252,253,137,92,36,28,232,251,1,33,139,149,233,15, + 182,75,252,253,252,233,244,1,248,7,255,128,165,233,235,65,139,134,233,65, + 137,174,233,137,133,233,252,233,244,2,255,3,68,36,4,255,129,124,253,202,4, + 239,139,44,202,15,133,244,51,141,84,202,8,137,90,252,252,139,157,233,139, + 11,15,182,252,233,15,182,205,131,195,4,65,252,255,36,252,238,255,141,76,202, + 8,65,137,215,139,105,252,248,129,121,253,252,252,239,15,133,244,28,248,52, + 139,90,252,252,252,247,195,237,15,133,244,253,248,1,137,106,252,248,137,68, + 36,4,131,232,1,15,132,244,249,248,2,139,41,65,137,47,139,105,4,65,137,111, + 4,65,131,199,8,131,193,8,131,232,1,15,133,244,2,139,106,252,248,248,3,139, + 68,36,4,128,189,233,1,15,135,244,251,248,4,139,157,233,139,11,15,182,252, + 233,15,182,205,131,195,4,65,252,255,36,252,238,248,5,255,252,247,195,237, + 15,133,244,4,15,182,75,252,253,72,252,247,209,141,12,202,68,139,121,252,248, + 69,139,191,233,69,139,191,233,252,233,244,4,248,7,15,139,244,1,131,227,252, + 248,41,218,65,137,215,139,90,252,252,252,233,244,1,255,141,76,202,8,139,105, + 232,139,65,252,236,137,41,137,65,4,139,105,252,240,139,65,252,244,137,105, + 8,137,65,12,139,105,224,139,65,228,137,105,252,248,137,65,252,252,129,252, + 248,239,184,237,15,133,244,28,137,202,137,90,252,252,139,157,233,139,11,15, + 182,252,233,15,182,205,131,195,4,65,252,255,36,252,238,255,15,182,252,236, + 139,66,252,248,141,12,202,139,128,233,15,182,128,233,68,137,60,36,68,141, + 188,253,194,233,68,43,122,252,252,133,252,237,15,132,244,251,141,108,252, + 233,252,248,65,57,215,15,131,244,248,248,1,65,139,71,252,248,137,1,65,139, + 71,252,252,65,131,199,8,137,65,4,131,193,8,57,252,233,15,131,244,249,65,57, + 215,15,130,244,1,248,2,199,65,4,237,131,193,8,57,252,233,15,130,244,2,248, + 3,68,139,60,36,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255, + 36,252,238,248,5,199,68,36,4,1,0,0,0,137,208,68,41,252,248,15,134,244,3,255, + 137,197,193,252,237,3,131,197,1,137,108,36,4,139,108,36,24,1,200,59,133,233, + 15,135,244,253,248,6,65,139,71,252,248,137,1,65,139,71,252,252,65,131,199, + 8,137,65,4,131,193,8,65,57,215,15,130,244,6,252,233,244,3,248,7,137,149,233, + 137,141,233,137,92,36,28,65,41,215,139,116,36,4,131,252,238,1,137,252,239, + 232,251,1,0,139,149,233,139,141,233,65,1,215,252,233,244,6,255,193,225,3, + 255,248,1,139,90,252,252,137,68,36,4,252,247,195,237,15,133,244,253,255,248, + 13,65,137,215,131,232,1,15,132,244,249,248,2,65,139,44,15,65,137,111,252, + 248,65,139,108,15,4,65,137,111,252,252,65,131,199,8,131,232,1,15,133,244, + 2,248,3,139,68,36,4,15,182,107,252,255,248,5,57,197,15,135,244,252,255,139, + 108,10,4,137,106,252,252,139,44,10,137,106,252,248,255,248,5,56,67,252,255, + 15,135,244,252,255,15,182,75,252,253,72,252,247,209,141,20,202,68,139,122, + 252,248,69,139,191,233,69,139,191,233,139,3,15,182,204,15,182,232,131,195, + 4,193,232,16,65,252,255,36,252,238,248,6,255,65,199,71,252,252,237,65,131, + 199,8,255,199,68,194,252,244,237,255,131,192,1,252,233,244,5,248,7,15,139, + 244,14,131,227,252,248,41,218,255,1,217,255,137,221,209,252,237,129,229,239, + 102,65,131,172,253,46,233,1,15,132,244,140,255,141,12,202,255,129,121,253, + 4,239,15,135,244,53,129,121,253,12,239,15,135,244,53,255,139,105,20,255,129, + 252,253,239,15,135,244,53,255,252,242,15,16,1,252,242,15,16,73,8,255,252, + 242,15,88,65,16,252,242,15,17,1,133,252,237,15,136,244,249,255,15,140,244, + 249,255,102,15,46,200,248,1,252,242,15,17,65,24,255,221,65,8,221,1,255,220, + 65,16,221,17,221,81,24,133,252,237,15,136,244,247,255,221,81,24,15,140,244, + 247,255,217,201,248,1,255,15,183,67,252,254,255,15,131,244,248,141,156,253, + 131,233,255,141,156,253,131,233,15,183,67,252,254,15,131,245,255,15,130,244, + 248,141,156,253,131,233,255,248,3,102,15,46,193,252,233,244,1,255,141,12, + 202,139,105,4,129,252,253,239,15,132,244,247,255,137,105,252,252,139,41,137, + 105,252,248,252,233,245,255,141,156,253,131,233,139,1,137,105,252,252,137, + 65,252,248,255,65,139,142,233,139,4,193,72,139,128,233,139,108,36,24,65,137, + 150,233,65,137,174,233,76,137,36,36,76,137,108,36,8,72,131,252,236,16,252, + 255,224,255,141,156,253,131,233,139,3,15,182,204,15,182,232,131,195,4,193, + 232,16,65,252,255,36,252,238,255,137,221,209,252,237,129,229,239,102,65,131, + 172,253,46,233,1,15,132,244,142,255,68,139,187,233,139,108,36,24,141,12,202, + 59,141,233,15,135,244,23,15,182,139,233,57,200,15,134,244,249,248,2,255,15, + 183,67,252,254,252,233,245,255,248,3,199,68,194,252,252,237,131,192,1,57, + 200,15,134,244,3,252,233,244,2,255,141,44,197,237,141,4,194,68,139,122,252, + 248,137,104,252,252,68,137,120,252,248,139,108,36,24,141,12,200,59,141,233, + 15,135,244,22,137,209,137,194,15,182,171,233,133,252,237,15,132,244,248,248, + 1,131,193,8,57,209,15,131,244,249,68,139,121,252,248,68,137,56,68,139,121, + 252,252,68,137,120,4,131,192,8,199,65,252,252,237,131,252,237,1,15,133,244, + 1,248,2,255,68,139,187,233,139,3,15,182,204,15,182,232,131,195,4,193,232, + 16,65,252,255,36,252,238,255,248,3,199,64,4,237,131,192,8,131,252,237,1,15, + 133,244,3,252,233,244,2,255,139,106,252,248,76,139,189,233,139,108,36,24, + 141,68,194,252,248,137,149,233,141,136,233,59,141,233,137,133,233,255,137, + 252,239,255,76,137,252,254,137,252,239,255,15,135,244,21,65,199,134,233,237, + 255,65,252,255,215,255,65,252,255,150,233,255,65,199,134,233,237,139,149, + 233,141,12,194,252,247,217,3,141,233,139,90,252,252,252,233,244,12,255,254, + 0 }; enum { @@ -1370,58 +1371,58 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse) #endif dasm_put(Dst, 7558); #if LJ_HASJIT - dasm_put(Dst, 7561, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP); + dasm_put(Dst, 7561, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, BC_FUNCF); #endif - dasm_put(Dst, 7647); + dasm_put(Dst, 7661); if (!sse) { - dasm_put(Dst, 7650); + dasm_put(Dst, 7664); } - dasm_put(Dst, 7695, (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, 7709, (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, 7781); + dasm_put(Dst, 7795); } - dasm_put(Dst, 7826, (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, 7840, (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, 7912); + dasm_put(Dst, 7926); } - 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, 7965, (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, (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, 8054, (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, 8154); + dasm_put(Dst, 8168); } - dasm_put(Dst, 8201); + dasm_put(Dst, 8215); if (!sse) { } else { - dasm_put(Dst, 8278); + dasm_put(Dst, 8292); } - dasm_put(Dst, 8281); - dasm_put(Dst, 8366, (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, 8467, (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, 8641); + dasm_put(Dst, 8295); + dasm_put(Dst, 8380, (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, 8481, (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, 8655); if (sse) { - dasm_put(Dst, 8682); - dasm_put(Dst, 8752); - dasm_put(Dst, 8824); + dasm_put(Dst, 8696); + dasm_put(Dst, 8766); + dasm_put(Dst, 8838); } else { - dasm_put(Dst, 8876); - dasm_put(Dst, 8968); + dasm_put(Dst, 8890); + dasm_put(Dst, 8982); } - dasm_put(Dst, 9014); + dasm_put(Dst, 9028); if (sse) { - dasm_put(Dst, 9020, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); - dasm_put(Dst, 9105, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); + dasm_put(Dst, 9034, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); + dasm_put(Dst, 9119, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); } else { - dasm_put(Dst, 9233); - dasm_put(Dst, 9316); + dasm_put(Dst, 9247); + dasm_put(Dst, 9330); if (cmov) { - dasm_put(Dst, 9371); + dasm_put(Dst, 9385); } else { - dasm_put(Dst, 9390); + dasm_put(Dst, 9404); } - dasm_put(Dst, 9229); + dasm_put(Dst, 9243); } - dasm_put(Dst, 9431); + dasm_put(Dst, 9445); } /* Generate the code for a single instruction. */ @@ -1437,595 +1438,595 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) /* Remember: all ops branch for a true comparison, fall through otherwise. */ case BC_ISLT: case BC_ISGE: case BC_ISLE: case BC_ISGT: - dasm_put(Dst, 9453, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 9467, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9474); + dasm_put(Dst, 9488); } else { - dasm_put(Dst, 9489); + dasm_put(Dst, 9503); if (cmov) { - dasm_put(Dst, 9499); + dasm_put(Dst, 9513); } else { - dasm_put(Dst, 9505); + dasm_put(Dst, 9519); } } switch (op) { case BC_ISLT: - dasm_put(Dst, 9512); + dasm_put(Dst, 9526); break; case BC_ISGE: - dasm_put(Dst, 9311); + dasm_put(Dst, 9325); break; case BC_ISLE: dasm_put(Dst, 5942); break; case BC_ISGT: - dasm_put(Dst, 9517); + dasm_put(Dst, 9531); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 9522, -BCBIAS_J*4); + dasm_put(Dst, 9536, -BCBIAS_J*4); break; case BC_ISEQV: case BC_ISNEV: vk = op == BC_ISEQV; - dasm_put(Dst, 9557, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 9571, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9583); + dasm_put(Dst, 9597); } else { - dasm_put(Dst, 9595); + dasm_put(Dst, 9609); if (cmov) { - dasm_put(Dst, 9499); + dasm_put(Dst, 9513); } else { - dasm_put(Dst, 9505); + dasm_put(Dst, 9519); } } iseqne_fp: if (vk) { - dasm_put(Dst, 9602); + dasm_put(Dst, 9616); } else { - dasm_put(Dst, 9611); + dasm_put(Dst, 9625); } iseqne_end: if (vk) { - dasm_put(Dst, 9620, -BCBIAS_J*4); + dasm_put(Dst, 9634, -BCBIAS_J*4); } else { - dasm_put(Dst, 9635, -BCBIAS_J*4); + dasm_put(Dst, 9649, -BCBIAS_J*4); } - dasm_put(Dst, 9536); + dasm_put(Dst, 9550); if (op == BC_ISEQV || op == BC_ISNEV) { - dasm_put(Dst, 9650, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<metatable), Dt6(->nomm), 1<>32)); + dasm_put(Dst, 9958, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); } else { - dasm_put(Dst, 9969); + dasm_put(Dst, 9983); } - dasm_put(Dst, 9536); + dasm_put(Dst, 9550); break; case BC_LEN: - dasm_put(Dst, 9978, LJ_TSTR); + dasm_put(Dst, 9992, LJ_TSTR); if (sse) { - dasm_put(Dst, 9992, Dt5(->len)); + dasm_put(Dst, 10006, Dt5(->len)); } else { - dasm_put(Dst, 10010, Dt5(->len)); + dasm_put(Dst, 10024, Dt5(->len)); } - dasm_put(Dst, 10019, LJ_TTAB); + dasm_put(Dst, 10033, LJ_TTAB); if (sse) { - dasm_put(Dst, 10061); + dasm_put(Dst, 10075); } else { } - dasm_put(Dst, 10070); + dasm_put(Dst, 10084); break; /* -- Binary ops -------------------------------------------------------- */ case BC_ADDVN: case BC_ADDNV: case BC_ADDVV: - dasm_put(Dst, 10080); + dasm_put(Dst, 10094); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 10088, LJ_TISNUM); + dasm_put(Dst, 10102, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10100); + dasm_put(Dst, 10114); } else { - dasm_put(Dst, 10115); + dasm_put(Dst, 10129); } break; case 1: - dasm_put(Dst, 10124, LJ_TISNUM); + dasm_put(Dst, 10138, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10136); + dasm_put(Dst, 10150); } else { - dasm_put(Dst, 10151); + dasm_put(Dst, 10165); } break; default: - dasm_put(Dst, 10160, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10174, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10182); - } else { dasm_put(Dst, 10196); + } else { + dasm_put(Dst, 10210); } break; } if (sse) { - dasm_put(Dst, 9962); + dasm_put(Dst, 9976); } else { - dasm_put(Dst, 9974); + dasm_put(Dst, 9988); } - dasm_put(Dst, 9536); + dasm_put(Dst, 9550); break; case BC_SUBVN: case BC_SUBNV: case BC_SUBVV: - dasm_put(Dst, 10080); + dasm_put(Dst, 10094); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 10088, LJ_TISNUM); + dasm_put(Dst, 10102, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10204); + dasm_put(Dst, 10218); } else { - dasm_put(Dst, 10219); + dasm_put(Dst, 10233); } break; case 1: - dasm_put(Dst, 10124, LJ_TISNUM); + dasm_put(Dst, 10138, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10228); + dasm_put(Dst, 10242); } else { - dasm_put(Dst, 10243); + dasm_put(Dst, 10257); } break; default: - dasm_put(Dst, 10160, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10174, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10252); - } else { dasm_put(Dst, 10266); + } else { + dasm_put(Dst, 10280); } break; } if (sse) { - dasm_put(Dst, 9962); + dasm_put(Dst, 9976); } else { - dasm_put(Dst, 9974); + dasm_put(Dst, 9988); } - dasm_put(Dst, 9536); + dasm_put(Dst, 9550); break; case BC_MULVN: case BC_MULNV: case BC_MULVV: - dasm_put(Dst, 10080); + dasm_put(Dst, 10094); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 10088, LJ_TISNUM); + dasm_put(Dst, 10102, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10274); + dasm_put(Dst, 10288); } else { - dasm_put(Dst, 10289); + dasm_put(Dst, 10303); } break; case 1: - dasm_put(Dst, 10124, LJ_TISNUM); + dasm_put(Dst, 10138, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10298); + dasm_put(Dst, 10312); } else { - dasm_put(Dst, 10313); + dasm_put(Dst, 10327); } break; default: - dasm_put(Dst, 10160, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10174, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10322); - } else { dasm_put(Dst, 10336); + } else { + dasm_put(Dst, 10350); } break; } if (sse) { - dasm_put(Dst, 9962); + dasm_put(Dst, 9976); } else { - dasm_put(Dst, 9974); + dasm_put(Dst, 9988); } - dasm_put(Dst, 9536); + dasm_put(Dst, 9550); break; case BC_DIVVN: case BC_DIVNV: case BC_DIVVV: - dasm_put(Dst, 10080); + dasm_put(Dst, 10094); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 10088, LJ_TISNUM); + dasm_put(Dst, 10102, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10344); + dasm_put(Dst, 10358); } else { - dasm_put(Dst, 10359); + dasm_put(Dst, 10373); } break; case 1: - dasm_put(Dst, 10124, LJ_TISNUM); + dasm_put(Dst, 10138, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10368); + dasm_put(Dst, 10382); } else { - dasm_put(Dst, 10383); + dasm_put(Dst, 10397); } break; default: - dasm_put(Dst, 10160, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10174, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10392); - } else { dasm_put(Dst, 10406); + } else { + dasm_put(Dst, 10420); } break; } if (sse) { - dasm_put(Dst, 9962); + dasm_put(Dst, 9976); } else { - dasm_put(Dst, 9974); + dasm_put(Dst, 9988); } - dasm_put(Dst, 9536); + dasm_put(Dst, 9550); break; case BC_MODVN: - dasm_put(Dst, 10080); + dasm_put(Dst, 10094); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 10088, LJ_TISNUM); + dasm_put(Dst, 10102, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10414); + dasm_put(Dst, 10428); } else { - dasm_put(Dst, 10429); + dasm_put(Dst, 10443); } break; case 1: - dasm_put(Dst, 10124, LJ_TISNUM); + dasm_put(Dst, 10138, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10438); + dasm_put(Dst, 10452); } else { - dasm_put(Dst, 10453); + dasm_put(Dst, 10467); } break; default: - dasm_put(Dst, 10160, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10174, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10462); - } else { dasm_put(Dst, 10476); + } else { + dasm_put(Dst, 10490); } break; } - dasm_put(Dst, 10484); + dasm_put(Dst, 10498); if (sse) { - dasm_put(Dst, 9962); + dasm_put(Dst, 9976); } else { - dasm_put(Dst, 9974); + dasm_put(Dst, 9988); } - dasm_put(Dst, 9536); + dasm_put(Dst, 9550); break; case BC_MODNV: case BC_MODVV: - dasm_put(Dst, 10080); + dasm_put(Dst, 10094); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 10088, LJ_TISNUM); + dasm_put(Dst, 10102, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10414); + dasm_put(Dst, 10428); } else { - dasm_put(Dst, 10429); + dasm_put(Dst, 10443); } break; case 1: - dasm_put(Dst, 10124, LJ_TISNUM); + dasm_put(Dst, 10138, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10438); + dasm_put(Dst, 10452); } else { - dasm_put(Dst, 10453); + dasm_put(Dst, 10467); } break; default: - dasm_put(Dst, 10160, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10174, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10462); - } else { dasm_put(Dst, 10476); + } else { + dasm_put(Dst, 10490); } break; } - dasm_put(Dst, 10490); + dasm_put(Dst, 10504); break; case BC_POW: - dasm_put(Dst, 10080); + dasm_put(Dst, 10094); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 10088, LJ_TISNUM); + dasm_put(Dst, 10102, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10414); + dasm_put(Dst, 10428); } else { - dasm_put(Dst, 10429); + dasm_put(Dst, 10443); } break; case 1: - dasm_put(Dst, 10124, LJ_TISNUM); + dasm_put(Dst, 10138, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10438); + dasm_put(Dst, 10452); } else { - dasm_put(Dst, 10453); + dasm_put(Dst, 10467); } break; default: - dasm_put(Dst, 10160, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10174, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10462); - } else { dasm_put(Dst, 10476); + } else { + dasm_put(Dst, 10490); } break; } - dasm_put(Dst, 10495); + dasm_put(Dst, 10509); if (sse) { - dasm_put(Dst, 9962); + dasm_put(Dst, 9976); } else { - dasm_put(Dst, 9974); + dasm_put(Dst, 9988); } - dasm_put(Dst, 9536); + dasm_put(Dst, 9550); break; case BC_CAT: - dasm_put(Dst, 10499, Dt1(->base), Dt1(->base)); + dasm_put(Dst, 10513, Dt1(->base), Dt1(->base)); break; /* -- Constant ops ------------------------------------------------------ */ case BC_KSTR: - dasm_put(Dst, 10590, LJ_TSTR); + dasm_put(Dst, 10604, LJ_TSTR); break; case BC_KSHORT: if (sse) { - dasm_put(Dst, 10627); + dasm_put(Dst, 10641); } else { - dasm_put(Dst, 10642); + dasm_put(Dst, 10656); } - dasm_put(Dst, 9536); + dasm_put(Dst, 9550); break; case BC_KNUM: if (sse) { - dasm_put(Dst, 10650); - } else { dasm_put(Dst, 10664); + } else { + dasm_put(Dst, 10678); } - dasm_put(Dst, 9536); + dasm_put(Dst, 9550); break; case BC_KPRI: - dasm_put(Dst, 10672); + dasm_put(Dst, 10686); break; case BC_KNIL: - dasm_put(Dst, 10701, LJ_TNIL); + dasm_put(Dst, 10715, LJ_TNIL); break; /* -- Upvalue and function ops ------------------------------------------ */ case BC_UGET: - dasm_put(Dst, 10749, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 10763, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_USETV: #define TV2MARKOFS \ ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv)) - dasm_put(Dst, 10795, 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, 10891); + dasm_put(Dst, 10809, 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, 10905); break; #undef TV2MARKOFS case BC_USETS: - dasm_put(Dst, 10903, 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, 10917, 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, 10999); + dasm_put(Dst, 11013); if (sse) { - dasm_put(Dst, 11004); + dasm_put(Dst, 11018); } else { - dasm_put(Dst, 9778); + dasm_put(Dst, 9792); } - dasm_put(Dst, 11012, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 11026, offsetof(GCfuncL, uvptr), DtA(->v)); if (sse) { - dasm_put(Dst, 11021); + dasm_put(Dst, 11035); } else { - dasm_put(Dst, 11027); + dasm_put(Dst, 11041); } - dasm_put(Dst, 9536); + dasm_put(Dst, 9550); break; case BC_USETP: - dasm_put(Dst, 11030, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 11044, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_UCLO: - dasm_put(Dst, 11070, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 11084, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); break; case BC_FNEW: - dasm_put(Dst, 11126, Dt1(->base), Dt1(->base), LJ_TFUNC); + dasm_put(Dst, 11140, Dt1(->base), Dt1(->base), LJ_TFUNC); break; /* -- Table ops --------------------------------------------------------- */ case BC_TNEW: - dasm_put(Dst, 11193, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 11207, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); break; case BC_TDUP: - dasm_put(Dst, 11317, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 11331, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); break; case BC_GGET: - dasm_put(Dst, 11416, Dt7(->env)); + dasm_put(Dst, 11430, Dt7(->env)); break; case BC_GSET: - dasm_put(Dst, 11436, Dt7(->env)); + dasm_put(Dst, 11450, Dt7(->env)); break; case BC_TGETV: - dasm_put(Dst, 11456, LJ_TTAB, LJ_TISNUM); + dasm_put(Dst, 11470, LJ_TTAB, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11489); + dasm_put(Dst, 11503); } else { } - dasm_put(Dst, 11510, 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, 11708, 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, 11722, 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)); - dasm_put(Dst, 12000, Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 11929, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable)); + dasm_put(Dst, 12014, Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETS: - dasm_put(Dst, 12064, 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, 12141, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); - dasm_put(Dst, 12233, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 12078, 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, 12155, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); + dasm_put(Dst, 12247, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETB: - dasm_put(Dst, 12325, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); - dasm_put(Dst, 12425, Dt6(->metatable), Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 12339, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); + dasm_put(Dst, 12439, Dt6(->metatable), Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETM: - dasm_put(Dst, 12473); + dasm_put(Dst, 12487); if (sse) { - dasm_put(Dst, 12478); + dasm_put(Dst, 12492); } else { } - dasm_put(Dst, 12486, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); - dasm_put(Dst, 12634, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 12500, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 12648, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; /* -- Calls and vararg handling ----------------------------------------- */ case BC_CALL: case BC_CALLM: - dasm_put(Dst, 10084); + dasm_put(Dst, 10098); if (op == BC_CALLM) { - dasm_put(Dst, 12654); + dasm_put(Dst, 12668); } - dasm_put(Dst, 12659, LJ_TFUNC, Dt7(->pc)); + dasm_put(Dst, 12673, LJ_TFUNC, Dt7(->pc)); break; case BC_CALLMT: - dasm_put(Dst, 12654); + dasm_put(Dst, 12668); break; case BC_CALLT: - dasm_put(Dst, 12702, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); - dasm_put(Dst, 12826, FRAME_TYPE, Dt7(->pc), PC2PROTO(k)); + dasm_put(Dst, 12716, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); + dasm_put(Dst, 12840, FRAME_TYPE, Dt7(->pc), PC2PROTO(k)); break; case BC_ITERC: - dasm_put(Dst, 12887, LJ_TFUNC, 2+1, Dt7(->pc)); + dasm_put(Dst, 12901, LJ_TFUNC, 2+1, Dt7(->pc)); break; case BC_VARG: - dasm_put(Dst, 12969, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL); - dasm_put(Dst, 13123, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 12983, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL); + dasm_put(Dst, 13137, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); break; /* -- Returns ----------------------------------------------------------- */ case BC_RETM: - dasm_put(Dst, 12654); + dasm_put(Dst, 12668); break; case BC_RET: case BC_RET0: case BC_RET1: if (op != BC_RET0) { - dasm_put(Dst, 13228); + dasm_put(Dst, 13242); } - dasm_put(Dst, 13232, FRAME_TYPE); + dasm_put(Dst, 13246, FRAME_TYPE); switch (op) { case BC_RET: - dasm_put(Dst, 13251); + dasm_put(Dst, 13265); break; case BC_RET1: - dasm_put(Dst, 13315); + dasm_put(Dst, 13329); /* fallthrough */ case BC_RET0: - dasm_put(Dst, 13331); + dasm_put(Dst, 13345); default: break; } - dasm_put(Dst, 13342, Dt7(->pc), PC2PROTO(k)); + dasm_put(Dst, 13356, Dt7(->pc), PC2PROTO(k)); if (op == BC_RET) { - dasm_put(Dst, 13390, LJ_TNIL); + dasm_put(Dst, 13404, LJ_TNIL); } else { - dasm_put(Dst, 13401, LJ_TNIL); + dasm_put(Dst, 13415, LJ_TNIL); } - dasm_put(Dst, 13408); + dasm_put(Dst, 13422); if (op != BC_RET0) { - dasm_put(Dst, 13428); + dasm_put(Dst, 13442); } dasm_put(Dst, 4596); break; @@ -2035,7 +2036,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORL: #if LJ_HASJIT - dasm_put(Dst, 13431, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 13445, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2047,57 +2048,57 @@ 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, 13452); + dasm_put(Dst, 13466); if (!vk) { - dasm_put(Dst, 13456, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 13470, LJ_TISNUM, LJ_TISNUM); } - dasm_put(Dst, 13475); + dasm_put(Dst, 13489); if (!vk) { - dasm_put(Dst, 13479, LJ_TISNUM); + dasm_put(Dst, 13493, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 13488); + dasm_put(Dst, 13502); if (vk) { - dasm_put(Dst, 13500); + dasm_put(Dst, 13514); } else { - dasm_put(Dst, 13519); + dasm_put(Dst, 13533); } - dasm_put(Dst, 13524); + dasm_put(Dst, 13538); } else { - dasm_put(Dst, 13537); + dasm_put(Dst, 13551); if (vk) { - dasm_put(Dst, 13543); + dasm_put(Dst, 13557); } else { - dasm_put(Dst, 13559); + dasm_put(Dst, 13573); } - dasm_put(Dst, 13567); + dasm_put(Dst, 13581); if (cmov) { - dasm_put(Dst, 9499); + dasm_put(Dst, 9513); } else { - dasm_put(Dst, 9505); + dasm_put(Dst, 9519); } if (!cmov) { - dasm_put(Dst, 13572); + dasm_put(Dst, 13586); } } if (op == BC_FORI) { - dasm_put(Dst, 13578, -BCBIAS_J*4); + dasm_put(Dst, 13592, -BCBIAS_J*4); } else if (op == BC_JFORI) { - dasm_put(Dst, 13588, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 13602, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 13602, -BCBIAS_J*4); + dasm_put(Dst, 13616, -BCBIAS_J*4); } else { - dasm_put(Dst, 13598, BC_JLOOP); + dasm_put(Dst, 13612, BC_JLOOP); } - dasm_put(Dst, 9534); + dasm_put(Dst, 9548); if (sse) { - dasm_put(Dst, 13612); + dasm_put(Dst, 13626); } break; case BC_ITERL: #if LJ_HASJIT - dasm_put(Dst, 13431, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 13445, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2106,33 +2107,33 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IITERL: - dasm_put(Dst, 13623, LJ_TNIL); + dasm_put(Dst, 13637, LJ_TNIL); if (op == BC_JITERL) { - dasm_put(Dst, 13638, BC_JLOOP); + dasm_put(Dst, 13652, BC_JLOOP); } else { - dasm_put(Dst, 13652, -BCBIAS_J*4); + dasm_put(Dst, 13666, -BCBIAS_J*4); } - dasm_put(Dst, 9838); + dasm_put(Dst, 9852); break; case BC_LOOP: #if LJ_HASJIT - dasm_put(Dst, 13431, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 13445, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; case BC_ILOOP: - dasm_put(Dst, 9536); + dasm_put(Dst, 9550); break; case BC_JLOOP: #if LJ_HASJIT - dasm_put(Dst, 13668, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); + dasm_put(Dst, 13682, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); #endif break; case BC_JMP: - dasm_put(Dst, 13709, -BCBIAS_J*4); + dasm_put(Dst, 13723, -BCBIAS_J*4); break; /* -- Function headers -------------------------------------------------- */ @@ -2146,7 +2147,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FUNCF: #if LJ_HASJIT - dasm_put(Dst, 13735, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 13749, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif case BC_FUNCV: /* NYI: compiled vararg functions. */ break; @@ -2156,47 +2157,47 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IFUNCF: - dasm_put(Dst, 13756, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); + dasm_put(Dst, 13770, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); if (op == BC_JFUNCF) { - dasm_put(Dst, 13787, BC_JLOOP); + dasm_put(Dst, 13801, BC_JLOOP); } else { - dasm_put(Dst, 9536); + dasm_put(Dst, 9550); } - dasm_put(Dst, 13796, LJ_TNIL); + dasm_put(Dst, 13810, LJ_TNIL); break; case BC_JFUNCV: #if !LJ_HASJIT break; #endif - dasm_put(Dst, 9231); + dasm_put(Dst, 9245); break; /* NYI: compiled vararg functions. */ case BC_IFUNCV: - dasm_put(Dst, 13818, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); + dasm_put(Dst, 13832, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); if (op == BC_JFUNCV) { - dasm_put(Dst, 13787, BC_JLOOP); + dasm_put(Dst, 13801, BC_JLOOP); } else { - dasm_put(Dst, 13915, -4+PC2PROTO(k)); + dasm_put(Dst, 13929, -4+PC2PROTO(k)); } - dasm_put(Dst, 13940, LJ_TNIL); + dasm_put(Dst, 13954, LJ_TNIL); break; case BC_FUNCC: case BC_FUNCCW: - dasm_put(Dst, 13962, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); + dasm_put(Dst, 13976, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); if (op == BC_FUNCC) { - dasm_put(Dst, 13992); + dasm_put(Dst, 14006); } else { - dasm_put(Dst, 13996); + dasm_put(Dst, 14010); } - dasm_put(Dst, 14004, DISPATCH_GL(vmstate), ~LJ_VMST_C); + dasm_put(Dst, 14018, DISPATCH_GL(vmstate), ~LJ_VMST_C); if (op == BC_FUNCC) { - dasm_put(Dst, 14014); + dasm_put(Dst, 14028); } else { - dasm_put(Dst, 14019, DISPATCH_GL(wrapf)); + dasm_put(Dst, 14033, DISPATCH_GL(wrapf)); } - dasm_put(Dst, 14025, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 14039, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); break; /* ---------------------------------------------------------------------- */ @@ -2224,7 +2225,7 @@ static int build_backend(BuildCtx *ctx) build_subroutines(ctx, cmov, sse); - dasm_put(Dst, 14051); + dasm_put(Dst, 14065); 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 78835bb9..7876c9b3 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[14001] = { +static const unsigned char build_actionlist[14016] = { 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,252,247,198,237,15,132,244,10, @@ -383,280 +383,281 @@ static const unsigned char build_actionlist[14001] = { 233,102,68,15,111,153,233,102,68,15,111,145,233,102,68,15,111,137,233,102, 68,15,111,129,233,102,15,111,185,233,72,137,204,102,15,111,49,76,139,124, 36,16,76,139,116,36,24,76,139,108,36,32,76,139,100,36,80,133,192,15,136,244, - 248,137,68,36,84,139,122,252,248,139,191,233,139,191,233,199,131,233,0,0, - 0,0,199,131,233,237,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, - 255,36,252,235,248,2,252,247,216,137,252,233,137,194,232,251,1,24,255,248, - 82,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,145,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,84,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,146,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,104,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,147,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,148,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,88,217,252,234,222,201,248,149,217,84,36,8,129,124,36,8,0,0,128,127,15, - 132,244,247,129,124,36,8,0,0,128,252,255,15,132,244,248,248,150,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,107,255,248,151,252,242,15, - 45,193,252,242,15,42,208,102,15,46,202,15,133,244,254,15,138,244,255,248, - 152,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,80,72,184,237,237,102,72,15,110,200,252,242,15,94,200,88,15,40, - 193,252,247,216,131,252,248,1,15,132,244,5,252,233,244,1,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,255,102,72,15,126,192,72,209,224,15,132, - 244,250,72,193,192,12,72,61,252,254,15,0,0,15,132,244,251,252,242,15,17,76, - 36,16,252,242,15,17,68,36,8,221,68,36,16,221,68,36,8,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,8,252,242,15,16,68,36,8,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,153,255,131,252,250,1,15,130,244,82,15,132,244, - 84,131,252,250,3,15,130,244,104,15,135,244,248,252,242,15,81,192,195,248, - 2,252,242,15,17,68,36,8,221,68,36,8,131,252,250,5,15,135,244,248,88,15,132, - 244,247,232,244,88,80,252,233,244,253,248,1,232,244,149,255,80,252,233,244, - 253,248,2,131,252,250,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,250,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,250,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,8,252,242,15,16,68,36,8,195,255,139, - 84,36,12,221,68,36,4,131,252,250,1,15,130,244,82,15,132,244,84,131,252,250, - 3,15,130,244,104,15,135,244,248,217,252,250,195,248,2,131,252,250,5,15,130, - 244,88,15,132,244,149,131,252,250,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,250,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,250,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,248,154,255, - 65,131,252,248,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,65,131,252,248,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,65,131,252,248, - 5,15,130,244,148,15,132,244,107,65,131,252,248,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,65,131,252,248,9,15,135,244,248,252, - 242,15,17,68,36,8,252,242,15,17,76,36,16,221,68,36,8,221,68,36,16,15,132, - 244,247,217,252,243,248,7,221,92,36,8,252,242,15,16,68,36,8,195,248,1,217, - 201,217,252,253,221,217,252,233,244,7,248,2,65,131,252,248,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,148,15,132,244,107,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, - 221,217,195,248,2,131,252,248,11,15,132,244,247,15,135,244,255,255,219,252, - 233,219,209,221,217,195,248,1,219,252,233,218,209,221,217,195,255,221,225, - 223,224,252,246,196,1,15,132,244,248,217,201,248,2,221,216,195,248,1,221, - 225,223,224,252,246,196,1,15,133,244,248,217,201,248,2,221,216,195,255,248, - 155,137,200,86,72,137,214,83,15,162,137,6,137,94,4,137,78,8,137,86,12,91, - 94,195,255,129,124,253,202,4,239,15,135,244,41,129,124,253,194,4,239,15,135, - 244,41,255,252,242,15,16,4,194,131,198,4,102,15,46,4,202,255,221,4,202,221, - 4,194,131,198,4,255,223,252,233,221,216,255,218,252,233,223,224,158,255,15, - 134,244,248,255,15,131,244,248,255,248,1,15,183,70,252,254,141,180,253,134, - 233,248,2,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252, - 235,255,139,108,194,4,131,198,4,129,252,253,239,15,135,244,251,129,124,253, - 202,4,239,15,135,244,251,255,252,242,15,16,4,194,102,15,46,4,202,255,221, - 4,202,221,4,194,255,15,138,244,248,15,133,244,248,255,15,138,244,248,15,132, - 244,247,255,248,1,15,183,70,252,254,141,180,253,134,233,248,2,255,248,2,15, - 183,70,252,254,141,180,253,134,233,248,1,255,248,5,57,108,202,4,15,133,244, - 2,129,252,253,239,15,131,244,1,139,12,202,139,4,194,57,193,15,132,244,1,129, - 252,253,239,15,135,244,2,139,169,233,133,252,237,15,132,244,2,252,246,133, - 233,235,15,133,244,2,255,49,252,237,255,189,1,0,0,0,255,252,233,244,45,255, - 72,252,247,208,131,198,4,129,124,253,202,4,239,15,133,244,248,139,12,202, - 59,12,135,255,131,198,4,129,124,253,202,4,239,15,135,244,248,255,252,242, - 15,16,4,199,102,15,46,4,202,255,221,4,202,221,4,199,255,72,252,247,208,131, - 198,4,57,68,202,4,255,139,108,194,4,131,198,4,129,252,253,239,255,15,131, - 244,247,255,15,130,244,247,255,137,108,202,4,139,44,194,137,44,202,255,15, - 183,70,252,254,141,180,253,134,233,248,1,139,6,15,182,204,15,182,232,131, - 198,4,193,232,16,252,255,36,252,235,255,139,108,194,4,139,4,194,137,108,202, - 4,137,4,202,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252, - 235,255,49,252,237,129,124,253,194,4,239,129,213,239,137,108,202,4,139,6, - 15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,129,124, - 253,194,4,239,15,135,244,48,255,252,242,15,16,4,194,72,184,237,237,102,72, - 15,110,200,15,87,193,252,242,15,17,4,202,255,221,4,194,217,224,221,28,202, - 255,129,124,253,194,4,239,15,133,244,248,139,4,194,255,15,87,192,252,242, - 15,42,128,233,248,1,252,242,15,17,4,202,255,219,128,233,248,1,221,28,202, - 255,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248, - 2,129,124,253,194,4,239,15,133,244,50,139,12,194,137,213,232,251,1,18,255, - 252,242,15,42,192,137,252,234,255,15,182,78,252,253,252,233,244,1,255,15, - 182,252,236,15,182,192,255,129,124,253,252,234,4,239,15,135,244,46,255,252, - 242,15,16,4,252,234,252,242,15,88,4,199,255,221,4,252,234,220,4,199,255,129, - 124,253,252,234,4,239,15,135,244,47,255,252,242,15,16,4,199,252,242,15,88, - 4,252,234,255,221,4,199,220,4,252,234,255,129,124,253,252,234,4,239,15,135, - 244,49,129,124,253,194,4,239,15,135,244,49,255,252,242,15,16,4,252,234,252, - 242,15,88,4,194,255,221,4,252,234,220,4,194,255,252,242,15,16,4,252,234,252, - 242,15,92,4,199,255,221,4,252,234,220,36,199,255,252,242,15,16,4,199,252, - 242,15,92,4,252,234,255,221,4,199,220,36,252,234,255,252,242,15,16,4,252, - 234,252,242,15,92,4,194,255,221,4,252,234,220,36,194,255,252,242,15,16,4, - 252,234,252,242,15,89,4,199,255,221,4,252,234,220,12,199,255,252,242,15,16, - 4,199,252,242,15,89,4,252,234,255,221,4,199,220,12,252,234,255,252,242,15, - 16,4,252,234,252,242,15,89,4,194,255,221,4,252,234,220,12,194,255,252,242, - 15,16,4,252,234,252,242,15,94,4,199,255,221,4,252,234,220,52,199,255,252, - 242,15,16,4,199,252,242,15,94,4,252,234,255,221,4,199,220,52,252,234,255, - 252,242,15,16,4,252,234,252,242,15,94,4,194,255,221,4,252,234,220,52,194, - 255,252,242,15,16,4,252,234,252,242,15,16,12,199,255,221,4,252,234,221,4, - 199,255,252,242,15,16,4,199,252,242,15,16,12,252,234,255,221,4,199,221,4, - 252,234,255,252,242,15,16,4,252,234,252,242,15,16,12,194,255,221,4,252,234, - 221,4,194,255,248,156,232,244,148,255,252,233,244,156,255,232,244,107,255, - 15,182,252,236,15,182,192,139,76,36,96,137,145,233,141,20,194,65,137,192, - 65,41,232,248,33,137,205,137,116,36,100,232,251,1,25,139,149,233,133,192, - 15,133,244,42,15,182,110,252,255,15,182,78,252,253,139,68,252,234,4,139,44, - 252,234,137,68,202,4,137,44,202,139,6,15,182,204,15,182,232,131,198,4,193, - 232,16,252,255,36,252,235,255,72,252,247,208,139,4,135,199,68,202,4,237,137, - 4,202,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235, - 255,15,191,192,252,242,15,42,192,252,242,15,17,4,202,255,223,70,252,254,221, - 28,202,255,252,242,15,16,4,199,252,242,15,17,4,202,255,221,4,199,221,28,202, - 255,72,252,247,208,137,68,202,4,139,6,15,182,204,15,182,232,131,198,4,193, - 232,16,252,255,36,252,235,255,141,76,202,12,141,68,194,4,189,237,137,105, - 252,248,248,1,137,41,131,193,8,57,193,15,134,244,1,139,6,15,182,204,15,182, - 232,131,198,4,193,232,16,252,255,36,252,235,255,139,106,252,248,139,172,253, - 133,233,139,173,233,139,69,4,139,109,0,137,68,202,4,137,44,202,139,6,15,182, - 204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,139,106,252,248, - 139,172,253,141,233,128,189,233,0,139,173,233,139,12,194,139,68,194,4,137, - 77,0,137,69,4,15,132,244,247,252,246,133,233,235,15,133,244,248,248,1,139, - 6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,2,129, - 232,239,129,252,248,239,15,134,244,1,252,246,129,233,235,15,132,244,1,135, - 213,141,139,233,255,232,251,1,26,137,252,234,252,233,244,1,255,72,252,247, - 208,139,106,252,248,139,172,253,141,233,139,12,135,139,133,233,137,8,199, - 64,4,237,252,246,133,233,235,15,133,244,248,248,1,139,6,15,182,204,15,182, - 232,131,198,4,193,232,16,252,255,36,252,235,248,2,252,246,129,233,235,15, - 132,244,1,128,189,233,0,15,132,244,1,137,213,137,194,141,139,233,232,251, - 1,26,137,252,234,252,233,244,1,255,139,106,252,248,255,252,242,15,16,4,199, - 255,139,172,253,141,233,139,141,233,255,252,242,15,17,1,255,221,25,255,72, - 252,247,208,139,106,252,248,139,172,253,141,233,139,141,233,137,65,4,139, - 6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,141,180, - 253,134,233,139,108,36,96,131,189,233,0,15,132,244,247,137,149,233,141,20, - 202,137,252,233,232,251,1,27,139,149,233,248,1,139,6,15,182,204,15,182,232, - 131,198,4,193,232,16,252,255,36,252,235,255,72,252,247,208,139,108,36,96, - 137,149,233,68,139,66,252,248,139,20,135,137,252,233,137,116,36,100,232,251, - 1,28,139,149,233,15,182,78,252,253,137,4,202,199,68,202,4,237,139,6,15,182, - 204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,139,76,36,96,137, - 145,233,248,1,65,137,192,37,252,255,7,0,0,65,193,232,11,61,252,255,7,0,0, - 15,132,244,249,248,2,137,194,139,131,233,137,205,59,131,233,137,116,36,100, - 15,131,244,251,232,251,1,29,139,149,233,15,182,78,252,253,137,4,202,199,68, - 202,4,237,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252, - 235,248,3,184,1,8,0,0,252,233,244,2,248,5,232,251,1,30,15,183,70,252,254, - 137,252,233,252,233,244,1,255,72,252,247,208,139,108,36,96,139,139,233,137, - 116,36,100,59,139,233,137,149,233,15,131,244,249,248,2,139,20,135,137,252, - 233,232,251,1,31,139,149,233,15,182,78,252,253,137,4,202,199,68,202,4,237, - 139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,3, - 137,252,233,232,251,1,30,15,183,70,252,254,72,252,247,208,252,233,244,2,255, - 72,252,247,208,139,106,252,248,139,173,233,139,4,135,252,233,244,157,255, - 72,252,247,208,139,106,252,248,139,173,233,139,4,135,252,233,244,158,255, - 15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,36,139,44, - 252,234,129,124,253,194,4,239,15,135,244,251,255,252,242,15,16,4,194,252, - 242,15,45,192,252,242,15,42,200,102,15,46,193,255,15,133,244,36,59,133,233, - 15,131,244,36,193,224,3,3,133,233,129,120,253,4,239,15,132,244,248,248,1, - 139,40,139,64,4,137,44,202,137,68,202,4,139,6,15,182,204,15,182,232,131,198, - 4,193,232,16,252,255,36,252,235,248,2,131,189,233,0,15,132,244,1,139,141, - 233,252,246,129,233,235,15,132,244,36,15,182,78,252,253,252,233,244,1,248, - 5,255,129,124,253,194,4,239,15,133,244,36,139,4,194,252,233,244,157,255,15, - 182,252,236,15,182,192,72,252,247,208,139,4,135,129,124,253,252,234,4,239, - 15,133,244,34,139,44,252,234,248,157,139,141,233,35,136,233,105,201,239,3, - 141,233,248,1,129,185,233,239,15,133,244,250,57,129,233,15,133,244,250,129, - 121,253,4,239,15,132,244,251,15,182,70,252,253,139,41,139,73,4,137,44,194, - 248,2,255,137,76,194,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, - 255,36,252,235,248,3,15,182,70,252,253,185,237,252,233,244,2,248,4,139,137, - 233,133,201,15,133,244,1,248,5,139,141,233,133,201,15,132,244,3,252,246,129, - 233,235,15,133,244,3,252,233,244,34,255,15,182,252,236,15,182,192,129,124, - 253,252,234,4,239,15,133,244,35,139,44,252,234,59,133,233,15,131,244,35,193, - 224,3,3,133,233,129,120,253,4,239,15,132,244,248,248,1,139,40,139,64,4,137, - 44,202,137,68,202,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, - 255,36,252,235,248,2,131,189,233,0,15,132,244,1,139,141,233,252,246,129,233, - 235,15,132,244,35,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239, - 15,133,244,39,139,44,252,234,129,124,253,194,4,239,15,135,244,251,255,15, - 133,244,39,59,133,233,15,131,244,39,193,224,3,3,133,233,129,120,253,4,239, - 15,132,244,249,248,1,252,246,133,233,235,15,133,244,253,248,2,139,108,202, - 4,139,12,202,137,104,4,137,8,139,6,15,182,204,15,182,232,131,198,4,193,232, - 16,252,255,36,252,235,248,3,131,189,233,0,15,132,244,1,139,141,233,255,252, - 246,129,233,235,15,132,244,39,15,182,78,252,253,252,233,244,1,248,5,129,124, - 253,194,4,239,15,133,244,39,139,4,194,252,233,244,158,248,7,128,165,233,235, - 139,139,233,137,171,233,137,141,233,15,182,78,252,253,252,233,244,2,255,15, - 182,252,236,15,182,192,72,252,247,208,139,4,135,129,124,253,252,234,4,239, - 15,133,244,37,139,44,252,234,248,158,139,141,233,35,136,233,105,201,239,198, - 133,233,0,3,141,233,248,1,129,185,233,239,15,133,244,251,57,129,233,15,133, - 244,251,129,121,253,4,239,15,132,244,250,248,2,255,252,246,133,233,235,15, - 133,244,253,248,3,15,182,70,252,253,139,108,194,4,139,4,194,137,105,4,137, - 1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248, - 4,131,189,233,0,15,132,244,2,137,76,36,80,139,141,233,252,246,129,233,235, - 15,132,244,37,139,76,36,80,252,233,244,2,248,5,139,137,233,133,201,15,133, - 244,1,255,139,141,233,133,201,15,132,244,252,252,246,129,233,235,15,132,244, - 37,248,6,137,68,36,80,199,68,36,84,237,137,108,36,32,139,76,36,96,137,145, - 233,76,141,68,36,80,137,252,234,137,205,137,116,36,100,232,251,1,32,139,149, - 233,139,108,36,32,137,193,252,233,244,2,248,7,128,165,233,235,139,131,233, - 137,171,233,137,133,233,252,233,244,3,255,15,182,252,236,15,182,192,129,124, - 253,252,234,4,239,15,133,244,38,139,44,252,234,59,133,233,15,131,244,38,193, - 224,3,3,133,233,129,120,253,4,239,15,132,244,249,248,1,252,246,133,233,235, - 15,133,244,253,248,2,139,108,202,4,139,12,202,137,104,4,137,8,139,6,15,182, - 204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,3,131,189,233, - 0,15,132,244,1,255,139,141,233,252,246,129,233,235,15,132,244,38,15,182,78, - 252,253,252,233,244,1,248,7,128,165,233,235,139,139,233,137,171,233,137,141, - 233,15,182,78,252,253,252,233,244,2,255,137,124,36,80,255,252,242,15,45,60, - 199,255,248,1,141,12,202,139,105,252,248,252,246,133,233,235,15,133,244,253, - 248,2,139,68,36,84,131,232,1,15,132,244,250,1,252,248,59,133,233,15,131,244, - 251,41,252,248,193,231,3,3,189,233,248,3,139,41,137,47,139,105,4,131,193, - 8,137,111,4,131,199,8,131,232,1,15,133,244,3,248,4,139,124,36,80,139,6,15, - 182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,5,139,76,36, - 96,137,145,233,137,252,234,65,137,192,137,205,137,116,36,100,232,251,1,33, - 139,149,233,15,182,78,252,253,252,233,244,1,248,7,255,128,165,233,235,139, - 131,233,137,171,233,137,133,233,252,233,244,2,255,3,68,36,84,255,129,124, - 253,202,4,239,139,44,202,15,133,244,51,141,84,202,8,137,114,252,252,139,181, - 233,139,14,15,182,252,233,15,182,205,131,198,4,252,255,36,252,235,255,141, - 76,202,8,137,215,139,105,252,248,129,121,253,252,252,239,15,133,244,28,248, - 52,139,114,252,252,252,247,198,237,15,133,244,253,248,1,137,106,252,248,137, - 68,36,84,131,232,1,15,132,244,249,248,2,139,41,137,47,139,105,4,137,111,4, - 131,199,8,131,193,8,131,232,1,15,133,244,2,139,106,252,248,248,3,139,68,36, - 84,128,189,233,1,15,135,244,251,248,4,139,181,233,139,14,15,182,252,233,15, - 182,205,131,198,4,252,255,36,252,235,248,5,255,252,247,198,237,15,133,244, - 4,15,182,78,252,253,72,252,247,209,141,12,202,139,121,252,248,139,191,233, - 139,191,233,252,233,244,4,248,7,15,139,244,1,131,230,252,248,41,252,242,137, - 215,139,114,252,252,252,233,244,1,255,141,76,202,8,139,105,232,139,65,252, - 236,137,41,137,65,4,139,105,252,240,139,65,252,244,137,105,8,137,65,12,139, - 105,224,139,65,228,137,105,252,248,137,65,252,252,129,252,248,239,184,237, - 15,133,244,28,137,202,137,114,252,252,139,181,233,139,14,15,182,252,233,15, - 182,205,131,198,4,252,255,36,252,235,255,15,182,252,236,139,66,252,248,141, - 12,202,139,128,233,15,182,128,233,137,124,36,80,141,188,253,194,233,43,122, - 252,252,133,252,237,15,132,244,251,141,108,252,233,252,248,57,215,15,131, - 244,248,248,1,139,71,252,248,137,1,139,71,252,252,131,199,8,137,65,4,131, - 193,8,57,252,233,15,131,244,249,57,215,15,130,244,1,248,2,199,65,4,237,131, - 193,8,57,252,233,15,130,244,2,248,3,139,124,36,80,139,6,15,182,204,15,182, - 232,131,198,4,193,232,16,252,255,36,252,235,248,5,199,68,36,84,1,0,0,0,137, - 208,41,252,248,15,134,244,3,255,137,197,193,252,237,3,131,197,1,137,108,36, - 84,139,108,36,96,1,200,59,133,233,15,135,244,253,248,6,139,71,252,248,137, - 1,139,71,252,252,131,199,8,137,65,4,131,193,8,57,215,15,130,244,6,252,233, - 244,3,248,7,137,149,233,137,141,233,137,116,36,100,41,215,139,84,36,84,131, - 252,234,1,137,252,233,232,251,1,0,139,149,233,139,141,233,1,215,252,233,244, - 6,255,193,225,3,255,248,1,139,114,252,252,137,68,36,84,252,247,198,237,15, - 133,244,253,255,248,13,137,215,131,232,1,15,132,244,249,248,2,139,44,15,137, - 111,252,248,139,108,15,4,137,111,252,252,131,199,8,131,232,1,15,133,244,2, - 248,3,139,68,36,84,15,182,110,252,255,248,5,57,197,15,135,244,252,255,139, - 108,10,4,137,106,252,252,139,44,10,137,106,252,248,255,248,5,56,70,252,255, - 15,135,244,252,255,15,182,78,252,253,72,252,247,209,141,20,202,139,122,252, - 248,139,191,233,139,191,233,139,6,15,182,204,15,182,232,131,198,4,193,232, - 16,252,255,36,252,235,248,6,255,199,71,252,252,237,131,199,8,255,199,68,194, + 249,137,68,36,84,139,122,252,248,139,191,233,139,191,233,199,131,233,0,0, + 0,0,199,131,233,237,139,6,15,182,204,15,182,232,131,198,4,193,232,16,129, + 252,253,239,15,130,244,248,255,139,68,36,84,248,2,252,255,36,252,235,248, + 3,252,247,216,137,252,233,137,194,232,251,1,24,255,248,82,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,145,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,84,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,146,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,104,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,147, + 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, + 148,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,88,217,252, + 234,222,201,248,149,217,84,36,8,129,124,36,8,0,0,128,127,15,132,244,247,129, + 124,36,8,0,0,128,252,255,15,132,244,248,248,150,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,107,255,248,151,252,242,15,45,193,252,242, + 15,42,208,102,15,46,202,15,133,244,254,15,138,244,255,248,152,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,80, + 72,184,237,237,102,72,15,110,200,252,242,15,94,200,88,15,40,193,252,247,216, + 131,252,248,1,15,132,244,5,252,233,244,1,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,255,102,72,15,126,192,72,209,224,15,132,244,250,72,193, + 192,12,72,61,252,254,15,0,0,15,132,244,251,252,242,15,17,76,36,16,252,242, + 15,17,68,36,8,221,68,36,16,221,68,36,8,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, + 8,252,242,15,16,68,36,8,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,153,255,131,252,250,1,15,130,244,82,15,132,244,84,131,252,250,3,15, + 130,244,104,15,135,244,248,252,242,15,81,192,195,248,2,252,242,15,17,68,36, + 8,221,68,36,8,131,252,250,5,15,135,244,248,88,15,132,244,247,232,244,88,80, + 252,233,244,253,248,1,232,244,149,255,80,252,233,244,253,248,2,131,252,250, + 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,250,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,250,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,8,252,242,15,16,68,36,8,195,255,139,84,36,12,221,68,36,4, + 131,252,250,1,15,130,244,82,15,132,244,84,131,252,250,3,15,130,244,104,15, + 135,244,248,217,252,250,195,248,2,131,252,250,5,15,130,244,88,15,132,244, + 149,131,252,250,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,250,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,250,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,248,154,255,65,131,252,248, + 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,65,131,252,248,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,65,131,252,248,5,15,130,244,148, + 15,132,244,107,65,131,252,248,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,65,131,252,248,9,15,135,244,248,252,242,15,17,68, + 36,8,252,242,15,17,76,36,16,221,68,36,8,221,68,36,16,15,132,244,247,217,252, + 243,248,7,221,92,36,8,252,242,15,16,68,36,8,195,248,1,217,201,217,252,253, + 221,217,252,233,244,7,248,2,65,131,252,248,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,148, + 15,132,244,107,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,221,217,195,248,2,131,252, + 248,11,15,132,244,247,15,135,244,255,255,219,252,233,219,209,221,217,195, + 248,1,219,252,233,218,209,221,217,195,255,221,225,223,224,252,246,196,1,15, + 132,244,248,217,201,248,2,221,216,195,248,1,221,225,223,224,252,246,196,1, + 15,133,244,248,217,201,248,2,221,216,195,255,248,155,137,200,86,72,137,214, + 83,15,162,137,6,137,94,4,137,78,8,137,86,12,91,94,195,255,129,124,253,202, + 4,239,15,135,244,41,129,124,253,194,4,239,15,135,244,41,255,252,242,15,16, + 4,194,131,198,4,102,15,46,4,202,255,221,4,202,221,4,194,131,198,4,255,223, + 252,233,221,216,255,218,252,233,223,224,158,255,15,134,244,248,255,15,131, + 244,248,255,248,1,15,183,70,252,254,141,180,253,134,233,248,2,139,6,15,182, + 204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,139,108,194,4, + 131,198,4,129,252,253,239,15,135,244,251,129,124,253,202,4,239,15,135,244, + 251,255,252,242,15,16,4,194,102,15,46,4,202,255,221,4,202,221,4,194,255,15, + 138,244,248,15,133,244,248,255,15,138,244,248,15,132,244,247,255,248,1,15, + 183,70,252,254,141,180,253,134,233,248,2,255,248,2,15,183,70,252,254,141, + 180,253,134,233,248,1,255,248,5,57,108,202,4,15,133,244,2,129,252,253,239, + 15,131,244,1,139,12,202,139,4,194,57,193,15,132,244,1,129,252,253,239,15, + 135,244,2,139,169,233,133,252,237,15,132,244,2,252,246,133,233,235,15,133, + 244,2,255,49,252,237,255,189,1,0,0,0,255,252,233,244,45,255,72,252,247,208, + 131,198,4,129,124,253,202,4,239,15,133,244,248,139,12,202,59,12,135,255,131, + 198,4,129,124,253,202,4,239,15,135,244,248,255,252,242,15,16,4,199,102,15, + 46,4,202,255,221,4,202,221,4,199,255,72,252,247,208,131,198,4,57,68,202,4, + 255,139,108,194,4,131,198,4,129,252,253,239,255,15,131,244,247,255,15,130, + 244,247,255,137,108,202,4,139,44,194,137,44,202,255,15,183,70,252,254,141, + 180,253,134,233,248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, + 255,36,252,235,255,139,108,194,4,139,4,194,137,108,202,4,137,4,202,139,6, + 15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,49,252, + 237,129,124,253,194,4,239,129,213,239,137,108,202,4,139,6,15,182,204,15,182, + 232,131,198,4,193,232,16,252,255,36,252,235,255,129,124,253,194,4,239,15, + 135,244,48,255,252,242,15,16,4,194,72,184,237,237,102,72,15,110,200,15,87, + 193,252,242,15,17,4,202,255,221,4,194,217,224,221,28,202,255,129,124,253, + 194,4,239,15,133,244,248,139,4,194,255,15,87,192,252,242,15,42,128,233,248, + 1,252,242,15,17,4,202,255,219,128,233,248,1,221,28,202,255,139,6,15,182,204, + 15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,2,129,124,253,194, + 4,239,15,133,244,50,139,12,194,137,213,232,251,1,18,255,252,242,15,42,192, + 137,252,234,255,15,182,78,252,253,252,233,244,1,255,15,182,252,236,15,182, + 192,255,129,124,253,252,234,4,239,15,135,244,46,255,252,242,15,16,4,252,234, + 252,242,15,88,4,199,255,221,4,252,234,220,4,199,255,129,124,253,252,234,4, + 239,15,135,244,47,255,252,242,15,16,4,199,252,242,15,88,4,252,234,255,221, + 4,199,220,4,252,234,255,129,124,253,252,234,4,239,15,135,244,49,129,124,253, + 194,4,239,15,135,244,49,255,252,242,15,16,4,252,234,252,242,15,88,4,194,255, + 221,4,252,234,220,4,194,255,252,242,15,16,4,252,234,252,242,15,92,4,199,255, + 221,4,252,234,220,36,199,255,252,242,15,16,4,199,252,242,15,92,4,252,234, + 255,221,4,199,220,36,252,234,255,252,242,15,16,4,252,234,252,242,15,92,4, + 194,255,221,4,252,234,220,36,194,255,252,242,15,16,4,252,234,252,242,15,89, + 4,199,255,221,4,252,234,220,12,199,255,252,242,15,16,4,199,252,242,15,89, + 4,252,234,255,221,4,199,220,12,252,234,255,252,242,15,16,4,252,234,252,242, + 15,89,4,194,255,221,4,252,234,220,12,194,255,252,242,15,16,4,252,234,252, + 242,15,94,4,199,255,221,4,252,234,220,52,199,255,252,242,15,16,4,199,252, + 242,15,94,4,252,234,255,221,4,199,220,52,252,234,255,252,242,15,16,4,252, + 234,252,242,15,94,4,194,255,221,4,252,234,220,52,194,255,252,242,15,16,4, + 252,234,252,242,15,16,12,199,255,221,4,252,234,221,4,199,255,252,242,15,16, + 4,199,252,242,15,16,12,252,234,255,221,4,199,221,4,252,234,255,252,242,15, + 16,4,252,234,252,242,15,16,12,194,255,221,4,252,234,221,4,194,255,248,156, + 232,244,148,255,252,233,244,156,255,232,244,107,255,15,182,252,236,15,182, + 192,139,76,36,96,137,145,233,141,20,194,65,137,192,65,41,232,248,33,137,205, + 137,116,36,100,232,251,1,25,139,149,233,133,192,15,133,244,42,15,182,110, + 252,255,15,182,78,252,253,139,68,252,234,4,139,44,252,234,137,68,202,4,137, + 44,202,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235, + 255,72,252,247,208,139,4,135,199,68,202,4,237,137,4,202,139,6,15,182,204, + 15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,15,191,192,252,242, + 15,42,192,252,242,15,17,4,202,255,223,70,252,254,221,28,202,255,252,242,15, + 16,4,199,252,242,15,17,4,202,255,221,4,199,221,28,202,255,72,252,247,208, + 137,68,202,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36, + 252,235,255,141,76,202,12,141,68,194,4,189,237,137,105,252,248,248,1,137, + 41,131,193,8,57,193,15,134,244,1,139,6,15,182,204,15,182,232,131,198,4,193, + 232,16,252,255,36,252,235,255,139,106,252,248,139,172,253,133,233,139,173, + 233,139,69,4,139,109,0,137,68,202,4,137,44,202,139,6,15,182,204,15,182,232, + 131,198,4,193,232,16,252,255,36,252,235,255,139,106,252,248,139,172,253,141, + 233,128,189,233,0,139,173,233,139,12,194,139,68,194,4,137,77,0,137,69,4,15, + 132,244,247,252,246,133,233,235,15,133,244,248,248,1,139,6,15,182,204,15, + 182,232,131,198,4,193,232,16,252,255,36,252,235,248,2,129,232,239,129,252, + 248,239,15,134,244,1,252,246,129,233,235,15,132,244,1,135,213,141,139,233, + 255,232,251,1,26,137,252,234,252,233,244,1,255,72,252,247,208,139,106,252, + 248,139,172,253,141,233,139,12,135,139,133,233,137,8,199,64,4,237,252,246, + 133,233,235,15,133,244,248,248,1,139,6,15,182,204,15,182,232,131,198,4,193, + 232,16,252,255,36,252,235,248,2,252,246,129,233,235,15,132,244,1,128,189, + 233,0,15,132,244,1,137,213,137,194,141,139,233,232,251,1,26,137,252,234,252, + 233,244,1,255,139,106,252,248,255,252,242,15,16,4,199,255,139,172,253,141, + 233,139,141,233,255,252,242,15,17,1,255,221,25,255,72,252,247,208,139,106, + 252,248,139,172,253,141,233,139,141,233,137,65,4,139,6,15,182,204,15,182, + 232,131,198,4,193,232,16,252,255,36,252,235,255,141,180,253,134,233,139,108, + 36,96,131,189,233,0,15,132,244,247,137,149,233,141,20,202,137,252,233,232, + 251,1,27,139,149,233,248,1,139,6,15,182,204,15,182,232,131,198,4,193,232, + 16,252,255,36,252,235,255,72,252,247,208,139,108,36,96,137,149,233,68,139, + 66,252,248,139,20,135,137,252,233,137,116,36,100,232,251,1,28,139,149,233, + 15,182,78,252,253,137,4,202,199,68,202,4,237,139,6,15,182,204,15,182,232, + 131,198,4,193,232,16,252,255,36,252,235,255,139,76,36,96,137,145,233,248, + 1,65,137,192,37,252,255,7,0,0,65,193,232,11,61,252,255,7,0,0,15,132,244,249, + 248,2,137,194,139,131,233,137,205,59,131,233,137,116,36,100,15,131,244,251, + 232,251,1,29,139,149,233,15,182,78,252,253,137,4,202,199,68,202,4,237,139, + 6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,3,184, + 1,8,0,0,252,233,244,2,248,5,232,251,1,30,15,183,70,252,254,137,252,233,252, + 233,244,1,255,72,252,247,208,139,108,36,96,139,139,233,137,116,36,100,59, + 139,233,137,149,233,15,131,244,249,248,2,139,20,135,137,252,233,232,251,1, + 31,139,149,233,15,182,78,252,253,137,4,202,199,68,202,4,237,139,6,15,182, + 204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,3,137,252,233, + 232,251,1,30,15,183,70,252,254,72,252,247,208,252,233,244,2,255,72,252,247, + 208,139,106,252,248,139,173,233,139,4,135,252,233,244,157,255,72,252,247, + 208,139,106,252,248,139,173,233,139,4,135,252,233,244,158,255,15,182,252, + 236,15,182,192,129,124,253,252,234,4,239,15,133,244,36,139,44,252,234,129, + 124,253,194,4,239,15,135,244,251,255,252,242,15,16,4,194,252,242,15,45,192, + 252,242,15,42,200,102,15,46,193,255,15,133,244,36,59,133,233,15,131,244,36, + 193,224,3,3,133,233,129,120,253,4,239,15,132,244,248,248,1,139,40,139,64, + 4,137,44,202,137,68,202,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16, + 252,255,36,252,235,248,2,131,189,233,0,15,132,244,1,139,141,233,252,246,129, + 233,235,15,132,244,36,15,182,78,252,253,252,233,244,1,248,5,255,129,124,253, + 194,4,239,15,133,244,36,139,4,194,252,233,244,157,255,15,182,252,236,15,182, + 192,72,252,247,208,139,4,135,129,124,253,252,234,4,239,15,133,244,34,139, + 44,252,234,248,157,139,141,233,35,136,233,105,201,239,3,141,233,248,1,129, + 185,233,239,15,133,244,250,57,129,233,15,133,244,250,129,121,253,4,239,15, + 132,244,251,15,182,70,252,253,139,41,139,73,4,137,44,194,248,2,255,137,76, + 194,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235, + 248,3,15,182,70,252,253,185,237,252,233,244,2,248,4,139,137,233,133,201,15, + 133,244,1,248,5,139,141,233,133,201,15,132,244,3,252,246,129,233,235,15,133, + 244,3,252,233,244,34,255,15,182,252,236,15,182,192,129,124,253,252,234,4, + 239,15,133,244,35,139,44,252,234,59,133,233,15,131,244,35,193,224,3,3,133, + 233,129,120,253,4,239,15,132,244,248,248,1,139,40,139,64,4,137,44,202,137, + 68,202,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252, + 235,248,2,131,189,233,0,15,132,244,1,139,141,233,252,246,129,233,235,15,132, + 244,35,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244, + 39,139,44,252,234,129,124,253,194,4,239,15,135,244,251,255,15,133,244,39, + 59,133,233,15,131,244,39,193,224,3,3,133,233,129,120,253,4,239,15,132,244, + 249,248,1,252,246,133,233,235,15,133,244,253,248,2,139,108,202,4,139,12,202, + 137,104,4,137,8,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255, + 36,252,235,248,3,131,189,233,0,15,132,244,1,139,141,233,255,252,246,129,233, + 235,15,132,244,39,15,182,78,252,253,252,233,244,1,248,5,129,124,253,194,4, + 239,15,133,244,39,139,4,194,252,233,244,158,248,7,128,165,233,235,139,139, + 233,137,171,233,137,141,233,15,182,78,252,253,252,233,244,2,255,15,182,252, + 236,15,182,192,72,252,247,208,139,4,135,129,124,253,252,234,4,239,15,133, + 244,37,139,44,252,234,248,158,139,141,233,35,136,233,105,201,239,198,133, + 233,0,3,141,233,248,1,129,185,233,239,15,133,244,251,57,129,233,15,133,244, + 251,129,121,253,4,239,15,132,244,250,248,2,255,252,246,133,233,235,15,133, + 244,253,248,3,15,182,70,252,253,139,108,194,4,139,4,194,137,105,4,137,1,139, + 6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,4,131, + 189,233,0,15,132,244,2,137,76,36,80,139,141,233,252,246,129,233,235,15,132, + 244,37,139,76,36,80,252,233,244,2,248,5,139,137,233,133,201,15,133,244,1, + 255,139,141,233,133,201,15,132,244,252,252,246,129,233,235,15,132,244,37, + 248,6,137,68,36,80,199,68,36,84,237,137,108,36,32,139,76,36,96,137,145,233, + 76,141,68,36,80,137,252,234,137,205,137,116,36,100,232,251,1,32,139,149,233, + 139,108,36,32,137,193,252,233,244,2,248,7,128,165,233,235,139,131,233,137, + 171,233,137,133,233,252,233,244,3,255,15,182,252,236,15,182,192,129,124,253, + 252,234,4,239,15,133,244,38,139,44,252,234,59,133,233,15,131,244,38,193,224, + 3,3,133,233,129,120,253,4,239,15,132,244,249,248,1,252,246,133,233,235,15, + 133,244,253,248,2,139,108,202,4,139,12,202,137,104,4,137,8,139,6,15,182,204, + 15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,3,131,189,233,0,15, + 132,244,1,255,139,141,233,252,246,129,233,235,15,132,244,38,15,182,78,252, + 253,252,233,244,1,248,7,128,165,233,235,139,139,233,137,171,233,137,141,233, + 15,182,78,252,253,252,233,244,2,255,137,124,36,80,255,252,242,15,45,60,199, + 255,248,1,141,12,202,139,105,252,248,252,246,133,233,235,15,133,244,253,248, + 2,139,68,36,84,131,232,1,15,132,244,250,1,252,248,59,133,233,15,131,244,251, + 41,252,248,193,231,3,3,189,233,248,3,139,41,137,47,139,105,4,131,193,8,137, + 111,4,131,199,8,131,232,1,15,133,244,3,248,4,139,124,36,80,139,6,15,182,204, + 15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,5,139,76,36,96,137, + 145,233,137,252,234,65,137,192,137,205,137,116,36,100,232,251,1,33,139,149, + 233,15,182,78,252,253,252,233,244,1,248,7,255,128,165,233,235,139,131,233, + 137,171,233,137,133,233,252,233,244,2,255,3,68,36,84,255,129,124,253,202, + 4,239,139,44,202,15,133,244,51,141,84,202,8,137,114,252,252,139,181,233,139, + 14,15,182,252,233,15,182,205,131,198,4,252,255,36,252,235,255,141,76,202, + 8,137,215,139,105,252,248,129,121,253,252,252,239,15,133,244,28,248,52,139, + 114,252,252,252,247,198,237,15,133,244,253,248,1,137,106,252,248,137,68,36, + 84,131,232,1,15,132,244,249,248,2,139,41,137,47,139,105,4,137,111,4,131,199, + 8,131,193,8,131,232,1,15,133,244,2,139,106,252,248,248,3,139,68,36,84,128, + 189,233,1,15,135,244,251,248,4,139,181,233,139,14,15,182,252,233,15,182,205, + 131,198,4,252,255,36,252,235,248,5,255,252,247,198,237,15,133,244,4,15,182, + 78,252,253,72,252,247,209,141,12,202,139,121,252,248,139,191,233,139,191, + 233,252,233,244,4,248,7,15,139,244,1,131,230,252,248,41,252,242,137,215,139, + 114,252,252,252,233,244,1,255,141,76,202,8,139,105,232,139,65,252,236,137, + 41,137,65,4,139,105,252,240,139,65,252,244,137,105,8,137,65,12,139,105,224, + 139,65,228,137,105,252,248,137,65,252,252,129,252,248,239,184,237,15,133, + 244,28,137,202,137,114,252,252,139,181,233,139,14,15,182,252,233,15,182,205, + 131,198,4,252,255,36,252,235,255,15,182,252,236,139,66,252,248,141,12,202, + 139,128,233,15,182,128,233,137,124,36,80,141,188,253,194,233,43,122,252,252, + 133,252,237,15,132,244,251,141,108,252,233,252,248,57,215,15,131,244,248, + 248,1,139,71,252,248,137,1,139,71,252,252,131,199,8,137,65,4,131,193,8,57, + 252,233,15,131,244,249,57,215,15,130,244,1,248,2,199,65,4,237,131,193,8,57, + 252,233,15,130,244,2,248,3,139,124,36,80,139,6,15,182,204,15,182,232,131, + 198,4,193,232,16,252,255,36,252,235,248,5,199,68,36,84,1,0,0,0,137,208,41, + 252,248,15,134,244,3,255,137,197,193,252,237,3,131,197,1,137,108,36,84,139, + 108,36,96,1,200,59,133,233,15,135,244,253,248,6,139,71,252,248,137,1,139, + 71,252,252,131,199,8,137,65,4,131,193,8,57,215,15,130,244,6,252,233,244,3, + 248,7,137,149,233,137,141,233,137,116,36,100,41,215,139,84,36,84,131,252, + 234,1,137,252,233,232,251,1,0,139,149,233,139,141,233,1,215,252,233,244,6, + 255,193,225,3,255,248,1,139,114,252,252,137,68,36,84,252,247,198,237,15,133, + 244,253,255,248,13,137,215,131,232,1,15,132,244,249,248,2,139,44,15,137,111, + 252,248,139,108,15,4,137,111,252,252,131,199,8,131,232,1,15,133,244,2,248, + 3,139,68,36,84,15,182,110,252,255,248,5,57,197,15,135,244,252,255,139,108, + 10,4,137,106,252,252,139,44,10,137,106,252,248,255,248,5,56,70,252,255,15, + 135,244,252,255,15,182,78,252,253,72,252,247,209,141,20,202,139,122,252,248, + 139,191,233,139,191,233,139,6,15,182,204,15,182,232,131,198,4,193,232,16, + 252,255,36,252,235,248,6,255,199,71,252,252,237,131,199,8,255,199,68,194, 252,244,237,255,131,192,1,252,233,244,5,248,7,15,139,244,14,131,230,252,248, 41,252,242,255,1,252,241,255,137,252,245,209,252,237,129,229,239,102,131, 172,253,43,233,1,15,132,244,140,255,141,12,202,255,129,121,253,4,239,15,135, @@ -1370,58 +1371,59 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse) #endif dasm_put(Dst, 7505); #if LJ_HASJIT - dasm_put(Dst, 7508, 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); + dasm_put(Dst, 7508, 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, 7650); #endif - dasm_put(Dst, 7661); + dasm_put(Dst, 7676); if (!sse) { - dasm_put(Dst, 7664); + dasm_put(Dst, 7679); } - dasm_put(Dst, 7709, (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, 7724, (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, 7795); + dasm_put(Dst, 7810); } - dasm_put(Dst, 7840, (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, 7855, (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, 7926); + dasm_put(Dst, 7941); } - dasm_put(Dst, 7965, (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, 7980, (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, 8054, (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, 8069, (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, 8168); + dasm_put(Dst, 8183); } - dasm_put(Dst, 8215); + dasm_put(Dst, 8230); if (!sse) { } else { - dasm_put(Dst, 8289); + dasm_put(Dst, 8304); } - dasm_put(Dst, 8292); - dasm_put(Dst, 8377, (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, 8478, (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, 8646); + dasm_put(Dst, 8307); + dasm_put(Dst, 8392, (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, 8493, (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, 8661); if (sse) { - dasm_put(Dst, 8687); - dasm_put(Dst, 8757); - dasm_put(Dst, 8830); + dasm_put(Dst, 8702); + dasm_put(Dst, 8772); + dasm_put(Dst, 8845); } else { - dasm_put(Dst, 8880); - dasm_put(Dst, 8972); + dasm_put(Dst, 8895); + dasm_put(Dst, 8987); } - dasm_put(Dst, 9018); + dasm_put(Dst, 9033); if (sse) { - dasm_put(Dst, 9024, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); - dasm_put(Dst, 9113, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); + dasm_put(Dst, 9039, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); + dasm_put(Dst, 9128, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); } else { - dasm_put(Dst, 9237); - dasm_put(Dst, 9320); + dasm_put(Dst, 9252); + dasm_put(Dst, 9335); if (cmov) { - dasm_put(Dst, 9375); + dasm_put(Dst, 9390); } else { - dasm_put(Dst, 9394); + dasm_put(Dst, 9409); } - dasm_put(Dst, 9233); + dasm_put(Dst, 9248); } - dasm_put(Dst, 9435); + dasm_put(Dst, 9450); } /* Generate the code for a single instruction. */ @@ -1437,595 +1439,595 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) /* Remember: all ops branch for a true comparison, fall through otherwise. */ case BC_ISLT: case BC_ISGE: case BC_ISLE: case BC_ISGT: - dasm_put(Dst, 9461, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 9476, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9482); - } else { dasm_put(Dst, 9497); + } else { + dasm_put(Dst, 9512); if (cmov) { - dasm_put(Dst, 9507); + dasm_put(Dst, 9522); } else { - dasm_put(Dst, 9513); + dasm_put(Dst, 9528); } } switch (op) { case BC_ISLT: - dasm_put(Dst, 9520); + dasm_put(Dst, 9535); break; case BC_ISGE: - dasm_put(Dst, 9315); + dasm_put(Dst, 9330); break; case BC_ISLE: dasm_put(Dst, 5900); break; case BC_ISGT: - dasm_put(Dst, 9525); + dasm_put(Dst, 9540); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 9530, -BCBIAS_J*4); + dasm_put(Dst, 9545, -BCBIAS_J*4); break; case BC_ISEQV: case BC_ISNEV: vk = op == BC_ISEQV; - dasm_put(Dst, 9564, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 9579, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9590); + dasm_put(Dst, 9605); } else { - dasm_put(Dst, 9602); + dasm_put(Dst, 9617); if (cmov) { - dasm_put(Dst, 9507); + dasm_put(Dst, 9522); } else { - dasm_put(Dst, 9513); + dasm_put(Dst, 9528); } } iseqne_fp: if (vk) { - dasm_put(Dst, 9609); + dasm_put(Dst, 9624); } else { - dasm_put(Dst, 9618); + dasm_put(Dst, 9633); } iseqne_end: if (vk) { - dasm_put(Dst, 9627, -BCBIAS_J*4); - } else { dasm_put(Dst, 9642, -BCBIAS_J*4); + } else { + dasm_put(Dst, 9657, -BCBIAS_J*4); } - dasm_put(Dst, 9544); + dasm_put(Dst, 9559); if (op == BC_ISEQV || op == BC_ISNEV) { - dasm_put(Dst, 9657, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<metatable), Dt6(->nomm), 1<>32)); + dasm_put(Dst, 9960, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); } else { - dasm_put(Dst, 9970); + dasm_put(Dst, 9985); } - dasm_put(Dst, 9544); + dasm_put(Dst, 9559); break; case BC_LEN: - dasm_put(Dst, 9979, LJ_TSTR); + dasm_put(Dst, 9994, LJ_TSTR); if (sse) { - dasm_put(Dst, 9993, Dt5(->len)); + dasm_put(Dst, 10008, Dt5(->len)); } else { - dasm_put(Dst, 10011, Dt5(->len)); + dasm_put(Dst, 10026, Dt5(->len)); } - dasm_put(Dst, 10020, LJ_TTAB); + dasm_put(Dst, 10035, LJ_TTAB); if (sse) { - dasm_put(Dst, 10061); + dasm_put(Dst, 10076); } else { } - dasm_put(Dst, 10070); + dasm_put(Dst, 10085); break; /* -- Binary ops -------------------------------------------------------- */ case BC_ADDVN: case BC_ADDNV: case BC_ADDVV: - dasm_put(Dst, 10080); + dasm_put(Dst, 10095); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 10088, LJ_TISNUM); + dasm_put(Dst, 10103, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10100); + dasm_put(Dst, 10115); } else { - dasm_put(Dst, 10114); + dasm_put(Dst, 10129); } break; case 1: - dasm_put(Dst, 10122, LJ_TISNUM); + dasm_put(Dst, 10137, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10134); + dasm_put(Dst, 10149); } else { - dasm_put(Dst, 10148); + dasm_put(Dst, 10163); } break; default: - dasm_put(Dst, 10156, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10171, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10178); + dasm_put(Dst, 10193); } else { - dasm_put(Dst, 10192); + dasm_put(Dst, 10207); } break; } if (sse) { - dasm_put(Dst, 9963); + dasm_put(Dst, 9978); } else { - dasm_put(Dst, 9975); + dasm_put(Dst, 9990); } - dasm_put(Dst, 9544); + dasm_put(Dst, 9559); break; case BC_SUBVN: case BC_SUBNV: case BC_SUBVV: - dasm_put(Dst, 10080); + dasm_put(Dst, 10095); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 10088, LJ_TISNUM); + dasm_put(Dst, 10103, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10200); + dasm_put(Dst, 10215); } else { - dasm_put(Dst, 10214); + dasm_put(Dst, 10229); } break; case 1: - dasm_put(Dst, 10122, LJ_TISNUM); + dasm_put(Dst, 10137, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10222); + dasm_put(Dst, 10237); } else { - dasm_put(Dst, 10236); + dasm_put(Dst, 10251); } break; default: - dasm_put(Dst, 10156, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10171, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10244); + dasm_put(Dst, 10259); } else { - dasm_put(Dst, 10258); + dasm_put(Dst, 10273); } break; } if (sse) { - dasm_put(Dst, 9963); + dasm_put(Dst, 9978); } else { - dasm_put(Dst, 9975); + dasm_put(Dst, 9990); } - dasm_put(Dst, 9544); + dasm_put(Dst, 9559); break; case BC_MULVN: case BC_MULNV: case BC_MULVV: - dasm_put(Dst, 10080); + dasm_put(Dst, 10095); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 10088, LJ_TISNUM); + dasm_put(Dst, 10103, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10266); + dasm_put(Dst, 10281); } else { - dasm_put(Dst, 10280); + dasm_put(Dst, 10295); } break; case 1: - dasm_put(Dst, 10122, LJ_TISNUM); + dasm_put(Dst, 10137, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10288); + dasm_put(Dst, 10303); } else { - dasm_put(Dst, 10302); + dasm_put(Dst, 10317); } break; default: - dasm_put(Dst, 10156, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10171, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10310); + dasm_put(Dst, 10325); } else { - dasm_put(Dst, 10324); + dasm_put(Dst, 10339); } break; } if (sse) { - dasm_put(Dst, 9963); + dasm_put(Dst, 9978); } else { - dasm_put(Dst, 9975); + dasm_put(Dst, 9990); } - dasm_put(Dst, 9544); + dasm_put(Dst, 9559); break; case BC_DIVVN: case BC_DIVNV: case BC_DIVVV: - dasm_put(Dst, 10080); + dasm_put(Dst, 10095); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 10088, LJ_TISNUM); + dasm_put(Dst, 10103, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10332); + dasm_put(Dst, 10347); } else { - dasm_put(Dst, 10346); + dasm_put(Dst, 10361); } break; case 1: - dasm_put(Dst, 10122, LJ_TISNUM); + dasm_put(Dst, 10137, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10354); + dasm_put(Dst, 10369); } else { - dasm_put(Dst, 10368); + dasm_put(Dst, 10383); } break; default: - dasm_put(Dst, 10156, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10171, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10376); + dasm_put(Dst, 10391); } else { - dasm_put(Dst, 10390); + dasm_put(Dst, 10405); } break; } if (sse) { - dasm_put(Dst, 9963); + dasm_put(Dst, 9978); } else { - dasm_put(Dst, 9975); + dasm_put(Dst, 9990); } - dasm_put(Dst, 9544); + dasm_put(Dst, 9559); break; case BC_MODVN: - dasm_put(Dst, 10080); + dasm_put(Dst, 10095); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 10088, LJ_TISNUM); + dasm_put(Dst, 10103, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10398); + dasm_put(Dst, 10413); } else { - dasm_put(Dst, 10412); + dasm_put(Dst, 10427); } break; case 1: - dasm_put(Dst, 10122, LJ_TISNUM); + dasm_put(Dst, 10137, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10420); + dasm_put(Dst, 10435); } else { - dasm_put(Dst, 10434); + dasm_put(Dst, 10449); } break; default: - dasm_put(Dst, 10156, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10171, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10442); + dasm_put(Dst, 10457); } else { - dasm_put(Dst, 10456); + dasm_put(Dst, 10471); } break; } - dasm_put(Dst, 10464); + dasm_put(Dst, 10479); if (sse) { - dasm_put(Dst, 9963); + dasm_put(Dst, 9978); } else { - dasm_put(Dst, 9975); + dasm_put(Dst, 9990); } - dasm_put(Dst, 9544); + dasm_put(Dst, 9559); break; case BC_MODNV: case BC_MODVV: - dasm_put(Dst, 10080); + dasm_put(Dst, 10095); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 10088, LJ_TISNUM); + dasm_put(Dst, 10103, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10398); + dasm_put(Dst, 10413); } else { - dasm_put(Dst, 10412); + dasm_put(Dst, 10427); } break; case 1: - dasm_put(Dst, 10122, LJ_TISNUM); + dasm_put(Dst, 10137, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10420); + dasm_put(Dst, 10435); } else { - dasm_put(Dst, 10434); + dasm_put(Dst, 10449); } break; default: - dasm_put(Dst, 10156, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10171, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10442); + dasm_put(Dst, 10457); } else { - dasm_put(Dst, 10456); + dasm_put(Dst, 10471); } break; } - dasm_put(Dst, 10470); + dasm_put(Dst, 10485); break; case BC_POW: - dasm_put(Dst, 10080); + dasm_put(Dst, 10095); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 10088, LJ_TISNUM); + dasm_put(Dst, 10103, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10398); + dasm_put(Dst, 10413); } else { - dasm_put(Dst, 10412); + dasm_put(Dst, 10427); } break; case 1: - dasm_put(Dst, 10122, LJ_TISNUM); + dasm_put(Dst, 10137, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10420); + dasm_put(Dst, 10435); } else { - dasm_put(Dst, 10434); + dasm_put(Dst, 10449); } break; default: - dasm_put(Dst, 10156, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10171, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10442); + dasm_put(Dst, 10457); } else { - dasm_put(Dst, 10456); + dasm_put(Dst, 10471); } break; } - dasm_put(Dst, 10475); + dasm_put(Dst, 10490); if (sse) { - dasm_put(Dst, 9963); + dasm_put(Dst, 9978); } else { - dasm_put(Dst, 9975); + dasm_put(Dst, 9990); } - dasm_put(Dst, 9544); + dasm_put(Dst, 9559); break; case BC_CAT: - dasm_put(Dst, 10479, Dt1(->base), Dt1(->base)); + dasm_put(Dst, 10494, Dt1(->base), Dt1(->base)); break; /* -- Constant ops ------------------------------------------------------ */ case BC_KSTR: - dasm_put(Dst, 10569, LJ_TSTR); + dasm_put(Dst, 10584, LJ_TSTR); break; case BC_KSHORT: if (sse) { - dasm_put(Dst, 10604); - } else { dasm_put(Dst, 10619); + } else { + dasm_put(Dst, 10634); } - dasm_put(Dst, 9544); + dasm_put(Dst, 9559); break; case BC_KNUM: if (sse) { - dasm_put(Dst, 10627); + dasm_put(Dst, 10642); } else { - dasm_put(Dst, 10640); + dasm_put(Dst, 10655); } - dasm_put(Dst, 9544); + dasm_put(Dst, 9559); break; case BC_KPRI: - dasm_put(Dst, 10647); + dasm_put(Dst, 10662); break; case BC_KNIL: - dasm_put(Dst, 10675, LJ_TNIL); + dasm_put(Dst, 10690, LJ_TNIL); break; /* -- Upvalue and function ops ------------------------------------------ */ case BC_UGET: - dasm_put(Dst, 10722, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 10737, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_USETV: #define TV2MARKOFS \ ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv)) - dasm_put(Dst, 10767, 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, 10858); + dasm_put(Dst, 10782, 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, 10873); break; #undef TV2MARKOFS case BC_USETS: - dasm_put(Dst, 10870, 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, 10885, 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, 10963); + dasm_put(Dst, 10978); if (sse) { - dasm_put(Dst, 10968); + dasm_put(Dst, 10983); } else { - dasm_put(Dst, 9783); + dasm_put(Dst, 9798); } - dasm_put(Dst, 10975, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 10990, offsetof(GCfuncL, uvptr), DtA(->v)); if (sse) { - dasm_put(Dst, 10984); + dasm_put(Dst, 10999); } else { - dasm_put(Dst, 10990); + dasm_put(Dst, 11005); } - dasm_put(Dst, 9544); + dasm_put(Dst, 9559); break; case BC_USETP: - dasm_put(Dst, 10993, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 11008, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_UCLO: - dasm_put(Dst, 11032, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 11047, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); break; case BC_FNEW: - dasm_put(Dst, 11087, Dt1(->base), Dt1(->base), LJ_TFUNC); + dasm_put(Dst, 11102, Dt1(->base), Dt1(->base), LJ_TFUNC); break; /* -- Table ops --------------------------------------------------------- */ case BC_TNEW: - dasm_put(Dst, 11153, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 11168, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); break; case BC_TDUP: - dasm_put(Dst, 11274, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 11289, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); break; case BC_GGET: - dasm_put(Dst, 11369, Dt7(->env)); + dasm_put(Dst, 11384, Dt7(->env)); break; case BC_GSET: - dasm_put(Dst, 11388, Dt7(->env)); + dasm_put(Dst, 11403, Dt7(->env)); break; case BC_TGETV: - dasm_put(Dst, 11407, LJ_TTAB, LJ_TISNUM); + dasm_put(Dst, 11422, LJ_TTAB, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11440); + dasm_put(Dst, 11455); } else { } - dasm_put(Dst, 11461, 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, 11657, 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, 11672, 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)); - dasm_put(Dst, 11946, Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 11877, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable)); + dasm_put(Dst, 11961, Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETS: - dasm_put(Dst, 12008, 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, 12084, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); - dasm_put(Dst, 12177, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 12023, 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, 12099, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); + dasm_put(Dst, 12192, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETB: - dasm_put(Dst, 12268, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); - dasm_put(Dst, 12367, Dt6(->metatable), Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 12283, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); + dasm_put(Dst, 12382, Dt6(->metatable), Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETM: - dasm_put(Dst, 12413); + dasm_put(Dst, 12428); if (sse) { - dasm_put(Dst, 12418); + dasm_put(Dst, 12433); } else { } - dasm_put(Dst, 12425, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); - dasm_put(Dst, 12565, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 12440, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 12580, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; /* -- Calls and vararg handling ----------------------------------------- */ case BC_CALL: case BC_CALLM: - dasm_put(Dst, 10084); + dasm_put(Dst, 10099); if (op == BC_CALLM) { - dasm_put(Dst, 12583); + dasm_put(Dst, 12598); } - dasm_put(Dst, 12588, LJ_TFUNC, Dt7(->pc)); + dasm_put(Dst, 12603, LJ_TFUNC, Dt7(->pc)); break; case BC_CALLMT: - dasm_put(Dst, 12583); + dasm_put(Dst, 12598); break; case BC_CALLT: - dasm_put(Dst, 12630, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); - dasm_put(Dst, 12749, FRAME_TYPE, Dt7(->pc), PC2PROTO(k)); + dasm_put(Dst, 12645, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); + dasm_put(Dst, 12764, FRAME_TYPE, Dt7(->pc), PC2PROTO(k)); break; case BC_ITERC: - dasm_put(Dst, 12807, LJ_TFUNC, 2+1, Dt7(->pc)); + dasm_put(Dst, 12822, LJ_TFUNC, 2+1, Dt7(->pc)); break; case BC_VARG: - dasm_put(Dst, 12888, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL); - dasm_put(Dst, 13033, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 12903, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL); + dasm_put(Dst, 13048, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); break; /* -- Returns ----------------------------------------------------------- */ case BC_RETM: - dasm_put(Dst, 12583); + dasm_put(Dst, 12598); break; case BC_RET: case BC_RET0: case BC_RET1: if (op != BC_RET0) { - dasm_put(Dst, 13132); + dasm_put(Dst, 13147); } - dasm_put(Dst, 13136, FRAME_TYPE); + dasm_put(Dst, 13151, FRAME_TYPE); switch (op) { case BC_RET: - dasm_put(Dst, 13155); + dasm_put(Dst, 13170); break; case BC_RET1: - dasm_put(Dst, 13213); + dasm_put(Dst, 13228); /* fallthrough */ case BC_RET0: - dasm_put(Dst, 13229); + dasm_put(Dst, 13244); default: break; } - dasm_put(Dst, 13240, Dt7(->pc), PC2PROTO(k)); + dasm_put(Dst, 13255, Dt7(->pc), PC2PROTO(k)); if (op == BC_RET) { - dasm_put(Dst, 13284, LJ_TNIL); + dasm_put(Dst, 13299, LJ_TNIL); } else { - dasm_put(Dst, 13293, LJ_TNIL); + dasm_put(Dst, 13308, LJ_TNIL); } - dasm_put(Dst, 13300); + dasm_put(Dst, 13315); if (op != BC_RET0) { - dasm_put(Dst, 13321); + dasm_put(Dst, 13336); } dasm_put(Dst, 4570); break; @@ -2035,7 +2037,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORL: #if LJ_HASJIT - dasm_put(Dst, 13325, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 13340, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2047,57 +2049,57 @@ 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, 13346); + dasm_put(Dst, 13361); if (!vk) { - dasm_put(Dst, 13350, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 13365, LJ_TISNUM, LJ_TISNUM); } - dasm_put(Dst, 13369); + dasm_put(Dst, 13384); if (!vk) { - dasm_put(Dst, 13373, LJ_TISNUM); + dasm_put(Dst, 13388, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 13382); + dasm_put(Dst, 13397); if (vk) { - dasm_put(Dst, 13394); + dasm_put(Dst, 13409); } else { - dasm_put(Dst, 13413); + dasm_put(Dst, 13428); } - dasm_put(Dst, 13418); + dasm_put(Dst, 13433); } else { - dasm_put(Dst, 13431); + dasm_put(Dst, 13446); if (vk) { - dasm_put(Dst, 13437); + dasm_put(Dst, 13452); } else { - dasm_put(Dst, 13453); + dasm_put(Dst, 13468); } - dasm_put(Dst, 13461); + dasm_put(Dst, 13476); if (cmov) { - dasm_put(Dst, 9507); + dasm_put(Dst, 9522); } else { - dasm_put(Dst, 9513); + dasm_put(Dst, 9528); } if (!cmov) { - dasm_put(Dst, 13466); + dasm_put(Dst, 13481); } } if (op == BC_FORI) { - dasm_put(Dst, 13472, -BCBIAS_J*4); + dasm_put(Dst, 13487, -BCBIAS_J*4); } else if (op == BC_JFORI) { - dasm_put(Dst, 13482, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 13497, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 13496, -BCBIAS_J*4); + dasm_put(Dst, 13511, -BCBIAS_J*4); } else { - dasm_put(Dst, 13492, BC_JLOOP); + dasm_put(Dst, 13507, BC_JLOOP); } - dasm_put(Dst, 9542); + dasm_put(Dst, 9557); if (sse) { - dasm_put(Dst, 13506); + dasm_put(Dst, 13521); } break; case BC_ITERL: #if LJ_HASJIT - dasm_put(Dst, 13325, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 13340, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2106,33 +2108,33 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IITERL: - dasm_put(Dst, 13517, LJ_TNIL); + dasm_put(Dst, 13532, LJ_TNIL); if (op == BC_JITERL) { - dasm_put(Dst, 13532, BC_JLOOP); + dasm_put(Dst, 13547, BC_JLOOP); } else { - dasm_put(Dst, 13546, -BCBIAS_J*4); + dasm_put(Dst, 13561, -BCBIAS_J*4); } - dasm_put(Dst, 9842); + dasm_put(Dst, 9857); break; case BC_LOOP: #if LJ_HASJIT - dasm_put(Dst, 13325, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 13340, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; case BC_ILOOP: - dasm_put(Dst, 9544); + dasm_put(Dst, 9559); break; case BC_JLOOP: #if LJ_HASJIT - dasm_put(Dst, 13562, 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, 13577, 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, 13671, -BCBIAS_J*4); + dasm_put(Dst, 13686, -BCBIAS_J*4); break; /* -- Function headers -------------------------------------------------- */ @@ -2146,7 +2148,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FUNCF: #if LJ_HASJIT - dasm_put(Dst, 13696, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 13711, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif case BC_FUNCV: /* NYI: compiled vararg functions. */ break; @@ -2156,47 +2158,47 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IFUNCF: - dasm_put(Dst, 13717, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); + dasm_put(Dst, 13732, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); if (op == BC_JFUNCF) { - dasm_put(Dst, 13747, BC_JLOOP); + dasm_put(Dst, 13762, BC_JLOOP); } else { - dasm_put(Dst, 9544); + dasm_put(Dst, 9559); } - dasm_put(Dst, 13756, LJ_TNIL); + dasm_put(Dst, 13771, LJ_TNIL); break; case BC_JFUNCV: #if !LJ_HASJIT break; #endif - dasm_put(Dst, 9235); + dasm_put(Dst, 9250); break; /* NYI: compiled vararg functions. */ case BC_IFUNCV: - dasm_put(Dst, 13778, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); + dasm_put(Dst, 13793, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); if (op == BC_JFUNCV) { - dasm_put(Dst, 13747, BC_JLOOP); + dasm_put(Dst, 13762, BC_JLOOP); } else { - dasm_put(Dst, 13869, -4+PC2PROTO(k)); + dasm_put(Dst, 13884, -4+PC2PROTO(k)); } - dasm_put(Dst, 13892, LJ_TNIL); + dasm_put(Dst, 13907, LJ_TNIL); break; case BC_FUNCC: case BC_FUNCCW: - dasm_put(Dst, 13914, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); + dasm_put(Dst, 13929, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); if (op == BC_FUNCC) { - dasm_put(Dst, 13944); + dasm_put(Dst, 13959); } else { - dasm_put(Dst, 13948); + dasm_put(Dst, 13963); } - dasm_put(Dst, 13956, DISPATCH_GL(vmstate), ~LJ_VMST_C); + dasm_put(Dst, 13971, DISPATCH_GL(vmstate), ~LJ_VMST_C); if (op == BC_FUNCC) { - dasm_put(Dst, 13965); + dasm_put(Dst, 13980); } else { - dasm_put(Dst, 13969, DISPATCH_GL(wrapf)); + dasm_put(Dst, 13984, DISPATCH_GL(wrapf)); } - dasm_put(Dst, 13974, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 13989, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); break; /* ---------------------------------------------------------------------- */ @@ -2224,7 +2226,7 @@ static int build_backend(BuildCtx *ctx) build_subroutines(ctx, cmov, sse); - dasm_put(Dst, 13999); + dasm_put(Dst, 14014); 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 4d3b081c..e0a70daa 100644 --- a/src/buildvm_x86.dasc +++ b/src/buildvm_x86.dasc @@ -2668,16 +2668,30 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse) | mov r13, TMPa | mov r12, TMPQ |.endif - | test RD, RD; js >2 // Check for error from exit. + | test RD, RD; js >3 // Check for error from exit. | mov MULTRES, RD | mov LFUNC:KBASE, [BASE-8] | mov KBASE, LFUNC:KBASE->pc | mov KBASE, [KBASE+PC2PROTO(k)] | mov dword [DISPATCH+DISPATCH_GL(jit_L)], 0 | set_vmstate INTERP - | ins_next + | // Modified copy of ins_next which handles function header dispatch, too. + | mov RC, [PC] + | movzx RA, RCH + | movzx OP, RCL + | add PC, 4 + | shr RC, 16 + | cmp OP, BC_FUNCF // Function header? + | jb >2 + | mov RC, MULTRES // RC/RD holds nres+1. + |2: + |.if X64 + | jmp aword [DISPATCH+OP*8] + |.else + | jmp aword [DISPATCH+OP*4] + |.endif | - |2: // Rethrow error from the right C frame. + |3: // Rethrow error from the right C frame. | neg RD | mov FCARG1, L:RB | mov FCARG2, RD diff --git a/src/buildvm_x86.h b/src/buildvm_x86.h index a88848fe..fec4d3f9 100644 --- a/src/buildvm_x86.h +++ b/src/buildvm_x86.h @@ -12,7 +12,7 @@ #define DASM_SECTION_CODE_OP 0 #define DASM_SECTION_CODE_SUB 1 #define DASM_MAXSECTION 2 -static const unsigned char build_actionlist[15203] = { +static const unsigned char build_actionlist[15217] = { 254,1,248,10,252,247,198,237,15,132,244,11,131,230,252,248,41,252,242,141, 76,49,252,248,139,114,252,252,199,68,10,4,237,248,12,131,192,1,137,68,36, 20,252,247,198,237,15,132,244,13,248,14,252,247,198,237,15,132,244,10,199, @@ -418,334 +418,334 @@ static const unsigned char build_actionlist[15203] = { 15,17,85,176,252,242,15,17,77,168,252,242,15,17,69,160,139,171,233,139,147, 233,137,171,233,137,149,233,141,84,36,16,141,139,233,232,251,1,23,139,141, 233,129,225,239,137,204,137,169,233,139,149,233,139,177,233,255,248,144,255, - 133,192,15,136,244,248,137,68,36,20,139,122,252,248,139,191,233,139,191,233, + 133,192,15,136,244,249,137,68,36,20,139,122,252,248,139,191,233,139,191,233, 199,131,233,0,0,0,0,199,131,233,237,139,6,15,182,204,15,182,232,131,198,4, - 193,232,16,252,255,36,171,248,2,252,247,216,137,252,233,137,194,232,251,1, - 24,255,248,82,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,145,102,15,252,239,210,102,15,118,210,102,15,115, - 210,1,184,0,0,48,67,102,15,110,216,102,15,112,219,81,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,184,0,0,252,240,63,102,15,110,208,102,15,112,210, - 81,252,242,15,194,193,1,102,15,84,194,252,242,15,92,200,15,40,193,248,1,195, - 248,84,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,146,102,15,252,239,210,102,15,118,210,102,15,115,210,1,184, - 0,0,48,67,102,15,110,216,102,15,112,219,81,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,184,0,0,252,240,191,102,15,110,208,102,15,112,210,81,252,242,15, - 194,193,6,102,15,84,194,252,242,15,92,200,15,40,193,248,1,195,248,104,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,147,102,15,252, - 239,210,102,15,118,210,102,15,115,210,1,184,0,0,48,67,102,15,110,216,102, - 15,112,219,81,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,184,0,0,252,240,63,102, - 15,110,216,102,15,112,219,81,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,148,255,15,40,232,252,242,15, - 94,193,102,15,252,239,210,102,15,118,210,102,15,115,210,1,184,0,0,48,67,102, - 15,110,216,102,15,112,219,81,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,184, - 0,0,252,240,63,102,15,110,208,102,15,112,210,81,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,88,217,252,234,222,201,248,149,217,84,36,4,129,124,36,4,0,0,128,127, - 15,132,244,247,129,124,36,4,0,0,128,252,255,15,132,244,248,248,150,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,107,219,84,36,4,219,68, - 36,4,255,223,252,233,255,221,252,233,223,224,158,255,15,133,244,254,15,138, - 244,255,221,216,139,68,36,4,131,252,248,1,15,142,244,252,248,1,169,1,0,0, - 0,15,133,244,248,216,200,209,232,252,233,244,1,248,2,209,232,15,132,244,251, - 217,192,248,3,216,200,209,232,15,132,244,250,15,131,244,3,220,201,252,233, - 244,3,248,4,255,222,201,248,5,195,248,6,15,132,244,5,15,130,244,253,217,232, - 222,252,241,252,247,216,131,252,248,1,15,132,244,5,252,233,244,1,248,7,221, - 216,217,232,195,248,8,217,84,36,4,217,201,217,84,36,8,139,68,36,4,209,224, - 61,0,0,0,252,255,15,132,244,248,139,68,36,8,209,224,15,132,244,250,61,0,0, - 0,252,255,15,132,244,250,217,252,241,252,233,244,150,248,9,255,217,232,255, - 223,252,234,255,221,252,234,223,224,158,255,15,132,244,247,217,201,248,1, - 221,216,195,248,2,217,225,217,232,255,15,132,244,249,221,216,217,225,217, - 252,238,184,0,0,0,0,15,146,208,209,200,51,68,36,4,15,137,244,249,217,201, - 248,3,221,217,217,225,195,248,4,131,124,36,4,0,15,141,244,3,221,216,221,216, - 133,192,15,132,244,251,217,252,238,195,248,5,199,68,36,4,0,0,128,127,217, - 68,36,4,195,255,248,107,255,248,151,252,242,15,45,193,252,242,15,42,208,102, - 15,46,202,15,133,244,254,15,138,244,255,248,152,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,80,184,0,0,252, - 240,63,102,15,110,200,102,15,112,201,81,252,242,15,94,200,88,15,40,193,252, - 247,216,131,252,248,1,15,132,244,5,252,233,244,1,248,7,184,0,0,252,240,63, - 102,15,110,192,102,15,112,192,81,195,248,8,252,242,15,17,76,36,12,252,242, - 15,17,68,36,4,131,124,36,12,0,15,133,244,247,139,68,36,16,209,224,61,0,0, - 224,252,255,15,132,244,248,248,1,255,131,124,36,4,0,15,133,244,247,139,68, - 36,8,209,224,15,132,244,250,61,0,0,224,252,255,15,132,244,251,248,1,221,68, - 36,12,221,68,36,4,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,4,252,242,15,16,68, - 36,4,195,248,9,184,0,0,252,240,63,102,15,110,208,102,15,112,210,81,102,15, - 46,194,15,132,244,247,15,40,193,248,1,195,248,2,102,15,252,239,210,102,15, - 118,210,102,15,115,210,1,102,15,84,194,184,0,0,252,240,63,102,15,110,208, - 102,15,112,210,81,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,184,0,0,252,240,127,102,15,110,192, - 102,15,112,192,81,195,248,4,102,15,80,193,133,192,15,133,244,3,255,15,87, - 192,195,248,5,102,15,80,193,133,192,15,132,244,3,15,87,192,195,248,153,255, - 139,68,36,12,252,242,15,16,68,36,4,131,252,248,1,15,132,244,247,15,135,244, - 248,232,244,82,252,233,244,253,248,1,232,244,84,252,233,244,253,248,2,131, - 252,248,3,15,132,244,247,15,135,244,248,232,244,104,255,252,233,244,253,248, - 1,252,242,15,81,192,248,7,252,242,15,17,68,36,4,221,68,36,4,195,248,2,221, - 68,36,4,131,252,248,5,15,130,244,88,15,132,244,149,248,2,131,252,248,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,248,9,15,132,244,247,15,135,244, - 248,255,217,252,236,217,201,217,252,241,195,248,1,217,252,254,195,248,2,131, - 252,248,11,15,132,244,247,15,135,244,255,217,252,255,195,248,1,217,252,242, - 221,216,195,255,139,68,36,12,221,68,36,4,131,252,248,1,15,130,244,82,15,132, - 244,84,131,252,248,3,15,130,244,104,15,135,244,248,217,252,250,195,248,2, - 131,252,248,5,15,130,244,88,15,132,244,149,131,252,248,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,248,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,248,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,248,154,255,139,68,36,20,252,242,15,16,68,36,4,252,242,15,16, - 76,36,12,131,252,248,1,15,132,244,247,15,135,244,248,252,242,15,88,193,248, - 7,252,242,15,17,68,36,4,221,68,36,4,195,248,1,252,242,15,92,193,252,233,244, - 7,248,2,131,252,248,3,15,132,244,247,15,135,244,248,252,242,15,89,193,252, - 233,244,7,248,1,252,242,15,94,193,252,233,244,7,248,2,131,252,248,5,15,132, - 244,247,255,15,135,244,248,232,244,148,252,233,244,7,248,1,90,232,244,107, - 82,252,233,244,7,248,2,131,252,248,7,15,132,244,247,15,135,244,248,184,0, - 0,0,128,102,15,110,200,102,15,112,201,81,15,87,193,252,233,244,7,248,1,102, - 15,252,239,201,102,15,118,201,102,15,115,209,1,15,84,193,252,233,244,7,248, - 2,255,131,252,248,9,15,135,244,248,221,68,36,4,221,68,36,12,15,132,244,247, - 217,252,243,195,248,1,217,201,217,252,253,221,217,195,248,2,131,252,248,11, - 15,132,244,247,15,135,244,255,252,242,15,93,193,252,233,244,7,248,1,252,242, - 15,95,193,252,233,244,7,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,148,15,132,244,107,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,221,217,195,248,2,131,252,248,11,15,132,244, - 247,15,135,244,255,255,219,252,233,219,209,221,217,195,248,1,219,252,233, - 218,209,221,217,195,255,221,225,223,224,252,246,196,1,15,132,244,248,217, - 201,248,2,221,216,195,248,1,221,225,223,224,252,246,196,1,15,133,244,248, - 217,201,248,2,221,216,195,255,248,155,156,90,137,209,129,252,242,0,0,32,0, - 82,157,156,90,49,192,57,209,15,132,244,247,139,68,36,4,87,83,15,162,139,124, - 36,16,137,7,137,95,4,137,79,8,137,87,12,91,95,248,1,195,255,249,255,129,124, - 253,202,4,239,15,135,244,41,129,124,253,194,4,239,15,135,244,41,255,252,242, - 15,16,4,194,131,198,4,102,15,46,4,202,255,221,4,202,221,4,194,131,198,4,255, - 223,252,233,221,216,255,218,252,233,223,224,158,255,15,134,244,248,255,15, - 131,244,248,255,248,1,15,183,70,252,254,141,180,253,134,233,248,2,139,6,15, - 182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,255,139,108,194,4, - 131,198,4,129,252,253,239,15,135,244,251,129,124,253,202,4,239,15,135,244, - 251,255,252,242,15,16,4,194,102,15,46,4,202,255,221,4,202,221,4,194,255,15, - 138,244,248,15,133,244,248,255,15,138,244,248,15,132,244,247,255,248,1,15, - 183,70,252,254,141,180,253,134,233,248,2,255,248,2,15,183,70,252,254,141, - 180,253,134,233,248,1,255,248,5,57,108,202,4,15,133,244,2,129,252,253,239, - 15,131,244,1,139,12,202,139,4,194,57,193,15,132,244,1,129,252,253,239,15, - 135,244,2,139,169,233,133,252,237,15,132,244,2,252,246,133,233,235,15,133, - 244,2,255,49,252,237,255,189,1,0,0,0,255,252,233,244,45,255,252,247,208,131, - 198,4,129,124,253,202,4,239,15,133,244,248,139,12,202,59,12,135,255,131,198, - 4,129,124,253,202,4,239,15,135,244,248,255,252,242,15,16,4,199,102,15,46, - 4,202,255,221,4,202,221,4,199,255,252,247,208,131,198,4,57,68,202,4,255,139, - 108,194,4,131,198,4,129,252,253,239,255,15,131,244,247,255,15,130,244,247, - 255,137,108,202,4,139,44,194,137,44,202,255,15,183,70,252,254,141,180,253, - 134,233,248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36, - 171,255,139,108,194,4,139,4,194,137,108,202,4,137,4,202,139,6,15,182,204, - 15,182,232,131,198,4,193,232,16,252,255,36,171,255,49,252,237,129,124,253, - 194,4,239,129,213,239,137,108,202,4,139,6,15,182,204,15,182,232,131,198,4, - 193,232,16,252,255,36,171,255,129,124,253,194,4,239,15,135,244,48,255,252, - 242,15,16,4,194,184,0,0,0,128,102,15,110,200,102,15,112,201,81,15,87,193, - 252,242,15,17,4,202,255,221,4,194,217,224,221,28,202,255,129,124,253,194, - 4,239,15,133,244,248,139,4,194,255,15,87,192,252,242,15,42,128,233,248,1, - 252,242,15,17,4,202,255,219,128,233,248,1,221,28,202,255,139,6,15,182,204, - 15,182,232,131,198,4,193,232,16,252,255,36,171,248,2,129,124,253,194,4,239, - 15,133,244,50,139,12,194,137,213,232,251,1,18,255,252,242,15,42,192,137,252, - 234,255,137,4,36,137,252,234,219,4,36,255,15,182,78,252,253,252,233,244,1, - 255,15,182,252,236,15,182,192,255,129,124,253,252,234,4,239,15,135,244,46, - 255,252,242,15,16,4,252,234,252,242,15,88,4,199,255,221,4,252,234,220,4,199, - 255,129,124,253,252,234,4,239,15,135,244,47,255,252,242,15,16,4,199,252,242, - 15,88,4,252,234,255,221,4,199,220,4,252,234,255,129,124,253,252,234,4,239, - 15,135,244,49,129,124,253,194,4,239,15,135,244,49,255,252,242,15,16,4,252, - 234,252,242,15,88,4,194,255,221,4,252,234,220,4,194,255,252,242,15,16,4,252, - 234,252,242,15,92,4,199,255,221,4,252,234,220,36,199,255,252,242,15,16,4, - 199,252,242,15,92,4,252,234,255,221,4,199,220,36,252,234,255,252,242,15,16, - 4,252,234,252,242,15,92,4,194,255,221,4,252,234,220,36,194,255,252,242,15, - 16,4,252,234,252,242,15,89,4,199,255,221,4,252,234,220,12,199,255,252,242, - 15,16,4,199,252,242,15,89,4,252,234,255,221,4,199,220,12,252,234,255,252, - 242,15,16,4,252,234,252,242,15,89,4,194,255,221,4,252,234,220,12,194,255, - 252,242,15,16,4,252,234,252,242,15,94,4,199,255,221,4,252,234,220,52,199, - 255,252,242,15,16,4,199,252,242,15,94,4,252,234,255,221,4,199,220,52,252, - 234,255,252,242,15,16,4,252,234,252,242,15,94,4,194,255,221,4,252,234,220, - 52,194,255,252,242,15,16,4,252,234,252,242,15,16,12,199,255,221,4,252,234, - 221,4,199,255,252,242,15,16,4,199,252,242,15,16,12,252,234,255,221,4,199, - 221,4,252,234,255,252,242,15,16,4,252,234,252,242,15,16,12,194,255,221,4, - 252,234,221,4,194,255,248,156,232,244,148,255,252,233,244,156,255,232,244, - 107,255,15,182,252,236,15,182,192,141,12,194,41,232,137,76,36,4,137,68,36, - 8,248,33,139,108,36,48,137,44,36,137,149,233,137,116,36,24,232,251,1,25,139, - 149,233,133,192,15,133,244,42,15,182,110,252,255,15,182,78,252,253,139,68, - 252,234,4,139,44,252,234,137,68,202,4,137,44,202,139,6,15,182,204,15,182, - 232,131,198,4,193,232,16,252,255,36,171,255,252,247,208,139,4,135,199,68, - 202,4,237,137,4,202,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, - 255,36,171,255,15,191,192,252,242,15,42,192,252,242,15,17,4,202,255,223,70, - 252,254,221,28,202,255,252,242,15,16,4,199,252,242,15,17,4,202,255,221,4, - 199,221,28,202,255,252,247,208,137,68,202,4,139,6,15,182,204,15,182,232,131, - 198,4,193,232,16,252,255,36,171,255,141,76,202,12,141,68,194,4,189,237,137, - 105,252,248,248,1,137,41,131,193,8,57,193,15,134,244,1,139,6,15,182,204,15, - 182,232,131,198,4,193,232,16,252,255,36,171,255,139,106,252,248,139,172,253, - 133,233,139,173,233,139,69,4,139,109,0,137,68,202,4,137,44,202,139,6,15,182, - 204,15,182,232,131,198,4,193,232,16,252,255,36,171,255,139,106,252,248,139, - 172,253,141,233,128,189,233,0,139,173,233,139,12,194,139,68,194,4,137,77, - 0,137,69,4,15,132,244,247,252,246,133,233,235,15,133,244,248,248,1,139,6, - 15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,2,129,232,239, - 129,252,248,239,15,134,244,1,252,246,129,233,235,15,132,244,1,135,213,141, - 139,233,255,232,251,1,26,137,252,234,252,233,244,1,255,252,247,208,139,106, - 252,248,139,172,253,141,233,139,12,135,139,133,233,137,8,199,64,4,237,252, - 246,133,233,235,15,133,244,248,248,1,139,6,15,182,204,15,182,232,131,198, - 4,193,232,16,252,255,36,171,248,2,252,246,129,233,235,15,132,244,1,128,189, - 233,0,15,132,244,1,137,213,137,194,141,139,233,232,251,1,26,137,252,234,252, - 233,244,1,255,139,106,252,248,255,252,242,15,16,4,199,255,139,172,253,141, - 233,139,141,233,255,252,242,15,17,1,255,221,25,255,252,247,208,139,106,252, - 248,139,172,253,141,233,139,141,233,137,65,4,139,6,15,182,204,15,182,232, - 131,198,4,193,232,16,252,255,36,171,255,141,180,253,134,233,139,108,36,48, - 131,189,233,0,15,132,244,247,137,149,233,141,20,202,137,252,233,232,251,1, - 27,139,149,233,248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, - 255,36,171,255,252,247,208,139,74,252,248,139,4,135,139,108,36,48,137,76, - 36,8,137,68,36,4,137,44,36,137,149,233,137,116,36,24,232,251,1,28,139,149, + 193,232,16,129,252,253,239,15,130,244,248,139,68,36,20,248,2,252,255,36,171, + 248,3,252,247,216,137,252,233,137,194,232,251,1,24,255,248,82,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,145, + 102,15,252,239,210,102,15,118,210,102,15,115,210,1,184,0,0,48,67,102,15,110, + 216,102,15,112,219,81,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,184,0,0,252, + 240,63,102,15,110,208,102,15,112,210,81,252,242,15,194,193,1,102,15,84,194, + 252,242,15,92,200,15,40,193,248,1,195,248,84,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,146,102,15,252,239, + 210,102,15,118,210,102,15,115,210,1,184,0,0,48,67,102,15,110,216,102,15,112, + 219,81,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,184,0,0,252,240,191,102, + 15,110,208,102,15,112,210,81,252,242,15,194,193,6,102,15,84,194,252,242,15, + 92,200,15,40,193,248,1,195,248,104,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,147,102,15,252,239,210,102,15,118,210,102,15,115,210, + 1,184,0,0,48,67,102,15,110,216,102,15,112,219,81,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,184,0,0,252,240,63,102,15,110,216,102,15,112,219,81,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,148,255,15,40,232,252,242,15,94,193,102,15,252,239,210,102,15,118, + 210,102,15,115,210,1,184,0,0,48,67,102,15,110,216,102,15,112,219,81,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,184,0,0,252,240,63,102,15,110,208,102, + 15,112,210,81,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,88,217,252,234,222,201, + 248,149,217,84,36,4,129,124,36,4,0,0,128,127,15,132,244,247,129,124,36,4, + 0,0,128,252,255,15,132,244,248,248,150,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,107,219,84,36,4,219,68,36,4,255,223,252,233,255,221, + 252,233,223,224,158,255,15,133,244,254,15,138,244,255,221,216,139,68,36,4, + 131,252,248,1,15,142,244,252,248,1,169,1,0,0,0,15,133,244,248,216,200,209, + 232,252,233,244,1,248,2,209,232,15,132,244,251,217,192,248,3,216,200,209, + 232,15,132,244,250,15,131,244,3,220,201,252,233,244,3,248,4,255,222,201,248, + 5,195,248,6,15,132,244,5,15,130,244,253,217,232,222,252,241,252,247,216,131, + 252,248,1,15,132,244,5,252,233,244,1,248,7,221,216,217,232,195,248,8,217, + 84,36,4,217,201,217,84,36,8,139,68,36,4,209,224,61,0,0,0,252,255,15,132,244, + 248,139,68,36,8,209,224,15,132,244,250,61,0,0,0,252,255,15,132,244,250,217, + 252,241,252,233,244,150,248,9,255,217,232,255,223,252,234,255,221,252,234, + 223,224,158,255,15,132,244,247,217,201,248,1,221,216,195,248,2,217,225,217, + 232,255,15,132,244,249,221,216,217,225,217,252,238,184,0,0,0,0,15,146,208, + 209,200,51,68,36,4,15,137,244,249,217,201,248,3,221,217,217,225,195,248,4, + 131,124,36,4,0,15,141,244,3,221,216,221,216,133,192,15,132,244,251,217,252, + 238,195,248,5,199,68,36,4,0,0,128,127,217,68,36,4,195,255,248,107,255,248, + 151,252,242,15,45,193,252,242,15,42,208,102,15,46,202,15,133,244,254,15,138, + 244,255,248,152,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,80,184,0,0,252,240,63,102,15,110,200,102,15,112, + 201,81,252,242,15,94,200,88,15,40,193,252,247,216,131,252,248,1,15,132,244, + 5,252,233,244,1,248,7,184,0,0,252,240,63,102,15,110,192,102,15,112,192,81, + 195,248,8,252,242,15,17,76,36,12,252,242,15,17,68,36,4,131,124,36,12,0,15, + 133,244,247,139,68,36,16,209,224,61,0,0,224,252,255,15,132,244,248,248,1, + 255,131,124,36,4,0,15,133,244,247,139,68,36,8,209,224,15,132,244,250,61,0, + 0,224,252,255,15,132,244,251,248,1,221,68,36,12,221,68,36,4,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,4,252,242,15,16,68,36,4,195,248,9,184,0,0,252,240,63,102, + 15,110,208,102,15,112,210,81,102,15,46,194,15,132,244,247,15,40,193,248,1, + 195,248,2,102,15,252,239,210,102,15,118,210,102,15,115,210,1,102,15,84,194, + 184,0,0,252,240,63,102,15,110,208,102,15,112,210,81,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,184,0,0,252,240,127,102,15,110,192,102,15,112,192,81,195,248,4,102,15,80, + 193,133,192,15,133,244,3,255,15,87,192,195,248,5,102,15,80,193,133,192,15, + 132,244,3,15,87,192,195,248,153,255,139,68,36,12,252,242,15,16,68,36,4,131, + 252,248,1,15,132,244,247,15,135,244,248,232,244,82,252,233,244,253,248,1, + 232,244,84,252,233,244,253,248,2,131,252,248,3,15,132,244,247,15,135,244, + 248,232,244,104,255,252,233,244,253,248,1,252,242,15,81,192,248,7,252,242, + 15,17,68,36,4,221,68,36,4,195,248,2,221,68,36,4,131,252,248,5,15,130,244, + 88,15,132,244,149,248,2,131,252,248,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,248,9,15,132,244,247,15,135,244,248,255,217,252,236,217,201,217,252,241, + 195,248,1,217,252,254,195,248,2,131,252,248,11,15,132,244,247,15,135,244, + 255,217,252,255,195,248,1,217,252,242,221,216,195,255,139,68,36,12,221,68, + 36,4,131,252,248,1,15,130,244,82,15,132,244,84,131,252,248,3,15,130,244,104, + 15,135,244,248,217,252,250,195,248,2,131,252,248,5,15,130,244,88,15,132,244, + 149,131,252,248,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,248,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,248,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,248,154,255,139,68,36,20, + 252,242,15,16,68,36,4,252,242,15,16,76,36,12,131,252,248,1,15,132,244,247, + 15,135,244,248,252,242,15,88,193,248,7,252,242,15,17,68,36,4,221,68,36,4, + 195,248,1,252,242,15,92,193,252,233,244,7,248,2,131,252,248,3,15,132,244, + 247,15,135,244,248,252,242,15,89,193,252,233,244,7,248,1,252,242,15,94,193, + 252,233,244,7,248,2,131,252,248,5,15,132,244,247,255,15,135,244,248,232,244, + 148,252,233,244,7,248,1,90,232,244,107,82,252,233,244,7,248,2,131,252,248, + 7,15,132,244,247,15,135,244,248,184,0,0,0,128,102,15,110,200,102,15,112,201, + 81,15,87,193,252,233,244,7,248,1,102,15,252,239,201,102,15,118,201,102,15, + 115,209,1,15,84,193,252,233,244,7,248,2,255,131,252,248,9,15,135,244,248, + 221,68,36,4,221,68,36,12,15,132,244,247,217,252,243,195,248,1,217,201,217, + 252,253,221,217,195,248,2,131,252,248,11,15,132,244,247,15,135,244,255,252, + 242,15,93,193,252,233,244,7,248,1,252,242,15,95,193,252,233,244,7,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,148,15,132,244,107,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,221, + 217,195,248,2,131,252,248,11,15,132,244,247,15,135,244,255,255,219,252,233, + 219,209,221,217,195,248,1,219,252,233,218,209,221,217,195,255,221,225,223, + 224,252,246,196,1,15,132,244,248,217,201,248,2,221,216,195,248,1,221,225, + 223,224,252,246,196,1,15,133,244,248,217,201,248,2,221,216,195,255,248,155, + 156,90,137,209,129,252,242,0,0,32,0,82,157,156,90,49,192,57,209,15,132,244, + 247,139,68,36,4,87,83,15,162,139,124,36,16,137,7,137,95,4,137,79,8,137,87, + 12,91,95,248,1,195,255,249,255,129,124,253,202,4,239,15,135,244,41,129,124, + 253,194,4,239,15,135,244,41,255,252,242,15,16,4,194,131,198,4,102,15,46,4, + 202,255,221,4,202,221,4,194,131,198,4,255,223,252,233,221,216,255,218,252, + 233,223,224,158,255,15,134,244,248,255,15,131,244,248,255,248,1,15,183,70, + 252,254,141,180,253,134,233,248,2,139,6,15,182,204,15,182,232,131,198,4,193, + 232,16,252,255,36,171,255,139,108,194,4,131,198,4,129,252,253,239,15,135, + 244,251,129,124,253,202,4,239,15,135,244,251,255,252,242,15,16,4,194,102, + 15,46,4,202,255,221,4,202,221,4,194,255,15,138,244,248,15,133,244,248,255, + 15,138,244,248,15,132,244,247,255,248,1,15,183,70,252,254,141,180,253,134, + 233,248,2,255,248,2,15,183,70,252,254,141,180,253,134,233,248,1,255,248,5, + 57,108,202,4,15,133,244,2,129,252,253,239,15,131,244,1,139,12,202,139,4,194, + 57,193,15,132,244,1,129,252,253,239,15,135,244,2,139,169,233,133,252,237, + 15,132,244,2,252,246,133,233,235,15,133,244,2,255,49,252,237,255,189,1,0, + 0,0,255,252,233,244,45,255,252,247,208,131,198,4,129,124,253,202,4,239,15, + 133,244,248,139,12,202,59,12,135,255,131,198,4,129,124,253,202,4,239,15,135, + 244,248,255,252,242,15,16,4,199,102,15,46,4,202,255,221,4,202,221,4,199,255, + 252,247,208,131,198,4,57,68,202,4,255,139,108,194,4,131,198,4,129,252,253, + 239,255,15,131,244,247,255,15,130,244,247,255,137,108,202,4,139,44,194,137, + 44,202,255,15,183,70,252,254,141,180,253,134,233,248,1,139,6,15,182,204,15, + 182,232,131,198,4,193,232,16,252,255,36,171,255,139,108,194,4,139,4,194,137, + 108,202,4,137,4,202,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, + 255,36,171,255,49,252,237,129,124,253,194,4,239,129,213,239,137,108,202,4, + 139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,255,129,124, + 253,194,4,239,15,135,244,48,255,252,242,15,16,4,194,184,0,0,0,128,102,15, + 110,200,102,15,112,201,81,15,87,193,252,242,15,17,4,202,255,221,4,194,217, + 224,221,28,202,255,129,124,253,194,4,239,15,133,244,248,139,4,194,255,15, + 87,192,252,242,15,42,128,233,248,1,252,242,15,17,4,202,255,219,128,233,248, + 1,221,28,202,255,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255, + 36,171,248,2,129,124,253,194,4,239,15,133,244,50,139,12,194,137,213,232,251, + 1,18,255,252,242,15,42,192,137,252,234,255,137,4,36,137,252,234,219,4,36, + 255,15,182,78,252,253,252,233,244,1,255,15,182,252,236,15,182,192,255,129, + 124,253,252,234,4,239,15,135,244,46,255,252,242,15,16,4,252,234,252,242,15, + 88,4,199,255,221,4,252,234,220,4,199,255,129,124,253,252,234,4,239,15,135, + 244,47,255,252,242,15,16,4,199,252,242,15,88,4,252,234,255,221,4,199,220, + 4,252,234,255,129,124,253,252,234,4,239,15,135,244,49,129,124,253,194,4,239, + 15,135,244,49,255,252,242,15,16,4,252,234,252,242,15,88,4,194,255,221,4,252, + 234,220,4,194,255,252,242,15,16,4,252,234,252,242,15,92,4,199,255,221,4,252, + 234,220,36,199,255,252,242,15,16,4,199,252,242,15,92,4,252,234,255,221,4, + 199,220,36,252,234,255,252,242,15,16,4,252,234,252,242,15,92,4,194,255,221, + 4,252,234,220,36,194,255,252,242,15,16,4,252,234,252,242,15,89,4,199,255, + 221,4,252,234,220,12,199,255,252,242,15,16,4,199,252,242,15,89,4,252,234, + 255,221,4,199,220,12,252,234,255,252,242,15,16,4,252,234,252,242,15,89,4, + 194,255,221,4,252,234,220,12,194,255,252,242,15,16,4,252,234,252,242,15,94, + 4,199,255,221,4,252,234,220,52,199,255,252,242,15,16,4,199,252,242,15,94, + 4,252,234,255,221,4,199,220,52,252,234,255,252,242,15,16,4,252,234,252,242, + 15,94,4,194,255,221,4,252,234,220,52,194,255,252,242,15,16,4,252,234,252, + 242,15,16,12,199,255,221,4,252,234,221,4,199,255,252,242,15,16,4,199,252, + 242,15,16,12,252,234,255,221,4,199,221,4,252,234,255,252,242,15,16,4,252, + 234,252,242,15,16,12,194,255,221,4,252,234,221,4,194,255,248,156,232,244, + 148,255,252,233,244,156,255,232,244,107,255,15,182,252,236,15,182,192,141, + 12,194,41,232,137,76,36,4,137,68,36,8,248,33,139,108,36,48,137,44,36,137, + 149,233,137,116,36,24,232,251,1,25,139,149,233,133,192,15,133,244,42,15,182, + 110,252,255,15,182,78,252,253,139,68,252,234,4,139,44,252,234,137,68,202, + 4,137,44,202,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36, + 171,255,252,247,208,139,4,135,199,68,202,4,237,137,4,202,139,6,15,182,204, + 15,182,232,131,198,4,193,232,16,252,255,36,171,255,15,191,192,252,242,15, + 42,192,252,242,15,17,4,202,255,223,70,252,254,221,28,202,255,252,242,15,16, + 4,199,252,242,15,17,4,202,255,221,4,199,221,28,202,255,252,247,208,137,68, + 202,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,255, + 141,76,202,12,141,68,194,4,189,237,137,105,252,248,248,1,137,41,131,193,8, + 57,193,15,134,244,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, + 255,36,171,255,139,106,252,248,139,172,253,133,233,139,173,233,139,69,4,139, + 109,0,137,68,202,4,137,44,202,139,6,15,182,204,15,182,232,131,198,4,193,232, + 16,252,255,36,171,255,139,106,252,248,139,172,253,141,233,128,189,233,0,139, + 173,233,139,12,194,139,68,194,4,137,77,0,137,69,4,15,132,244,247,252,246, + 133,233,235,15,133,244,248,248,1,139,6,15,182,204,15,182,232,131,198,4,193, + 232,16,252,255,36,171,248,2,129,232,239,129,252,248,239,15,134,244,1,252, + 246,129,233,235,15,132,244,1,135,213,141,139,233,255,232,251,1,26,137,252, + 234,252,233,244,1,255,252,247,208,139,106,252,248,139,172,253,141,233,139, + 12,135,139,133,233,137,8,199,64,4,237,252,246,133,233,235,15,133,244,248, + 248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248, + 2,252,246,129,233,235,15,132,244,1,128,189,233,0,15,132,244,1,137,213,137, + 194,141,139,233,232,251,1,26,137,252,234,252,233,244,1,255,139,106,252,248, + 255,252,242,15,16,4,199,255,139,172,253,141,233,139,141,233,255,252,242,15, + 17,1,255,221,25,255,252,247,208,139,106,252,248,139,172,253,141,233,139,141, + 233,137,65,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36, + 171,255,141,180,253,134,233,139,108,36,48,131,189,233,0,15,132,244,247,137, + 149,233,141,20,202,137,252,233,232,251,1,27,139,149,233,248,1,139,6,15,182, + 204,15,182,232,131,198,4,193,232,16,252,255,36,171,255,252,247,208,139,74, + 252,248,139,4,135,139,108,36,48,137,76,36,8,137,68,36,4,137,44,36,137,149, + 233,137,116,36,24,232,251,1,28,139,149,233,15,182,78,252,253,137,4,202,199, + 68,202,4,237,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36, + 171,255,137,197,37,252,255,7,0,0,193,252,237,11,61,252,255,7,0,0,15,132,244, + 249,248,2,137,108,36,8,139,108,36,48,137,68,36,4,137,116,36,24,139,131,233, + 137,44,36,59,131,233,137,149,233,15,131,244,251,248,1,232,251,1,29,139,149, 233,15,182,78,252,253,137,4,202,199,68,202,4,237,139,6,15,182,204,15,182, - 232,131,198,4,193,232,16,252,255,36,171,255,137,197,37,252,255,7,0,0,193, - 252,237,11,61,252,255,7,0,0,15,132,244,249,248,2,137,108,36,8,139,108,36, - 48,137,68,36,4,137,116,36,24,139,131,233,137,44,36,59,131,233,137,149,233, - 15,131,244,251,248,1,232,251,1,29,139,149,233,15,182,78,252,253,137,4,202, - 199,68,202,4,237,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255, - 36,171,248,3,184,1,8,0,0,252,233,244,2,248,5,137,252,233,232,251,1,30,252, - 233,244,1,255,252,247,208,139,108,36,48,139,139,233,137,116,36,24,59,139, - 233,137,149,233,15,131,244,249,248,2,139,20,135,137,252,233,232,251,1,31, - 139,149,233,15,182,78,252,253,137,4,202,199,68,202,4,237,139,6,15,182,204, - 15,182,232,131,198,4,193,232,16,252,255,36,171,248,3,137,252,233,232,251, - 1,30,15,183,70,252,254,252,247,208,252,233,244,2,255,252,247,208,139,106, - 252,248,139,173,233,139,4,135,252,233,244,157,255,252,247,208,139,106,252, - 248,139,173,233,139,4,135,252,233,244,158,255,15,182,252,236,15,182,192,129, - 124,253,252,234,4,239,15,133,244,36,139,44,252,234,129,124,253,194,4,239, - 15,135,244,251,255,252,242,15,16,4,194,252,242,15,45,192,252,242,15,42,200, - 102,15,46,193,255,221,4,194,219,20,36,219,4,36,255,15,133,244,36,59,133,233, - 15,131,244,36,193,224,3,3,133,233,129,120,253,4,239,15,132,244,248,248,1, - 139,40,139,64,4,137,44,202,137,68,202,4,139,6,15,182,204,15,182,232,131,198, - 4,193,232,16,252,255,36,171,248,2,131,189,233,0,15,132,244,1,139,141,233, - 252,246,129,233,235,15,132,244,36,15,182,78,252,253,252,233,244,1,248,5,255, - 129,124,253,194,4,239,15,133,244,36,139,4,194,252,233,244,157,255,15,182, - 252,236,15,182,192,252,247,208,139,4,135,129,124,253,252,234,4,239,15,133, - 244,34,139,44,252,234,248,157,139,141,233,35,136,233,105,201,239,3,141,233, - 248,1,129,185,233,239,15,133,244,250,57,129,233,15,133,244,250,129,121,253, - 4,239,15,132,244,251,15,182,70,252,253,139,41,139,73,4,137,44,194,248,2,255, - 137,76,194,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36, - 171,248,3,15,182,70,252,253,185,237,252,233,244,2,248,4,139,137,233,133,201, - 15,133,244,1,248,5,139,141,233,133,201,15,132,244,3,252,246,129,233,235,15, - 133,244,3,252,233,244,34,255,15,182,252,236,15,182,192,129,124,253,252,234, - 4,239,15,133,244,35,139,44,252,234,59,133,233,15,131,244,35,193,224,3,3,133, - 233,129,120,253,4,239,15,132,244,248,248,1,139,40,139,64,4,137,44,202,137, - 68,202,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171, - 248,2,131,189,233,0,15,132,244,1,139,141,233,252,246,129,233,235,15,132,244, - 35,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,39, - 139,44,252,234,129,124,253,194,4,239,15,135,244,251,255,15,133,244,39,59, - 133,233,15,131,244,39,193,224,3,3,133,233,129,120,253,4,239,15,132,244,249, - 248,1,252,246,133,233,235,15,133,244,253,248,2,139,108,202,4,139,12,202,137, - 104,4,137,8,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171, - 248,3,131,189,233,0,15,132,244,1,139,141,233,255,252,246,129,233,235,15,132, - 244,39,15,182,78,252,253,252,233,244,1,248,5,129,124,253,194,4,239,15,133, - 244,39,139,4,194,252,233,244,158,248,7,128,165,233,235,139,139,233,137,171, - 233,137,141,233,15,182,78,252,253,252,233,244,2,255,15,182,252,236,15,182, - 192,252,247,208,139,4,135,129,124,253,252,234,4,239,15,133,244,37,139,44, - 252,234,248,158,139,141,233,35,136,233,105,201,239,198,133,233,0,3,141,233, - 248,1,129,185,233,239,15,133,244,251,57,129,233,15,133,244,251,129,121,253, - 4,239,15,132,244,250,248,2,255,252,246,133,233,235,15,133,244,253,248,3,15, - 182,70,252,253,139,108,194,4,139,4,194,137,105,4,137,1,139,6,15,182,204,15, - 182,232,131,198,4,193,232,16,252,255,36,171,248,4,131,189,233,0,15,132,244, - 2,137,76,36,16,139,141,233,252,246,129,233,235,15,132,244,37,139,76,36,16, - 252,233,244,2,248,5,139,137,233,133,201,15,133,244,1,255,139,141,233,133, - 201,15,132,244,252,252,246,129,233,235,15,132,244,37,248,6,137,68,36,16,199, - 68,36,20,237,137,108,36,12,141,68,36,16,137,108,36,4,139,108,36,48,137,68, - 36,8,137,44,36,137,149,233,137,116,36,24,232,251,1,32,139,149,233,139,108, - 36,12,137,193,252,233,244,2,248,7,128,165,233,235,139,131,233,137,171,233, - 137,133,233,252,233,244,3,255,15,182,252,236,15,182,192,129,124,253,252,234, - 4,239,15,133,244,38,139,44,252,234,59,133,233,15,131,244,38,193,224,3,3,133, + 232,131,198,4,193,232,16,252,255,36,171,248,3,184,1,8,0,0,252,233,244,2,248, + 5,137,252,233,232,251,1,30,252,233,244,1,255,252,247,208,139,108,36,48,139, + 139,233,137,116,36,24,59,139,233,137,149,233,15,131,244,249,248,2,139,20, + 135,137,252,233,232,251,1,31,139,149,233,15,182,78,252,253,137,4,202,199, + 68,202,4,237,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36, + 171,248,3,137,252,233,232,251,1,30,15,183,70,252,254,252,247,208,252,233, + 244,2,255,252,247,208,139,106,252,248,139,173,233,139,4,135,252,233,244,157, + 255,252,247,208,139,106,252,248,139,173,233,139,4,135,252,233,244,158,255, + 15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,36,139,44, + 252,234,129,124,253,194,4,239,15,135,244,251,255,252,242,15,16,4,194,252, + 242,15,45,192,252,242,15,42,200,102,15,46,193,255,221,4,194,219,20,36,219, + 4,36,255,15,133,244,36,59,133,233,15,131,244,36,193,224,3,3,133,233,129,120, + 253,4,239,15,132,244,248,248,1,139,40,139,64,4,137,44,202,137,68,202,4,139, + 6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,2,131,189, + 233,0,15,132,244,1,139,141,233,252,246,129,233,235,15,132,244,36,15,182,78, + 252,253,252,233,244,1,248,5,255,129,124,253,194,4,239,15,133,244,36,139,4, + 194,252,233,244,157,255,15,182,252,236,15,182,192,252,247,208,139,4,135,129, + 124,253,252,234,4,239,15,133,244,34,139,44,252,234,248,157,139,141,233,35, + 136,233,105,201,239,3,141,233,248,1,129,185,233,239,15,133,244,250,57,129, + 233,15,133,244,250,129,121,253,4,239,15,132,244,251,15,182,70,252,253,139, + 41,139,73,4,137,44,194,248,2,255,137,76,194,4,139,6,15,182,204,15,182,232, + 131,198,4,193,232,16,252,255,36,171,248,3,15,182,70,252,253,185,237,252,233, + 244,2,248,4,139,137,233,133,201,15,133,244,1,248,5,139,141,233,133,201,15, + 132,244,3,252,246,129,233,235,15,133,244,3,252,233,244,34,255,15,182,252, + 236,15,182,192,129,124,253,252,234,4,239,15,133,244,35,139,44,252,234,59, + 133,233,15,131,244,35,193,224,3,3,133,233,129,120,253,4,239,15,132,244,248, + 248,1,139,40,139,64,4,137,44,202,137,68,202,4,139,6,15,182,204,15,182,232, + 131,198,4,193,232,16,252,255,36,171,248,2,131,189,233,0,15,132,244,1,139, + 141,233,252,246,129,233,235,15,132,244,35,255,15,182,252,236,15,182,192,129, + 124,253,252,234,4,239,15,133,244,39,139,44,252,234,129,124,253,194,4,239, + 15,135,244,251,255,15,133,244,39,59,133,233,15,131,244,39,193,224,3,3,133, 233,129,120,253,4,239,15,132,244,249,248,1,252,246,133,233,235,15,133,244, 253,248,2,139,108,202,4,139,12,202,137,104,4,137,8,139,6,15,182,204,15,182, 232,131,198,4,193,232,16,252,255,36,171,248,3,131,189,233,0,15,132,244,1, - 255,139,141,233,252,246,129,233,235,15,132,244,38,15,182,78,252,253,252,233, - 244,1,248,7,128,165,233,235,139,139,233,137,171,233,137,141,233,15,182,78, - 252,253,252,233,244,2,255,137,124,36,16,255,252,242,15,45,60,199,255,221, - 4,199,219,92,36,12,139,124,36,12,255,248,1,141,12,202,139,105,252,248,252, - 246,133,233,235,15,133,244,253,248,2,139,68,36,20,131,232,1,15,132,244,250, - 1,252,248,59,133,233,15,131,244,251,41,252,248,193,231,3,3,189,233,248,3, - 139,41,137,47,139,105,4,131,193,8,137,111,4,131,199,8,131,232,1,15,133,244, - 3,248,4,139,124,36,16,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, - 255,36,171,248,5,137,108,36,4,139,108,36,48,137,149,233,137,68,36,8,137,44, - 36,137,116,36,24,232,251,1,33,139,149,233,15,182,78,252,253,252,233,244,1, - 248,7,255,128,165,233,235,139,131,233,137,171,233,137,133,233,252,233,244, - 2,255,3,68,36,20,255,129,124,253,202,4,239,139,44,202,15,133,244,51,141,84, - 202,8,137,114,252,252,139,181,233,139,14,15,182,252,233,15,182,205,131,198, - 4,252,255,36,171,255,141,76,202,8,137,215,139,105,252,248,129,121,253,252, - 252,239,15,133,244,28,248,52,139,114,252,252,252,247,198,237,15,133,244,253, - 248,1,137,106,252,248,137,68,36,20,131,232,1,15,132,244,249,248,2,139,41, - 137,47,139,105,4,137,111,4,131,199,8,131,193,8,131,232,1,15,133,244,2,139, - 106,252,248,248,3,139,68,36,20,128,189,233,1,15,135,244,251,248,4,139,181, - 233,139,14,15,182,252,233,15,182,205,131,198,4,252,255,36,171,248,5,255,252, - 247,198,237,15,133,244,4,15,182,78,252,253,252,247,209,141,12,202,139,121, - 252,248,139,191,233,139,191,233,252,233,244,4,248,7,15,139,244,1,131,230, - 252,248,41,252,242,137,215,139,114,252,252,252,233,244,1,255,141,76,202,8, - 139,105,232,139,65,252,236,137,41,137,65,4,139,105,252,240,139,65,252,244, - 137,105,8,137,65,12,139,105,224,139,65,228,137,105,252,248,137,65,252,252, - 129,252,248,239,184,237,15,133,244,28,137,202,137,114,252,252,139,181,233, - 139,14,15,182,252,233,15,182,205,131,198,4,252,255,36,171,255,15,182,252, - 236,139,66,252,248,141,12,202,139,128,233,15,182,128,233,137,124,36,16,141, - 188,253,194,233,43,122,252,252,133,252,237,15,132,244,251,141,108,252,233, - 252,248,57,215,15,131,244,248,248,1,139,71,252,248,137,1,139,71,252,252,131, - 199,8,137,65,4,131,193,8,57,252,233,15,131,244,249,57,215,15,130,244,1,248, - 2,199,65,4,237,131,193,8,57,252,233,15,130,244,2,248,3,139,124,36,16,139, - 6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,5,199,68, - 36,20,1,0,0,0,137,208,41,252,248,15,134,244,3,255,137,197,193,252,237,3,131, - 197,1,137,108,36,20,139,108,36,48,1,200,59,133,233,15,135,244,253,248,6,139, - 71,252,248,137,1,139,71,252,252,131,199,8,137,65,4,131,193,8,57,215,15,130, - 244,6,252,233,244,3,248,7,137,149,233,137,141,233,137,116,36,24,41,215,139, - 84,36,20,131,252,234,1,137,252,233,232,251,1,0,139,149,233,139,141,233,1, - 215,252,233,244,6,255,193,225,3,255,248,1,139,114,252,252,137,68,36,20,252, - 247,198,237,15,133,244,253,255,248,13,137,215,131,232,1,15,132,244,249,248, - 2,139,44,15,137,111,252,248,139,108,15,4,137,111,252,252,131,199,8,131,232, - 1,15,133,244,2,248,3,139,68,36,20,15,182,110,252,255,248,5,57,197,15,135, - 244,252,255,139,108,10,4,137,106,252,252,139,44,10,137,106,252,248,255,248, - 5,56,70,252,255,15,135,244,252,255,15,182,78,252,253,252,247,209,141,20,202, - 139,122,252,248,139,191,233,139,191,233,139,6,15,182,204,15,182,232,131,198, - 4,193,232,16,252,255,36,171,248,6,255,199,71,252,252,237,131,199,8,255,199, - 68,194,252,244,237,255,131,192,1,252,233,244,5,248,7,15,139,244,14,131,230, - 252,248,41,252,242,255,1,252,241,255,137,252,245,209,252,237,129,229,239, - 102,131,172,253,43,233,1,15,132,244,140,255,141,12,202,255,129,121,253,4, - 239,15,135,244,53,129,121,253,12,239,15,135,244,53,255,139,105,20,255,129, - 252,253,239,15,135,244,53,255,252,242,15,16,1,252,242,15,16,73,8,255,252, - 242,15,88,65,16,252,242,15,17,1,133,252,237,15,136,244,249,255,15,140,244, - 249,255,102,15,46,200,248,1,252,242,15,17,65,24,255,221,65,8,221,1,255,220, - 65,16,221,17,221,81,24,133,252,237,15,136,244,247,255,221,81,24,15,140,244, - 247,255,217,201,248,1,255,15,183,70,252,254,255,15,131,244,248,141,180,253, - 134,233,255,141,180,253,134,233,15,183,70,252,254,15,131,245,255,15,130,244, - 248,141,180,253,134,233,255,248,3,102,15,46,193,252,233,244,1,255,141,12, - 202,139,105,4,129,252,253,239,15,132,244,247,255,137,105,252,252,139,41,137, - 105,252,248,252,233,245,255,141,180,253,134,233,139,1,137,105,252,252,137, - 65,252,248,255,139,139,233,139,4,129,139,128,233,139,108,36,48,137,147,233, - 137,171,233,252,255,224,255,141,180,253,134,233,139,6,15,182,204,15,182,232, - 131,198,4,193,232,16,252,255,36,171,255,137,252,245,209,252,237,129,229,239, - 102,131,172,253,43,233,1,15,132,244,142,255,139,190,233,139,108,36,48,141, - 12,202,59,141,233,15,135,244,23,15,182,142,233,57,200,15,134,244,249,248, - 2,255,15,183,70,252,254,252,233,245,255,248,3,199,68,194,252,252,237,131, - 192,1,57,200,15,134,244,3,252,233,244,2,255,141,44,197,237,141,4,194,139, - 122,252,248,137,104,252,252,137,120,252,248,139,108,36,48,141,12,200,59,141, - 233,15,135,244,22,137,209,137,194,15,182,174,233,133,252,237,15,132,244,248, - 248,1,131,193,8,57,209,15,131,244,249,139,121,252,248,137,56,139,121,252, - 252,137,120,4,131,192,8,199,65,252,252,237,131,252,237,1,15,133,244,1,248, - 2,255,139,190,233,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255, - 36,171,255,248,3,199,64,4,237,131,192,8,131,252,237,1,15,133,244,3,252,233, - 244,2,255,139,106,252,248,139,189,233,139,108,36,48,141,68,194,252,248,137, - 149,233,141,136,233,59,141,233,137,133,233,255,137,44,36,255,137,124,36,4, - 137,44,36,255,15,135,244,21,199,131,233,237,255,252,255,215,255,252,255,147, - 233,255,199,131,233,237,139,149,233,141,12,194,252,247,217,3,141,233,139, - 114,252,252,252,233,244,12,255,254,0 + 139,141,233,255,252,246,129,233,235,15,132,244,39,15,182,78,252,253,252,233, + 244,1,248,5,129,124,253,194,4,239,15,133,244,39,139,4,194,252,233,244,158, + 248,7,128,165,233,235,139,139,233,137,171,233,137,141,233,15,182,78,252,253, + 252,233,244,2,255,15,182,252,236,15,182,192,252,247,208,139,4,135,129,124, + 253,252,234,4,239,15,133,244,37,139,44,252,234,248,158,139,141,233,35,136, + 233,105,201,239,198,133,233,0,3,141,233,248,1,129,185,233,239,15,133,244, + 251,57,129,233,15,133,244,251,129,121,253,4,239,15,132,244,250,248,2,255, + 252,246,133,233,235,15,133,244,253,248,3,15,182,70,252,253,139,108,194,4, + 139,4,194,137,105,4,137,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16, + 252,255,36,171,248,4,131,189,233,0,15,132,244,2,137,76,36,16,139,141,233, + 252,246,129,233,235,15,132,244,37,139,76,36,16,252,233,244,2,248,5,139,137, + 233,133,201,15,133,244,1,255,139,141,233,133,201,15,132,244,252,252,246,129, + 233,235,15,132,244,37,248,6,137,68,36,16,199,68,36,20,237,137,108,36,12,141, + 68,36,16,137,108,36,4,139,108,36,48,137,68,36,8,137,44,36,137,149,233,137, + 116,36,24,232,251,1,32,139,149,233,139,108,36,12,137,193,252,233,244,2,248, + 7,128,165,233,235,139,131,233,137,171,233,137,133,233,252,233,244,3,255,15, + 182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,38,139,44,252, + 234,59,133,233,15,131,244,38,193,224,3,3,133,233,129,120,253,4,239,15,132, + 244,249,248,1,252,246,133,233,235,15,133,244,253,248,2,139,108,202,4,139, + 12,202,137,104,4,137,8,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, + 255,36,171,248,3,131,189,233,0,15,132,244,1,255,139,141,233,252,246,129,233, + 235,15,132,244,38,15,182,78,252,253,252,233,244,1,248,7,128,165,233,235,139, + 139,233,137,171,233,137,141,233,15,182,78,252,253,252,233,244,2,255,137,124, + 36,16,255,252,242,15,45,60,199,255,221,4,199,219,92,36,12,139,124,36,12,255, + 248,1,141,12,202,139,105,252,248,252,246,133,233,235,15,133,244,253,248,2, + 139,68,36,20,131,232,1,15,132,244,250,1,252,248,59,133,233,15,131,244,251, + 41,252,248,193,231,3,3,189,233,248,3,139,41,137,47,139,105,4,131,193,8,137, + 111,4,131,199,8,131,232,1,15,133,244,3,248,4,139,124,36,16,139,6,15,182,204, + 15,182,232,131,198,4,193,232,16,252,255,36,171,248,5,137,108,36,4,139,108, + 36,48,137,149,233,137,68,36,8,137,44,36,137,116,36,24,232,251,1,33,139,149, + 233,15,182,78,252,253,252,233,244,1,248,7,255,128,165,233,235,139,131,233, + 137,171,233,137,133,233,252,233,244,2,255,3,68,36,20,255,129,124,253,202, + 4,239,139,44,202,15,133,244,51,141,84,202,8,137,114,252,252,139,181,233,139, + 14,15,182,252,233,15,182,205,131,198,4,252,255,36,171,255,141,76,202,8,137, + 215,139,105,252,248,129,121,253,252,252,239,15,133,244,28,248,52,139,114, + 252,252,252,247,198,237,15,133,244,253,248,1,137,106,252,248,137,68,36,20, + 131,232,1,15,132,244,249,248,2,139,41,137,47,139,105,4,137,111,4,131,199, + 8,131,193,8,131,232,1,15,133,244,2,139,106,252,248,248,3,139,68,36,20,128, + 189,233,1,15,135,244,251,248,4,139,181,233,139,14,15,182,252,233,15,182,205, + 131,198,4,252,255,36,171,248,5,255,252,247,198,237,15,133,244,4,15,182,78, + 252,253,252,247,209,141,12,202,139,121,252,248,139,191,233,139,191,233,252, + 233,244,4,248,7,15,139,244,1,131,230,252,248,41,252,242,137,215,139,114,252, + 252,252,233,244,1,255,141,76,202,8,139,105,232,139,65,252,236,137,41,137, + 65,4,139,105,252,240,139,65,252,244,137,105,8,137,65,12,139,105,224,139,65, + 228,137,105,252,248,137,65,252,252,129,252,248,239,184,237,15,133,244,28, + 137,202,137,114,252,252,139,181,233,139,14,15,182,252,233,15,182,205,131, + 198,4,252,255,36,171,255,15,182,252,236,139,66,252,248,141,12,202,139,128, + 233,15,182,128,233,137,124,36,16,141,188,253,194,233,43,122,252,252,133,252, + 237,15,132,244,251,141,108,252,233,252,248,57,215,15,131,244,248,248,1,139, + 71,252,248,137,1,139,71,252,252,131,199,8,137,65,4,131,193,8,57,252,233,15, + 131,244,249,57,215,15,130,244,1,248,2,199,65,4,237,131,193,8,57,252,233,15, + 130,244,2,248,3,139,124,36,16,139,6,15,182,204,15,182,232,131,198,4,193,232, + 16,252,255,36,171,248,5,199,68,36,20,1,0,0,0,137,208,41,252,248,15,134,244, + 3,255,137,197,193,252,237,3,131,197,1,137,108,36,20,139,108,36,48,1,200,59, + 133,233,15,135,244,253,248,6,139,71,252,248,137,1,139,71,252,252,131,199, + 8,137,65,4,131,193,8,57,215,15,130,244,6,252,233,244,3,248,7,137,149,233, + 137,141,233,137,116,36,24,41,215,139,84,36,20,131,252,234,1,137,252,233,232, + 251,1,0,139,149,233,139,141,233,1,215,252,233,244,6,255,193,225,3,255,248, + 1,139,114,252,252,137,68,36,20,252,247,198,237,15,133,244,253,255,248,13, + 137,215,131,232,1,15,132,244,249,248,2,139,44,15,137,111,252,248,139,108, + 15,4,137,111,252,252,131,199,8,131,232,1,15,133,244,2,248,3,139,68,36,20, + 15,182,110,252,255,248,5,57,197,15,135,244,252,255,139,108,10,4,137,106,252, + 252,139,44,10,137,106,252,248,255,248,5,56,70,252,255,15,135,244,252,255, + 15,182,78,252,253,252,247,209,141,20,202,139,122,252,248,139,191,233,139, + 191,233,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248, + 6,255,199,71,252,252,237,131,199,8,255,199,68,194,252,244,237,255,131,192, + 1,252,233,244,5,248,7,15,139,244,14,131,230,252,248,41,252,242,255,1,252, + 241,255,137,252,245,209,252,237,129,229,239,102,131,172,253,43,233,1,15,132, + 244,140,255,141,12,202,255,129,121,253,4,239,15,135,244,53,129,121,253,12, + 239,15,135,244,53,255,139,105,20,255,129,252,253,239,15,135,244,53,255,252, + 242,15,16,1,252,242,15,16,73,8,255,252,242,15,88,65,16,252,242,15,17,1,133, + 252,237,15,136,244,249,255,15,140,244,249,255,102,15,46,200,248,1,252,242, + 15,17,65,24,255,221,65,8,221,1,255,220,65,16,221,17,221,81,24,133,252,237, + 15,136,244,247,255,221,81,24,15,140,244,247,255,217,201,248,1,255,15,183, + 70,252,254,255,15,131,244,248,141,180,253,134,233,255,141,180,253,134,233, + 15,183,70,252,254,15,131,245,255,15,130,244,248,141,180,253,134,233,255,248, + 3,102,15,46,193,252,233,244,1,255,141,12,202,139,105,4,129,252,253,239,15, + 132,244,247,255,137,105,252,252,139,41,137,105,252,248,252,233,245,255,141, + 180,253,134,233,139,1,137,105,252,252,137,65,252,248,255,139,139,233,139, + 4,129,139,128,233,139,108,36,48,137,147,233,137,171,233,252,255,224,255,141, + 180,253,134,233,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255, + 36,171,255,137,252,245,209,252,237,129,229,239,102,131,172,253,43,233,1,15, + 132,244,142,255,139,190,233,139,108,36,48,141,12,202,59,141,233,15,135,244, + 23,15,182,142,233,57,200,15,134,244,249,248,2,255,15,183,70,252,254,252,233, + 245,255,248,3,199,68,194,252,252,237,131,192,1,57,200,15,134,244,3,252,233, + 244,2,255,141,44,197,237,141,4,194,139,122,252,248,137,104,252,252,137,120, + 252,248,139,108,36,48,141,12,200,59,141,233,15,135,244,22,137,209,137,194, + 15,182,174,233,133,252,237,15,132,244,248,248,1,131,193,8,57,209,15,131,244, + 249,139,121,252,248,137,56,139,121,252,252,137,120,4,131,192,8,199,65,252, + 252,237,131,252,237,1,15,133,244,1,248,2,255,139,190,233,139,6,15,182,204, + 15,182,232,131,198,4,193,232,16,252,255,36,171,255,248,3,199,64,4,237,131, + 192,8,131,252,237,1,15,133,244,3,252,233,244,2,255,139,106,252,248,139,189, + 233,139,108,36,48,141,68,194,252,248,137,149,233,141,136,233,59,141,233,137, + 133,233,255,137,44,36,255,137,124,36,4,137,44,36,255,15,135,244,21,199,131, + 233,237,255,252,255,215,255,252,255,147,233,255,199,131,233,237,139,149,233, + 141,12,194,252,247,217,3,141,233,139,114,252,252,252,233,244,12,255,254,0 }; enum { @@ -1459,87 +1459,87 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse) #endif dasm_put(Dst, 8383); #if LJ_HASJIT - dasm_put(Dst, 8386, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP); + dasm_put(Dst, 8386, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, BC_FUNCF); #endif - dasm_put(Dst, 8450); + dasm_put(Dst, 8464); if (!sse) { - dasm_put(Dst, 8453); + dasm_put(Dst, 8467); } - dasm_put(Dst, 8498); + dasm_put(Dst, 8512); if (!sse) { - dasm_put(Dst, 8600); + dasm_put(Dst, 8614); } - dasm_put(Dst, 8645); + dasm_put(Dst, 8659); if (!sse) { - dasm_put(Dst, 8747); + dasm_put(Dst, 8761); } - dasm_put(Dst, 8786); + dasm_put(Dst, 8800); if (sse) { - dasm_put(Dst, 8891); + dasm_put(Dst, 8905); } else { - dasm_put(Dst, 9021); + dasm_put(Dst, 9035); } - dasm_put(Dst, 9068); + dasm_put(Dst, 9082); if (!sse) { - dasm_put(Dst, 9142); + dasm_put(Dst, 9156); if (cmov) { - dasm_put(Dst, 9153); + dasm_put(Dst, 9167); } else { - dasm_put(Dst, 9157); - } - dasm_put(Dst, 9164); - dasm_put(Dst, 9238); - dasm_put(Dst, 9338); - if (cmov) { - dasm_put(Dst, 9341); - } else { - dasm_put(Dst, 9345); + dasm_put(Dst, 9171); } + dasm_put(Dst, 9178); + dasm_put(Dst, 9252); dasm_put(Dst, 9352); if (cmov) { - dasm_put(Dst, 9153); + dasm_put(Dst, 9355); } else { - dasm_put(Dst, 9157); + dasm_put(Dst, 9359); } - dasm_put(Dst, 9370); + dasm_put(Dst, 9366); + if (cmov) { + dasm_put(Dst, 9167); } else { - dasm_put(Dst, 9449); + dasm_put(Dst, 9171); } - dasm_put(Dst, 9452); - dasm_put(Dst, 9537); - dasm_put(Dst, 9668); - dasm_put(Dst, 9867); + dasm_put(Dst, 9384); + } else { + dasm_put(Dst, 9463); + } + dasm_put(Dst, 9466); + dasm_put(Dst, 9551); + dasm_put(Dst, 9682); + dasm_put(Dst, 9881); if (sse) { - dasm_put(Dst, 9890); - dasm_put(Dst, 9947); - dasm_put(Dst, 10038); + dasm_put(Dst, 9904); + dasm_put(Dst, 9961); + dasm_put(Dst, 10052); } else { - dasm_put(Dst, 10080); - dasm_put(Dst, 10172); + dasm_put(Dst, 10094); + dasm_put(Dst, 10186); } - dasm_put(Dst, 10218); + dasm_put(Dst, 10232); if (sse) { - dasm_put(Dst, 10224); - dasm_put(Dst, 10329); - dasm_put(Dst, 10412); + dasm_put(Dst, 10238); + dasm_put(Dst, 10343); + dasm_put(Dst, 10426); } else { - dasm_put(Dst, 10484); - dasm_put(Dst, 10567); + dasm_put(Dst, 10498); + dasm_put(Dst, 10581); if (cmov) { - dasm_put(Dst, 10622); + dasm_put(Dst, 10636); } else { - dasm_put(Dst, 10641); + dasm_put(Dst, 10655); } - dasm_put(Dst, 10480); + dasm_put(Dst, 10494); } - dasm_put(Dst, 10682); + dasm_put(Dst, 10696); } /* 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, 10736, defop); + dasm_put(Dst, 10750, defop); switch (op) { @@ -1548,611 +1548,611 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) /* Remember: all ops branch for a true comparison, fall through otherwise. */ case BC_ISLT: case BC_ISGE: case BC_ISLE: case BC_ISGT: - dasm_put(Dst, 10738, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10752, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10759); + dasm_put(Dst, 10773); } else { - dasm_put(Dst, 10774); + dasm_put(Dst, 10788); if (cmov) { - dasm_put(Dst, 10784); + dasm_put(Dst, 10798); } else { - dasm_put(Dst, 10790); + dasm_put(Dst, 10804); } } switch (op) { case BC_ISLT: - dasm_put(Dst, 10797); + dasm_put(Dst, 10811); break; case BC_ISGE: - dasm_put(Dst, 10033); + dasm_put(Dst, 10047); break; case BC_ISLE: dasm_put(Dst, 6181); break; case BC_ISGT: - dasm_put(Dst, 10802); + dasm_put(Dst, 10816); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 10807, -BCBIAS_J*4); + dasm_put(Dst, 10821, -BCBIAS_J*4); break; case BC_ISEQV: case BC_ISNEV: vk = op == BC_ISEQV; - dasm_put(Dst, 10840, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10854, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10866); + dasm_put(Dst, 10880); } else { - dasm_put(Dst, 10878); + dasm_put(Dst, 10892); if (cmov) { - dasm_put(Dst, 10784); + dasm_put(Dst, 10798); } else { - dasm_put(Dst, 10790); + dasm_put(Dst, 10804); } } iseqne_fp: if (vk) { - dasm_put(Dst, 10885); + dasm_put(Dst, 10899); } else { - dasm_put(Dst, 10894); + dasm_put(Dst, 10908); } iseqne_end: if (vk) { - dasm_put(Dst, 10903, -BCBIAS_J*4); + dasm_put(Dst, 10917, -BCBIAS_J*4); } else { - dasm_put(Dst, 10918, -BCBIAS_J*4); + dasm_put(Dst, 10932, -BCBIAS_J*4); } - dasm_put(Dst, 10821); + dasm_put(Dst, 10835); if (op == BC_ISEQV || op == BC_ISNEV) { - dasm_put(Dst, 10933, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<metatable), Dt6(->nomm), 1<len)); + dasm_put(Dst, 11283, Dt5(->len)); } else { - dasm_put(Dst, 11287, Dt5(->len)); + dasm_put(Dst, 11301, Dt5(->len)); } - dasm_put(Dst, 11296, LJ_TTAB); + dasm_put(Dst, 11310, LJ_TTAB); if (sse) { - dasm_put(Dst, 11336); + dasm_put(Dst, 11350); } else { - dasm_put(Dst, 11345); + dasm_put(Dst, 11359); } - dasm_put(Dst, 11355); + dasm_put(Dst, 11369); break; /* -- Binary ops -------------------------------------------------------- */ case BC_ADDVN: case BC_ADDNV: case BC_ADDVV: - dasm_put(Dst, 11365); + dasm_put(Dst, 11379); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11373, LJ_TISNUM); + dasm_put(Dst, 11387, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11385); - } else { dasm_put(Dst, 11399); + } else { + dasm_put(Dst, 11413); } break; case 1: - dasm_put(Dst, 11407, LJ_TISNUM); + dasm_put(Dst, 11421, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11419); - } else { dasm_put(Dst, 11433); + } else { + dasm_put(Dst, 11447); } break; default: - dasm_put(Dst, 11441, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11455, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11463); - } else { dasm_put(Dst, 11477); + } else { + dasm_put(Dst, 11491); } break; } if (sse) { - dasm_put(Dst, 11239); + dasm_put(Dst, 11253); } else { - dasm_put(Dst, 11251); + dasm_put(Dst, 11265); } - dasm_put(Dst, 10821); + dasm_put(Dst, 10835); break; case BC_SUBVN: case BC_SUBNV: case BC_SUBVV: - dasm_put(Dst, 11365); + dasm_put(Dst, 11379); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11373, LJ_TISNUM); + dasm_put(Dst, 11387, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11485); - } else { dasm_put(Dst, 11499); + } else { + dasm_put(Dst, 11513); } break; case 1: - dasm_put(Dst, 11407, LJ_TISNUM); + dasm_put(Dst, 11421, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11507); - } else { dasm_put(Dst, 11521); + } else { + dasm_put(Dst, 11535); } break; default: - dasm_put(Dst, 11441, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11455, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11529); - } else { dasm_put(Dst, 11543); + } else { + dasm_put(Dst, 11557); } break; } if (sse) { - dasm_put(Dst, 11239); + dasm_put(Dst, 11253); } else { - dasm_put(Dst, 11251); + dasm_put(Dst, 11265); } - dasm_put(Dst, 10821); + dasm_put(Dst, 10835); break; case BC_MULVN: case BC_MULNV: case BC_MULVV: - dasm_put(Dst, 11365); + dasm_put(Dst, 11379); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11373, LJ_TISNUM); + dasm_put(Dst, 11387, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11551); - } else { dasm_put(Dst, 11565); + } else { + dasm_put(Dst, 11579); } break; case 1: - dasm_put(Dst, 11407, LJ_TISNUM); + dasm_put(Dst, 11421, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11573); - } else { dasm_put(Dst, 11587); + } else { + dasm_put(Dst, 11601); } break; default: - dasm_put(Dst, 11441, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11455, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11595); - } else { dasm_put(Dst, 11609); + } else { + dasm_put(Dst, 11623); } break; } if (sse) { - dasm_put(Dst, 11239); + dasm_put(Dst, 11253); } else { - dasm_put(Dst, 11251); + dasm_put(Dst, 11265); } - dasm_put(Dst, 10821); + dasm_put(Dst, 10835); break; case BC_DIVVN: case BC_DIVNV: case BC_DIVVV: - dasm_put(Dst, 11365); + dasm_put(Dst, 11379); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11373, LJ_TISNUM); + dasm_put(Dst, 11387, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11617); - } else { dasm_put(Dst, 11631); + } else { + dasm_put(Dst, 11645); } break; case 1: - dasm_put(Dst, 11407, LJ_TISNUM); + dasm_put(Dst, 11421, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11639); - } else { dasm_put(Dst, 11653); + } else { + dasm_put(Dst, 11667); } break; default: - dasm_put(Dst, 11441, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11455, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11661); - } else { dasm_put(Dst, 11675); + } else { + dasm_put(Dst, 11689); } break; } if (sse) { - dasm_put(Dst, 11239); + dasm_put(Dst, 11253); } else { - dasm_put(Dst, 11251); + dasm_put(Dst, 11265); } - dasm_put(Dst, 10821); + dasm_put(Dst, 10835); break; case BC_MODVN: - dasm_put(Dst, 11365); + dasm_put(Dst, 11379); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11373, LJ_TISNUM); + dasm_put(Dst, 11387, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11683); - } else { dasm_put(Dst, 11697); + } else { + dasm_put(Dst, 11711); } break; case 1: - dasm_put(Dst, 11407, LJ_TISNUM); + dasm_put(Dst, 11421, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11705); - } else { dasm_put(Dst, 11719); + } else { + dasm_put(Dst, 11733); } break; default: - dasm_put(Dst, 11441, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11455, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11727); - } else { dasm_put(Dst, 11741); + } else { + dasm_put(Dst, 11755); } break; } - dasm_put(Dst, 11749); + dasm_put(Dst, 11763); if (sse) { - dasm_put(Dst, 11239); + dasm_put(Dst, 11253); } else { - dasm_put(Dst, 11251); + dasm_put(Dst, 11265); } - dasm_put(Dst, 10821); + dasm_put(Dst, 10835); break; case BC_MODNV: case BC_MODVV: - dasm_put(Dst, 11365); + dasm_put(Dst, 11379); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11373, LJ_TISNUM); + dasm_put(Dst, 11387, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11683); - } else { dasm_put(Dst, 11697); + } else { + dasm_put(Dst, 11711); } break; case 1: - dasm_put(Dst, 11407, LJ_TISNUM); + dasm_put(Dst, 11421, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11705); - } else { dasm_put(Dst, 11719); + } else { + dasm_put(Dst, 11733); } break; default: - dasm_put(Dst, 11441, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11455, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11727); - } else { dasm_put(Dst, 11741); + } else { + dasm_put(Dst, 11755); } break; } - dasm_put(Dst, 11755); + dasm_put(Dst, 11769); break; case BC_POW: - dasm_put(Dst, 11365); + dasm_put(Dst, 11379); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11373, LJ_TISNUM); + dasm_put(Dst, 11387, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11683); - } else { dasm_put(Dst, 11697); + } else { + dasm_put(Dst, 11711); } break; case 1: - dasm_put(Dst, 11407, LJ_TISNUM); + dasm_put(Dst, 11421, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11705); - } else { dasm_put(Dst, 11719); + } else { + dasm_put(Dst, 11733); } break; default: - dasm_put(Dst, 11441, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11455, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11727); - } else { dasm_put(Dst, 11741); + } else { + dasm_put(Dst, 11755); } break; } - dasm_put(Dst, 11760); + dasm_put(Dst, 11774); if (sse) { - dasm_put(Dst, 11239); + dasm_put(Dst, 11253); } else { - dasm_put(Dst, 11251); + dasm_put(Dst, 11265); } - dasm_put(Dst, 10821); + dasm_put(Dst, 10835); break; case BC_CAT: - dasm_put(Dst, 11764, Dt1(->base), Dt1(->base)); + dasm_put(Dst, 11778, Dt1(->base), Dt1(->base)); break; /* -- Constant ops ------------------------------------------------------ */ case BC_KSTR: - dasm_put(Dst, 11858, LJ_TSTR); + dasm_put(Dst, 11872, LJ_TSTR); break; case BC_KSHORT: if (sse) { - dasm_put(Dst, 11891); + dasm_put(Dst, 11905); } else { - dasm_put(Dst, 11906); + dasm_put(Dst, 11920); } - dasm_put(Dst, 10821); + dasm_put(Dst, 10835); break; case BC_KNUM: if (sse) { - dasm_put(Dst, 11914); + dasm_put(Dst, 11928); } else { - dasm_put(Dst, 11927); + dasm_put(Dst, 11941); } - dasm_put(Dst, 10821); + dasm_put(Dst, 10835); break; case BC_KPRI: - dasm_put(Dst, 11934); + dasm_put(Dst, 11948); break; case BC_KNIL: - dasm_put(Dst, 11960, LJ_TNIL); + dasm_put(Dst, 11974, LJ_TNIL); break; /* -- Upvalue and function ops ------------------------------------------ */ case BC_UGET: - dasm_put(Dst, 12006, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12020, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_USETV: #define TV2MARKOFS \ ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv)) - dasm_put(Dst, 12050, 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, 12140); + dasm_put(Dst, 12064, 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, 12154); break; #undef TV2MARKOFS case BC_USETS: - dasm_put(Dst, 12152, 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, 12166, 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, 12243); + dasm_put(Dst, 12257); if (sse) { - dasm_put(Dst, 12248); + dasm_put(Dst, 12262); } else { - dasm_put(Dst, 11058); + dasm_put(Dst, 11072); } - dasm_put(Dst, 12255, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12269, offsetof(GCfuncL, uvptr), DtA(->v)); if (sse) { - dasm_put(Dst, 12264); + dasm_put(Dst, 12278); } else { - dasm_put(Dst, 12270); + dasm_put(Dst, 12284); } - dasm_put(Dst, 10821); + dasm_put(Dst, 10835); break; case BC_USETP: - dasm_put(Dst, 12273, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12287, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_UCLO: - dasm_put(Dst, 12310, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 12324, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); break; case BC_FNEW: - dasm_put(Dst, 12364, Dt1(->base), Dt1(->base), LJ_TFUNC); + dasm_put(Dst, 12378, Dt1(->base), Dt1(->base), LJ_TFUNC); break; /* -- Table ops --------------------------------------------------------- */ case BC_TNEW: - dasm_put(Dst, 12435, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 12449, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); break; case BC_TDUP: - dasm_put(Dst, 12556, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 12570, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); break; case BC_GGET: - dasm_put(Dst, 12648, Dt7(->env)); + dasm_put(Dst, 12662, Dt7(->env)); break; case BC_GSET: - dasm_put(Dst, 12666, Dt7(->env)); + dasm_put(Dst, 12680, Dt7(->env)); break; case BC_TGETV: - dasm_put(Dst, 12684, LJ_TTAB, LJ_TISNUM); + dasm_put(Dst, 12698, LJ_TTAB, LJ_TISNUM); if (sse) { - dasm_put(Dst, 12717); + dasm_put(Dst, 12731); } else { - dasm_put(Dst, 12738); + dasm_put(Dst, 12752); if (cmov) { - dasm_put(Dst, 10784); + dasm_put(Dst, 10798); } else { - dasm_put(Dst, 10790); + dasm_put(Dst, 10804); } dasm_put(Dst, 2524); } - dasm_put(Dst, 12748, 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, 12942, 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, 12956, 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)); - dasm_put(Dst, 13228, Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13159, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable)); + dasm_put(Dst, 13242, Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETS: - dasm_put(Dst, 13290, 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, 13365, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); - dasm_put(Dst, 13457, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13304, 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, 13379, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); + dasm_put(Dst, 13471, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETB: - dasm_put(Dst, 13553, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); - dasm_put(Dst, 13651, Dt6(->metatable), Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13567, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); + dasm_put(Dst, 13665, Dt6(->metatable), Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETM: - dasm_put(Dst, 13697); + dasm_put(Dst, 13711); if (sse) { - dasm_put(Dst, 13702); + dasm_put(Dst, 13716); } else { - dasm_put(Dst, 13709); + dasm_put(Dst, 13723); } - dasm_put(Dst, 13721, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); - dasm_put(Dst, 13863, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13735, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 13877, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; /* -- Calls and vararg handling ----------------------------------------- */ case BC_CALL: case BC_CALLM: - dasm_put(Dst, 11369); + dasm_put(Dst, 11383); if (op == BC_CALLM) { - dasm_put(Dst, 13881); + dasm_put(Dst, 13895); } - dasm_put(Dst, 13886, LJ_TFUNC, Dt7(->pc)); + dasm_put(Dst, 13900, LJ_TFUNC, Dt7(->pc)); break; case BC_CALLMT: - dasm_put(Dst, 13881); + dasm_put(Dst, 13895); break; case BC_CALLT: - dasm_put(Dst, 13927, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); - dasm_put(Dst, 14045, FRAME_TYPE, Dt7(->pc), PC2PROTO(k)); + dasm_put(Dst, 13941, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); + dasm_put(Dst, 14059, FRAME_TYPE, Dt7(->pc), PC2PROTO(k)); break; case BC_ITERC: - dasm_put(Dst, 14102, LJ_TFUNC, 2+1, Dt7(->pc)); + dasm_put(Dst, 14116, LJ_TFUNC, 2+1, Dt7(->pc)); break; case BC_VARG: - dasm_put(Dst, 14182, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL); - dasm_put(Dst, 14326, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 14196, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL); + dasm_put(Dst, 14340, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); break; /* -- Returns ----------------------------------------------------------- */ case BC_RETM: - dasm_put(Dst, 13881); + dasm_put(Dst, 13895); break; case BC_RET: case BC_RET0: case BC_RET1: if (op != BC_RET0) { - dasm_put(Dst, 14425); + dasm_put(Dst, 14439); } - dasm_put(Dst, 14429, FRAME_TYPE); + dasm_put(Dst, 14443, FRAME_TYPE); switch (op) { case BC_RET: - dasm_put(Dst, 14448); + dasm_put(Dst, 14462); break; case BC_RET1: - dasm_put(Dst, 14506); + dasm_put(Dst, 14520); /* fallthrough */ case BC_RET0: - dasm_put(Dst, 14522); + dasm_put(Dst, 14536); default: break; } - dasm_put(Dst, 14533, Dt7(->pc), PC2PROTO(k)); + dasm_put(Dst, 14547, Dt7(->pc), PC2PROTO(k)); if (op == BC_RET) { - dasm_put(Dst, 14575, LJ_TNIL); + dasm_put(Dst, 14589, LJ_TNIL); } else { - dasm_put(Dst, 14584, LJ_TNIL); + dasm_put(Dst, 14598, LJ_TNIL); } - dasm_put(Dst, 14591); + dasm_put(Dst, 14605); if (op != BC_RET0) { - dasm_put(Dst, 14612); + dasm_put(Dst, 14626); } dasm_put(Dst, 4680); break; @@ -2162,7 +2162,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORL: #if LJ_HASJIT - dasm_put(Dst, 14616, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 14630, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2174,57 +2174,57 @@ 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, 14637); + dasm_put(Dst, 14651); if (!vk) { - dasm_put(Dst, 14641, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 14655, LJ_TISNUM, LJ_TISNUM); } - dasm_put(Dst, 14660); + dasm_put(Dst, 14674); if (!vk) { - dasm_put(Dst, 14664, LJ_TISNUM); + dasm_put(Dst, 14678, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 14673); + dasm_put(Dst, 14687); if (vk) { - dasm_put(Dst, 14685); + dasm_put(Dst, 14699); } else { - dasm_put(Dst, 14704); + dasm_put(Dst, 14718); } - dasm_put(Dst, 14709); + dasm_put(Dst, 14723); } else { - dasm_put(Dst, 14722); + dasm_put(Dst, 14736); if (vk) { - dasm_put(Dst, 14728); + dasm_put(Dst, 14742); } else { - dasm_put(Dst, 14744); + dasm_put(Dst, 14758); } - dasm_put(Dst, 14752); + dasm_put(Dst, 14766); if (cmov) { - dasm_put(Dst, 10784); + dasm_put(Dst, 10798); } else { - dasm_put(Dst, 10790); + dasm_put(Dst, 10804); } if (!cmov) { - dasm_put(Dst, 14757); + dasm_put(Dst, 14771); } } if (op == BC_FORI) { - dasm_put(Dst, 14763, -BCBIAS_J*4); + dasm_put(Dst, 14777, -BCBIAS_J*4); } else if (op == BC_JFORI) { - dasm_put(Dst, 14773, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 14787, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 14787, -BCBIAS_J*4); + dasm_put(Dst, 14801, -BCBIAS_J*4); } else { - dasm_put(Dst, 14783, BC_JLOOP); + dasm_put(Dst, 14797, BC_JLOOP); } - dasm_put(Dst, 10819); + dasm_put(Dst, 10833); if (sse) { - dasm_put(Dst, 14797); + dasm_put(Dst, 14811); } break; case BC_ITERL: #if LJ_HASJIT - dasm_put(Dst, 14616, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 14630, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2233,33 +2233,33 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IITERL: - dasm_put(Dst, 14808, LJ_TNIL); + dasm_put(Dst, 14822, LJ_TNIL); if (op == BC_JITERL) { - dasm_put(Dst, 14823, BC_JLOOP); + dasm_put(Dst, 14837, BC_JLOOP); } else { - dasm_put(Dst, 14837, -BCBIAS_J*4); + dasm_put(Dst, 14851, -BCBIAS_J*4); } - dasm_put(Dst, 11116); + dasm_put(Dst, 11130); break; case BC_LOOP: #if LJ_HASJIT - dasm_put(Dst, 14616, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 14630, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; case BC_ILOOP: - dasm_put(Dst, 10821); + dasm_put(Dst, 10835); break; case BC_JLOOP: #if LJ_HASJIT - dasm_put(Dst, 14853, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); + dasm_put(Dst, 14867, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); #endif break; case BC_JMP: - dasm_put(Dst, 14876, -BCBIAS_J*4); + dasm_put(Dst, 14890, -BCBIAS_J*4); break; /* -- Function headers -------------------------------------------------- */ @@ -2273,7 +2273,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FUNCF: #if LJ_HASJIT - dasm_put(Dst, 14900, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 14914, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif case BC_FUNCV: /* NYI: compiled vararg functions. */ break; @@ -2283,47 +2283,47 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IFUNCF: - dasm_put(Dst, 14921, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); + dasm_put(Dst, 14935, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); if (op == BC_JFUNCF) { - dasm_put(Dst, 14951, BC_JLOOP); + dasm_put(Dst, 14965, BC_JLOOP); } else { - dasm_put(Dst, 10821); + dasm_put(Dst, 10835); } - dasm_put(Dst, 14960, LJ_TNIL); + dasm_put(Dst, 14974, LJ_TNIL); break; case BC_JFUNCV: #if !LJ_HASJIT break; #endif - dasm_put(Dst, 10482); + dasm_put(Dst, 10496); break; /* NYI: compiled vararg functions. */ case BC_IFUNCV: - dasm_put(Dst, 14982, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); + dasm_put(Dst, 14996, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); if (op == BC_JFUNCV) { - dasm_put(Dst, 14951, BC_JLOOP); + dasm_put(Dst, 14965, BC_JLOOP); } else { - dasm_put(Dst, 15073, -4+PC2PROTO(k)); + dasm_put(Dst, 15087, -4+PC2PROTO(k)); } - dasm_put(Dst, 15095, LJ_TNIL); + dasm_put(Dst, 15109, LJ_TNIL); break; case BC_FUNCC: case BC_FUNCCW: - dasm_put(Dst, 15117, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); + dasm_put(Dst, 15131, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); if (op == BC_FUNCC) { - dasm_put(Dst, 15146); + dasm_put(Dst, 15160); } else { - dasm_put(Dst, 15150); + dasm_put(Dst, 15164); } - dasm_put(Dst, 15158, DISPATCH_GL(vmstate), ~LJ_VMST_C); + dasm_put(Dst, 15172, DISPATCH_GL(vmstate), ~LJ_VMST_C); if (op == BC_FUNCC) { - dasm_put(Dst, 15167); + dasm_put(Dst, 15181); } else { - dasm_put(Dst, 15171, DISPATCH_GL(wrapf)); + dasm_put(Dst, 15185, DISPATCH_GL(wrapf)); } - dasm_put(Dst, 15176, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 15190, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); break; /* ---------------------------------------------------------------------- */ @@ -2351,7 +2351,7 @@ static int build_backend(BuildCtx *ctx) build_subroutines(ctx, cmov, sse); - dasm_put(Dst, 15201); + dasm_put(Dst, 15215); for (op = 0; op < BC__MAX; op++) build_ins(ctx, (BCOp)op, op, cmov, sse); diff --git a/src/lj_asm.c b/src/lj_asm.c index 81b73867..75a0cd53 100644 --- a/src/lj_asm.c +++ b/src/lj_asm.c @@ -3280,12 +3280,13 @@ static void asm_tail_link(ASMState *as) } emit_loada(as, RID_DISPATCH, J2GG(as->J)->dispatch); emit_loada(as, RID_PC, pc); - mres = (int32_t)(snap->nslots - baseslot - bc_a(*pc)); + mres = (int32_t)(snap->nslots - baseslot); switch (bc_op(*pc)) { - case BC_CALLM: case BC_CALLMT: mres -= (int32_t)(1 + bc_c(*pc)); break; - case BC_RETM: mres -= (int32_t)bc_d(*pc); break; - case BC_TSETM: break; - default: mres = 0; break; + case BC_CALLM: case BC_CALLMT: + mres -= (int32_t)(1 + bc_a(*pc) + bc_c(*pc)); break; + case BC_RETM: mres -= (int32_t)(bc_a(*pc) + bc_d(*pc)); break; + case BC_TSETM: mres -= (int32_t)bc_a(*pc); break; + default: if (bc_op(*pc) < BC_FUNCF) mres = 0; break; } emit_loadi(as, RID_RET, mres); /* Return MULTRES or 0. */ } else if (baseslot) { diff --git a/src/lj_snap.c b/src/lj_snap.c index 743f05cf..33ac50f5 100644 --- a/src/lj_snap.c +++ b/src/lj_snap.c @@ -254,16 +254,13 @@ const BCIns *lj_snap_restore(jit_State *J, void *exptr) GCfunc *fn = ir_kfunc(ir); if (isluafunc(fn)) { MSize framesize = funcproto(fn)->framesize; - TValue *fs; L->base = ++o; if (LJ_UNLIKELY(o + framesize > L->maxstack)) { /* Grow again? */ ptrdiff_t fsave = savestack(L, frame); L->top = o; lj_state_growstack(L, framesize); frame = restorestack(L, fsave); - o = L->top; } - fs = o + framesize; } } } diff --git a/src/lj_trace.c b/src/lj_trace.c index d2e5a09c..cbd7ca6e 100644 --- a/src/lj_trace.c +++ b/src/lj_trace.c @@ -716,6 +716,8 @@ int LJ_FASTCALL lj_trace_exit(jit_State *J, void *exptr) case BC_TSETM: return (int)((BCReg)(L->top - L->base) + 1 - bc_a(*pc)); default: + if (bc_op(*pc) >= BC_FUNCF) + return (int)((BCReg)(L->top - L->base) + 1); return 0; } }