From fa5cd010e8e28c7fe2338d0fdd538e95ddd88bcc Mon Sep 17 00:00:00 2001 From: Mike Pall Date: Tue, 12 Apr 2011 19:12:29 +0200 Subject: Add support for tailcalls from internal C functions. PPC: Fix __call metamethod for tailcalls. --- src/buildvm_x64.h | 2060 +++++++++++++++++++++++++++-------------------------- 1 file changed, 1032 insertions(+), 1028 deletions(-) (limited to 'src/buildvm_x64.h') diff --git a/src/buildvm_x64.h b/src/buildvm_x64.h index 927ecc6b..fb6f57f9 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[15992] = { +static const unsigned char build_actionlist[16015] = { 254,1,248,10,252,247,195,237,15,132,244,11,131,227,252,248,41,218,72,141, 76,25,252,248,139,90,252,252,199,68,10,4,237,248,12,131,192,1,137,68,36,4, 252,247,195,237,15,132,244,13,248,14,129,252,243,239,252,247,195,237,15,133, @@ -52,111 +52,112 @@ static const unsigned char build_actionlist[15992] = { 68,137,124,36,16,76,139,189,233,76,137,124,36,32,72,137,165,233,252,255,209, 133,192,15,132,244,15,137,193,187,237,252,233,244,2,248,11,1,209,131,227, 252,248,137,213,41,218,199,68,193,252,252,237,137,200,139,93,252,244,72,99, - 77,252,240,76,141,61,245,255,76,1,252,249,68,139,122,252,248,69,139,191,233, - 69,139,191,233,252,255,225,248,32,15,182,75,252,255,131,252,237,16,141,12, - 202,41,252,233,15,132,244,33,252,247,217,193,252,233,3,139,124,36,24,137, - 151,233,137,202,72,139,8,72,137,77,0,137,252,238,252,233,244,34,248,35,137, + 77,252,240,133,201,15,132,244,247,255,76,141,61,245,76,1,252,249,68,139,122, + 252,248,69,139,191,233,69,139,191,233,252,255,225,248,1,41,213,193,252,237, + 3,141,69,252,255,252,233,244,32,248,33,15,182,75,252,255,131,252,237,16,141, + 12,202,41,252,233,15,132,244,34,252,247,217,193,252,233,3,139,124,36,24,137, + 151,233,137,202,72,139,8,72,137,77,0,137,252,238,252,233,244,35,248,36,137, 4,36,199,68,36,4,237,72,141,4,36,128,123,252,252,235,15,133,244,247,65,141, - 142,233,137,41,199,65,4,237,137,205,252,233,244,248,248,36,15,182,67,252, - 254,255,199,68,36,4,237,137,4,36,255,252,242,15,42,192,252,242,15,17,4,36, - 255,72,141,4,36,252,233,244,247,248,37,15,182,67,252,254,141,4,194,248,1, - 15,182,107,252,255,141,44,252,234,248,2,139,124,36,24,137,151,233,137,252, + 142,233,137,41,199,65,4,237,255,137,205,252,233,244,248,248,37,15,182,67, + 252,254,255,199,68,36,4,237,137,4,36,255,252,242,15,42,192,252,242,15,17, + 4,36,255,72,141,4,36,252,233,244,247,248,38,15,182,67,252,254,141,4,194,248, + 1,15,182,107,252,255,141,44,252,234,248,2,139,124,36,24,137,151,233,137,252, 238,72,137,194,137,252,253,137,92,36,28,232,251,1,2,139,149,233,133,192,15, - 132,244,249,248,33,15,182,75,252,253,72,139,40,72,137,44,202,139,3,15,182, + 132,244,249,248,34,15,182,75,252,253,72,139,40,72,137,44,202,139,3,15,182, 204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,139,141,233, 137,89,252,244,141,153,233,41,211,139,105,252,248,184,237,252,233,244,30, - 248,38,137,4,36,199,68,36,4,237,72,141,4,36,128,123,252,252,235,15,133,244, - 247,255,65,141,142,233,137,41,199,65,4,237,137,205,252,233,244,248,248,39, - 15,182,67,252,254,255,72,141,4,36,252,233,244,247,248,40,15,182,67,252,254, + 248,39,137,4,36,199,68,36,4,237,72,141,4,36,128,123,252,252,235,15,133,244, + 247,255,65,141,142,233,137,41,199,65,4,237,137,205,252,233,244,248,248,40, + 15,182,67,252,254,255,72,141,4,36,252,233,244,247,248,41,15,182,67,252,254, 141,4,194,248,1,15,182,107,252,255,141,44,252,234,248,2,139,124,36,24,137, 151,233,137,252,238,72,137,194,137,252,253,137,92,36,28,232,251,1,3,139,149, 233,133,192,15,132,244,249,15,182,75,252,253,72,139,44,202,72,137,40,248, - 41,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238, + 42,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238, 248,3,139,141,233,137,89,252,244,15,182,67,252,253,72,139,44,194,72,137,105, - 16,141,153,233,41,211,139,105,252,248,184,237,252,233,244,30,248,42,139,108, + 16,141,153,233,41,211,139,105,252,248,184,237,252,233,244,30,248,43,139,108, 36,24,137,149,233,141,52,202,141,20,194,137,252,239,15,182,75,252,252,137, - 92,36,28,232,251,1,4,248,3,139,149,233,255,131,252,248,1,15,135,244,43,248, + 92,36,28,232,251,1,4,248,3,139,149,233,255,131,252,248,1,15,135,244,44,248, 4,141,91,4,15,130,244,252,248,5,15,183,67,252,254,141,156,253,131,233,248, 6,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238, - 248,44,131,195,4,129,120,253,4,239,15,130,244,5,252,233,244,6,248,45,129, - 120,253,4,239,252,233,244,4,248,46,131,252,235,4,137,206,137,252,233,139, + 248,45,131,195,4,129,120,253,4,239,15,130,244,5,252,233,244,6,248,46,129, + 120,253,4,239,252,233,244,4,248,47,131,252,235,4,137,206,137,252,233,139, 108,36,24,137,149,233,255,137,194,137,252,239,137,92,36,28,232,251,1,5,252, - 233,244,3,248,47,255,131,252,235,4,139,108,36,24,137,149,233,137,252,239, - 139,115,252,252,137,92,36,28,232,251,1,6,252,233,244,3,255,248,48,255,15, - 182,107,252,255,255,248,49,65,141,4,199,252,233,244,247,248,50,255,248,51, - 65,141,4,199,141,44,252,234,149,252,233,244,248,248,52,141,4,194,137,197, - 252,233,244,248,248,53,255,248,54,141,4,194,248,1,141,44,252,234,248,2,141, + 233,244,3,248,48,255,131,252,235,4,139,108,36,24,137,149,233,137,252,239, + 139,115,252,252,137,92,36,28,232,251,1,6,252,233,244,3,255,248,49,255,15, + 182,107,252,255,255,248,50,65,141,4,199,252,233,244,247,248,51,255,248,52, + 65,141,4,199,141,44,252,234,149,252,233,244,248,248,53,141,4,194,137,197, + 252,233,244,248,248,54,255,248,55,141,4,194,248,1,141,44,252,234,248,2,141, 12,202,68,15,182,67,252,252,137,206,137,193,139,124,36,24,137,151,233,137, 252,234,137,252,253,137,92,36,28,232,251,1,7,139,149,233,133,192,15,132,244, - 41,248,43,137,193,41,208,137,89,252,244,141,152,233,184,237,252,233,244,28, - 248,55,139,108,36,24,137,149,233,141,52,194,137,252,239,137,92,36,28,232, - 251,1,8,139,149,233,252,233,244,43,248,56,141,76,202,8,248,29,137,76,36,4, + 42,248,44,137,193,41,208,137,89,252,244,141,152,233,184,237,252,233,244,28, + 248,56,139,108,36,24,137,149,233,141,52,194,137,252,239,137,92,36,28,232, + 251,1,8,139,149,233,252,233,244,44,248,57,141,76,202,8,248,29,137,76,36,4, 137,4,36,131,252,233,8,139,108,36,24,137,149,233,255,137,206,141,20,193,137, 252,239,137,92,36,28,232,251,1,9,139,149,233,139,76,36,4,139,4,36,139,105, - 252,248,131,192,1,65,57,215,15,132,244,57,137,202,137,90,252,252,139,157, + 252,248,131,192,1,65,57,215,15,132,244,58,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,248, - 58,139,108,36,24,137,149,233,137,206,137,252,239,137,92,36,28,232,251,1,10, + 59,139,108,36,24,137,149,233,137,206,137,252,239,137,92,36,28,232,251,1,10, 139,149,233,139,67,252,252,15,182,204,15,182,232,193,232,16,65,252,255,164, - 253,252,238,233,248,59,129,252,248,239,15,130,244,60,139,106,4,129,252,253, - 239,15,131,244,60,139,90,252,252,137,68,36,4,137,106,252,252,139,42,137,106, + 253,252,238,233,248,60,129,252,248,239,15,130,244,61,139,106,4,129,252,253, + 239,15,131,244,61,139,90,252,252,137,68,36,4,137,106,252,252,139,42,137,106, 252,248,131,232,2,15,132,244,248,137,209,248,1,131,193,8,72,139,41,72,137, - 105,252,248,131,232,1,15,133,244,1,248,2,255,139,68,36,4,252,233,244,61,248, - 62,129,252,248,239,15,130,244,60,139,106,4,137,252,233,193,252,249,15,131, + 105,252,248,131,232,1,15,133,244,1,248,2,255,139,68,36,4,252,233,244,62,248, + 63,129,252,248,239,15,130,244,61,139,106,4,137,252,233,193,252,249,15,131, 252,249,252,254,15,132,244,249,184,237,252,247,213,57,232,255,15,71,197,255, 15,134,244,247,137,232,248,1,255,248,2,139,106,252,248,139,132,253,197,233, - 139,90,252,252,199,66,252,252,237,137,66,252,248,252,233,244,63,248,3,184, - 237,252,233,244,2,248,64,129,252,248,239,15,130,244,60,139,106,4,139,90,252, + 139,90,252,252,199,66,252,252,237,137,66,252,248,252,233,244,64,248,3,184, + 237,252,233,244,2,248,65,129,252,248,239,15,130,244,61,139,106,4,139,90,252, 252,129,252,253,239,15,133,244,252,248,1,139,42,139,173,233,248,2,133,252, - 237,199,66,252,252,237,255,15,132,244,63,65,139,134,233,199,66,252,252,237, + 237,199,66,252,252,237,255,15,132,244,64,65,139,134,233,199,66,252,252,237, 137,106,252,248,139,141,233,35,136,233,105,201,239,3,141,233,248,3,129,185, 233,239,15,133,244,250,57,129,233,15,132,244,251,248,4,139,137,233,133,201, - 15,133,244,3,255,252,233,244,63,248,5,139,105,4,129,252,253,239,15,132,244, - 63,139,1,137,106,252,252,137,66,252,248,252,233,244,63,248,6,129,252,253, + 15,133,244,3,255,252,233,244,64,248,5,139,105,4,129,252,253,239,15,132,244, + 64,139,1,137,106,252,252,137,66,252,248,252,233,244,64,248,6,129,252,253, 239,15,132,244,1,129,252,253,239,15,135,244,254,129,252,253,239,15,134,244, 253,189,237,252,233,244,254,248,7,255,189,237,248,8,252,247,213,65,139,172, - 253,174,233,252,233,244,2,248,65,129,252,248,239,15,130,244,60,129,122,253, - 4,239,15,133,244,60,139,42,131,189,233,0,15,133,244,60,129,122,253,12,239, - 15,133,244,60,139,66,8,137,133,233,139,90,252,252,199,66,252,252,237,255, + 253,174,233,252,233,244,2,248,66,129,252,248,239,15,130,244,61,129,122,253, + 4,239,15,133,244,61,139,42,131,189,233,0,15,133,244,61,129,122,253,12,239, + 15,133,244,61,139,66,8,137,133,233,139,90,252,252,199,66,252,252,237,255, 137,106,252,248,252,246,133,233,235,15,132,244,247,128,165,233,235,65,139, - 134,233,65,137,174,233,137,133,233,248,1,252,233,244,63,248,66,129,252,248, - 239,15,130,244,60,129,122,253,4,239,15,133,244,60,137,213,139,50,141,82,8, + 134,233,65,137,174,233,137,133,233,248,1,252,233,244,64,248,67,129,252,248, + 239,15,130,244,61,129,122,253,4,239,15,133,244,61,137,213,139,50,141,82,8, 139,124,36,24,232,251,1,11,137,252,234,72,139,40,139,90,252,252,72,137,106, - 252,248,252,233,244,63,248,67,255,129,252,248,239,15,133,244,60,129,122,253, - 4,239,255,15,133,244,247,139,42,252,233,244,68,248,1,15,135,244,60,255,15, - 131,244,60,255,252,242,15,16,2,252,233,244,69,255,221,2,252,233,244,70,255, - 248,71,129,252,248,239,15,130,244,60,139,90,252,252,129,122,253,4,239,15, - 133,244,249,139,2,248,2,199,66,252,252,237,137,66,252,248,252,233,244,63, - 248,3,129,122,253,4,239,15,135,244,60,65,131,190,233,0,15,133,244,60,65,139, - 174,233,65,59,174,233,255,15,130,244,247,232,244,72,248,1,139,108,36,24,137, + 252,248,252,233,244,64,248,68,255,129,252,248,239,15,133,244,61,129,122,253, + 4,239,255,15,133,244,247,139,42,252,233,244,69,248,1,15,135,244,61,255,15, + 131,244,61,255,252,242,15,16,2,252,233,244,70,255,221,2,252,233,244,71,255, + 248,72,129,252,248,239,15,130,244,61,139,90,252,252,129,122,253,4,239,15, + 133,244,249,139,2,248,2,199,66,252,252,237,137,66,252,248,252,233,244,64, + 248,3,129,122,253,4,239,15,135,244,61,65,131,190,233,0,15,133,244,61,65,139, + 174,233,65,59,174,233,255,15,130,244,247,232,244,73,248,1,139,108,36,24,137, 149,233,137,92,36,28,137,214,137,252,239,255,232,251,1,12,255,232,251,1,13, - 255,139,149,233,252,233,244,2,248,73,129,252,248,239,15,130,244,60,15,132, - 244,248,248,1,129,122,253,4,239,15,133,244,60,139,108,36,24,137,149,233,137, + 255,139,149,233,252,233,244,2,248,74,129,252,248,239,15,130,244,61,15,132, + 244,248,248,1,129,122,253,4,239,15,133,244,61,139,108,36,24,137,149,233,137, 149,233,139,90,252,252,139,50,141,82,8,137,252,239,137,92,36,28,232,251,1, 14,139,149,233,133,192,15,132,244,249,72,139,106,8,72,139,66,16,72,137,106, - 252,248,72,137,2,248,74,184,237,255,252,233,244,75,248,2,199,66,12,237,252, - 233,244,1,248,3,199,66,252,252,237,252,233,244,63,248,76,129,252,248,239, - 15,130,244,60,139,42,129,122,253,4,239,15,133,244,60,255,131,189,233,0,15, - 133,244,60,255,139,106,252,248,139,133,233,139,90,252,252,199,66,252,252, - 237,137,66,252,248,199,66,12,237,184,237,252,233,244,75,248,77,129,252,248, - 239,15,130,244,60,129,122,253,4,239,15,133,244,60,129,122,253,12,239,255, + 252,248,72,137,2,248,75,184,237,255,252,233,244,76,248,2,199,66,12,237,252, + 233,244,1,248,3,199,66,252,252,237,252,233,244,64,248,77,129,252,248,239, + 15,130,244,61,139,42,129,122,253,4,239,15,133,244,61,255,131,189,233,0,15, + 133,244,61,255,139,106,252,248,139,133,233,139,90,252,252,199,66,252,252, + 237,137,66,252,248,199,66,12,237,184,237,252,233,244,76,248,78,129,252,248, + 239,15,130,244,61,129,122,253,4,239,15,133,244,61,129,122,253,12,239,255, 139,90,252,252,255,139,66,8,131,192,1,199,66,252,252,237,137,66,252,248,255, 252,242,15,16,66,8,72,189,237,237,102,72,15,110,205,252,242,15,88,193,252, 242,15,45,192,252,242,15,17,66,252,248,255,139,42,59,133,233,15,131,244,248, - 193,224,3,3,133,233,248,1,129,120,253,4,239,15,132,244,78,72,139,40,72,137, - 42,252,233,244,74,248,2,131,189,233,0,15,132,244,78,137,252,239,137,213,137, - 198,232,251,1,15,137,252,234,133,192,15,133,244,1,248,78,184,237,252,233, - 244,75,248,79,255,139,106,252,248,139,133,233,139,90,252,252,199,66,252,252, + 193,224,3,3,133,233,248,1,129,120,253,4,239,15,132,244,79,72,139,40,72,137, + 42,252,233,244,75,248,2,131,189,233,0,15,132,244,79,137,252,239,137,213,137, + 198,232,251,1,15,137,252,234,133,192,15,133,244,1,248,79,184,237,252,233, + 244,76,248,80,255,139,106,252,248,139,133,233,139,90,252,252,199,66,252,252, 237,137,66,252,248,255,199,66,12,237,199,66,8,0,0,0,0,255,15,87,192,252,242, - 15,17,66,8,255,217,252,238,221,90,8,255,184,237,252,233,244,75,248,80,129, - 252,248,239,15,130,244,60,141,74,8,131,232,1,187,237,248,1,65,15,182,174, - 233,193,252,237,235,131,229,1,1,252,235,252,233,244,28,248,81,129,252,248, - 239,15,130,244,60,129,122,253,12,239,15,133,244,60,255,139,106,4,137,106, + 15,17,66,8,255,217,252,238,221,90,8,255,184,237,252,233,244,76,248,81,129, + 252,248,239,15,130,244,61,141,74,8,131,232,1,187,237,248,1,65,15,182,174, + 233,193,252,237,235,131,229,1,1,252,235,252,233,244,28,248,82,129,252,248, + 239,15,130,244,61,129,122,253,12,239,15,133,244,61,255,139,106,4,137,106, 12,199,66,4,237,139,42,139,90,8,137,106,8,137,26,141,74,16,131,232,2,187, - 237,252,233,244,1,248,82,129,252,248,239,15,130,244,60,139,42,139,90,252, - 252,137,92,36,28,137,44,36,129,122,253,4,239,15,133,244,60,72,131,189,233, - 0,15,133,244,60,128,189,233,235,15,135,244,60,139,141,233,15,132,244,247, - 255,59,141,233,15,132,244,60,248,1,141,92,193,252,240,59,157,233,15,135,244, - 60,137,157,233,139,108,36,24,137,149,233,131,194,8,137,149,233,141,108,194, + 237,252,233,244,1,248,83,129,252,248,239,15,130,244,61,139,42,139,90,252, + 252,137,92,36,28,137,44,36,129,122,253,4,239,15,133,244,61,72,131,189,233, + 0,15,133,244,61,128,189,233,235,15,135,244,61,139,141,233,15,132,244,247, + 255,59,141,233,15,132,244,61,248,1,141,92,193,252,240,59,157,233,15,135,244, + 61,137,157,233,139,108,36,24,137,149,233,131,194,8,137,149,233,141,108,194, 232,72,41,221,57,203,15,132,244,249,248,2,72,139,4,43,72,137,67,252,248,131, 252,235,8,57,203,15,133,244,2,248,3,137,206,139,60,36,232,244,25,65,199,134, 233,237,255,139,108,36,24,139,28,36,139,149,233,129,252,248,239,15,135,244, @@ -167,10 +168,10 @@ static const unsigned char build_actionlist[15992] = { 248,252,255,252,255,252,255,252,247,195,237,255,15,132,244,13,252,233,244, 14,248,8,199,66,252,252,237,139,139,233,131,252,233,8,137,139,233,72,139, 1,72,137,2,184,237,252,233,244,7,248,9,139,12,36,68,137,185,233,137,222,137, - 252,239,232,251,1,0,139,28,36,139,149,233,252,233,244,4,248,83,139,106,252, + 252,239,232,251,1,0,139,28,36,139,149,233,252,233,244,4,248,84,139,106,252, 248,139,173,233,139,90,252,252,137,92,36,28,137,44,36,72,131,189,233,0,15, - 133,244,60,255,128,189,233,235,15,135,244,60,139,141,233,15,132,244,247,59, - 141,233,15,132,244,60,248,1,141,92,193,252,248,59,157,233,15,135,244,60,137, + 133,244,61,255,128,189,233,235,15,135,244,61,139,141,233,15,132,244,247,59, + 141,233,15,132,244,61,248,1,141,92,193,252,248,59,157,233,15,135,244,61,137, 157,233,139,108,36,24,137,149,233,137,149,233,141,108,194,252,240,72,41,221, 57,203,15,132,244,249,248,2,255,72,139,4,43,72,137,67,252,248,131,252,235, 8,57,203,15,133,244,2,248,3,137,206,139,60,36,232,244,25,65,199,134,233,237, @@ -181,204 +182,204 @@ static const unsigned char build_actionlist[15992] = { 1,248,7,139,92,36,28,137,68,36,4,49,201,252,247,195,237,15,132,244,13,252, 233,244,14,248,8,137,222,137,252,239,232,251,1,16,248,9,139,12,36,68,137, 185,233,137,222,137,252,239,232,251,1,0,139,28,36,139,149,233,252,233,244, - 4,248,84,139,108,36,24,72,252,247,133,233,237,15,132,244,60,255,137,149,233, + 4,248,85,139,108,36,24,72,252,247,133,233,237,15,132,244,61,255,137,149,233, 141,68,194,252,248,137,133,233,49,192,72,137,133,233,176,235,136,133,233, - 252,233,244,16,255,248,68,255,248,70,139,90,252,252,221,90,252,248,252,233, - 244,63,255,248,85,129,252,248,239,15,130,244,60,255,129,122,253,4,239,15, - 133,244,248,139,42,131,252,253,0,15,137,244,68,252,247,221,15,136,244,247, - 248,86,248,68,139,90,252,252,199,66,252,252,237,137,106,252,248,252,233,244, - 63,248,1,139,90,252,252,199,66,252,252,0,0,224,65,199,66,252,248,0,0,0,0, - 252,233,244,63,248,2,15,135,244,60,255,129,122,253,4,239,15,131,244,60,255, - 252,242,15,16,2,72,184,237,237,102,72,15,110,200,15,84,193,248,69,139,90, - 252,252,252,242,15,17,66,252,248,255,221,2,217,225,248,69,248,70,139,90,252, - 252,221,90,252,248,255,248,63,184,237,248,75,137,68,36,4,248,61,252,247,195, + 252,233,244,16,255,248,69,255,248,71,139,90,252,252,221,90,252,248,252,233, + 244,64,255,248,86,129,252,248,239,15,130,244,61,255,129,122,253,4,239,15, + 133,244,248,139,42,131,252,253,0,15,137,244,69,252,247,221,15,136,244,247, + 248,87,248,69,139,90,252,252,199,66,252,252,237,137,106,252,248,252,233,244, + 64,248,1,139,90,252,252,199,66,252,252,0,0,224,65,199,66,252,248,0,0,0,0, + 252,233,244,64,248,2,15,135,244,61,255,129,122,253,4,239,15,131,244,61,255, + 252,242,15,16,2,72,184,237,237,102,72,15,110,200,15,84,193,248,70,139,90, + 252,252,252,242,15,17,66,252,248,255,221,2,217,225,248,70,248,71,139,90,252, + 252,221,90,252,248,255,248,64,184,237,248,76,137,68,36,4,248,62,252,247,195, 237,15,133,244,253,248,5,56,67,252,255,15,135,244,252,15,182,75,252,253,72, 252,247,209,141,20,202,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65, 252,255,36,252,238,248,6,199,68,194,252,244,237,131,192,1,252,233,244,5,248, - 7,72,199,193,252,248,252,255,252,255,252,255,252,233,244,14,248,87,255,129, - 122,253,4,239,15,133,244,247,139,42,252,233,244,68,248,1,15,135,244,60,255, - 252,242,15,16,2,232,244,88,255,252,242,15,45,232,129,252,253,0,0,0,128,15, - 133,244,68,252,242,15,42,205,102,15,46,193,15,138,244,69,15,132,244,68,255, - 221,2,232,244,88,255,248,89,255,252,242,15,16,2,232,244,90,255,221,2,232, - 244,90,255,248,91,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131, - 244,60,252,242,15,81,2,252,233,244,69,255,248,91,129,252,248,239,15,130,244, - 60,129,122,253,4,239,15,131,244,60,221,2,217,252,250,252,233,244,70,255,248, - 92,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131,244,60,217,252, - 237,221,2,217,252,241,252,233,244,70,248,93,129,252,248,239,15,130,244,60, - 129,122,253,4,239,15,131,244,60,217,252,236,221,2,217,252,241,252,233,244, - 70,248,94,129,252,248,239,255,15,130,244,60,129,122,253,4,239,15,131,244, - 60,221,2,232,244,95,252,233,244,70,248,96,129,252,248,239,15,130,244,60,129, - 122,253,4,239,15,131,244,60,221,2,217,252,254,252,233,244,70,248,97,129,252, - 248,239,255,15,130,244,60,129,122,253,4,239,15,131,244,60,221,2,217,252,255, - 252,233,244,70,248,98,129,252,248,239,15,130,244,60,129,122,253,4,239,15, - 131,244,60,221,2,217,252,242,221,216,252,233,244,70,248,99,129,252,248,239, - 15,130,244,60,255,129,122,253,4,239,15,131,244,60,221,2,217,192,216,200,217, - 232,222,225,217,252,250,217,252,243,252,233,244,70,248,100,129,252,248,239, - 15,130,244,60,129,122,253,4,239,15,131,244,60,221,2,217,192,216,200,217,232, - 222,225,217,252,250,217,201,217,252,243,252,233,244,70,248,101,129,252,248, - 239,15,130,244,60,129,122,253,4,239,15,131,244,60,255,221,2,217,232,217,252, - 243,252,233,244,70,255,248,102,129,252,248,239,15,130,244,60,129,122,253, - 4,239,15,131,244,60,252,242,15,16,2,255,137,213,232,251,1,17,137,252,234, - 252,233,244,69,255,248,103,129,252,248,239,15,130,244,60,129,122,253,4,239, - 15,131,244,60,252,242,15,16,2,255,137,213,232,251,1,18,137,252,234,252,233, - 244,69,255,248,104,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131, - 244,60,252,242,15,16,2,255,137,213,232,251,1,19,137,252,234,252,233,244,69, - 248,105,255,248,106,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131, - 244,60,252,242,15,16,2,139,106,252,248,252,242,15,89,133,233,252,233,244, - 69,255,248,106,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131,244, - 60,221,2,139,106,252,248,220,141,233,252,233,244,70,255,248,107,129,252,248, - 239,15,130,244,60,129,122,253,4,239,15,131,244,60,129,122,253,12,239,15,131, - 244,60,221,2,221,66,8,217,252,243,252,233,244,70,248,108,129,252,248,239, - 15,130,244,60,129,122,253,4,239,15,131,244,60,129,122,253,12,239,255,15,131, - 244,60,221,66,8,221,2,217,252,253,221,217,252,233,244,70,248,109,129,252, - 248,239,15,130,244,60,139,106,4,129,252,253,239,15,131,244,60,139,90,252, + 7,72,199,193,252,248,252,255,252,255,252,255,252,233,244,14,248,88,255,129, + 122,253,4,239,15,133,244,247,139,42,252,233,244,69,248,1,15,135,244,61,255, + 252,242,15,16,2,232,244,89,255,252,242,15,45,232,129,252,253,0,0,0,128,15, + 133,244,69,252,242,15,42,205,102,15,46,193,15,138,244,70,15,132,244,69,255, + 221,2,232,244,89,255,248,90,255,252,242,15,16,2,232,244,91,255,221,2,232, + 244,91,255,248,92,129,252,248,239,15,130,244,61,129,122,253,4,239,15,131, + 244,61,252,242,15,81,2,252,233,244,70,255,248,92,129,252,248,239,15,130,244, + 61,129,122,253,4,239,15,131,244,61,221,2,217,252,250,252,233,244,71,255,248, + 93,129,252,248,239,15,130,244,61,129,122,253,4,239,15,131,244,61,217,252, + 237,221,2,217,252,241,252,233,244,71,248,94,129,252,248,239,15,130,244,61, + 129,122,253,4,239,15,131,244,61,217,252,236,221,2,217,252,241,252,233,244, + 71,248,95,129,252,248,239,255,15,130,244,61,129,122,253,4,239,15,131,244, + 61,221,2,232,244,96,252,233,244,71,248,97,129,252,248,239,15,130,244,61,129, + 122,253,4,239,15,131,244,61,221,2,217,252,254,252,233,244,71,248,98,129,252, + 248,239,255,15,130,244,61,129,122,253,4,239,15,131,244,61,221,2,217,252,255, + 252,233,244,71,248,99,129,252,248,239,15,130,244,61,129,122,253,4,239,15, + 131,244,61,221,2,217,252,242,221,216,252,233,244,71,248,100,129,252,248,239, + 15,130,244,61,255,129,122,253,4,239,15,131,244,61,221,2,217,192,216,200,217, + 232,222,225,217,252,250,217,252,243,252,233,244,71,248,101,129,252,248,239, + 15,130,244,61,129,122,253,4,239,15,131,244,61,221,2,217,192,216,200,217,232, + 222,225,217,252,250,217,201,217,252,243,252,233,244,71,248,102,129,252,248, + 239,15,130,244,61,129,122,253,4,239,15,131,244,61,255,221,2,217,232,217,252, + 243,252,233,244,71,255,248,103,129,252,248,239,15,130,244,61,129,122,253, + 4,239,15,131,244,61,252,242,15,16,2,255,137,213,232,251,1,17,137,252,234, + 252,233,244,70,255,248,104,129,252,248,239,15,130,244,61,129,122,253,4,239, + 15,131,244,61,252,242,15,16,2,255,137,213,232,251,1,18,137,252,234,252,233, + 244,70,255,248,105,129,252,248,239,15,130,244,61,129,122,253,4,239,15,131, + 244,61,252,242,15,16,2,255,137,213,232,251,1,19,137,252,234,252,233,244,70, + 248,106,255,248,107,129,252,248,239,15,130,244,61,129,122,253,4,239,15,131, + 244,61,252,242,15,16,2,139,106,252,248,252,242,15,89,133,233,252,233,244, + 70,255,248,107,129,252,248,239,15,130,244,61,129,122,253,4,239,15,131,244, + 61,221,2,139,106,252,248,220,141,233,252,233,244,71,255,248,108,129,252,248, + 239,15,130,244,61,129,122,253,4,239,15,131,244,61,129,122,253,12,239,15,131, + 244,61,221,2,221,66,8,217,252,243,252,233,244,71,248,109,129,252,248,239, + 15,130,244,61,129,122,253,4,239,15,131,244,61,129,122,253,12,239,255,15,131, + 244,61,221,66,8,221,2,217,252,253,221,217,252,233,244,71,248,110,129,252, + 248,239,15,130,244,61,139,106,4,129,252,253,239,15,131,244,61,139,90,252, 252,139,2,137,106,252,252,137,66,252,248,209,229,129,252,253,0,0,224,252, 255,15,131,244,249,9,232,15,132,244,249,184,252,254,3,0,0,129,252,253,0,0, 32,0,15,130,244,250,248,1,193,252,237,21,41,197,255,252,242,15,42,197,255, 137,44,36,219,4,36,255,139,106,252,252,129,229,252,255,252,255,15,128,129, 205,0,0,224,63,137,106,252,252,248,2,255,252,242,15,17,2,255,221,26,255,184, - 237,252,233,244,75,248,3,255,15,87,192,252,233,244,2,255,217,252,238,252, + 237,252,233,244,76,248,3,255,15,87,192,252,233,244,2,255,217,252,238,252, 233,244,2,255,248,4,255,252,242,15,16,2,72,189,237,237,102,72,15,110,205, 252,242,15,89,193,252,242,15,17,66,252,248,255,221,2,199,4,36,0,0,128,90, 216,12,36,221,90,252,248,255,139,106,252,252,184,52,4,0,0,209,229,252,233, - 244,1,255,248,110,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131, - 244,60,252,242,15,16,2,255,248,110,129,252,248,239,15,130,244,60,129,122, - 253,4,239,15,131,244,60,221,2,255,139,106,4,139,90,252,252,209,229,129,252, - 253,0,0,224,252,255,15,132,244,250,255,15,40,224,232,244,111,252,242,15,92, - 224,248,1,252,242,15,17,66,252,248,252,242,15,17,34,255,217,192,232,244,111, + 244,1,255,248,111,129,252,248,239,15,130,244,61,129,122,253,4,239,15,131, + 244,61,252,242,15,16,2,255,248,111,129,252,248,239,15,130,244,61,129,122, + 253,4,239,15,131,244,61,221,2,255,139,106,4,139,90,252,252,209,229,129,252, + 253,0,0,224,252,255,15,132,244,250,255,15,40,224,232,244,112,252,242,15,92, + 224,248,1,252,242,15,17,66,252,248,252,242,15,17,34,255,217,192,232,244,112, 220,252,233,248,1,221,90,252,248,221,26,255,139,66,252,252,139,106,4,49,232, - 15,136,244,249,248,2,184,237,252,233,244,75,248,3,129,252,245,0,0,0,128,137, + 15,136,244,249,248,2,184,237,252,233,244,76,248,3,129,252,245,0,0,0,128,137, 106,4,252,233,244,2,248,4,255,15,87,228,252,233,244,1,255,217,252,238,217, - 201,252,233,244,1,255,248,112,129,252,248,239,15,130,244,60,129,122,253,4, - 239,15,131,244,60,129,122,253,12,239,15,131,244,60,221,66,8,221,2,248,1,217, - 252,248,223,224,158,15,138,244,1,221,217,252,233,244,70,255,248,113,129,252, - 248,239,15,130,244,60,129,122,253,4,239,15,131,244,60,129,122,253,12,239, - 15,131,244,60,252,242,15,16,2,252,242,15,16,74,8,232,244,114,252,233,244, - 69,255,248,113,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131,244, - 60,129,122,253,12,239,15,131,244,60,221,2,221,66,8,232,244,114,252,233,244, - 70,255,248,115,185,2,0,0,0,129,122,253,4,239,255,15,133,244,250,139,42,248, - 1,57,193,15,131,244,68,129,124,253,202,252,252,239,15,133,244,249,59,108, + 201,252,233,244,1,255,248,113,129,252,248,239,15,130,244,61,129,122,253,4, + 239,15,131,244,61,129,122,253,12,239,15,131,244,61,221,66,8,221,2,248,1,217, + 252,248,223,224,158,15,138,244,1,221,217,252,233,244,71,255,248,114,129,252, + 248,239,15,130,244,61,129,122,253,4,239,15,131,244,61,129,122,253,12,239, + 15,131,244,61,252,242,15,16,2,252,242,15,16,74,8,232,244,115,252,233,244, + 70,255,248,114,129,252,248,239,15,130,244,61,129,122,253,4,239,15,131,244, + 61,129,122,253,12,239,15,131,244,61,221,2,221,66,8,232,244,115,252,233,244, + 71,255,248,116,185,2,0,0,0,129,122,253,4,239,255,15,133,244,250,139,42,248, + 1,57,193,15,131,244,69,129,124,253,202,252,252,239,15,133,244,249,59,108, 202,252,248,15,79,108,202,252,248,131,193,1,252,233,244,1,248,3,15,135,244, - 60,255,252,233,244,252,248,4,15,135,244,60,255,252,242,15,16,2,248,5,57,193, - 15,131,244,69,129,124,253,202,252,252,239,255,15,130,244,252,15,135,244,60, + 61,255,252,233,244,252,248,4,15,135,244,61,255,252,242,15,16,2,248,5,57,193, + 15,131,244,70,129,124,253,202,252,252,239,255,15,130,244,252,15,135,244,61, 252,242,15,42,76,202,252,248,252,233,244,253,255,248,6,252,242,15,16,76,202, - 252,248,248,7,252,242,15,93,193,131,193,1,252,233,244,5,255,248,116,185,2, + 252,248,248,7,252,242,15,93,193,131,193,1,252,233,244,5,255,248,117,185,2, 0,0,0,129,122,253,4,239,255,15,133,244,250,139,42,248,1,57,193,15,131,244, - 68,129,124,253,202,252,252,239,15,133,244,249,59,108,202,252,248,15,76,108, - 202,252,248,131,193,1,252,233,244,1,248,3,15,135,244,60,255,248,6,252,242, + 69,129,124,253,202,252,252,239,15,133,244,249,59,108,202,252,248,15,76,108, + 202,252,248,131,193,1,252,233,244,1,248,3,15,135,244,61,255,248,6,252,242, 15,16,76,202,252,248,248,7,252,242,15,95,193,131,193,1,252,233,244,5,255, - 248,9,221,216,252,233,244,60,255,248,117,129,252,248,239,15,130,244,60,129, - 122,253,4,239,15,133,244,60,139,42,255,139,173,233,252,233,244,68,255,252, - 242,15,42,133,233,252,233,244,69,255,219,133,233,252,233,244,70,255,248,118, - 129,252,248,239,15,133,244,60,129,122,253,4,239,15,133,244,60,139,42,139, - 90,252,252,131,189,233,1,15,130,244,78,15,182,173,233,255,252,242,15,42,197, - 252,233,244,69,255,137,44,36,219,4,36,252,233,244,70,255,248,119,65,139,174, - 233,65,59,174,233,15,130,244,247,232,244,72,248,1,129,252,248,239,15,133, - 244,60,129,122,253,4,239,255,15,133,244,60,139,42,129,252,253,252,255,0,0, - 0,15,135,244,60,137,108,36,4,255,15,131,244,60,252,242,15,44,42,129,252,253, - 252,255,0,0,0,15,135,244,60,137,108,36,4,255,15,131,244,60,221,2,219,92,36, - 4,129,124,36,4,252,255,0,0,0,15,135,244,60,255,199,68,36,8,1,0,0,0,72,141, - 68,36,4,248,120,139,108,36,24,137,149,233,139,84,36,8,72,137,198,137,252, + 248,9,221,216,252,233,244,61,255,248,118,129,252,248,239,15,130,244,61,129, + 122,253,4,239,15,133,244,61,139,42,255,139,173,233,252,233,244,69,255,252, + 242,15,42,133,233,252,233,244,70,255,219,133,233,252,233,244,71,255,248,119, + 129,252,248,239,15,133,244,61,129,122,253,4,239,15,133,244,61,139,42,139, + 90,252,252,131,189,233,1,15,130,244,79,15,182,173,233,255,252,242,15,42,197, + 252,233,244,70,255,137,44,36,219,4,36,252,233,244,71,255,248,120,65,139,174, + 233,65,59,174,233,15,130,244,247,232,244,73,248,1,129,252,248,239,15,133, + 244,61,129,122,253,4,239,255,15,133,244,61,139,42,129,252,253,252,255,0,0, + 0,15,135,244,61,137,108,36,4,255,15,131,244,61,252,242,15,44,42,129,252,253, + 252,255,0,0,0,15,135,244,61,137,108,36,4,255,15,131,244,61,221,2,219,92,36, + 4,129,124,36,4,252,255,0,0,0,15,135,244,61,255,199,68,36,8,1,0,0,0,72,141, + 68,36,4,248,121,139,108,36,24,137,149,233,139,84,36,8,72,137,198,137,252, 239,137,92,36,28,232,251,1,20,139,149,233,139,90,252,252,199,66,252,252,237, - 137,66,252,248,252,233,244,63,248,121,65,139,174,233,65,59,174,233,15,130, - 244,247,232,244,72,248,1,199,68,36,4,252,255,252,255,252,255,252,255,129, - 252,248,239,15,130,244,60,15,134,244,247,129,122,253,20,239,255,15,133,244, - 60,139,106,16,137,108,36,4,255,15,131,244,60,252,242,15,44,106,16,137,108, - 36,4,255,15,131,244,60,221,66,16,219,92,36,4,255,248,1,129,122,253,4,239, - 15,133,244,60,129,122,253,12,239,255,139,42,137,108,36,8,139,173,233,255, + 137,66,252,248,252,233,244,64,248,122,65,139,174,233,65,59,174,233,15,130, + 244,247,232,244,73,248,1,199,68,36,4,252,255,252,255,252,255,252,255,129, + 252,248,239,15,130,244,61,15,134,244,247,129,122,253,20,239,255,15,133,244, + 61,139,106,16,137,108,36,4,255,15,131,244,61,252,242,15,44,106,16,137,108, + 36,4,255,15,131,244,61,221,66,16,219,92,36,4,255,248,1,129,122,253,4,239, + 15,133,244,61,129,122,253,12,239,255,139,42,137,108,36,8,139,173,233,255, 139,74,8,255,252,242,15,44,74,8,255,139,68,36,4,57,197,15,130,244,251,248, - 2,133,201,15,142,244,253,248,3,139,108,36,8,41,200,15,140,244,122,141,172, - 253,13,233,131,192,1,248,4,137,68,36,8,137,232,252,233,244,120,248,5,15,140, + 2,133,201,15,142,244,253,248,3,139,108,36,8,41,200,15,140,244,123,141,172, + 253,13,233,131,192,1,248,4,137,68,36,8,137,232,252,233,244,121,248,5,15,140, 244,252,141,68,40,1,252,233,244,2,248,6,137,232,252,233,244,2,248,7,255,15, 132,244,254,1,252,233,131,193,1,15,143,244,3,248,8,185,1,0,0,0,252,233,244, - 3,248,122,49,192,252,233,244,4,248,123,129,252,248,239,15,130,244,60,65,139, - 174,233,65,59,174,233,15,130,244,247,232,244,72,248,1,255,129,122,253,4,239, - 15,133,244,60,129,122,253,12,239,139,42,255,15,133,244,60,139,66,8,255,15, - 131,244,60,252,242,15,44,66,8,255,15,131,244,60,221,66,8,219,92,36,4,139, - 68,36,4,255,133,192,15,142,244,122,131,189,233,1,15,130,244,122,15,133,244, - 124,65,57,134,233,15,130,244,124,15,182,141,233,65,139,174,233,137,68,36, + 3,248,123,49,192,252,233,244,4,248,124,129,252,248,239,15,130,244,61,65,139, + 174,233,65,59,174,233,15,130,244,247,232,244,73,248,1,255,129,122,253,4,239, + 15,133,244,61,129,122,253,12,239,139,42,255,15,133,244,61,139,66,8,255,15, + 131,244,61,252,242,15,44,66,8,255,15,131,244,61,221,66,8,219,92,36,4,139, + 68,36,4,255,133,192,15,142,244,123,131,189,233,1,15,130,244,123,15,133,244, + 125,65,57,134,233,15,130,244,125,15,182,141,233,65,139,174,233,137,68,36, 8,248,1,136,77,0,131,197,1,131,232,1,15,133,244,1,65,139,134,233,252,233, - 244,120,248,125,129,252,248,239,255,15,130,244,60,65,139,174,233,65,59,174, - 233,15,130,244,247,232,244,72,248,1,129,122,253,4,239,15,133,244,60,139,42, - 139,133,233,133,192,15,132,244,122,65,57,134,233,15,130,244,126,129,197,239, + 244,121,248,126,129,252,248,239,255,15,130,244,61,65,139,174,233,65,59,174, + 233,15,130,244,247,232,244,73,248,1,129,122,253,4,239,15,133,244,61,139,42, + 139,133,233,133,192,15,132,244,123,65,57,134,233,15,130,244,127,129,197,239, 137,92,36,4,137,68,36,8,65,139,158,233,248,1,255,15,182,77,0,131,197,1,131, - 232,1,136,12,3,15,133,244,1,137,216,139,92,36,4,252,233,244,120,248,127,129, - 252,248,239,15,130,244,60,65,139,174,233,65,59,174,233,15,130,244,247,232, - 244,72,248,1,129,122,253,4,239,15,133,244,60,139,42,139,133,233,65,57,134, - 233,255,15,130,244,126,129,197,239,137,92,36,4,137,68,36,8,65,139,158,233, + 232,1,136,12,3,15,133,244,1,137,216,139,92,36,4,252,233,244,121,248,128,129, + 252,248,239,15,130,244,61,65,139,174,233,65,59,174,233,15,130,244,247,232, + 244,73,248,1,129,122,253,4,239,15,133,244,61,139,42,139,133,233,65,57,134, + 233,255,15,130,244,127,129,197,239,137,92,36,4,137,68,36,8,65,139,158,233, 252,233,244,249,248,1,15,182,76,5,0,131,252,249,65,15,130,244,248,131,252, 249,90,15,135,244,248,131,252,241,32,248,2,136,12,3,248,3,131,232,1,15,137, - 244,1,137,216,139,92,36,4,252,233,244,120,248,128,129,252,248,239,15,130, - 244,60,255,65,139,174,233,65,59,174,233,15,130,244,247,232,244,72,248,1,129, - 122,253,4,239,15,133,244,60,139,42,139,133,233,65,57,134,233,15,130,244,126, + 244,1,137,216,139,92,36,4,252,233,244,121,248,129,129,252,248,239,15,130, + 244,61,255,65,139,174,233,65,59,174,233,15,130,244,247,232,244,73,248,1,129, + 122,253,4,239,15,133,244,61,139,42,139,133,233,65,57,134,233,15,130,244,127, 129,197,239,137,92,36,4,137,68,36,8,65,139,158,233,252,233,244,249,248,1, 15,182,76,5,0,131,252,249,97,15,130,244,248,255,131,252,249,122,15,135,244, 248,131,252,241,32,248,2,136,12,3,248,3,131,232,1,15,137,244,1,137,216,139, - 92,36,4,252,233,244,120,248,129,129,252,248,239,15,130,244,60,129,122,253, - 4,239,15,133,244,60,137,213,139,58,232,251,1,21,137,252,234,255,137,197,252, - 233,244,68,255,252,242,15,42,192,252,233,244,69,255,248,130,129,122,253,4, - 239,255,15,133,244,247,139,42,252,233,244,86,248,1,15,135,244,60,255,252, + 92,36,4,252,233,244,121,248,130,129,252,248,239,15,130,244,61,129,122,253, + 4,239,15,133,244,61,137,213,139,58,232,251,1,21,137,252,234,255,137,197,252, + 233,244,69,255,252,242,15,42,192,252,233,244,70,255,248,131,129,122,253,4, + 239,255,15,133,244,247,139,42,252,233,244,87,248,1,15,135,244,61,255,252, 242,15,16,2,72,189,237,237,102,72,15,110,205,252,242,15,88,193,102,15,126, - 197,255,252,233,244,86,255,248,131,255,72,189,237,237,102,72,15,110,205,255, + 197,255,252,233,244,87,255,248,132,255,72,189,237,237,102,72,15,110,205,255, 199,4,36,0,0,192,89,255,15,133,244,247,139,42,252,233,244,248,248,1,15,135, - 244,60,255,252,242,15,16,2,252,242,15,88,193,102,15,126,197,255,248,2,137, - 68,36,4,141,68,194,252,240,248,1,57,208,15,134,244,86,129,120,253,4,239,255, - 15,133,244,248,35,40,131,232,8,252,233,244,1,248,2,15,135,244,132,255,15, - 131,244,132,255,252,242,15,16,0,252,242,15,88,193,102,15,126,193,33,205,255, - 131,232,8,252,233,244,1,248,133,255,15,133,244,248,11,40,131,232,8,252,233, - 244,1,248,2,15,135,244,132,255,252,242,15,16,0,252,242,15,88,193,102,15,126, - 193,9,205,255,131,232,8,252,233,244,1,248,134,255,15,133,244,248,51,40,131, - 232,8,252,233,244,1,248,2,15,135,244,132,255,252,242,15,16,0,252,242,15,88, - 193,102,15,126,193,49,205,255,131,232,8,252,233,244,1,248,135,129,122,253, - 4,239,255,248,2,15,205,252,233,244,86,248,136,129,122,253,4,239,255,248,2, - 252,247,213,255,248,86,252,242,15,42,197,252,233,244,69,255,248,132,139,68, - 36,4,252,233,244,60,255,248,137,129,122,253,4,239,255,248,2,129,122,253,12, - 239,15,133,244,60,139,74,8,255,248,137,129,252,248,239,15,130,244,60,129, - 122,253,4,239,15,131,244,60,129,122,253,12,239,15,131,244,60,252,242,15,16, + 244,61,255,252,242,15,16,2,252,242,15,88,193,102,15,126,197,255,248,2,137, + 68,36,4,141,68,194,252,240,248,1,57,208,15,134,244,87,129,120,253,4,239,255, + 15,133,244,248,35,40,131,232,8,252,233,244,1,248,2,15,135,244,133,255,15, + 131,244,133,255,252,242,15,16,0,252,242,15,88,193,102,15,126,193,33,205,255, + 131,232,8,252,233,244,1,248,134,255,15,133,244,248,11,40,131,232,8,252,233, + 244,1,248,2,15,135,244,133,255,252,242,15,16,0,252,242,15,88,193,102,15,126, + 193,9,205,255,131,232,8,252,233,244,1,248,135,255,15,133,244,248,51,40,131, + 232,8,252,233,244,1,248,2,15,135,244,133,255,252,242,15,16,0,252,242,15,88, + 193,102,15,126,193,49,205,255,131,232,8,252,233,244,1,248,136,129,122,253, + 4,239,255,248,2,15,205,252,233,244,87,248,137,129,122,253,4,239,255,248,2, + 252,247,213,255,248,87,252,242,15,42,197,252,233,244,70,255,248,133,139,68, + 36,4,252,233,244,61,255,248,138,129,122,253,4,239,255,248,2,129,122,253,12, + 239,15,133,244,61,139,74,8,255,248,138,129,252,248,239,15,130,244,61,129, + 122,253,4,239,15,131,244,61,129,122,253,12,239,15,131,244,61,252,242,15,16, 2,252,242,15,16,74,8,72,189,237,237,102,72,15,110,213,252,242,15,88,194,252, - 242,15,88,202,102,15,126,197,102,15,126,201,255,211,229,252,233,244,86,255, - 248,138,129,122,253,4,239,255,248,138,129,252,248,239,15,130,244,60,129,122, - 253,4,239,15,131,244,60,129,122,253,12,239,15,131,244,60,252,242,15,16,2, + 242,15,88,202,102,15,126,197,102,15,126,201,255,211,229,252,233,244,87,255, + 248,139,129,122,253,4,239,255,248,139,129,252,248,239,15,130,244,61,129,122, + 253,4,239,15,131,244,61,129,122,253,12,239,15,131,244,61,252,242,15,16,2, 252,242,15,16,74,8,72,189,237,237,102,72,15,110,213,252,242,15,88,194,252, - 242,15,88,202,102,15,126,197,102,15,126,201,255,211,252,237,252,233,244,86, - 255,248,139,129,122,253,4,239,255,248,139,129,252,248,239,15,130,244,60,129, - 122,253,4,239,15,131,244,60,129,122,253,12,239,15,131,244,60,252,242,15,16, + 242,15,88,202,102,15,126,197,102,15,126,201,255,211,252,237,252,233,244,87, + 255,248,140,129,122,253,4,239,255,248,140,129,252,248,239,15,130,244,61,129, + 122,253,4,239,15,131,244,61,129,122,253,12,239,15,131,244,61,252,242,15,16, 2,252,242,15,16,74,8,72,189,237,237,102,72,15,110,213,252,242,15,88,194,252, - 242,15,88,202,102,15,126,197,102,15,126,201,255,211,252,253,252,233,244,86, - 255,248,140,129,122,253,4,239,255,248,140,129,252,248,239,15,130,244,60,129, - 122,253,4,239,15,131,244,60,129,122,253,12,239,15,131,244,60,252,242,15,16, + 242,15,88,202,102,15,126,197,102,15,126,201,255,211,252,253,252,233,244,87, + 255,248,141,129,122,253,4,239,255,248,141,129,252,248,239,15,130,244,61,129, + 122,253,4,239,15,131,244,61,129,122,253,12,239,15,131,244,61,252,242,15,16, 2,252,242,15,16,74,8,72,189,237,237,102,72,15,110,213,252,242,15,88,194,252, - 242,15,88,202,102,15,126,197,102,15,126,201,255,211,197,252,233,244,86,255, - 248,141,129,122,253,4,239,255,248,141,129,252,248,239,15,130,244,60,129,122, - 253,4,239,15,131,244,60,129,122,253,12,239,15,131,244,60,252,242,15,16,2, + 242,15,88,202,102,15,126,197,102,15,126,201,255,211,197,252,233,244,87,255, + 248,142,129,122,253,4,239,255,248,142,129,252,248,239,15,130,244,61,129,122, + 253,4,239,15,131,244,61,129,122,253,12,239,15,131,244,61,252,242,15,16,2, 252,242,15,16,74,8,72,189,237,237,102,72,15,110,213,252,242,15,88,194,252, - 242,15,88,202,102,15,126,197,102,15,126,201,255,211,205,252,233,244,86,248, - 124,184,237,252,233,244,60,248,126,184,237,248,60,139,108,36,24,139,90,252, + 242,15,88,202,102,15,126,197,102,15,126,201,255,211,205,252,233,244,87,248, + 125,184,237,252,233,244,61,248,127,184,237,248,61,139,108,36,24,139,90,252, 252,137,92,36,28,137,149,233,141,68,194,252,248,141,136,233,137,133,233,139, 66,252,248,59,141,233,15,135,244,251,137,252,239,252,255,144,233,139,149, - 233,133,192,15,143,244,75,248,1,255,139,141,233,41,209,193,252,233,3,133, - 192,141,65,1,139,106,252,248,15,133,244,248,139,157,233,139,11,15,182,252, - 233,15,182,205,131,195,4,65,252,255,36,252,238,248,2,137,209,252,247,195, + 233,133,192,15,143,244,76,248,1,255,139,141,233,41,209,193,252,233,3,133, + 192,141,65,1,139,106,252,248,15,133,244,32,139,157,233,139,11,15,182,252, + 233,15,182,205,131,195,4,65,252,255,36,252,238,248,32,137,209,252,247,195, 237,15,133,244,249,15,182,107,252,253,72,252,247,213,141,20,252,234,252,233, 244,28,248,3,137,221,131,229,252,248,41,252,234,252,233,244,28,248,5,190, - 237,137,252,239,232,251,1,0,139,149,233,49,192,252,233,244,1,248,72,93,72, + 237,137,252,239,232,251,1,0,139,149,233,49,192,252,233,244,1,248,73,93,72, 137,108,36,8,139,108,36,24,137,92,36,28,137,149,233,255,141,68,194,252,248, 137,252,239,137,133,233,232,251,1,22,139,149,233,139,133,233,41,208,193,232, - 3,131,192,1,72,139,108,36,8,85,195,248,142,255,65,15,182,134,233,168,235, + 3,131,192,1,72,139,108,36,8,85,195,248,143,255,65,15,182,134,233,168,235, 15,133,244,251,168,235,15,133,244,247,168,235,15,132,244,247,65,252,255,142, - 233,252,233,244,247,255,248,143,65,15,182,134,233,168,235,15,133,244,251, - 252,233,244,247,248,144,65,15,182,134,233,168,235,15,133,244,251,168,235, + 233,252,233,244,247,255,248,144,65,15,182,134,233,168,235,15,133,244,251, + 252,233,244,247,248,145,65,15,182,134,233,168,235,15,133,244,251,168,235, 15,132,244,251,65,252,255,142,233,15,132,244,247,168,235,15,132,244,251,248, 1,255,139,108,36,24,137,149,233,137,222,137,252,239,232,251,1,23,248,3,139, 149,233,248,4,15,182,75,252,253,248,5,15,182,107,252,252,15,183,67,252,254, - 65,252,255,164,253,252,238,233,248,145,131,195,4,139,77,232,137,76,36,4,252, - 233,244,4,248,146,255,139,106,252,248,139,173,233,15,182,133,233,141,4,194, + 65,252,255,164,253,252,238,233,248,146,131,195,4,139,77,232,137,76,36,4,252, + 233,244,4,248,147,255,139,106,252,248,139,173,233,15,182,133,233,141,4,194, 139,108,36,24,137,149,233,137,133,233,137,222,65,141,190,233,73,137,174,233, - 137,92,36,28,232,251,1,24,252,233,244,3,255,248,147,137,92,36,28,255,248, - 148,255,137,92,36,28,131,203,1,248,1,255,141,68,194,252,248,139,108,36,24, + 137,92,36,28,232,251,1,24,252,233,244,3,255,248,148,137,92,36,28,255,248, + 149,255,137,92,36,28,131,203,1,248,1,255,141,68,194,252,248,139,108,36,24, 137,149,233,137,133,233,137,222,137,252,239,232,251,1,25,199,68,36,28,0,0, 0,0,255,131,227,252,254,255,139,149,233,72,137,193,139,133,233,41,208,72, - 137,205,15,182,75,252,253,193,232,3,131,192,1,252,255,229,248,149,255,65, + 137,205,15,182,75,252,253,193,232,3,131,192,1,252,255,229,248,150,255,65, 85,65,84,65,83,65,82,65,81,65,80,87,86,85,72,141,108,36,88,85,83,82,81,80, 15,182,69,252,248,138,101,252,240,76,137,125,252,248,76,137,117,252,240,68, 139,117,0,65,139,142,233,65,199,134,233,237,65,137,134,233,65,137,142,233, @@ -390,30 +391,30 @@ static const unsigned char build_actionlist[15992] = { 15,17,77,136,252,242,15,17,69,128,65,139,174,233,65,139,150,233,73,137,174, 233,65,199,134,233,0,0,0,0,137,149,233,72,137,230,65,141,190,233,232,251, 1,26,72,139,141,233,72,129,225,239,72,137,204,137,169,233,139,149,233,139, - 153,233,252,233,244,247,255,248,150,255,72,131,196,16,248,1,76,139,108,36, + 153,233,252,233,244,247,255,248,151,255,72,131,196,16,248,1,76,139,108,36, 8,76,139,36,36,133,192,15,136,244,249,137,68,36,4,68,139,122,252,248,69,139, 191,233,69,139,191,233,65,199,134,233,0,0,0,0,65,199,134,233,237,139,3,15, 182,204,15,182,232,131,195,4,193,232,16,129,252,253,239,15,130,244,248,139, 68,36,4,248,2,65,252,255,36,252,238,248,3,252,247,216,137,252,239,137,198, - 232,251,1,1,255,248,88,255,217,124,36,4,137,68,36,8,102,184,0,4,102,11,68, + 232,251,1,1,255,248,89,255,217,124,36,4,137,68,36,8,102,184,0,4,102,11,68, 36,4,102,37,252,255,252,247,102,137,68,36,6,217,108,36,6,217,252,252,217, - 108,36,4,139,68,36,8,195,255,248,151,72,184,237,237,102,72,15,110,208,72, + 108,36,4,139,68,36,8,195,255,248,152,72,184,237,237,102,72,15,110,208,72, 184,237,237,102,72,15,110,216,15,40,200,102,15,84,202,102,15,46,217,15,134, 244,247,102,15,85,208,252,242,15,88,203,252,242,15,92,203,102,15,86,202,72, 184,237,237,102,72,15,110,208,252,242,15,194,193,1,102,15,84,194,252,242, - 15,92,200,15,40,193,248,1,195,248,90,255,217,124,36,4,137,68,36,8,102,184, + 15,92,200,15,40,193,248,1,195,248,91,255,217,124,36,4,137,68,36,8,102,184, 0,8,102,11,68,36,4,102,37,252,255,252,251,102,137,68,36,6,217,108,36,6,217, - 252,252,217,108,36,4,139,68,36,8,195,255,248,152,72,184,237,237,102,72,15, + 252,252,217,108,36,4,139,68,36,8,195,255,248,153,72,184,237,237,102,72,15, 110,208,72,184,237,237,102,72,15,110,216,15,40,200,102,15,84,202,102,15,46, 217,15,134,244,247,102,15,85,208,252,242,15,88,203,252,242,15,92,203,102, 15,86,202,72,184,237,237,102,72,15,110,208,252,242,15,194,193,6,102,15,84, - 194,252,242,15,92,200,15,40,193,248,1,195,248,111,255,217,124,36,4,137,68, + 194,252,242,15,92,200,15,40,193,248,1,195,248,112,255,217,124,36,4,137,68, 36,8,102,184,0,12,102,11,68,36,4,102,137,68,36,6,217,108,36,6,217,252,252, - 217,108,36,4,139,68,36,8,195,255,248,153,72,184,237,237,102,72,15,110,208, + 217,108,36,4,139,68,36,8,195,255,248,154,72,184,237,237,102,72,15,110,208, 72,184,237,237,102,72,15,110,216,15,40,200,102,15,84,202,102,15,46,217,15, 134,244,247,102,15,85,208,15,40,193,252,242,15,88,203,252,242,15,92,203,72, 184,237,237,102,72,15,110,216,252,242,15,194,193,1,102,15,84,195,252,242, - 15,92,200,102,15,86,202,15,40,193,248,1,195,248,154,255,15,40,232,252,242, + 15,92,200,102,15,86,202,15,40,193,248,1,195,248,155,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, @@ -421,12 +422,12 @@ static const unsigned char build_actionlist[15992] = { 89,204,252,242,15,92,193,195,248,1,252,242,15,89,200,15,40,197,252,242,15, 92,193,195,255,217,193,216,252,241,217,124,36,4,102,184,0,4,102,11,68,36, 4,102,37,252,255,252,247,102,137,68,36,6,217,108,36,6,217,252,252,217,108, - 36,4,222,201,222,252,233,195,255,248,95,217,252,234,222,201,248,155,217,84, + 36,4,222,201,222,252,233,195,255,248,96,217,252,234,222,201,248,156,217,84, 36,252,248,129,124,36,252,248,0,0,128,127,15,132,244,247,129,124,36,252,248, - 0,0,128,252,255,15,132,244,248,248,156,217,192,217,252,252,220,252,233,217, + 0,0,128,252,255,15,132,244,248,248,157,217,192,217,252,252,220,252,233,217, 201,217,252,240,217,232,222,193,217,252,253,221,217,248,1,195,248,2,221,216, - 217,252,238,195,255,248,114,255,248,157,252,242,15,45,193,252,242,15,42,208, - 102,15,46,202,15,133,244,254,15,138,244,255,248,158,131,252,248,1,15,142, + 217,252,238,195,255,248,115,255,248,158,252,242,15,45,193,252,242,15,42,208, + 102,15,46,202,15,133,244,254,15,138,244,255,248,159,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, @@ -444,27 +445,27 @@ static const unsigned char build_actionlist[15992] = { 1,102,15,80,193,15,87,192,136,196,15,146,208,48,224,15,133,244,1,248,3,72, 184,237,237,255,102,72,15,110,192,195,248,4,102,15,80,193,133,192,15,133, 244,3,15,87,192,195,248,5,102,15,80,193,133,192,15,132,244,3,15,87,192,195, - 248,159,255,131,252,255,1,15,130,244,88,15,132,244,90,131,252,255,3,15,130, - 244,111,15,135,244,248,252,242,15,81,192,195,248,2,252,242,15,17,68,36,252, + 248,160,255,131,252,255,1,15,130,244,89,15,132,244,91,131,252,255,3,15,130, + 244,112,15,135,244,248,252,242,15,81,192,195,248,2,252,242,15,17,68,36,252, 248,221,68,36,252,248,131,252,255,5,15,135,244,248,15,132,244,247,232,244, - 95,252,233,244,253,248,1,232,244,155,255,252,233,244,253,248,2,131,252,255, + 96,252,233,244,253,248,1,232,244,156,255,252,233,244,253,248,2,131,252,255, 7,15,132,244,247,15,135,244,248,217,252,237,217,201,217,252,241,252,233,244, 253,248,1,217,232,217,201,217,252,241,252,233,244,253,248,2,131,252,255,9, 15,132,244,247,15,135,244,248,217,252,236,217,201,217,252,241,252,233,244, 253,248,1,255,217,252,254,252,233,244,253,248,2,131,252,255,11,15,132,244, 247,15,135,244,255,217,252,255,252,233,244,253,248,1,217,252,242,221,216, 248,7,221,92,36,252,248,252,242,15,16,68,36,252,248,195,255,139,124,36,12, - 221,68,36,4,131,252,255,1,15,130,244,88,15,132,244,90,131,252,255,3,15,130, - 244,111,15,135,244,248,217,252,250,195,248,2,131,252,255,5,15,130,244,95, - 15,132,244,155,131,252,255,7,15,132,244,247,15,135,244,248,217,252,237,217, + 221,68,36,4,131,252,255,1,15,130,244,89,15,132,244,91,131,252,255,3,15,130, + 244,112,15,135,244,248,217,252,250,195,248,2,131,252,255,5,15,130,244,96, + 15,132,244,156,131,252,255,7,15,132,244,247,15,135,244,248,217,252,237,217, 201,217,252,241,195,248,1,217,232,217,201,217,252,241,195,248,2,131,252,255, 9,15,132,244,247,255,15,135,244,248,217,252,236,217,201,217,252,241,195,248, 1,217,252,254,195,248,2,131,252,255,11,15,132,244,247,15,135,244,255,217, - 252,255,195,248,1,217,252,242,221,216,195,255,248,9,204,255,248,160,255,131, + 252,255,195,248,1,217,252,242,221,216,195,255,248,9,204,255,248,161,255,131, 252,255,1,15,132,244,247,15,135,244,248,252,242,15,88,193,195,248,1,252,242, 15,92,193,195,248,2,131,252,255,3,15,132,244,247,15,135,244,248,252,242,15, - 89,193,195,248,1,252,242,15,94,193,195,248,2,131,252,255,5,15,130,244,154, - 15,132,244,114,131,252,255,7,15,132,244,247,15,135,244,248,72,184,237,237, + 89,193,195,248,1,252,242,15,94,193,195,248,2,131,252,255,5,15,130,244,155, + 15,132,244,115,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, @@ -474,14 +475,14 @@ static const unsigned char build_actionlist[15992] = { 248,9,204,255,139,68,36,20,221,68,36,4,221,68,36,12,131,252,248,1,15,132, 244,247,15,135,244,248,222,193,195,248,1,222,252,233,195,248,2,131,252,248, 3,15,132,244,247,15,135,244,248,222,201,195,248,1,222,252,249,195,248,2,131, - 252,248,5,15,130,244,154,15,132,244,114,131,252,248,7,15,132,244,247,15,135, + 252,248,5,15,130,244,155,15,132,244,115,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, - 161,137,252,248,83,15,162,137,6,137,94,4,137,78,8,137,86,12,91,195,248,162, + 162,137,252,248,83,15,162,137,6,137,94,4,137,78,8,137,86,12,91,195,248,163, 255,85,72,137,229,83,72,137,252,251,139,131,233,72,41,196,255,15,182,139, 233,131,252,233,1,15,136,244,248,248,1,72,139,132,253,203,233,72,137,132, 253,204,233,131,252,233,1,15,137,244,1,248,2,15,182,131,233,72,139,187,233, @@ -489,17 +490,17 @@ static const unsigned char build_actionlist[15992] = { 133,192,15,132,244,251,15,40,131,233,15,40,139,233,255,15,40,147,233,15,40, 155,233,131,252,248,4,15,134,244,251,15,40,163,233,15,40,171,233,15,40,179, 233,15,40,187,233,248,5,252,255,147,233,72,137,131,233,15,41,131,233,72,137, - 147,233,15,41,139,233,255,72,139,93,252,248,201,195,255,248,163,255,249,255, + 147,233,15,41,139,233,255,72,139,93,252,248,201,195,255,248,164,255,249,255, 129,124,253,202,4,239,15,133,244,253,129,124,253,194,4,239,15,133,244,254, 139,44,202,131,195,4,59,44,194,255,15,141,244,255,255,15,140,244,255,255, 15,143,244,255,255,15,142,244,255,255,248,6,15,183,67,252,254,141,156,253, 131,233,248,9,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255, - 36,252,238,248,7,15,135,244,42,129,124,253,194,4,239,15,130,244,247,15,133, - 244,42,255,252,242,15,42,4,194,252,233,244,248,255,221,4,202,219,4,194,252, - 233,244,249,255,248,8,15,135,244,42,255,252,242,15,42,12,202,252,242,15,16, + 36,252,238,248,7,15,135,244,43,129,124,253,194,4,239,15,130,244,247,15,133, + 244,43,255,252,242,15,42,4,194,252,233,244,248,255,221,4,202,219,4,194,252, + 233,244,249,255,248,8,15,135,244,43,255,252,242,15,42,12,202,252,242,15,16, 4,194,131,195,4,102,15,46,193,255,15,134,244,9,255,15,135,244,9,255,15,130, 244,9,255,15,131,244,9,255,252,233,244,6,255,219,4,202,252,233,244,248,255, - 129,124,253,202,4,239,15,131,244,42,129,124,253,194,4,239,15,131,244,42,255, + 129,124,253,202,4,239,15,131,244,43,129,124,253,194,4,239,15,131,244,43,255, 248,1,252,242,15,16,4,194,248,2,131,195,4,102,15,46,4,202,248,3,255,248,1, 221,4,202,248,2,221,4,194,248,3,131,195,4,255,223,252,233,221,216,255,218, 252,233,223,224,158,255,15,134,244,247,255,15,135,244,247,255,15,130,244, @@ -517,11 +518,11 @@ static const unsigned char build_actionlist[15992] = { 248,4,255,15,138,244,248,15,133,244,248,255,15,138,244,248,15,132,244,247, 255,248,1,15,183,67,252,254,141,156,253,131,233,248,2,255,248,2,15,183,67, 252,254,141,156,253,131,233,248,1,255,252,233,244,9,255,248,5,255,129,252, - 253,239,15,132,244,47,129,124,253,202,4,239,15,132,244,47,255,57,108,202, + 253,239,15,132,244,48,129,124,253,202,4,239,15,132,244,48,255,57,108,202, 4,15,133,244,2,129,252,253,239,15,131,244,1,139,12,202,139,4,194,57,193,15, 132,244,1,129,252,253,239,15,135,244,2,139,169,233,133,252,237,15,132,244, 2,252,246,133,233,235,15,133,244,2,255,49,252,237,255,189,1,0,0,0,255,252, - 233,244,46,255,248,3,129,252,253,239,255,15,133,244,9,255,252,233,244,47, + 233,244,47,255,248,3,129,252,253,239,255,15,133,244,9,255,252,233,244,48, 255,72,252,247,208,139,108,202,4,131,195,4,129,252,253,239,15,133,244,249, 139,12,202,65,59,12,135,255,139,108,202,4,131,195,4,255,129,252,253,239,15, 133,244,253,65,129,124,253,199,4,239,15,133,244,254,65,139,44,199,59,44,202, @@ -534,7 +535,7 @@ static const unsigned char build_actionlist[15992] = { 4,202,248,4,255,72,252,247,208,139,108,202,4,131,195,4,57,197,255,15,133, 244,249,15,183,67,252,254,141,156,253,131,233,248,2,139,3,15,182,204,15,182, 232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,129,252,253,239,15,133, - 244,2,252,233,244,47,255,15,132,244,248,129,252,253,239,15,132,244,47,15, + 244,2,252,233,244,48,255,15,132,244,248,129,252,253,239,15,132,244,48,15, 183,67,252,254,141,156,253,131,233,248,2,139,3,15,182,204,15,182,232,131, 195,4,193,232,16,65,252,255,36,252,238,255,139,108,194,4,131,195,4,129,252, 253,239,255,137,108,202,4,139,44,194,137,44,202,255,72,139,44,194,72,137, @@ -544,40 +545,40 @@ static const unsigned char build_actionlist[15992] = { 124,253,194,4,239,15,133,244,251,139,44,194,252,247,221,15,128,244,250,199, 68,202,4,237,137,44,202,248,9,139,3,15,182,204,15,182,232,131,195,4,193,232, 16,65,252,255,36,252,238,248,4,199,68,202,4,0,0,224,65,199,4,202,0,0,0,0, - 252,233,244,9,248,5,15,135,244,52,255,129,124,253,194,4,239,15,131,244,52, + 252,233,244,9,248,5,15,135,244,53,255,129,124,253,194,4,239,15,131,244,53, 255,252,242,15,16,4,194,72,184,237,237,102,72,15,110,200,15,87,193,252,242, 15,17,4,202,255,221,4,194,217,224,221,28,202,255,129,124,253,194,4,239,15, 133,244,248,139,4,194,255,139,128,233,248,1,199,68,202,4,237,137,4,202,255, 15,87,192,252,242,15,42,128,233,248,1,252,242,15,17,4,202,255,219,128,233, 248,1,221,28,202,255,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65, - 252,255,36,252,238,248,2,129,124,253,194,4,239,15,133,244,55,139,60,194,137, + 252,255,36,252,238,248,2,129,124,253,194,4,239,15,133,244,56,139,60,194,137, 213,232,251,1,21,255,252,242,15,42,192,255,137,252,234,15,182,75,252,253, 252,233,244,1,255,15,182,252,236,15,182,192,255,129,124,253,252,234,4,239, - 15,133,244,49,65,129,124,253,199,4,239,15,133,244,49,139,44,252,234,65,3, - 44,199,15,128,244,48,255,129,124,253,252,234,4,239,15,133,244,51,65,129,124, - 253,199,4,239,15,133,244,51,65,139,4,199,3,4,252,234,15,128,244,50,255,129, - 124,253,252,234,4,239,15,133,244,54,129,124,253,194,4,239,15,133,244,54,139, - 44,252,234,3,44,194,15,128,244,53,255,199,68,202,4,237,255,129,124,253,252, - 234,4,239,15,131,244,49,255,65,129,124,253,199,4,239,15,131,244,49,255,252, + 15,133,244,50,65,129,124,253,199,4,239,15,133,244,50,139,44,252,234,65,3, + 44,199,15,128,244,49,255,129,124,253,252,234,4,239,15,133,244,52,65,129,124, + 253,199,4,239,15,133,244,52,65,139,4,199,3,4,252,234,15,128,244,51,255,129, + 124,253,252,234,4,239,15,133,244,55,129,124,253,194,4,239,15,133,244,55,139, + 44,252,234,3,44,194,15,128,244,54,255,199,68,202,4,237,255,129,124,253,252, + 234,4,239,15,131,244,50,255,65,129,124,253,199,4,239,15,131,244,50,255,252, 242,15,16,4,252,234,252,242,65,15,88,4,199,255,221,4,252,234,65,220,4,199, - 255,129,124,253,252,234,4,239,15,131,244,51,255,65,129,124,253,199,4,239, - 15,131,244,51,255,252,242,65,15,16,4,199,252,242,15,88,4,252,234,255,65,221, - 4,199,220,4,252,234,255,129,124,253,252,234,4,239,15,131,244,54,129,124,253, - 194,4,239,15,131,244,54,255,252,242,15,16,4,252,234,252,242,15,88,4,194,255, - 221,4,252,234,220,4,194,255,129,124,253,252,234,4,239,15,133,244,49,65,129, - 124,253,199,4,239,15,133,244,49,139,44,252,234,65,43,44,199,15,128,244,48, - 255,129,124,253,252,234,4,239,15,133,244,51,65,129,124,253,199,4,239,15,133, - 244,51,65,139,4,199,43,4,252,234,15,128,244,50,255,129,124,253,252,234,4, - 239,15,133,244,54,129,124,253,194,4,239,15,133,244,54,139,44,252,234,43,44, - 194,15,128,244,53,255,252,242,15,16,4,252,234,252,242,65,15,92,4,199,255, + 255,129,124,253,252,234,4,239,15,131,244,52,255,65,129,124,253,199,4,239, + 15,131,244,52,255,252,242,65,15,16,4,199,252,242,15,88,4,252,234,255,65,221, + 4,199,220,4,252,234,255,129,124,253,252,234,4,239,15,131,244,55,129,124,253, + 194,4,239,15,131,244,55,255,252,242,15,16,4,252,234,252,242,15,88,4,194,255, + 221,4,252,234,220,4,194,255,129,124,253,252,234,4,239,15,133,244,50,65,129, + 124,253,199,4,239,15,133,244,50,139,44,252,234,65,43,44,199,15,128,244,49, + 255,129,124,253,252,234,4,239,15,133,244,52,65,129,124,253,199,4,239,15,133, + 244,52,65,139,4,199,43,4,252,234,15,128,244,51,255,129,124,253,252,234,4, + 239,15,133,244,55,129,124,253,194,4,239,15,133,244,55,139,44,252,234,43,44, + 194,15,128,244,54,255,252,242,15,16,4,252,234,252,242,65,15,92,4,199,255, 221,4,252,234,65,220,36,199,255,252,242,65,15,16,4,199,252,242,15,92,4,252, 234,255,65,221,4,199,220,36,252,234,255,252,242,15,16,4,252,234,252,242,15, 92,4,194,255,221,4,252,234,220,36,194,255,129,124,253,252,234,4,239,15,133, - 244,49,65,129,124,253,199,4,239,15,133,244,49,139,44,252,234,65,15,175,44, - 199,15,128,244,48,255,129,124,253,252,234,4,239,15,133,244,51,65,129,124, - 253,199,4,239,15,133,244,51,65,139,4,199,15,175,4,252,234,15,128,244,50,255, - 129,124,253,252,234,4,239,15,133,244,54,129,124,253,194,4,239,15,133,244, - 54,139,44,252,234,15,175,44,194,15,128,244,53,255,252,242,15,16,4,252,234, + 244,50,65,129,124,253,199,4,239,15,133,244,50,139,44,252,234,65,15,175,44, + 199,15,128,244,49,255,129,124,253,252,234,4,239,15,133,244,52,65,129,124, + 253,199,4,239,15,133,244,52,65,139,4,199,15,175,4,252,234,15,128,244,51,255, + 129,124,253,252,234,4,239,15,133,244,55,129,124,253,194,4,239,15,133,244, + 55,139,44,252,234,15,175,44,194,15,128,244,54,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, @@ -587,10 +588,10 @@ static const unsigned char build_actionlist[15992] = { 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,164,232,244,154,255,252,233,244, - 164,255,232,244,114,255,15,182,252,236,15,182,192,139,124,36,24,137,151,233, - 141,52,194,137,194,41,252,234,248,34,137,252,253,137,92,36,28,232,251,1,27, - 139,149,233,133,192,15,133,244,43,15,182,107,252,255,15,182,75,252,253,72, + 12,194,255,221,4,252,234,221,4,194,255,248,165,232,244,155,255,252,233,244, + 165,255,232,244,115,255,15,182,252,236,15,182,192,139,124,36,24,137,151,233, + 141,52,194,137,194,41,252,234,248,35,137,252,253,137,92,36,28,232,251,1,27, + 139,149,233,133,192,15,133,244,44,15,182,107,252,255,15,182,75,252,253,72, 139,4,252,234,72,137,4,202,139,3,15,182,204,15,182,232,131,195,4,193,232, 16,65,252,255,36,252,238,255,72,252,247,208,65,139,4,135,199,68,202,4,237, 137,4,202,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36, @@ -633,56 +634,56 @@ static const unsigned char build_actionlist[15992] = { 253,137,4,202,199,68,202,4,237,139,3,15,182,204,15,182,232,131,195,4,193, 232,16,65,252,255,36,252,238,248,3,137,252,239,232,251,1,32,15,183,67,252, 254,72,252,247,208,252,233,244,2,255,72,252,247,208,139,106,252,248,139,173, - 233,65,139,4,135,252,233,244,165,255,72,252,247,208,139,106,252,248,139,173, - 233,65,139,4,135,252,233,244,166,255,15,182,252,236,15,182,192,129,124,253, - 252,234,4,239,15,133,244,37,139,44,252,234,255,129,124,253,194,4,239,15,133, + 233,65,139,4,135,252,233,244,166,255,72,252,247,208,139,106,252,248,139,173, + 233,65,139,4,135,252,233,244,167,255,15,182,252,236,15,182,192,129,124,253, + 252,234,4,239,15,133,244,38,139,44,252,234,255,129,124,253,194,4,239,15,133, 244,251,139,4,194,255,129,124,253,194,4,239,15,131,244,251,255,252,242,15, 16,4,194,252,242,15,45,192,252,242,15,42,200,102,15,46,193,255,15,133,244, - 37,255,59,133,233,15,131,244,37,193,224,3,3,133,233,129,120,253,4,239,15, + 38,255,59,133,233,15,131,244,38,193,224,3,3,133,233,129,120,253,4,239,15, 132,244,248,72,139,40,72,137,44,202,248,1,139,3,15,182,204,15,182,232,131, 195,4,193,232,16,65,252,255,36,252,238,248,2,131,189,233,0,15,132,244,249, - 139,141,233,252,246,129,233,235,15,132,244,37,15,182,75,252,253,248,3,199, - 68,202,4,237,252,233,244,1,248,5,255,129,124,253,194,4,239,15,133,244,37, - 139,4,194,252,233,244,165,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,35,139,44,252,234,248,165, + 139,141,233,252,246,129,233,235,15,132,244,38,15,182,75,252,253,248,3,199, + 68,202,4,237,252,233,244,1,248,5,255,129,124,253,194,4,239,15,133,244,38, + 139,4,194,252,233,244,166,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,36,139,44,252,234,248,166, 139,141,233,35,136,233,105,201,239,3,141,233,248,1,129,185,233,239,15,133, 244,250,57,129,233,15,133,244,250,129,121,253,4,239,15,132,244,251,15,182, 67,252,253,72,139,41,72,137,44,194,248,2,255,139,3,15,182,204,15,182,232, 131,195,4,193,232,16,65,252,255,36,252,238,248,3,15,182,67,252,253,199,68, 194,4,237,252,233,244,2,248,4,139,137,233,133,201,15,133,244,1,248,5,139, 141,233,133,201,15,132,244,3,252,246,129,233,235,15,133,244,3,252,233,244, - 35,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,36, - 139,44,252,234,59,133,233,15,131,244,36,193,224,3,3,133,233,129,120,253,4, + 36,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,37, + 139,44,252,234,59,133,233,15,131,244,37,193,224,3,3,133,233,129,120,253,4, 239,15,132,244,248,72,139,40,72,137,44,202,248,1,139,3,15,182,204,15,182, 232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,131,189,233,0,15,132, - 244,249,139,141,233,252,246,129,233,235,15,132,244,36,255,15,182,75,252,253, + 244,249,139,141,233,252,246,129,233,235,15,132,244,37,255,15,182,75,252,253, 248,3,199,68,202,4,237,252,233,244,1,255,15,182,252,236,15,182,192,129,124, - 253,252,234,4,239,15,133,244,40,139,44,252,234,255,15,133,244,40,255,59,133, - 233,15,131,244,40,193,224,3,3,133,233,129,120,253,4,239,15,132,244,249,248, + 253,252,234,4,239,15,133,244,41,139,44,252,234,255,15,133,244,41,255,59,133, + 233,15,131,244,41,193,224,3,3,133,233,129,120,253,4,239,15,132,244,249,248, 1,252,246,133,233,235,15,133,244,253,248,2,72,139,44,202,72,137,40,139,3, 15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,131, - 189,233,0,15,132,244,1,139,141,233,252,246,129,233,235,255,15,132,244,40, - 15,182,75,252,253,252,233,244,1,248,5,129,124,253,194,4,239,15,133,244,40, - 139,4,194,252,233,244,166,248,7,128,165,233,235,65,139,142,233,65,137,174, + 189,233,0,15,132,244,1,139,141,233,252,246,129,233,235,255,15,132,244,41, + 15,182,75,252,253,252,233,244,1,248,5,129,124,253,194,4,239,15,133,244,41, + 139,4,194,252,233,244,167,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,38,139, - 44,252,234,248,166,139,141,233,35,136,233,105,201,239,198,133,233,0,3,141, + 192,72,252,247,208,65,139,4,135,129,124,253,252,234,4,239,15,133,244,39,139, + 44,252,234,248,167,139,141,233,35,136,233,105,201,239,198,133,233,0,3,141, 233,248,1,129,185,233,239,15,133,244,251,57,129,233,15,133,244,251,129,121, 253,4,239,15,132,244,250,248,2,255,252,246,133,233,235,15,133,244,253,248, 3,15,182,67,252,253,72,139,44,194,72,137,41,139,3,15,182,204,15,182,232,131, 195,4,193,232,16,65,252,255,36,252,238,248,4,131,189,233,0,15,132,244,2,137, - 12,36,139,141,233,252,246,129,233,235,15,132,244,38,139,12,36,252,233,244, + 12,36,139,141,233,252,246,129,233,235,15,132,244,39,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,38,248,6,137,4,36,199,68,36,4,237,137, + 252,252,246,129,233,235,15,132,244,39,248,6,137,4,36,199,68,36,4,237,137, 108,36,8,139,124,36,24,137,151,233,72,141,20,36,137,252,238,137,252,253,137, 92,36,28,232,251,1,34,139,149,233,139,108,36,8,137,193,252,233,244,2,248, 7,128,165,233,235,65,139,134,233,65,137,174,233,137,133,233,252,233,244,3, - 255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,39,139, - 44,252,234,59,133,233,15,131,244,39,193,224,3,3,133,233,129,120,253,4,239, + 255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,40,139, + 44,252,234,59,133,233,15,131,244,40,193,224,3,3,133,233,129,120,253,4,239, 15,132,244,249,248,1,252,246,133,233,235,15,133,244,253,248,2,72,139,12,202, 72,137,8,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252, 238,248,3,131,189,233,0,15,132,244,1,255,139,141,233,252,246,129,233,235, - 15,132,244,39,15,182,75,252,253,252,233,244,1,248,7,128,165,233,235,65,139, + 15,132,244,40,15,182,75,252,253,252,233,244,1,248,7,128,165,233,235,65,139, 142,233,65,137,174,233,137,141,233,15,182,75,252,253,252,233,244,2,255,68, 137,60,36,69,139,60,199,248,1,141,12,202,139,105,252,248,252,246,133,233, 235,15,133,244,253,248,2,139,68,36,4,131,232,1,15,132,244,250,68,1,252,248, @@ -692,10 +693,10 @@ static const unsigned char build_actionlist[15992] = { 238,248,5,139,124,36,24,137,151,233,137,252,238,137,194,137,252,253,137,92, 36,28,232,251,1,35,139,149,233,15,182,75,252,253,252,233,244,1,248,7,255, 128,165,233,235,65,139,134,233,65,137,174,233,137,133,233,252,233,244,2,255, - 3,68,36,4,255,129,124,253,202,4,239,139,44,202,15,133,244,56,141,84,202,8, + 3,68,36,4,255,129,124,253,202,4,239,139,44,202,15,133,244,57,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,29,248,57,139,90,252,252,252,247,195,237,15,133,244, + 252,252,239,15,133,244,29,248,58,139,90,252,252,252,247,195,237,15,133,244, 253,248,1,137,106,252,248,137,68,36,4,131,232,1,15,132,244,249,248,2,72,139, 41,131,193,8,73,137,47,65,131,199,8,131,232,1,15,133,244,2,139,106,252,248, 248,3,139,68,36,4,128,189,233,1,15,135,244,251,248,4,139,157,233,139,11,15, @@ -743,19 +744,19 @@ static const unsigned char build_actionlist[15992] = { 65,199,71,252,252,237,65,131,199,8,255,199,68,194,252,244,237,255,131,192, 1,252,233,244,5,248,7,141,171,233,252,247,197,237,15,133,244,14,41,252,234, 255,1,252,233,255,137,221,209,252,237,129,229,239,102,65,131,172,253,46,233, - 1,15,132,244,146,255,141,12,202,255,129,121,253,4,239,15,133,244,255,255, - 129,121,253,12,239,15,133,244,58,129,121,253,20,239,15,133,244,58,139,41, - 131,121,16,0,15,140,244,251,255,129,121,253,12,239,15,133,244,163,129,121, - 253,20,239,15,133,244,163,255,139,105,16,133,252,237,15,136,244,251,3,41, + 1,15,132,244,147,255,141,12,202,255,129,121,253,4,239,15,133,244,255,255, + 129,121,253,12,239,15,133,244,59,129,121,253,20,239,15,133,244,59,139,41, + 131,121,16,0,15,140,244,251,255,129,121,253,12,239,15,133,244,164,129,121, + 253,20,239,15,133,244,164,255,139,105,16,133,252,237,15,136,244,251,3,41, 15,128,244,247,137,41,255,59,105,8,199,65,28,237,137,105,24,255,15,142,244, 253,248,1,248,6,141,156,253,131,233,255,141,156,253,131,233,15,183,67,252, 254,15,142,245,248,1,248,6,255,15,143,244,253,248,6,141,156,253,131,233,248, 1,255,248,7,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36, 252,238,248,5,255,3,41,15,128,244,1,137,41,255,15,141,244,7,255,141,156,253, 131,233,15,183,67,252,254,15,141,245,255,15,140,244,7,255,252,233,244,6,248, - 9,255,129,121,253,4,239,255,15,131,244,58,129,121,253,12,239,15,131,244,58, - 255,129,121,253,12,239,15,131,244,163,129,121,253,20,239,15,131,244,163,255, - 139,105,20,255,129,252,253,239,15,131,244,58,255,252,242,15,16,1,252,242, + 9,255,129,121,253,4,239,255,15,131,244,59,129,121,253,12,239,15,131,244,59, + 255,129,121,253,12,239,15,131,244,164,129,121,253,20,239,15,131,244,164,255, + 139,105,20,255,129,252,253,239,15,131,244,59,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, @@ -769,7 +770,7 @@ static const unsigned char build_actionlist[15992] = { 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,148,255,68,139,187,233,139,108,36,24,141,12,202,59,141,233,15,135, + 132,244,149,255,68,139,187,233,139,108,36,24,141,12,202,59,141,233,15,135, 244,24,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, @@ -809,6 +810,7 @@ enum { GLOB_vmeta_call, GLOB_vm_call_dispatch_f, GLOB_vm_cpcall, + GLOB_vm_call_tail, GLOB_cont_cat, GLOB_cont_ra, GLOB_BC_CAT_Z, @@ -969,6 +971,7 @@ static const char *const globnames[] = { "vmeta_call", "vm_call_dispatch_f", "vm_cpcall", + "vm_call_tail", "cont_cat", "cont_ra", "BC_CAT_Z", @@ -1173,671 +1176,672 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse) dasm_put(Dst, 302, 1+1, Dt1(->base), Dt1(->glref), GG_G2DISP, LJ_TFALSE, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, LUA_MINSTACK, -4+PC2PROTO(framesize), Dt1(->base)); dasm_put(Dst, 385, Dt1(->top), Dt1(->base), Dt1(->top), Dt7(->pc), FRAME_CP, CFRAME_RESUME, Dt1(->glref), GG_G2DISP, Dt1(->cframe), Dt1(->status), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->status), Dt1(->base), Dt1(->top), FRAME_TYPE); dasm_put(Dst, 548, FRAME_CP, FRAME_C, Dt1(->cframe), Dt1(->cframe), Dt1(->glref), GG_G2DISP, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base)); - dasm_put(Dst, 648, Dt1(->top), LJ_TFUNC, Dt7(->pc), Dt1(->stack), Dt1(->top), Dt1(->cframe), Dt1(->cframe), FRAME_CP, LJ_TNIL, 0); - dasm_put(Dst, 817, Dt7(->pc), PC2PROTO(k), Dt1(->base), LJ_TSTR, BC_GGET, DISPATCH_GL(tmptv), LJ_TTAB); + dasm_put(Dst, 648, Dt1(->top), LJ_TFUNC, Dt7(->pc), Dt1(->stack), Dt1(->top), Dt1(->cframe), Dt1(->cframe), FRAME_CP, LJ_TNIL); + dasm_put(Dst, 819, 0, Dt7(->pc), PC2PROTO(k), Dt1(->base), LJ_TSTR, BC_GGET, DISPATCH_GL(tmptv), LJ_TTAB); + dasm_put(Dst, 944); if (LJ_DUALNUM) { - dasm_put(Dst, 935, LJ_TISNUM); + dasm_put(Dst, 958, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 944); + dasm_put(Dst, 967); } else { } - dasm_put(Dst, 956, Dt1(->base), Dt1(->base), Dt1(->top), FRAME_CONT, 2+1, LJ_TSTR, BC_GSET); - dasm_put(Dst, 1102, DISPATCH_GL(tmptv), LJ_TTAB); + dasm_put(Dst, 979, Dt1(->base), Dt1(->base), Dt1(->top), FRAME_CONT, 2+1, LJ_TSTR, BC_GSET); + dasm_put(Dst, 1125, DISPATCH_GL(tmptv), LJ_TTAB); if (LJ_DUALNUM) { - dasm_put(Dst, 935, LJ_TISNUM); + dasm_put(Dst, 958, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 944); + dasm_put(Dst, 967); } else { } - dasm_put(Dst, 1126, Dt1(->base), Dt1(->base), Dt1(->top), FRAME_CONT, 3+1, Dt1(->base), Dt1(->base)); - dasm_put(Dst, 1298, -BCBIAS_J*4, LJ_TISTRUECOND, LJ_TISTRUECOND, Dt1(->base)); - dasm_put(Dst, 1397); + dasm_put(Dst, 1149, Dt1(->base), Dt1(->base), Dt1(->top), FRAME_CONT, 3+1, Dt1(->base), Dt1(->base)); + dasm_put(Dst, 1321, -BCBIAS_J*4, LJ_TISTRUECOND, LJ_TISTRUECOND, Dt1(->base)); + dasm_put(Dst, 1420); #if LJ_HASFFI - dasm_put(Dst, 1417, Dt1(->base)); + dasm_put(Dst, 1440, Dt1(->base)); #endif - dasm_put(Dst, 1448); + dasm_put(Dst, 1471); #if LJ_DUALNUM - dasm_put(Dst, 1451); + dasm_put(Dst, 1474); #endif - dasm_put(Dst, 1457); + dasm_put(Dst, 1480); #if LJ_DUALNUM - dasm_put(Dst, 929); + dasm_put(Dst, 952); #endif - dasm_put(Dst, 1470); + dasm_put(Dst, 1493); #if LJ_DUALNUM - dasm_put(Dst, 1451); + dasm_put(Dst, 1474); #endif - dasm_put(Dst, 1499, Dt1(->base), Dt1(->base), FRAME_CONT, 2+1, Dt1(->base), Dt1(->base), Dt1(->base)); - dasm_put(Dst, 1631, Dt1(->base), Dt7(->pc), Dt1(->base), Dt1(->base), GG_DISP2STATIC, 1+1, LJ_TISTRUECOND); - dasm_put(Dst, 1815, 1+1, ~LJ_TNUMX); + dasm_put(Dst, 1522, Dt1(->base), Dt1(->base), FRAME_CONT, 2+1, Dt1(->base), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 1654, Dt1(->base), Dt7(->pc), Dt1(->base), Dt1(->base), GG_DISP2STATIC, 1+1, LJ_TISTRUECOND); + dasm_put(Dst, 1838, 1+1, ~LJ_TNUMX); if (cmov) { - dasm_put(Dst, 1860); + dasm_put(Dst, 1883); } else { - dasm_put(Dst, 1864); + dasm_put(Dst, 1887); } - dasm_put(Dst, 1873, ((char *)(&((GCfuncC *)0)->upvalue)), LJ_TSTR, ~LJ_TLIGHTUD, 1+1, LJ_TTAB, Dt6(->metatable), LJ_TNIL); - dasm_put(Dst, 1952, DISPATCH_GL(gcroot)+4*(GCROOT_MMNAME+MM_metatable), LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), DtB(->next)); - dasm_put(Dst, 2010, LJ_TNIL, LJ_TUDATA, LJ_TNUMX, LJ_TISNUM, LJ_TLIGHTUD); - dasm_put(Dst, 2076, LJ_TNUMX, DISPATCH_GL(gcroot[GCROOT_BASEMT]), 2+1, LJ_TTAB, Dt6(->metatable), LJ_TTAB, Dt6(->metatable), LJ_TTAB); - dasm_put(Dst, 2147, Dt6(->marked), LJ_GC_BLACK, Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist), 2+1, LJ_TTAB); - dasm_put(Dst, 2237, 1+1, LJ_TISNUM); + dasm_put(Dst, 1896, ((char *)(&((GCfuncC *)0)->upvalue)), LJ_TSTR, ~LJ_TLIGHTUD, 1+1, LJ_TTAB, Dt6(->metatable), LJ_TNIL); + dasm_put(Dst, 1975, DISPATCH_GL(gcroot)+4*(GCROOT_MMNAME+MM_metatable), LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), DtB(->next)); + dasm_put(Dst, 2033, LJ_TNIL, LJ_TUDATA, LJ_TNUMX, LJ_TISNUM, LJ_TLIGHTUD); + dasm_put(Dst, 2099, LJ_TNUMX, DISPATCH_GL(gcroot[GCROOT_BASEMT]), 2+1, LJ_TTAB, Dt6(->metatable), LJ_TTAB, Dt6(->metatable), LJ_TTAB); + dasm_put(Dst, 2170, Dt6(->marked), LJ_GC_BLACK, Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist), 2+1, LJ_TTAB); + dasm_put(Dst, 2260, 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 2251); + dasm_put(Dst, 2274); } else { - dasm_put(Dst, 2268); + dasm_put(Dst, 2291); } if (sse) { - dasm_put(Dst, 2273); + dasm_put(Dst, 2296); } else { - dasm_put(Dst, 2283); + dasm_put(Dst, 2306); } - dasm_put(Dst, 2290, 1+1, LJ_TSTR, LJ_TSTR, LJ_TISNUM, DISPATCH_GL(gcroot[GCROOT_BASEMT_NUM]), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); - dasm_put(Dst, 2359, Dt1(->base)); + dasm_put(Dst, 2313, 1+1, LJ_TSTR, LJ_TSTR, LJ_TISNUM, DISPATCH_GL(gcroot[GCROOT_BASEMT_NUM]), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); + dasm_put(Dst, 2382, Dt1(->base)); if (LJ_DUALNUM) { - dasm_put(Dst, 2385); + dasm_put(Dst, 2408); } else { - dasm_put(Dst, 2390); + dasm_put(Dst, 2413); } - dasm_put(Dst, 2395, Dt1(->base), 1+1, LJ_TTAB, Dt1(->base), Dt1(->top), Dt1(->base), 1+2); - dasm_put(Dst, 2487, LJ_TNIL, LJ_TNIL, 1+1, LJ_TTAB); + dasm_put(Dst, 2418, Dt1(->base), 1+1, LJ_TTAB, Dt1(->base), Dt1(->top), Dt1(->base), 1+2); + dasm_put(Dst, 2510, LJ_TNIL, LJ_TNIL, 1+1, LJ_TTAB); #ifdef LUAJIT_ENABLE_LUA52COMPAT - dasm_put(Dst, 2534, Dt6(->metatable)); + dasm_put(Dst, 2557, Dt6(->metatable)); #endif - dasm_put(Dst, 2543, Dt8(->upvalue[0]), LJ_TFUNC, LJ_TNIL, 1+3, 1+1, LJ_TTAB, LJ_TISNUM); + dasm_put(Dst, 2566, Dt8(->upvalue[0]), LJ_TFUNC, LJ_TNIL, 1+3, 1+1, LJ_TTAB, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 2529); + dasm_put(Dst, 2552); } else { - dasm_put(Dst, 2268); + dasm_put(Dst, 2291); } - dasm_put(Dst, 2598); + dasm_put(Dst, 2621); if (LJ_DUALNUM) { - dasm_put(Dst, 2603, LJ_TISNUM); + dasm_put(Dst, 2626, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 2619, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); + dasm_put(Dst, 2642, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); } else { } - dasm_put(Dst, 2652, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->hmask), 1+0); - dasm_put(Dst, 2514, 1+1, LJ_TTAB); + dasm_put(Dst, 2675, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->hmask), 1+0); + dasm_put(Dst, 2537, 1+1, LJ_TTAB); #ifdef LUAJIT_ENABLE_LUA52COMPAT - dasm_put(Dst, 2534, Dt6(->metatable)); + dasm_put(Dst, 2557, Dt6(->metatable)); #endif - dasm_put(Dst, 2729, Dt8(->upvalue[0]), LJ_TFUNC); + dasm_put(Dst, 2752, Dt8(->upvalue[0]), LJ_TFUNC); if (LJ_DUALNUM) { - dasm_put(Dst, 2750, LJ_TISNUM); + dasm_put(Dst, 2773, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 2762); - } else { - dasm_put(Dst, 2772); - } - dasm_put(Dst, 2779, 1+3, 1+1, 8+FRAME_PCALL, DISPATCH_GL(hookmask), HOOK_ACTIVE_SHIFT, 2+1, LJ_TFUNC); - dasm_put(Dst, 2844, LJ_TFUNC, 16+FRAME_PCALL, 1+1, LJ_TTHREAD, Dt1(->cframe), Dt1(->status), LUA_YIELD, Dt1(->top)); - dasm_put(Dst, 2933, Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP); - dasm_put(Dst, 3020, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack), LJ_TTRUE, FRAME_TYPE); - dasm_put(Dst, 3135, LJ_TFALSE, Dt1(->top), Dt1(->top), 1+2, Dt1(->top), Dt1(->base), Dt8(->upvalue[0].gcr), Dt1(->cframe)); - dasm_put(Dst, 3230, Dt1(->status), LUA_YIELD, Dt1(->top), Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top)); - dasm_put(Dst, 3296, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack)); - dasm_put(Dst, 3385, FRAME_TYPE, Dt1(->top), Dt1(->base), Dt1(->cframe), CFRAME_RESUME); - dasm_put(Dst, 3495, Dt1(->base), Dt1(->top), Dt1(->cframe), LUA_YIELD, Dt1(->status)); + dasm_put(Dst, 2785); + } else { + dasm_put(Dst, 2795); + } + dasm_put(Dst, 2802, 1+3, 1+1, 8+FRAME_PCALL, DISPATCH_GL(hookmask), HOOK_ACTIVE_SHIFT, 2+1, LJ_TFUNC); + dasm_put(Dst, 2867, LJ_TFUNC, 16+FRAME_PCALL, 1+1, LJ_TTHREAD, Dt1(->cframe), Dt1(->status), LUA_YIELD, Dt1(->top)); + dasm_put(Dst, 2956, Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP); + dasm_put(Dst, 3043, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack), LJ_TTRUE, FRAME_TYPE); + dasm_put(Dst, 3158, LJ_TFALSE, Dt1(->top), Dt1(->top), 1+2, Dt1(->top), Dt1(->base), Dt8(->upvalue[0].gcr), Dt1(->cframe)); + dasm_put(Dst, 3253, Dt1(->status), LUA_YIELD, Dt1(->top), Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 3319, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack)); + dasm_put(Dst, 3408, FRAME_TYPE, Dt1(->top), Dt1(->base), Dt1(->cframe), CFRAME_RESUME); + dasm_put(Dst, 3518, Dt1(->base), Dt1(->top), Dt1(->cframe), LUA_YIELD, Dt1(->status)); if (!LJ_DUALNUM) { - dasm_put(Dst, 3522); + dasm_put(Dst, 3545); } if (sse) { - dasm_put(Dst, 3525); + dasm_put(Dst, 3548); } - dasm_put(Dst, 3540, 1+1); + dasm_put(Dst, 3563, 1+1); if (LJ_DUALNUM) { - dasm_put(Dst, 3551, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 3574, LJ_TISNUM, LJ_TISNUM); } else { - dasm_put(Dst, 3631, LJ_TISNUM); + dasm_put(Dst, 3654, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 3641, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); + dasm_put(Dst, 3664, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); } else { - dasm_put(Dst, 3672); + dasm_put(Dst, 3695); } - dasm_put(Dst, 3689, 1+1, FRAME_TYPE, LJ_TNIL); + dasm_put(Dst, 3712, 1+1, FRAME_TYPE, LJ_TNIL); if (LJ_DUALNUM) { - dasm_put(Dst, 3786, LJ_TISNUM); + dasm_put(Dst, 3809, LJ_TISNUM); } else { - dasm_put(Dst, 3631, LJ_TISNUM); + dasm_put(Dst, 3654, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 3808); + dasm_put(Dst, 3831); if (LJ_DUALNUM) { - dasm_put(Dst, 3817); + dasm_put(Dst, 3840); } - dasm_put(Dst, 2278); + dasm_put(Dst, 2301); } else { - dasm_put(Dst, 3851); + dasm_put(Dst, 3874); if (LJ_DUALNUM) { } else { - dasm_put(Dst, 2285); + dasm_put(Dst, 2308); } } - dasm_put(Dst, 3857); + dasm_put(Dst, 3880); if (LJ_DUALNUM) { - dasm_put(Dst, 3786, LJ_TISNUM); + dasm_put(Dst, 3809, LJ_TISNUM); } else { - dasm_put(Dst, 3631, LJ_TISNUM); + dasm_put(Dst, 3654, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 3860); + dasm_put(Dst, 3883); if (LJ_DUALNUM) { - dasm_put(Dst, 3817); + dasm_put(Dst, 3840); } - dasm_put(Dst, 2278); + dasm_put(Dst, 2301); } else { - dasm_put(Dst, 3869); + dasm_put(Dst, 3892); if (LJ_DUALNUM) { } else { - dasm_put(Dst, 2285); + dasm_put(Dst, 2308); } } if (sse) { - dasm_put(Dst, 3875, 1+1, LJ_TISNUM); + dasm_put(Dst, 3898, 1+1, LJ_TISNUM); } else { - dasm_put(Dst, 3904, 1+1, LJ_TISNUM); + dasm_put(Dst, 3927, 1+1, LJ_TISNUM); } - dasm_put(Dst, 3933, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); - dasm_put(Dst, 4002, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); - dasm_put(Dst, 4059, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); - dasm_put(Dst, 4122, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM); - dasm_put(Dst, 4212); + dasm_put(Dst, 3956, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); + dasm_put(Dst, 4025, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); + dasm_put(Dst, 4082, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); + dasm_put(Dst, 4145, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM); + dasm_put(Dst, 4235); if (sse) { - dasm_put(Dst, 4224, 1+1, LJ_TISNUM); + dasm_put(Dst, 4247, 1+1, LJ_TISNUM); } else { } - dasm_put(Dst, 4249); + dasm_put(Dst, 4272); if (sse) { - dasm_put(Dst, 4263, 1+1, LJ_TISNUM); + dasm_put(Dst, 4286, 1+1, LJ_TISNUM); } else { } - dasm_put(Dst, 4288); + dasm_put(Dst, 4311); if (sse) { - dasm_put(Dst, 4302, 1+1, LJ_TISNUM); + dasm_put(Dst, 4325, 1+1, LJ_TISNUM); } else { } - dasm_put(Dst, 4327); + dasm_put(Dst, 4350); if (sse) { - dasm_put(Dst, 4343, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); + dasm_put(Dst, 4366, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); } else { - dasm_put(Dst, 4382, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); + dasm_put(Dst, 4405, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); } - dasm_put(Dst, 4415, 2+1, LJ_TISNUM, LJ_TISNUM, 2+1, LJ_TISNUM, LJ_TISNUM); - dasm_put(Dst, 4480, 1+1, LJ_TISNUM); + dasm_put(Dst, 4438, 2+1, LJ_TISNUM, LJ_TISNUM, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 4503, 1+1, LJ_TISNUM); if (sse) { - dasm_put(Dst, 4579); + dasm_put(Dst, 4602); } else { - dasm_put(Dst, 4585); + dasm_put(Dst, 4608); } - dasm_put(Dst, 4592); + dasm_put(Dst, 4615); if (sse) { - dasm_put(Dst, 4617); + dasm_put(Dst, 4640); } else { - dasm_put(Dst, 4623); + dasm_put(Dst, 4646); } - dasm_put(Dst, 4626, 1+2); + dasm_put(Dst, 4649, 1+2); if (sse) { - dasm_put(Dst, 4635); + dasm_put(Dst, 4658); } else { - dasm_put(Dst, 4643); + dasm_put(Dst, 4666); } - dasm_put(Dst, 4651); + dasm_put(Dst, 4674); if (sse) { - dasm_put(Dst, 4654, (unsigned int)(U64x(43500000,00000000)), (unsigned int)((U64x(43500000,00000000))>>32)); + dasm_put(Dst, 4677, (unsigned int)(U64x(43500000,00000000)), (unsigned int)((U64x(43500000,00000000))>>32)); } else { - dasm_put(Dst, 4681); + dasm_put(Dst, 4704); } - dasm_put(Dst, 4698); + dasm_put(Dst, 4721); if (sse) { - dasm_put(Dst, 4714, 1+1, LJ_TISNUM); + dasm_put(Dst, 4737, 1+1, LJ_TISNUM); } else { - dasm_put(Dst, 4739, 1+1, LJ_TISNUM); + dasm_put(Dst, 4762, 1+1, LJ_TISNUM); } - dasm_put(Dst, 4761); + dasm_put(Dst, 4784); if (sse) { - dasm_put(Dst, 4783); + dasm_put(Dst, 4806); } else { - dasm_put(Dst, 4809); + dasm_put(Dst, 4832); } - dasm_put(Dst, 4826, 1+2); + dasm_put(Dst, 4849, 1+2); if (sse) { - dasm_put(Dst, 4866); + dasm_put(Dst, 4889); } else { - dasm_put(Dst, 4874); + dasm_put(Dst, 4897); } - dasm_put(Dst, 4884, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 4907, 2+1, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 4936, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 4959, 2+1, LJ_TISNUM, LJ_TISNUM); } else { - dasm_put(Dst, 4983, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 5006, 2+1, LJ_TISNUM, LJ_TISNUM); } - dasm_put(Dst, 5024, LJ_TISNUM); + dasm_put(Dst, 5047, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5037, LJ_TISNUM); + dasm_put(Dst, 5060, LJ_TISNUM); if (sse) { - dasm_put(Dst, 4579); + dasm_put(Dst, 4602); } else { } - dasm_put(Dst, 5087); + dasm_put(Dst, 5110); } else { - dasm_put(Dst, 2268); + dasm_put(Dst, 2291); } if (sse) { - dasm_put(Dst, 5098, LJ_TISNUM); + dasm_put(Dst, 5121, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5119); + dasm_put(Dst, 5142); } else { - dasm_put(Dst, 2268); + dasm_put(Dst, 2291); } - dasm_put(Dst, 5140); + dasm_put(Dst, 5163); } else { } - dasm_put(Dst, 5165, LJ_TISNUM); + dasm_put(Dst, 5188, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5178, LJ_TISNUM); + dasm_put(Dst, 5201, LJ_TISNUM); if (sse) { - dasm_put(Dst, 4579); + dasm_put(Dst, 4602); } else { } - dasm_put(Dst, 5087); + dasm_put(Dst, 5110); } else { - dasm_put(Dst, 2268); + dasm_put(Dst, 2291); } if (sse) { - dasm_put(Dst, 5098, LJ_TISNUM); + dasm_put(Dst, 5121, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5119); + dasm_put(Dst, 5142); } else { - dasm_put(Dst, 2268); + dasm_put(Dst, 2291); } - dasm_put(Dst, 5228); + dasm_put(Dst, 5251); } else { } if (!sse) { - dasm_put(Dst, 5253); + dasm_put(Dst, 5276); } - dasm_put(Dst, 5262, 1+1, LJ_TSTR); + dasm_put(Dst, 5285, 1+1, LJ_TSTR); if (LJ_DUALNUM) { - dasm_put(Dst, 5284, Dt5(->len)); + dasm_put(Dst, 5307, Dt5(->len)); } else if (sse) { - dasm_put(Dst, 5292, Dt5(->len)); + dasm_put(Dst, 5315, Dt5(->len)); } else { - dasm_put(Dst, 5303, Dt5(->len)); + dasm_put(Dst, 5326, Dt5(->len)); } - dasm_put(Dst, 5311, 1+1, LJ_TSTR, Dt5(->len), Dt5([1])); + dasm_put(Dst, 5334, 1+1, LJ_TSTR, Dt5(->len), Dt5([1])); if (LJ_DUALNUM) { - dasm_put(Dst, 5287); + dasm_put(Dst, 5310); } else if (sse) { - dasm_put(Dst, 5349); + dasm_put(Dst, 5372); } else { - dasm_put(Dst, 5359); + dasm_put(Dst, 5382); } - dasm_put(Dst, 5370, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+1, LJ_TISNUM); + dasm_put(Dst, 5393, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5403); - } else if (sse) { dasm_put(Dst, 5426); + } else if (sse) { + dasm_put(Dst, 5449); } else { - dasm_put(Dst, 5452); + dasm_put(Dst, 5475); } - dasm_put(Dst, 5476, Dt1(->base), Dt1(->base), LJ_TSTR, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+2, LJ_TISNUM); + dasm_put(Dst, 5499, Dt1(->base), Dt1(->base), LJ_TSTR, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+2, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5585); + dasm_put(Dst, 5608); } else if (sse) { - dasm_put(Dst, 5597); + dasm_put(Dst, 5620); } else { - dasm_put(Dst, 5612); + dasm_put(Dst, 5635); } - dasm_put(Dst, 5624, LJ_TSTR, LJ_TISNUM); + dasm_put(Dst, 5647, LJ_TSTR, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 2529); + dasm_put(Dst, 2552); } else { - dasm_put(Dst, 2268); + dasm_put(Dst, 2291); } - dasm_put(Dst, 5641, Dt5(->len)); + dasm_put(Dst, 5664, Dt5(->len)); if (LJ_DUALNUM) { - dasm_put(Dst, 5651); + dasm_put(Dst, 5674); } else if (sse) { - dasm_put(Dst, 5655); + dasm_put(Dst, 5678); } else { } - dasm_put(Dst, 5662, sizeof(GCstr)-1); - dasm_put(Dst, 5737, 2+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); - dasm_put(Dst, 5798, LJ_TSTR, LJ_TISNUM); + dasm_put(Dst, 5685, sizeof(GCstr)-1); + dasm_put(Dst, 5760, 2+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); + dasm_put(Dst, 5821, LJ_TSTR, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5815); + dasm_put(Dst, 5838); } else if (sse) { - dasm_put(Dst, 5823); + dasm_put(Dst, 5846); } else { - dasm_put(Dst, 5834); + dasm_put(Dst, 5857); } - dasm_put(Dst, 5850, Dt5(->len), DISPATCH_GL(tmpbuf.sz), Dt5([1]), DISPATCH_GL(tmpbuf.buf), DISPATCH_GL(tmpbuf.buf), 1+1); - dasm_put(Dst, 5918, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz), sizeof(GCstr), DISPATCH_GL(tmpbuf.buf)); - dasm_put(Dst, 5985, 1+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz)); - dasm_put(Dst, 6058, sizeof(GCstr), DISPATCH_GL(tmpbuf.buf), 1+1); - dasm_put(Dst, 6143, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz), sizeof(GCstr), DISPATCH_GL(tmpbuf.buf)); - dasm_put(Dst, 6217, 1+1, LJ_TTAB); + dasm_put(Dst, 5873, Dt5(->len), DISPATCH_GL(tmpbuf.sz), Dt5([1]), DISPATCH_GL(tmpbuf.buf), DISPATCH_GL(tmpbuf.buf), 1+1); + dasm_put(Dst, 5941, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz), sizeof(GCstr), DISPATCH_GL(tmpbuf.buf)); + dasm_put(Dst, 6008, 1+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz)); + dasm_put(Dst, 6081, sizeof(GCstr), DISPATCH_GL(tmpbuf.buf), 1+1); + dasm_put(Dst, 6166, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz), sizeof(GCstr), DISPATCH_GL(tmpbuf.buf)); + dasm_put(Dst, 6240, 1+1, LJ_TTAB); if (LJ_DUALNUM) { - dasm_put(Dst, 6284); + dasm_put(Dst, 6307); } else if (sse) { - dasm_put(Dst, 6291); + dasm_put(Dst, 6314); } else { } - dasm_put(Dst, 6301, LJ_TISNUM); + dasm_put(Dst, 6324, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6309); + dasm_put(Dst, 6332); } else { - dasm_put(Dst, 2268); + dasm_put(Dst, 2291); } if (sse) { - dasm_put(Dst, 6326, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6349, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } dasm_put(Dst, 106); if (LJ_DUALNUM || sse) { if (!sse) { } - dasm_put(Dst, 6350); + dasm_put(Dst, 6373); } else { } - dasm_put(Dst, 6355); + dasm_put(Dst, 6378); if (sse) { - dasm_put(Dst, 6358, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6381, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { - dasm_put(Dst, 6368); + dasm_put(Dst, 6391); } - dasm_put(Dst, 2245, LJ_TISNUM); + dasm_put(Dst, 2268, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6376); + dasm_put(Dst, 6399); } else { - dasm_put(Dst, 2268); + dasm_put(Dst, 2291); } if (sse) { - dasm_put(Dst, 6393); + dasm_put(Dst, 6416); } else { } - dasm_put(Dst, 6408, LJ_TISNUM); + dasm_put(Dst, 6431, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6433); + dasm_put(Dst, 6456); } else { - dasm_put(Dst, 6453); + dasm_put(Dst, 6476); } if (sse) { - dasm_put(Dst, 6458); + dasm_put(Dst, 6481); } else { } - dasm_put(Dst, 6475); + dasm_put(Dst, 6498); if (sse) { - dasm_put(Dst, 6358, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6381, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { - dasm_put(Dst, 6368); + dasm_put(Dst, 6391); } - dasm_put(Dst, 2245, LJ_TISNUM); + dasm_put(Dst, 2268, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6376); + dasm_put(Dst, 6399); } else { - dasm_put(Dst, 2268); + dasm_put(Dst, 2291); } if (sse) { - dasm_put(Dst, 6393); + dasm_put(Dst, 6416); } else { } - dasm_put(Dst, 6408, LJ_TISNUM); + dasm_put(Dst, 6431, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6485); + dasm_put(Dst, 6508); } else { - dasm_put(Dst, 6453); + dasm_put(Dst, 6476); } if (sse) { - dasm_put(Dst, 6505); + dasm_put(Dst, 6528); } else { } - dasm_put(Dst, 6522); + dasm_put(Dst, 6545); if (sse) { - dasm_put(Dst, 6358, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6381, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { - dasm_put(Dst, 6368); + dasm_put(Dst, 6391); } - dasm_put(Dst, 2245, LJ_TISNUM); + dasm_put(Dst, 2268, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6376); + dasm_put(Dst, 6399); } else { - dasm_put(Dst, 2268); + dasm_put(Dst, 2291); } if (sse) { - dasm_put(Dst, 6393); + dasm_put(Dst, 6416); } else { } - dasm_put(Dst, 6408, LJ_TISNUM); + dasm_put(Dst, 6431, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6532); + dasm_put(Dst, 6555); } else { - dasm_put(Dst, 6453); + dasm_put(Dst, 6476); } if (sse) { - dasm_put(Dst, 6552); + dasm_put(Dst, 6575); } else { } - dasm_put(Dst, 6569, LJ_TISNUM); + dasm_put(Dst, 6592, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6376); + dasm_put(Dst, 6399); } else { - dasm_put(Dst, 2268); + dasm_put(Dst, 2291); } if (sse) { - dasm_put(Dst, 6326, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6349, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6584, LJ_TISNUM); + dasm_put(Dst, 6607, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6376); + dasm_put(Dst, 6399); } else { - dasm_put(Dst, 2268); + dasm_put(Dst, 2291); } if (sse) { - dasm_put(Dst, 6326, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6349, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6600); + dasm_put(Dst, 6623); if (LJ_DUALNUM) { - dasm_put(Dst, 6350); + dasm_put(Dst, 6373); } else if (sse) { - dasm_put(Dst, 6606); + dasm_put(Dst, 6629); } else { } - dasm_put(Dst, 6618); + dasm_put(Dst, 6641); if (LJ_DUALNUM) { - dasm_put(Dst, 6629, LJ_TISNUM); + dasm_put(Dst, 6652, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6376); + dasm_put(Dst, 6399); } else { - dasm_put(Dst, 2268); + dasm_put(Dst, 2291); } if (sse) { - dasm_put(Dst, 6326, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6349, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6637, LJ_TISNUM); + dasm_put(Dst, 6660, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 6652, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6675, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6719); + dasm_put(Dst, 6742); if (LJ_DUALNUM) { - dasm_put(Dst, 6726, LJ_TISNUM); + dasm_put(Dst, 6749, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6376); + dasm_put(Dst, 6399); } else { - dasm_put(Dst, 2268); + dasm_put(Dst, 2291); } if (sse) { - dasm_put(Dst, 6326, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6349, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6637, LJ_TISNUM); + dasm_put(Dst, 6660, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 6734, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6757, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6801); + dasm_put(Dst, 6824); if (LJ_DUALNUM) { - dasm_put(Dst, 6809, LJ_TISNUM); + dasm_put(Dst, 6832, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6376); + dasm_put(Dst, 6399); } else { - dasm_put(Dst, 2268); + dasm_put(Dst, 2291); } if (sse) { - dasm_put(Dst, 6326, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6349, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6637, LJ_TISNUM); + dasm_put(Dst, 6660, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 6817, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6840, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6884); + dasm_put(Dst, 6907); if (LJ_DUALNUM) { - dasm_put(Dst, 6892, LJ_TISNUM); + dasm_put(Dst, 6915, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6376); + dasm_put(Dst, 6399); } else { - dasm_put(Dst, 2268); + dasm_put(Dst, 2291); } if (sse) { - dasm_put(Dst, 6326, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6349, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6637, LJ_TISNUM); + dasm_put(Dst, 6660, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 6900, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6923, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6967); + dasm_put(Dst, 6990); if (LJ_DUALNUM) { - dasm_put(Dst, 6974, LJ_TISNUM); + dasm_put(Dst, 6997, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6376); + dasm_put(Dst, 6399); } else { - dasm_put(Dst, 2268); + dasm_put(Dst, 2291); } if (sse) { - dasm_put(Dst, 6326, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6349, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6637, LJ_TISNUM); + dasm_put(Dst, 6660, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 6982, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 7005, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 7049, 1+2, 1+1, Dt1(->base), 8*LUA_MINSTACK, Dt1(->top), Dt1(->maxstack), Dt8(->f), Dt1(->base)); - dasm_put(Dst, 7125, Dt1(->top), Dt7(->pc), FRAME_TYPE, LUA_MINSTACK, Dt1(->base), Dt1(->base)); - dasm_put(Dst, 7252, Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 7072, 1+2, 1+1, Dt1(->base), 8*LUA_MINSTACK, Dt1(->top), Dt1(->maxstack), Dt8(->f), Dt1(->base)); + dasm_put(Dst, 7148, Dt1(->top), Dt7(->pc), FRAME_TYPE, LUA_MINSTACK, Dt1(->base), Dt1(->base)); + dasm_put(Dst, 7275, Dt1(->top), Dt1(->base), Dt1(->top)); #if LJ_HASJIT - dasm_put(Dst, 7291, DISPATCH_GL(hookmask), HOOK_VMEVENT, HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount)); + dasm_put(Dst, 7314, DISPATCH_GL(hookmask), HOOK_VMEVENT, HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount)); #endif - dasm_put(Dst, 7324, DISPATCH_GL(hookmask), HOOK_ACTIVE, DISPATCH_GL(hookmask), HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount), LUA_MASKLINE); - dasm_put(Dst, 7378, Dt1(->base), Dt1(->base), GG_DISP2STATIC); + dasm_put(Dst, 7347, DISPATCH_GL(hookmask), HOOK_ACTIVE, DISPATCH_GL(hookmask), HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount), LUA_MASKLINE); + dasm_put(Dst, 7401, Dt1(->base), Dt1(->base), GG_DISP2STATIC); #if LJ_HASJIT - dasm_put(Dst, 7445, Dt7(->pc), PC2PROTO(framesize), Dt1(->base), Dt1(->top), GG_DISP2J, DISPATCH_J(L)); + dasm_put(Dst, 7468, Dt7(->pc), PC2PROTO(framesize), Dt1(->base), Dt1(->top), GG_DISP2J, DISPATCH_J(L)); #endif - dasm_put(Dst, 7492); + dasm_put(Dst, 7515); #if LJ_HASJIT - dasm_put(Dst, 7319); + dasm_put(Dst, 7342); #endif - dasm_put(Dst, 7499); + dasm_put(Dst, 7522); #if LJ_HASJIT - dasm_put(Dst, 7502); + dasm_put(Dst, 7525); #endif - dasm_put(Dst, 7512, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 7535, Dt1(->base), Dt1(->top)); #if LJ_HASJIT - dasm_put(Dst, 7545); + dasm_put(Dst, 7568); #endif - dasm_put(Dst, 7550, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 7573, Dt1(->base), Dt1(->top)); #if LJ_HASJIT - dasm_put(Dst, 7581, DISPATCH_GL(vmstate), DISPATCH_GL(vmstate), ~LJ_VMST_EXIT, DISPATCH_J(exitno), DISPATCH_J(parent), 16*8, DISPATCH_GL(jit_L), DISPATCH_GL(jit_base), DISPATCH_J(L), DISPATCH_GL(jit_L), Dt1(->base), GG_DISP2J, Dt1(->cframe), CFRAME_RAWMASK, CFRAME_OFS_L, Dt1(->base), CFRAME_OFS_PC); + dasm_put(Dst, 7604, DISPATCH_GL(vmstate), DISPATCH_GL(vmstate), ~LJ_VMST_EXIT, DISPATCH_J(exitno), DISPATCH_J(parent), 16*8, DISPATCH_GL(jit_L), DISPATCH_GL(jit_base), DISPATCH_J(L), DISPATCH_GL(jit_L), Dt1(->base), GG_DISP2J, Dt1(->cframe), CFRAME_RAWMASK, CFRAME_OFS_L, Dt1(->base), CFRAME_OFS_PC); #endif - dasm_put(Dst, 7820); + dasm_put(Dst, 7843); #if LJ_HASJIT - dasm_put(Dst, 7823, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, BC_FUNCF); + dasm_put(Dst, 7846, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, BC_FUNCF); #endif - dasm_put(Dst, 7923); + dasm_put(Dst, 7946); if (!sse) { - dasm_put(Dst, 7926); + dasm_put(Dst, 7949); } - dasm_put(Dst, 7971, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); + dasm_put(Dst, 7994, (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, 8057); + dasm_put(Dst, 8080); } - dasm_put(Dst, 8102, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(bff00000,00000000)), (unsigned int)((U64x(bff00000,00000000))>>32)); + dasm_put(Dst, 8125, (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, 8188); + dasm_put(Dst, 8211); } - dasm_put(Dst, 8227, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); + dasm_put(Dst, 8250, (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, 8316, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); + dasm_put(Dst, 8339, (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, 8430); + dasm_put(Dst, 8453); } - dasm_put(Dst, 8477); + dasm_put(Dst, 8500); if (!sse) { } else { - dasm_put(Dst, 8554); + dasm_put(Dst, 8577); } - dasm_put(Dst, 8557); - dasm_put(Dst, 8642, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); - dasm_put(Dst, 8745, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(7ff00000,00000000)), (unsigned int)((U64x(7ff00000,00000000))>>32)); - dasm_put(Dst, 8907); + dasm_put(Dst, 8580); + dasm_put(Dst, 8665, (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, 8768, (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, 8930); #if LJ_HASJIT if (sse) { - dasm_put(Dst, 8948); - dasm_put(Dst, 9018); - dasm_put(Dst, 9090); + dasm_put(Dst, 8971); + dasm_put(Dst, 9041); + dasm_put(Dst, 9113); } else { - dasm_put(Dst, 9142); - dasm_put(Dst, 9234); + dasm_put(Dst, 9165); + dasm_put(Dst, 9257); } - dasm_put(Dst, 9280); + dasm_put(Dst, 9303); #endif - dasm_put(Dst, 9284); + dasm_put(Dst, 9307); if (sse) { - dasm_put(Dst, 9287, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); - dasm_put(Dst, 9372, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); + dasm_put(Dst, 9310, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); + dasm_put(Dst, 9395, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); } else { - dasm_put(Dst, 9500); - dasm_put(Dst, 9583); + dasm_put(Dst, 9523); + dasm_put(Dst, 9606); if (cmov) { - dasm_put(Dst, 9638); + dasm_put(Dst, 9661); } else { - dasm_put(Dst, 9657); + dasm_put(Dst, 9680); } - dasm_put(Dst, 9280); + dasm_put(Dst, 9303); } - dasm_put(Dst, 9698); + dasm_put(Dst, 9721); #if LJ_HASFFI #define DtE(_V) (int)(ptrdiff_t)&(((CCallState *)0)_V) - dasm_put(Dst, 9722, DtE(->spadj)); + dasm_put(Dst, 9745, DtE(->spadj)); #if LJ_TARGET_WINDOWS #endif - dasm_put(Dst, 9738, DtE(->nsp), offsetof(CCallState, stack), CCALL_SPS_EXTRA*8, DtE(->nfpr), DtE(->gpr[0]), DtE(->gpr[1]), DtE(->gpr[2]), DtE(->gpr[3]), DtE(->gpr[4]), DtE(->gpr[5]), DtE(->fpr[0]), DtE(->fpr[1])); - dasm_put(Dst, 9817, DtE(->fpr[2]), DtE(->fpr[3]), DtE(->fpr[4]), DtE(->fpr[5]), DtE(->fpr[6]), DtE(->fpr[7]), DtE(->func), DtE(->gpr[0]), DtE(->fpr[0]), DtE(->gpr[1]), DtE(->fpr[1])); + dasm_put(Dst, 9761, DtE(->nsp), offsetof(CCallState, stack), CCALL_SPS_EXTRA*8, DtE(->nfpr), DtE(->gpr[0]), DtE(->gpr[1]), DtE(->gpr[2]), DtE(->gpr[3]), DtE(->gpr[4]), DtE(->gpr[5]), DtE(->fpr[0]), DtE(->fpr[1])); + dasm_put(Dst, 9840, DtE(->fpr[2]), DtE(->fpr[3]), DtE(->fpr[4]), DtE(->fpr[5]), DtE(->fpr[6]), DtE(->fpr[7]), DtE(->func), DtE(->gpr[0]), DtE(->fpr[0]), DtE(->gpr[1]), DtE(->fpr[1])); #if LJ_TARGET_WINDOWS #endif - dasm_put(Dst, 9872); + dasm_put(Dst, 9895); #endif - dasm_put(Dst, 9880); + dasm_put(Dst, 9903); #ifdef LUA_USE_ASSERT - dasm_put(Dst, 9282); + dasm_put(Dst, 9305); #endif - dasm_put(Dst, 9282); + dasm_put(Dst, 9305); } /* 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, 9883, defop); + dasm_put(Dst, 9906, defop); switch (op) { @@ -1848,296 +1852,296 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_ISLT: case BC_ISGE: case BC_ISLE: case BC_ISGT: if (LJ_DUALNUM) { - dasm_put(Dst, 9885, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 9908, LJ_TISNUM, LJ_TISNUM); switch (op) { case BC_ISLT: - dasm_put(Dst, 9915); + dasm_put(Dst, 9938); break; case BC_ISGE: - dasm_put(Dst, 9920); + dasm_put(Dst, 9943); break; case BC_ISLE: - dasm_put(Dst, 9925); + dasm_put(Dst, 9948); break; case BC_ISGT: - dasm_put(Dst, 9930); + dasm_put(Dst, 9953); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 9935, -BCBIAS_J*4, LJ_TISNUM); + dasm_put(Dst, 9958, -BCBIAS_J*4, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9990); + dasm_put(Dst, 10013); } else { - dasm_put(Dst, 10001); + dasm_put(Dst, 10024); } - dasm_put(Dst, 10012); + dasm_put(Dst, 10035); if (sse) { - dasm_put(Dst, 10019); + dasm_put(Dst, 10042); switch (op) { case BC_ISLT: - dasm_put(Dst, 10039); + dasm_put(Dst, 10062); break; case BC_ISGE: - dasm_put(Dst, 10044); + dasm_put(Dst, 10067); break; case BC_ISLE: - dasm_put(Dst, 10049); + dasm_put(Dst, 10072); break; case BC_ISGT: - dasm_put(Dst, 10054); + dasm_put(Dst, 10077); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 10059); + dasm_put(Dst, 10082); } else { - dasm_put(Dst, 10064); + dasm_put(Dst, 10087); } } else { - dasm_put(Dst, 10072, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10095, LJ_TISNUM, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 10093); + dasm_put(Dst, 10116); } else { - dasm_put(Dst, 10114); + dasm_put(Dst, 10137); if (cmov) { - dasm_put(Dst, 10130); + dasm_put(Dst, 10153); } else { - dasm_put(Dst, 10136); + dasm_put(Dst, 10159); } } if (LJ_DUALNUM) { switch (op) { case BC_ISLT: - dasm_put(Dst, 10039); + dasm_put(Dst, 10062); break; case BC_ISGE: - dasm_put(Dst, 10044); + dasm_put(Dst, 10067); break; case BC_ISLE: - dasm_put(Dst, 10049); + dasm_put(Dst, 10072); break; case BC_ISGT: - dasm_put(Dst, 10054); + dasm_put(Dst, 10077); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 10059); + dasm_put(Dst, 10082); } else { switch (op) { case BC_ISLT: - dasm_put(Dst, 10143); + dasm_put(Dst, 10166); break; case BC_ISGE: - dasm_put(Dst, 10148); + dasm_put(Dst, 10171); break; case BC_ISLE: - dasm_put(Dst, 10153); + dasm_put(Dst, 10176); break; case BC_ISGT: - dasm_put(Dst, 10158); + dasm_put(Dst, 10181); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 10163, -BCBIAS_J*4); + dasm_put(Dst, 10186, -BCBIAS_J*4); } break; case BC_ISEQV: case BC_ISNEV: vk = op == BC_ISEQV; - dasm_put(Dst, 10196); + dasm_put(Dst, 10219); if (LJ_DUALNUM) { - dasm_put(Dst, 10204, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10227, LJ_TISNUM, LJ_TISNUM); if (vk) { - dasm_put(Dst, 10229); + dasm_put(Dst, 10252); } else { - dasm_put(Dst, 10234); + dasm_put(Dst, 10257); } - dasm_put(Dst, 10239, -BCBIAS_J*4, LJ_TISNUM); + dasm_put(Dst, 10262, -BCBIAS_J*4, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10292); + dasm_put(Dst, 10315); } else { - dasm_put(Dst, 10299); + dasm_put(Dst, 10322); } - dasm_put(Dst, 10303); + dasm_put(Dst, 10326); if (sse) { - dasm_put(Dst, 10314); + dasm_put(Dst, 10337); } else { - dasm_put(Dst, 10326); + dasm_put(Dst, 10349); } - dasm_put(Dst, 10333); + dasm_put(Dst, 10356); } else { - dasm_put(Dst, 10338, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10361, LJ_TISNUM, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 10357); + dasm_put(Dst, 10380); } else { - dasm_put(Dst, 10375); + dasm_put(Dst, 10398); if (cmov) { - dasm_put(Dst, 10130); + dasm_put(Dst, 10153); } else { - dasm_put(Dst, 10136); + dasm_put(Dst, 10159); } } iseqne_fp: if (vk) { - dasm_put(Dst, 10388); + dasm_put(Dst, 10411); } else { - dasm_put(Dst, 10397); + dasm_put(Dst, 10420); } iseqne_end: if (vk) { - dasm_put(Dst, 10406, -BCBIAS_J*4); + dasm_put(Dst, 10429, -BCBIAS_J*4); if (!LJ_HASFFI) { - dasm_put(Dst, 4632); + dasm_put(Dst, 4655); } } else { if (!LJ_HASFFI) { - dasm_put(Dst, 4632); + dasm_put(Dst, 4655); } - dasm_put(Dst, 10421, -BCBIAS_J*4); + dasm_put(Dst, 10444, -BCBIAS_J*4); } if (LJ_DUALNUM && (op == BC_ISEQV || op == BC_ISNEV || op == BC_ISEQN || op == BC_ISNEN)) { - dasm_put(Dst, 10436); + dasm_put(Dst, 10459); } else { - dasm_put(Dst, 10175); + dasm_put(Dst, 10198); } if (op == BC_ISEQV || op == BC_ISNEV) { - dasm_put(Dst, 10441); + dasm_put(Dst, 10464); if (LJ_HASFFI) { - dasm_put(Dst, 10444, LJ_TCDATA, LJ_TCDATA); + dasm_put(Dst, 10467, LJ_TCDATA, LJ_TCDATA); } - dasm_put(Dst, 10463, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<metatable), Dt6(->nomm), 1<>32)); + dasm_put(Dst, 11057, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); } else { - dasm_put(Dst, 11059); + dasm_put(Dst, 11082); } if (LJ_DUALNUM) { - dasm_put(Dst, 10436); + dasm_put(Dst, 10459); } else { - dasm_put(Dst, 10175); + dasm_put(Dst, 10198); } break; case BC_LEN: - dasm_put(Dst, 11068, LJ_TSTR); + dasm_put(Dst, 11091, LJ_TSTR); if (LJ_DUALNUM) { - dasm_put(Dst, 11082, Dt5(->len), LJ_TISNUM); + dasm_put(Dst, 11105, Dt5(->len), LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 11096, Dt5(->len)); + dasm_put(Dst, 11119, Dt5(->len)); } else { - dasm_put(Dst, 11114, Dt5(->len)); + dasm_put(Dst, 11137, Dt5(->len)); } - dasm_put(Dst, 11123, LJ_TTAB); + dasm_put(Dst, 11146, LJ_TTAB); if (LJ_DUALNUM) { } else if (sse) { - dasm_put(Dst, 11165); + dasm_put(Dst, 11188); } else { } - dasm_put(Dst, 11171); + dasm_put(Dst, 11194); break; /* -- Binary ops -------------------------------------------------------- */ @@ -2145,605 +2149,605 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_ADDVN: case BC_ADDNV: case BC_ADDVV: if (LJ_DUALNUM) { - dasm_put(Dst, 11184); + dasm_put(Dst, 11207); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11192, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11215, LJ_TISNUM, LJ_TISNUM); break; case 1: - dasm_put(Dst, 11227, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11250, LJ_TISNUM, LJ_TISNUM); break; default: - dasm_put(Dst, 11262, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11285, LJ_TISNUM, LJ_TISNUM); break; } - dasm_put(Dst, 11295, LJ_TISNUM); + dasm_put(Dst, 11318, LJ_TISNUM); if (vk == 1) { - dasm_put(Dst, 11092); + dasm_put(Dst, 11115); } else { - dasm_put(Dst, 10875); + dasm_put(Dst, 10898); } - dasm_put(Dst, 10175); + dasm_put(Dst, 10198); } else { - dasm_put(Dst, 11184); + dasm_put(Dst, 11207); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11301, LJ_TISNUM); + dasm_put(Dst, 11324, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11313, LJ_TISNUM); + dasm_put(Dst, 11336, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11325); + dasm_put(Dst, 11348); } else { - dasm_put(Dst, 11340); + dasm_put(Dst, 11363); } break; case 1: - dasm_put(Dst, 11349, LJ_TISNUM); + dasm_put(Dst, 11372, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11361, LJ_TISNUM); + dasm_put(Dst, 11384, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11373); + dasm_put(Dst, 11396); } else { - dasm_put(Dst, 11388); + dasm_put(Dst, 11411); } break; default: - dasm_put(Dst, 11397, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11420, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11419); + dasm_put(Dst, 11442); } else { - dasm_put(Dst, 11433); + dasm_put(Dst, 11456); } break; } if (sse) { - dasm_put(Dst, 11052); + dasm_put(Dst, 11075); } else { - dasm_put(Dst, 11064); + dasm_put(Dst, 11087); } - dasm_put(Dst, 10175); + dasm_put(Dst, 10198); } break; case BC_SUBVN: case BC_SUBNV: case BC_SUBVV: if (LJ_DUALNUM) { - dasm_put(Dst, 11184); + dasm_put(Dst, 11207); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11441, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11464, LJ_TISNUM, LJ_TISNUM); break; case 1: - dasm_put(Dst, 11476, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11499, LJ_TISNUM, LJ_TISNUM); break; default: - dasm_put(Dst, 11511, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11534, LJ_TISNUM, LJ_TISNUM); break; } - dasm_put(Dst, 11295, LJ_TISNUM); + dasm_put(Dst, 11318, LJ_TISNUM); if (vk == 1) { - dasm_put(Dst, 11092); + dasm_put(Dst, 11115); } else { - dasm_put(Dst, 10875); + dasm_put(Dst, 10898); } - dasm_put(Dst, 10175); + dasm_put(Dst, 10198); } else { - dasm_put(Dst, 11184); + dasm_put(Dst, 11207); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11301, LJ_TISNUM); + dasm_put(Dst, 11324, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11313, LJ_TISNUM); + dasm_put(Dst, 11336, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11544); + dasm_put(Dst, 11567); } else { - dasm_put(Dst, 11559); + dasm_put(Dst, 11582); } break; case 1: - dasm_put(Dst, 11349, LJ_TISNUM); + dasm_put(Dst, 11372, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11361, LJ_TISNUM); + dasm_put(Dst, 11384, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11568); + dasm_put(Dst, 11591); } else { - dasm_put(Dst, 11583); + dasm_put(Dst, 11606); } break; default: - dasm_put(Dst, 11397, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11420, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11592); + dasm_put(Dst, 11615); } else { - dasm_put(Dst, 11606); + dasm_put(Dst, 11629); } break; } if (sse) { - dasm_put(Dst, 11052); + dasm_put(Dst, 11075); } else { - dasm_put(Dst, 11064); + dasm_put(Dst, 11087); } - dasm_put(Dst, 10175); + dasm_put(Dst, 10198); } break; case BC_MULVN: case BC_MULNV: case BC_MULVV: if (LJ_DUALNUM) { - dasm_put(Dst, 11184); + dasm_put(Dst, 11207); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11614, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11637, LJ_TISNUM, LJ_TISNUM); break; case 1: - dasm_put(Dst, 11650, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11673, LJ_TISNUM, LJ_TISNUM); break; default: - dasm_put(Dst, 11686, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11709, LJ_TISNUM, LJ_TISNUM); break; } - dasm_put(Dst, 11295, LJ_TISNUM); + dasm_put(Dst, 11318, LJ_TISNUM); if (vk == 1) { - dasm_put(Dst, 11092); + dasm_put(Dst, 11115); } else { - dasm_put(Dst, 10875); + dasm_put(Dst, 10898); } - dasm_put(Dst, 10175); + dasm_put(Dst, 10198); } else { - dasm_put(Dst, 11184); + dasm_put(Dst, 11207); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11301, LJ_TISNUM); + dasm_put(Dst, 11324, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11313, LJ_TISNUM); + dasm_put(Dst, 11336, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11720); + dasm_put(Dst, 11743); } else { - dasm_put(Dst, 11735); + dasm_put(Dst, 11758); } break; case 1: - dasm_put(Dst, 11349, LJ_TISNUM); + dasm_put(Dst, 11372, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11361, LJ_TISNUM); + dasm_put(Dst, 11384, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11744); + dasm_put(Dst, 11767); } else { - dasm_put(Dst, 11759); + dasm_put(Dst, 11782); } break; default: - dasm_put(Dst, 11397, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11420, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11768); + dasm_put(Dst, 11791); } else { - dasm_put(Dst, 11782); + dasm_put(Dst, 11805); } break; } if (sse) { - dasm_put(Dst, 11052); + dasm_put(Dst, 11075); } else { - dasm_put(Dst, 11064); + dasm_put(Dst, 11087); } - dasm_put(Dst, 10175); + dasm_put(Dst, 10198); } break; case BC_DIVVN: case BC_DIVNV: case BC_DIVVV: - dasm_put(Dst, 11184); + dasm_put(Dst, 11207); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11301, LJ_TISNUM); + dasm_put(Dst, 11324, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11313, LJ_TISNUM); + dasm_put(Dst, 11336, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11790); + dasm_put(Dst, 11813); } else { - dasm_put(Dst, 11805); + dasm_put(Dst, 11828); } break; case 1: - dasm_put(Dst, 11349, LJ_TISNUM); + dasm_put(Dst, 11372, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11361, LJ_TISNUM); + dasm_put(Dst, 11384, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11814); + dasm_put(Dst, 11837); } else { - dasm_put(Dst, 11829); + dasm_put(Dst, 11852); } break; default: - dasm_put(Dst, 11397, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11420, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11838); + dasm_put(Dst, 11861); } else { - dasm_put(Dst, 11852); + dasm_put(Dst, 11875); } break; } if (sse) { - dasm_put(Dst, 11052); + dasm_put(Dst, 11075); } else { - dasm_put(Dst, 11064); + dasm_put(Dst, 11087); } - dasm_put(Dst, 10175); + dasm_put(Dst, 10198); break; case BC_MODVN: - dasm_put(Dst, 11184); + dasm_put(Dst, 11207); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11301, LJ_TISNUM); + dasm_put(Dst, 11324, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11313, LJ_TISNUM); + dasm_put(Dst, 11336, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11860); + dasm_put(Dst, 11883); } else { - dasm_put(Dst, 11875); + dasm_put(Dst, 11898); } break; case 1: - dasm_put(Dst, 11349, LJ_TISNUM); + dasm_put(Dst, 11372, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11361, LJ_TISNUM); + dasm_put(Dst, 11384, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11884); + dasm_put(Dst, 11907); } else { - dasm_put(Dst, 11899); + dasm_put(Dst, 11922); } break; default: - dasm_put(Dst, 11397, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11420, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11908); + dasm_put(Dst, 11931); } else { - dasm_put(Dst, 11922); + dasm_put(Dst, 11945); } break; } - dasm_put(Dst, 11930); + dasm_put(Dst, 11953); if (sse) { - dasm_put(Dst, 11052); + dasm_put(Dst, 11075); } else { - dasm_put(Dst, 11064); + dasm_put(Dst, 11087); } - dasm_put(Dst, 10175); + dasm_put(Dst, 10198); break; case BC_MODNV: case BC_MODVV: - dasm_put(Dst, 11184); + dasm_put(Dst, 11207); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11301, LJ_TISNUM); + dasm_put(Dst, 11324, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11313, LJ_TISNUM); + dasm_put(Dst, 11336, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11860); + dasm_put(Dst, 11883); } else { - dasm_put(Dst, 11875); + dasm_put(Dst, 11898); } break; case 1: - dasm_put(Dst, 11349, LJ_TISNUM); + dasm_put(Dst, 11372, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11361, LJ_TISNUM); + dasm_put(Dst, 11384, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11884); + dasm_put(Dst, 11907); } else { - dasm_put(Dst, 11899); + dasm_put(Dst, 11922); } break; default: - dasm_put(Dst, 11397, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11420, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11908); + dasm_put(Dst, 11931); } else { - dasm_put(Dst, 11922); + dasm_put(Dst, 11945); } break; } - dasm_put(Dst, 11936); + dasm_put(Dst, 11959); break; case BC_POW: - dasm_put(Dst, 11184); + dasm_put(Dst, 11207); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11301, LJ_TISNUM); + dasm_put(Dst, 11324, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11313, LJ_TISNUM); + dasm_put(Dst, 11336, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11860); + dasm_put(Dst, 11883); } else { - dasm_put(Dst, 11875); + dasm_put(Dst, 11898); } break; case 1: - dasm_put(Dst, 11349, LJ_TISNUM); + dasm_put(Dst, 11372, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11361, LJ_TISNUM); + dasm_put(Dst, 11384, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11884); + dasm_put(Dst, 11907); } else { - dasm_put(Dst, 11899); + dasm_put(Dst, 11922); } break; default: - dasm_put(Dst, 11397, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11420, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11908); + dasm_put(Dst, 11931); } else { - dasm_put(Dst, 11922); + dasm_put(Dst, 11945); } break; } - dasm_put(Dst, 11941); + dasm_put(Dst, 11964); if (sse) { - dasm_put(Dst, 11052); + dasm_put(Dst, 11075); } else { - dasm_put(Dst, 11064); + dasm_put(Dst, 11087); } - dasm_put(Dst, 10175); + dasm_put(Dst, 10198); break; case BC_CAT: - dasm_put(Dst, 11945, Dt1(->base), Dt1(->base)); + dasm_put(Dst, 11968, Dt1(->base), Dt1(->base)); break; /* -- Constant ops ------------------------------------------------------ */ case BC_KSTR: - dasm_put(Dst, 12029, LJ_TSTR); + dasm_put(Dst, 12052, LJ_TSTR); break; case BC_KCDATA: #if LJ_HASFFI - dasm_put(Dst, 12029, LJ_TCDATA); + dasm_put(Dst, 12052, LJ_TCDATA); #endif break; case BC_KSHORT: if (LJ_DUALNUM) { - dasm_put(Dst, 12066, LJ_TISNUM); + dasm_put(Dst, 12089, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 12078); + dasm_put(Dst, 12101); } else { - dasm_put(Dst, 12093); + dasm_put(Dst, 12116); } - dasm_put(Dst, 10175); + dasm_put(Dst, 10198); break; case BC_KNUM: if (sse) { - dasm_put(Dst, 12101); + dasm_put(Dst, 12124); } else { - dasm_put(Dst, 12115); + dasm_put(Dst, 12138); } - dasm_put(Dst, 10175); + dasm_put(Dst, 10198); break; case BC_KPRI: - dasm_put(Dst, 12123); + dasm_put(Dst, 12146); break; case BC_KNIL: - dasm_put(Dst, 12152, LJ_TNIL); + dasm_put(Dst, 12175, LJ_TNIL); break; /* -- Upvalue and function ops ------------------------------------------ */ case BC_UGET: - dasm_put(Dst, 12200, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12223, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_USETV: #define TV2MARKOFS \ ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv)) - dasm_put(Dst, 12241, offsetof(GCfuncL, uvptr), DtA(->closed), DtA(->v), TV2MARKOFS, LJ_GC_BLACK, LJ_TISGCV, LJ_TISNUM - LJ_TISGCV, Dt4(->gch.marked), LJ_GC_WHITES, GG_DISP2G); - dasm_put(Dst, 12337); + dasm_put(Dst, 12264, 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, 12360); break; #undef TV2MARKOFS case BC_USETS: - dasm_put(Dst, 12349, offsetof(GCfuncL, uvptr), DtA(->v), LJ_TSTR, DtA(->marked), LJ_GC_BLACK, Dt4(->gch.marked), LJ_GC_WHITES, DtA(->closed), GG_DISP2G); + dasm_put(Dst, 12372, 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, 12445); + dasm_put(Dst, 12468); if (sse) { - dasm_put(Dst, 12450); + dasm_put(Dst, 12473); } else { - dasm_put(Dst, 10699); + dasm_put(Dst, 10722); } - dasm_put(Dst, 12458, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12481, offsetof(GCfuncL, uvptr), DtA(->v)); if (sse) { - dasm_put(Dst, 12467); + dasm_put(Dst, 12490); } else { - dasm_put(Dst, 12473); + dasm_put(Dst, 12496); } - dasm_put(Dst, 10175); + dasm_put(Dst, 10198); break; case BC_USETP: - dasm_put(Dst, 12476, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12499, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_UCLO: - dasm_put(Dst, 12516, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 12539, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); break; case BC_FNEW: - dasm_put(Dst, 12572, Dt1(->base), Dt1(->base), LJ_TFUNC); + dasm_put(Dst, 12595, Dt1(->base), Dt1(->base), LJ_TFUNC); break; /* -- Table ops --------------------------------------------------------- */ case BC_TNEW: - dasm_put(Dst, 12639, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 12662, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); break; case BC_TDUP: - dasm_put(Dst, 12763, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 12786, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); break; case BC_GGET: - dasm_put(Dst, 12862, Dt7(->env)); + dasm_put(Dst, 12885, Dt7(->env)); break; case BC_GSET: - dasm_put(Dst, 12882, Dt7(->env)); + dasm_put(Dst, 12905, Dt7(->env)); break; case BC_TGETV: - dasm_put(Dst, 12902, LJ_TTAB); + dasm_put(Dst, 12925, LJ_TTAB); if (LJ_DUALNUM) { - dasm_put(Dst, 12925, LJ_TISNUM); + dasm_put(Dst, 12948, LJ_TISNUM); } else { - dasm_put(Dst, 12939, LJ_TISNUM); + dasm_put(Dst, 12962, LJ_TISNUM); if (sse) { - dasm_put(Dst, 12950); + dasm_put(Dst, 12973); } else { } - dasm_put(Dst, 12971); + dasm_put(Dst, 12994); } - dasm_put(Dst, 12976, 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, 13171, 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, 13194, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13407, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETS: - dasm_put(Dst, 13524, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->nomm), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); - dasm_put(Dst, 13601, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); - dasm_put(Dst, 13688, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13547, 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, 13624, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); + dasm_put(Dst, 13711, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETB: - dasm_put(Dst, 13780, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); - dasm_put(Dst, 13875, Dt6(->metatable), Dt6(->nomm), 1<marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13803, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); + dasm_put(Dst, 13898, Dt6(->metatable), Dt6(->nomm), 1<marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETM: - dasm_put(Dst, 13923, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); - dasm_put(Dst, 14073, Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13946, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 14096, Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; /* -- Calls and vararg handling ----------------------------------------- */ case BC_CALL: case BC_CALLM: - dasm_put(Dst, 11188); + dasm_put(Dst, 11211); if (op == BC_CALLM) { - dasm_put(Dst, 14093); + dasm_put(Dst, 14116); } - dasm_put(Dst, 14098, LJ_TFUNC, Dt7(->pc)); + dasm_put(Dst, 14121, LJ_TFUNC, Dt7(->pc)); break; case BC_CALLMT: - dasm_put(Dst, 14093); + dasm_put(Dst, 14116); break; case BC_CALLT: - dasm_put(Dst, 14141, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); - dasm_put(Dst, 14259, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG); + dasm_put(Dst, 14164, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); + dasm_put(Dst, 14282, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG); break; case BC_ITERC: - dasm_put(Dst, 14333, LJ_TFUNC, 2+1, Dt7(->pc)); + dasm_put(Dst, 14356, LJ_TFUNC, 2+1, Dt7(->pc)); break; case BC_ITERN: #if LJ_HASJIT #endif - dasm_put(Dst, 14405, Dt6(->asize), Dt6(->array), LJ_TNIL); + dasm_put(Dst, 14428, Dt6(->asize), Dt6(->array), LJ_TNIL); if (LJ_DUALNUM) { - dasm_put(Dst, 11087, LJ_TISNUM); + dasm_put(Dst, 11110, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 11165); + dasm_put(Dst, 11188); } else { - dasm_put(Dst, 14457); + dasm_put(Dst, 14480); } - dasm_put(Dst, 14463); + dasm_put(Dst, 14486); if (LJ_DUALNUM) { } else if (sse) { - dasm_put(Dst, 11052); + dasm_put(Dst, 11075); } else { - dasm_put(Dst, 11064); + dasm_put(Dst, 11087); } - dasm_put(Dst, 14476, -BCBIAS_J*4); + dasm_put(Dst, 14499, -BCBIAS_J*4); if (!LJ_DUALNUM && !sse) { - dasm_put(Dst, 14530); + dasm_put(Dst, 14553); } - dasm_put(Dst, 14536, Dt6(->hmask), sizeof(Node), Dt6(->node), DtB(->val.it), LJ_TNIL, DtB(->key), DtB(->val)); + dasm_put(Dst, 14559, Dt6(->hmask), sizeof(Node), Dt6(->node), DtB(->val.it), LJ_TNIL, DtB(->key), DtB(->val)); break; case BC_ISNEXT: - dasm_put(Dst, 14615, LJ_TFUNC, LJ_TTAB, LJ_TNIL, Dt8(->ffid), FF_next_N, -BCBIAS_J*4, BC_JMP, -BCBIAS_J*4, BC_ITERC); + dasm_put(Dst, 14638, LJ_TFUNC, LJ_TTAB, LJ_TNIL, Dt8(->ffid), FF_next_N, -BCBIAS_J*4, BC_JMP, -BCBIAS_J*4, BC_ITERC); break; case BC_VARG: - dasm_put(Dst, 14716, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); - dasm_put(Dst, 14883, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 14739, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); + dasm_put(Dst, 14906, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); break; /* -- Returns ----------------------------------------------------------- */ case BC_RETM: - dasm_put(Dst, 14093); + dasm_put(Dst, 14116); break; case BC_RET: case BC_RET0: case BC_RET1: if (op != BC_RET0) { - dasm_put(Dst, 14953); + dasm_put(Dst, 14976); } - dasm_put(Dst, 14957, FRAME_TYPE); + dasm_put(Dst, 14980, FRAME_TYPE); switch (op) { case BC_RET: - dasm_put(Dst, 14976); + dasm_put(Dst, 14999); break; case BC_RET1: - dasm_put(Dst, 15030); + dasm_put(Dst, 15053); /* fallthrough */ case BC_RET0: - dasm_put(Dst, 15040); + dasm_put(Dst, 15063); default: break; } - dasm_put(Dst, 15051, Dt7(->pc), PC2PROTO(k)); + dasm_put(Dst, 15074, Dt7(->pc), PC2PROTO(k)); if (op == BC_RET) { - dasm_put(Dst, 15099, LJ_TNIL); + dasm_put(Dst, 15122, LJ_TNIL); } else { - dasm_put(Dst, 15110, LJ_TNIL); + dasm_put(Dst, 15133, LJ_TNIL); } - dasm_put(Dst, 15117, -FRAME_VARG, FRAME_TYPEP); + dasm_put(Dst, 15140, -FRAME_VARG, FRAME_TYPEP); if (op != BC_RET0) { - dasm_put(Dst, 15141); + dasm_put(Dst, 15164); } - dasm_put(Dst, 4709); + dasm_put(Dst, 4732); break; /* -- Loops and branches ------------------------------------------------ */ @@ -2751,7 +2755,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORL: #if LJ_HASJIT - dasm_put(Dst, 15145, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 15168, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2763,111 +2767,111 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORI: case BC_IFORL: vk = (op == BC_IFORL || op == BC_JFORL); - dasm_put(Dst, 15166); + dasm_put(Dst, 15189); if (LJ_DUALNUM) { - dasm_put(Dst, 15170, LJ_TISNUM); + dasm_put(Dst, 15193, LJ_TISNUM); if (!vk) { - dasm_put(Dst, 15180, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 15203, LJ_TISNUM, LJ_TISNUM); } else { #ifdef LUA_USE_ASSERT - dasm_put(Dst, 15209, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 15232, LJ_TISNUM, LJ_TISNUM); #endif - dasm_put(Dst, 15228); + dasm_put(Dst, 15251); } - dasm_put(Dst, 15247, LJ_TISNUM); + dasm_put(Dst, 15270, LJ_TISNUM); if (op == BC_FORI) { - dasm_put(Dst, 15258, -BCBIAS_J*4); + dasm_put(Dst, 15281, -BCBIAS_J*4); } else if (op == BC_JFORI) { - dasm_put(Dst, 15272, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 15295, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 15290, -BCBIAS_J*4); + dasm_put(Dst, 15313, -BCBIAS_J*4); } else { - dasm_put(Dst, 15282, BC_JLOOP); + dasm_put(Dst, 15305, BC_JLOOP); } - dasm_put(Dst, 15304); + dasm_put(Dst, 15327); if (vk) { - dasm_put(Dst, 15329); + dasm_put(Dst, 15352); } - dasm_put(Dst, 15247, LJ_TISNUM); + dasm_put(Dst, 15270, LJ_TISNUM); if (op == BC_FORI) { - dasm_put(Dst, 15338); + dasm_put(Dst, 15361); } else if (op == BC_JFORI) { - dasm_put(Dst, 15343, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 15366, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 15357); + dasm_put(Dst, 15380); } else { - dasm_put(Dst, 15353, BC_JLOOP); + dasm_put(Dst, 15376, BC_JLOOP); } - dasm_put(Dst, 15362); + dasm_put(Dst, 15385); } else if (!vk) { - dasm_put(Dst, 15369, LJ_TISNUM); + dasm_put(Dst, 15392, LJ_TISNUM); } if (!vk) { - dasm_put(Dst, 15375, LJ_TISNUM); + dasm_put(Dst, 15398, LJ_TISNUM); } else { #ifdef LUA_USE_ASSERT - dasm_put(Dst, 15389, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 15412, LJ_TISNUM, LJ_TISNUM); #endif } - dasm_put(Dst, 15408); + dasm_put(Dst, 15431); if (!vk) { - dasm_put(Dst, 15412, LJ_TISNUM); + dasm_put(Dst, 15435, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 15421); + dasm_put(Dst, 15444); if (vk) { - dasm_put(Dst, 15433); + dasm_put(Dst, 15456); } else { - dasm_put(Dst, 15452); + dasm_put(Dst, 15475); } - dasm_put(Dst, 15457); + dasm_put(Dst, 15480); } else { - dasm_put(Dst, 15470); + dasm_put(Dst, 15493); if (vk) { - dasm_put(Dst, 15476); + dasm_put(Dst, 15499); } else { - dasm_put(Dst, 15492); + dasm_put(Dst, 15515); } - dasm_put(Dst, 15500); + dasm_put(Dst, 15523); if (cmov) { - dasm_put(Dst, 10130); + dasm_put(Dst, 10153); } else { - dasm_put(Dst, 10136); + dasm_put(Dst, 10159); } if (!cmov) { - dasm_put(Dst, 15505); + dasm_put(Dst, 15528); } } if (op == BC_FORI) { if (LJ_DUALNUM) { - dasm_put(Dst, 15511); + dasm_put(Dst, 15534); } else { - dasm_put(Dst, 15516, -BCBIAS_J*4); + dasm_put(Dst, 15539, -BCBIAS_J*4); } } else if (op == BC_JFORI) { - dasm_put(Dst, 15526, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 15549, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { if (LJ_DUALNUM) { - dasm_put(Dst, 15540); + dasm_put(Dst, 15563); } else { - dasm_put(Dst, 15545, -BCBIAS_J*4); + dasm_put(Dst, 15568, -BCBIAS_J*4); } } else { - dasm_put(Dst, 15536, BC_JLOOP); + dasm_put(Dst, 15559, BC_JLOOP); } if (LJ_DUALNUM) { - dasm_put(Dst, 10059); + dasm_put(Dst, 10082); } else { - dasm_put(Dst, 10833); + dasm_put(Dst, 10856); } if (sse) { - dasm_put(Dst, 15555); + dasm_put(Dst, 15578); } break; case BC_ITERL: #if LJ_HASJIT - dasm_put(Dst, 15145, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 15168, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2876,33 +2880,33 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IITERL: - dasm_put(Dst, 15566, LJ_TNIL); + dasm_put(Dst, 15589, LJ_TNIL); if (op == BC_JITERL) { - dasm_put(Dst, 15581, BC_JLOOP); + dasm_put(Dst, 15604, BC_JLOOP); } else { - dasm_put(Dst, 15595, -BCBIAS_J*4); + dasm_put(Dst, 15618, -BCBIAS_J*4); } - dasm_put(Dst, 10173); + dasm_put(Dst, 10196); break; case BC_LOOP: #if LJ_HASJIT - dasm_put(Dst, 15145, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 15168, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; case BC_ILOOP: - dasm_put(Dst, 10175); + dasm_put(Dst, 10198); break; case BC_JLOOP: #if LJ_HASJIT - dasm_put(Dst, 15611, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); + dasm_put(Dst, 15634, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); #endif break; case BC_JMP: - dasm_put(Dst, 15652, -BCBIAS_J*4); + dasm_put(Dst, 15675, -BCBIAS_J*4); break; /* -- Function headers -------------------------------------------------- */ @@ -2916,7 +2920,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FUNCF: #if LJ_HASJIT - dasm_put(Dst, 15678, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 15701, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif case BC_FUNCV: /* NYI: compiled vararg functions. */ break; @@ -2926,47 +2930,47 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IFUNCF: - dasm_put(Dst, 15699, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); + dasm_put(Dst, 15722, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); if (op == BC_JFUNCF) { - dasm_put(Dst, 15730, BC_JLOOP); + dasm_put(Dst, 15753, BC_JLOOP); } else { - dasm_put(Dst, 10175); + dasm_put(Dst, 10198); } - dasm_put(Dst, 15739, LJ_TNIL); + dasm_put(Dst, 15762, LJ_TNIL); break; case BC_JFUNCV: #if !LJ_HASJIT break; #endif - dasm_put(Dst, 9282); + dasm_put(Dst, 9305); break; /* NYI: compiled vararg functions. */ case BC_IFUNCV: - dasm_put(Dst, 15761, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); + dasm_put(Dst, 15784, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); if (op == BC_JFUNCV) { - dasm_put(Dst, 15730, BC_JLOOP); + dasm_put(Dst, 15753, BC_JLOOP); } else { - dasm_put(Dst, 15858, -4+PC2PROTO(k)); + dasm_put(Dst, 15881, -4+PC2PROTO(k)); } - dasm_put(Dst, 15883, LJ_TNIL); + dasm_put(Dst, 15906, LJ_TNIL); break; case BC_FUNCC: case BC_FUNCCW: - dasm_put(Dst, 15905, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); + dasm_put(Dst, 15928, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); if (op == BC_FUNCC) { - dasm_put(Dst, 2381); + dasm_put(Dst, 2404); } else { - dasm_put(Dst, 15935); + dasm_put(Dst, 15958); } - dasm_put(Dst, 15943, DISPATCH_GL(vmstate), ~LJ_VMST_C); + dasm_put(Dst, 15966, DISPATCH_GL(vmstate), ~LJ_VMST_C); if (op == BC_FUNCC) { - dasm_put(Dst, 15953); + dasm_put(Dst, 15976); } else { - dasm_put(Dst, 15958, DISPATCH_GL(wrapf)); + dasm_put(Dst, 15981, DISPATCH_GL(wrapf)); } - dasm_put(Dst, 15964, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 15987, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); break; /* ---------------------------------------------------------------------- */ @@ -2994,7 +2998,7 @@ static int build_backend(BuildCtx *ctx) build_subroutines(ctx, cmov, sse); - dasm_put(Dst, 15990); + dasm_put(Dst, 16013); for (op = 0; op < BC__MAX; op++) build_ins(ctx, (BCOp)op, op, cmov, sse); -- cgit v1.2.3-55-g6feb