diff --git a/src/buildvm_x64.h b/src/buildvm_x64.h index 1d2b8b44..ca235221 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[15952] = { +static const unsigned char build_actionlist[15975] = { 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, @@ -25,139 +25,140 @@ static const unsigned char build_actionlist[15952] = { 194,8,131,192,1,252,233,244,4,248,7,255,133,201,15,132,244,5,41,193,141,20, 202,252,233,244,5,248,8,137,149,233,137,68,36,4,137,206,137,252,239,232,251, 1,0,139,149,233,252,233,244,3,248,17,137,252,240,72,137,252,252,248,18,139, - 108,36,24,139,173,233,199,133,233,237,252,233,244,16,248,19,72,129,231,239, - 72,137,252,252,248,20,139,108,36,24,72,199,193,252,248,252,255,252,255,252, - 255,184,237,255,139,149,233,68,139,181,233,65,129,198,239,139,90,252,252, - 199,66,252,252,237,65,199,134,233,237,252,233,244,12,248,21,190,237,252,233, - 244,248,248,22,131,232,8,252,233,244,247,248,23,141,68,194,252,248,248,1, - 15,182,139,233,131,195,4,137,149,233,137,133,233,255,137,92,36,28,137,206, + 108,36,24,139,173,233,199,133,233,237,252,233,244,16,248,19,139,124,36,24, + 137,198,72,131,196,40,65,94,65,95,91,93,252,233,251,1,1,248,20,72,129,231, + 239,72,137,252,252,248,21,255,139,108,36,24,72,199,193,252,248,252,255,252, + 255,252,255,184,237,139,149,233,68,139,181,233,65,129,198,239,139,90,252, + 252,199,66,252,252,237,65,199,134,233,237,252,233,244,12,248,22,190,237,252, + 233,244,248,248,23,131,232,8,252,233,244,247,248,24,141,68,194,252,248,248, + 1,15,182,139,233,131,195,4,137,149,233,255,137,133,233,137,92,36,28,137,206, 248,2,137,252,239,232,251,1,0,139,149,233,139,133,233,139,106,252,248,41, 208,193,232,3,131,192,1,139,157,233,139,11,15,182,252,233,15,182,205,131, - 195,4,65,252,255,36,252,238,248,24,85,83,65,87,65,86,72,131,252,236,40,137, + 195,4,65,252,255,36,252,238,248,25,85,83,65,87,65,86,72,131,252,236,40,137, 252,253,137,124,36,24,137,252,241,187,237,49,192,76,141,188,253,36,233,68, 139,181,233,65,129,198,239,76,137,189,233,137,68,36,28,72,137,68,36,32,137, 68,36,16,137,68,36,20,56,133,233,15,132,244,249,65,199,134,233,237,136,133, 233,139,149,233,139,133,233,41,200,193,232,3,131,192,1,41,209,139,90,252, - 252,137,68,36,4,252,247,195,237,15,132,244,13,255,252,233,244,14,248,25,85, + 252,137,68,36,4,252,247,195,237,255,15,132,244,13,252,233,244,14,248,26,85, 83,65,87,65,86,72,131,252,236,40,187,237,137,76,36,20,252,233,244,247,248, - 26,85,83,65,87,65,86,72,131,252,236,40,187,237,248,1,137,84,36,16,137,252, + 27,85,83,65,87,65,86,72,131,252,236,40,187,237,248,1,137,84,36,16,137,252, 253,137,124,36,24,137,252,241,76,139,189,233,76,137,124,36,32,137,108,36, 28,72,137,165,233,248,2,68,139,181,233,65,129,198,239,248,3,65,199,134,233, - 237,139,149,233,1,203,41,211,139,133,233,41,200,193,232,3,131,192,1,248,27, - 255,139,105,252,248,129,121,253,252,252,239,15,133,244,28,248,29,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,30,85,83,65,87,65,86,72,131,252,236,40,137,252,253, - 137,124,36,24,137,108,36,28,68,139,189,233,68,43,189,233,199,68,36,20,0,0, - 0,0,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,76,1,252,249,68,139,122,252,248,69,139,191, - 233,255,69,139,191,233,252,255,225,248,31,15,182,75,252,255,131,252,237,16, - 141,12,202,41,252,233,15,132,244,32,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,33,248, - 34,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,35,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,36,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,1,139,149,233,133,192, - 15,132,244,249,248,32,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, - 29,248,37,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, - 38,15,182,67,252,254,255,72,141,4,36,252,233,244,247,248,39,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,15,182,75,252,253,72,139,44,202,72,137,40, - 248,40,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,29,248,41,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,3,248,3,139,149,233,255,131,252,248,1,15,135,244,42, - 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,43,131,195,4,129,120,253,4,239,15,130,244,5,252,233,244,6,248,44, - 129,120,253,4,239,252,233,244,4,248,45,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, - 4,252,233,244,3,248,46,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,5,252,233,244,3,255,248,47,255, - 15,182,107,252,255,255,248,48,65,141,4,199,252,233,244,247,248,49,255,248, - 50,65,141,4,199,141,44,252,234,149,252,233,244,248,248,51,141,4,194,137,197, - 252,233,244,248,248,52,255,248,53,141,4,194,248,1,141,44,252,234,248,2,141, + 237,139,149,233,255,1,203,41,211,139,133,233,41,200,193,232,3,131,192,1,248, + 28,139,105,252,248,129,121,253,252,252,239,15,133,244,29,248,30,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,31,85,83,65,87,65,86,72,131,252,236,40,137,252,253,137, + 124,36,24,137,108,36,28,68,139,189,233,68,43,189,233,199,68,36,20,0,0,0,0, + 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, + 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, + 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, + 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, + 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, + 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, + 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, + 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, + 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, 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,6,139,149,233,133,192,15,132,244, - 40,248,42,137,193,41,208,137,89,252,244,141,152,233,184,237,252,233,244,27, - 248,54,139,108,36,24,137,149,233,141,52,194,137,252,239,137,92,36,28,232, - 251,1,7,139,149,233,252,233,244,42,248,55,141,76,202,8,248,28,137,76,36,4, + 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, 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,8,139,149,233,139,76,36,4,139,4,36,139,105, - 252,248,131,192,1,65,57,215,15,132,244,56,137,202,137,90,252,252,139,157, + 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, 233,139,11,15,182,252,233,15,182,205,131,195,4,65,252,255,36,252,238,248, - 57,139,108,36,24,137,149,233,137,206,137,252,239,137,92,36,28,232,251,1,9, + 58,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,58,129,252,248,239,15,130,244,59,139,106,4,129,252,253, - 239,15,131,244,59,139,90,252,252,137,68,36,4,137,106,252,252,139,42,137,106, + 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, 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,60,248, - 61,129,252,248,239,15,130,244,59,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,61,248, + 62,129,252,248,239,15,130,244,60,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,62,248,3,184, - 237,252,233,244,2,248,63,129,252,248,239,15,130,244,59,139,106,4,139,90,252, + 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, 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,62,65,139,134,233,199,66,252,252,237, + 237,199,66,252,252,237,255,15,132,244,63,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,62,248,5,139,105,4,129,252,253,239,15,132,244, - 62,139,1,137,106,252,252,137,66,252,248,252,233,244,62,248,6,129,252,253, + 15,133,244,3,255,252,233,244,63,248,5,139,105,4,129,252,253,239,15,132,244, + 63,139,1,137,106,252,252,137,66,252,248,252,233,244,63,248,6,129,252,253, 239,15,132,244,1,129,252,253,239,15,135,244,253,189,237,248,7,252,247,213, - 65,139,172,253,174,233,252,233,244,2,248,64,255,129,252,248,239,15,130,244, - 59,129,122,253,4,239,15,133,244,59,139,42,131,189,233,0,15,133,244,59,129, - 122,253,12,239,15,133,244,59,139,66,8,137,133,233,139,90,252,252,199,66,252, + 65,139,172,253,174,233,252,233,244,2,248,65,255,129,252,248,239,15,130,244, + 60,129,122,253,4,239,15,133,244,60,139,42,131,189,233,0,15,133,244,60,129, + 122,253,12,239,15,133,244,60,139,66,8,137,133,233,139,90,252,252,199,66,252, 252,237,137,106,252,248,252,246,133,233,235,15,132,244,247,128,165,233,235, - 255,65,139,134,233,65,137,174,233,137,133,233,248,1,252,233,244,62,248,65, - 129,252,248,239,15,130,244,59,129,122,253,4,239,15,133,244,59,137,213,139, - 50,141,82,8,139,124,36,24,232,251,1,10,137,252,234,72,139,40,139,90,252,252, - 72,137,106,252,248,252,233,244,62,248,66,129,252,248,239,15,133,244,59,129, - 122,253,4,239,255,15,133,244,247,139,42,252,233,244,67,248,1,15,135,244,59, - 255,15,131,244,59,255,252,242,15,16,2,252,233,244,68,255,221,2,252,233,244, - 69,255,248,70,129,252,248,239,15,130,244,59,139,90,252,252,129,122,253,4, + 255,65,139,134,233,65,137,174,233,137,133,233,248,1,252,233,244,63,248,66, + 129,252,248,239,15,130,244,60,129,122,253,4,239,15,133,244,60,137,213,139, + 50,141,82,8,139,124,36,24,232,251,1,11,137,252,234,72,139,40,139,90,252,252, + 72,137,106,252,248,252,233,244,63,248,67,129,252,248,239,15,133,244,60,129, + 122,253,4,239,255,15,133,244,247,139,42,252,233,244,68,248,1,15,135,244,60, + 255,15,131,244,60,255,252,242,15,16,2,252,233,244,69,255,221,2,252,233,244, + 70,255,248,71,129,252,248,239,15,130,244,60,139,90,252,252,129,122,253,4, 239,15,133,244,249,139,2,248,2,199,66,252,252,237,137,66,252,248,252,233, - 244,62,248,3,129,122,253,4,239,15,135,244,59,65,131,190,233,0,15,133,244, - 59,65,139,174,233,65,59,174,233,255,15,130,244,247,232,244,71,248,1,139,108, - 36,24,137,149,233,137,92,36,28,137,214,137,252,239,255,232,251,1,11,255,232, - 251,1,12,255,139,149,233,252,233,244,2,248,72,129,252,248,239,15,130,244, - 59,15,132,244,248,248,1,129,122,253,4,239,15,133,244,59,139,108,36,24,137, + 244,63,248,3,129,122,253,4,239,15,135,244,60,65,131,190,233,0,15,133,244, + 60,65,139,174,233,65,59,174,233,255,15,130,244,247,232,244,72,248,1,139,108, + 36,24,137,149,233,137,92,36,28,137,214,137,252,239,255,232,251,1,12,255,232, + 251,1,13,255,139,149,233,252,233,244,2,248,73,129,252,248,239,15,130,244, + 60,15,132,244,248,248,1,129,122,253,4,239,15,133,244,60,139,108,36,24,137, 149,233,137,149,233,139,90,252,252,139,50,141,82,8,137,252,239,137,92,36, - 28,232,251,1,13,139,149,233,133,192,15,132,244,249,72,139,106,8,72,139,66, - 16,72,137,106,252,248,72,137,2,248,73,184,237,255,252,233,244,74,248,2,199, - 66,12,237,252,233,244,1,248,3,199,66,252,252,237,252,233,244,62,248,75,129, - 252,248,239,15,130,244,59,139,42,129,122,253,4,239,15,133,244,59,255,131, - 189,233,0,15,133,244,59,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,74,248,76, - 129,252,248,239,15,130,244,59,129,122,253,4,239,15,133,244,59,129,122,253, + 28,232,251,1,14,139,149,233,133,192,15,132,244,249,72,139,106,8,72,139,66, + 16,72,137,106,252,248,72,137,2,248,74,184,237,255,252,233,244,75,248,2,199, + 66,12,237,252,233,244,1,248,3,199,66,252,252,237,252,233,244,63,248,76,129, + 252,248,239,15,130,244,60,139,42,129,122,253,4,239,15,133,244,60,255,131, + 189,233,0,15,133,244,60,255,139,106,252,248,139,133,233,139,90,252,252,199, + 66,252,252,237,137,66,252,248,199,66,12,237,184,237,252,233,244,75,248,77, + 129,252,248,239,15,130,244,60,129,122,253,4,239,15,133,244,60,129,122,253, 12,239,255,139,90,252,252,255,139,66,8,131,192,1,199,66,252,252,237,137,66, 252,248,255,252,242,15,16,66,8,72,189,237,237,102,72,15,110,205,252,242,15, 88,193,252,242,15,45,192,252,242,15,17,66,252,248,255,139,42,59,133,233,15, - 131,244,248,193,224,3,3,133,233,248,1,129,120,253,4,239,15,132,244,77,72, - 139,40,72,137,42,252,233,244,73,248,2,131,189,233,0,15,132,244,77,137,252, - 239,137,213,137,198,232,251,1,14,137,252,234,133,192,15,133,244,1,248,77, - 184,237,252,233,244,74,248,78,255,139,106,252,248,139,133,233,139,90,252, + 131,244,248,193,224,3,3,133,233,248,1,129,120,253,4,239,15,132,244,78,72, + 139,40,72,137,42,252,233,244,74,248,2,131,189,233,0,15,132,244,78,137,252, + 239,137,213,137,198,232,251,1,15,137,252,234,133,192,15,133,244,1,248,78, + 184,237,252,233,244,75,248,79,255,139,106,252,248,139,133,233,139,90,252, 252,199,66,252,252,237,137,66,252,248,255,199,66,12,237,199,66,8,0,0,0,0, 255,15,87,192,252,242,15,17,66,8,255,217,252,238,221,90,8,255,184,237,252, - 233,244,74,248,79,129,252,248,239,15,130,244,59,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,27, - 248,80,129,252,248,239,15,130,244,59,129,122,253,12,239,15,133,244,59,255, + 233,244,75,248,80,129,252,248,239,15,130,244,60,141,74,8,131,232,1,187,237, + 248,1,65,15,182,174,233,193,252,237,235,131,229,1,1,252,235,252,233,244,28, + 248,81,129,252,248,239,15,130,244,60,129,122,253,12,239,15,133,244,60,255, 139,106,4,137,106,12,199,66,4,237,139,42,139,90,8,137,106,8,137,26,141,74, - 16,131,232,2,187,237,252,233,244,1,248,81,129,252,248,239,15,130,244,59,139, - 42,139,90,252,252,137,92,36,28,137,44,36,129,122,253,4,239,15,133,244,59, - 72,131,189,233,0,15,133,244,59,128,189,233,235,15,135,244,59,139,141,233, - 15,132,244,247,255,59,141,233,15,132,244,59,248,1,141,92,193,252,240,59,157, - 233,15,135,244,59,137,157,233,139,108,36,24,137,149,233,131,194,8,137,149, + 16,131,232,2,187,237,252,233,244,1,248,82,129,252,248,239,15,130,244,60,139, + 42,139,90,252,252,137,92,36,28,137,44,36,129,122,253,4,239,15,133,244,60, + 72,131,189,233,0,15,133,244,60,128,189,233,235,15,135,244,60,139,141,233, + 15,132,244,247,255,59,141,233,15,132,244,60,248,1,141,92,193,252,240,59,157, + 233,15,135,244,60,137,157,233,139,108,36,24,137,149,233,131,194,8,137,149, 233,141,108,194,232,72,41,221,57,203,15,132,244,249,248,2,72,139,4,43,72, 137,67,252,248,131,252,235,8,57,203,15,133,244,2,248,3,137,206,139,60,36, - 232,244,24,65,199,134,233,237,255,139,108,36,24,139,28,36,139,149,233,129, + 232,244,25,65,199,134,233,237,255,139,108,36,24,139,28,36,139,149,233,129, 252,248,239,15,135,244,254,248,4,139,139,233,68,139,187,233,137,139,233,68, 137,252,251,41,203,15,132,244,252,141,4,26,193,252,235,3,59,133,233,15,135, 244,255,137,213,72,41,205,248,5,72,139,1,72,137,4,41,131,193,8,68,57,252, @@ -166,218 +167,218 @@ static const unsigned char build_actionlist[15952] = { 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,82,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,59,255,128,189,233,235,15,135,244,59,139, - 141,233,15,132,244,247,59,141,233,15,132,244,59,248,1,141,92,193,252,248, - 59,157,233,15,135,244,59,137,157,233,139,108,36,24,137,149,233,137,149,233, + 244,4,248,83,139,106,252,248,139,173,233,139,90,252,252,137,92,36,28,137, + 44,36,72,131,189,233,0,15,133,244,60,255,128,189,233,235,15,135,244,60,139, + 141,233,15,132,244,247,59,141,233,15,132,244,60,248,1,141,92,193,252,248, + 59,157,233,15,135,244,60,137,157,233,139,108,36,24,137,149,233,137,149,233, 141,108,194,252,240,72,41,221,57,203,15,132,244,249,248,2,255,72,139,4,43, 72,137,67,252,248,131,252,235,8,57,203,15,133,244,2,248,3,137,206,139,60, - 36,232,244,24,65,199,134,233,237,139,108,36,24,139,28,36,139,149,233,129, + 36,232,244,25,65,199,134,233,237,139,108,36,24,139,28,36,139,149,233,129, 252,248,239,15,135,244,254,248,4,139,139,233,68,139,187,233,137,139,233,68, 137,252,251,41,203,15,132,244,252,141,4,26,193,252,235,3,59,133,233,15,135, 244,255,255,137,213,72,41,205,248,5,72,139,1,72,137,4,41,131,193,8,68,57, 252,249,15,133,244,5,248,6,141,67,1,248,7,139,92,36,28,137,68,36,4,49,201, 252,247,195,237,15,132,244,13,252,233,244,14,248,8,137,222,137,252,239,232, - 251,1,15,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,108,36,24,72,252,247,133,233,237, - 15,132,244,59,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,67,255,248,69,139,90,252, - 252,221,90,252,248,252,233,244,62,255,248,84,129,252,248,239,15,130,244,59, - 255,129,122,253,4,239,15,133,244,248,139,42,131,252,253,0,15,137,244,67,252, - 247,221,15,136,244,247,248,85,248,67,139,90,252,252,199,66,252,252,237,137, - 106,252,248,252,233,244,62,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,62,248,2,15,135,244,59,255,129,122,253, - 4,239,15,131,244,59,255,252,242,15,16,2,72,184,237,237,102,72,15,110,200, - 15,84,193,248,68,139,90,252,252,252,242,15,17,66,252,248,255,221,2,217,225, - 248,68,248,69,139,90,252,252,221,90,252,248,255,248,62,184,237,248,74,137, - 68,36,4,248,60,252,247,195,237,15,133,244,253,248,5,56,67,252,255,15,135, + 251,1,16,248,9,139,12,36,68,137,185,233,137,222,137,252,239,232,251,1,0,139, + 28,36,139,149,233,252,233,244,4,248,84,139,108,36,24,72,252,247,133,233,237, + 15,132,244,60,255,137,149,233,141,68,194,252,248,137,133,233,49,192,72,137, + 133,233,176,235,136,133,233,252,233,244,16,255,248,68,255,248,70,139,90,252, + 252,221,90,252,248,252,233,244,63,255,248,85,129,252,248,239,15,130,244,60, + 255,129,122,253,4,239,15,133,244,248,139,42,131,252,253,0,15,137,244,68,252, + 247,221,15,136,244,247,248,86,248,68,139,90,252,252,199,66,252,252,237,137, + 106,252,248,252,233,244,63,248,1,139,90,252,252,199,66,252,252,0,0,224,65, + 199,66,252,248,0,0,0,0,252,233,244,63,248,2,15,135,244,60,255,129,122,253, + 4,239,15,131,244,60,255,252,242,15,16,2,72,184,237,237,102,72,15,110,200, + 15,84,193,248,69,139,90,252,252,252,242,15,17,66,252,248,255,221,2,217,225, + 248,69,248,70,139,90,252,252,221,90,252,248,255,248,63,184,237,248,75,137, + 68,36,4,248,61,252,247,195,237,15,133,244,253,248,5,56,67,252,255,15,135, 244,252,15,182,75,252,253,72,252,247,209,141,20,202,139,3,15,182,204,15,182, 232,131,195,4,193,232,16,65,252,255,36,252,238,248,6,199,68,194,252,244,237, 131,192,1,252,233,244,5,248,7,72,199,193,252,248,252,255,252,255,252,255, - 252,233,244,14,248,86,255,129,122,253,4,239,15,133,244,247,139,42,252,233, - 244,67,248,1,15,135,244,59,255,252,242,15,16,2,232,244,87,255,252,242,15, - 45,232,129,252,253,0,0,0,128,15,133,244,67,252,242,15,42,205,102,15,46,193, - 15,138,244,68,15,132,244,67,255,221,2,232,244,87,255,248,88,255,252,242,15, - 16,2,232,244,89,255,221,2,232,244,89,255,248,90,129,252,248,239,15,130,244, - 59,129,122,253,4,239,15,131,244,59,252,242,15,81,2,252,233,244,68,255,248, - 90,129,252,248,239,15,130,244,59,129,122,253,4,239,15,131,244,59,221,2,217, - 252,250,252,233,244,69,255,248,91,129,252,248,239,15,130,244,59,129,122,253, - 4,239,15,131,244,59,217,252,237,221,2,217,252,241,252,233,244,69,248,92,129, - 252,248,239,15,130,244,59,129,122,253,4,239,15,131,244,59,217,252,236,221, - 2,217,252,241,252,233,244,69,248,93,129,252,248,239,255,15,130,244,59,129, - 122,253,4,239,15,131,244,59,221,2,232,244,94,252,233,244,69,248,95,129,252, - 248,239,15,130,244,59,129,122,253,4,239,15,131,244,59,221,2,217,252,254,252, - 233,244,69,248,96,129,252,248,239,255,15,130,244,59,129,122,253,4,239,15, - 131,244,59,221,2,217,252,255,252,233,244,69,248,97,129,252,248,239,15,130, - 244,59,129,122,253,4,239,15,131,244,59,221,2,217,252,242,221,216,252,233, - 244,69,248,98,129,252,248,239,15,130,244,59,255,129,122,253,4,239,15,131, - 244,59,221,2,217,192,216,200,217,232,222,225,217,252,250,217,252,243,252, - 233,244,69,248,99,129,252,248,239,15,130,244,59,129,122,253,4,239,15,131, - 244,59,221,2,217,192,216,200,217,232,222,225,217,252,250,217,201,217,252, - 243,252,233,244,69,248,100,129,252,248,239,15,130,244,59,129,122,253,4,239, - 15,131,244,59,255,221,2,217,232,217,252,243,252,233,244,69,255,248,101,129, - 252,248,239,15,130,244,59,129,122,253,4,239,15,131,244,59,252,242,15,16,2, - 255,137,213,232,251,1,16,137,252,234,252,233,244,68,255,248,102,129,252,248, - 239,15,130,244,59,129,122,253,4,239,15,131,244,59,252,242,15,16,2,255,137, - 213,232,251,1,17,137,252,234,252,233,244,68,255,248,103,129,252,248,239,15, - 130,244,59,129,122,253,4,239,15,131,244,59,252,242,15,16,2,255,137,213,232, - 251,1,18,137,252,234,252,233,244,68,248,104,255,248,105,129,252,248,239,15, - 130,244,59,129,122,253,4,239,15,131,244,59,252,242,15,16,2,139,106,252,248, - 252,242,15,89,133,233,252,233,244,68,255,248,105,129,252,248,239,15,130,244, - 59,129,122,253,4,239,15,131,244,59,221,2,139,106,252,248,220,141,233,252, - 233,244,69,255,248,106,129,252,248,239,15,130,244,59,129,122,253,4,239,15, - 131,244,59,129,122,253,12,239,15,131,244,59,221,2,221,66,8,217,252,243,252, - 233,244,69,248,107,129,252,248,239,15,130,244,59,129,122,253,4,239,15,131, - 244,59,129,122,253,12,239,255,15,131,244,59,221,66,8,221,2,217,252,253,221, - 217,252,233,244,69,248,108,129,252,248,239,15,130,244,59,139,106,4,129,252, - 253,239,15,131,244,59,139,90,252,252,139,2,137,106,252,252,137,66,252,248, + 252,233,244,14,248,87,255,129,122,253,4,239,15,133,244,247,139,42,252,233, + 244,68,248,1,15,135,244,60,255,252,242,15,16,2,232,244,88,255,252,242,15, + 45,232,129,252,253,0,0,0,128,15,133,244,68,252,242,15,42,205,102,15,46,193, + 15,138,244,69,15,132,244,68,255,221,2,232,244,88,255,248,89,255,252,242,15, + 16,2,232,244,90,255,221,2,232,244,90,255,248,91,129,252,248,239,15,130,244, + 60,129,122,253,4,239,15,131,244,60,252,242,15,81,2,252,233,244,69,255,248, + 91,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131,244,60,221,2,217, + 252,250,252,233,244,70,255,248,92,129,252,248,239,15,130,244,60,129,122,253, + 4,239,15,131,244,60,217,252,237,221,2,217,252,241,252,233,244,70,248,93,129, + 252,248,239,15,130,244,60,129,122,253,4,239,15,131,244,60,217,252,236,221, + 2,217,252,241,252,233,244,70,248,94,129,252,248,239,255,15,130,244,60,129, + 122,253,4,239,15,131,244,60,221,2,232,244,95,252,233,244,70,248,96,129,252, + 248,239,15,130,244,60,129,122,253,4,239,15,131,244,60,221,2,217,252,254,252, + 233,244,70,248,97,129,252,248,239,255,15,130,244,60,129,122,253,4,239,15, + 131,244,60,221,2,217,252,255,252,233,244,70,248,98,129,252,248,239,15,130, + 244,60,129,122,253,4,239,15,131,244,60,221,2,217,252,242,221,216,252,233, + 244,70,248,99,129,252,248,239,15,130,244,60,255,129,122,253,4,239,15,131, + 244,60,221,2,217,192,216,200,217,232,222,225,217,252,250,217,252,243,252, + 233,244,70,248,100,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131, + 244,60,221,2,217,192,216,200,217,232,222,225,217,252,250,217,201,217,252, + 243,252,233,244,70,248,101,129,252,248,239,15,130,244,60,129,122,253,4,239, + 15,131,244,60,255,221,2,217,232,217,252,243,252,233,244,70,255,248,102,129, + 252,248,239,15,130,244,60,129,122,253,4,239,15,131,244,60,252,242,15,16,2, + 255,137,213,232,251,1,17,137,252,234,252,233,244,69,255,248,103,129,252,248, + 239,15,130,244,60,129,122,253,4,239,15,131,244,60,252,242,15,16,2,255,137, + 213,232,251,1,18,137,252,234,252,233,244,69,255,248,104,129,252,248,239,15, + 130,244,60,129,122,253,4,239,15,131,244,60,252,242,15,16,2,255,137,213,232, + 251,1,19,137,252,234,252,233,244,69,248,105,255,248,106,129,252,248,239,15, + 130,244,60,129,122,253,4,239,15,131,244,60,252,242,15,16,2,139,106,252,248, + 252,242,15,89,133,233,252,233,244,69,255,248,106,129,252,248,239,15,130,244, + 60,129,122,253,4,239,15,131,244,60,221,2,139,106,252,248,220,141,233,252, + 233,244,70,255,248,107,129,252,248,239,15,130,244,60,129,122,253,4,239,15, + 131,244,60,129,122,253,12,239,15,131,244,60,221,2,221,66,8,217,252,243,252, + 233,244,70,248,108,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131, + 244,60,129,122,253,12,239,255,15,131,244,60,221,66,8,221,2,217,252,253,221, + 217,252,233,244,70,248,109,129,252,248,239,15,130,244,60,139,106,4,129,252, + 253,239,15,131,244,60,139,90,252,252,139,2,137,106,252,252,137,66,252,248, 209,229,129,252,253,0,0,224,252,255,15,131,244,249,9,232,15,132,244,249,184, 252,254,3,0,0,129,252,253,0,0,32,0,15,130,244,250,248,1,193,252,237,21,41, 197,255,252,242,15,42,197,255,137,44,36,219,4,36,255,139,106,252,252,129, 229,252,255,252,255,15,128,129,205,0,0,224,63,137,106,252,252,248,2,255,252, - 242,15,17,2,255,221,26,255,184,237,252,233,244,74,248,3,255,15,87,192,252, + 242,15,17,2,255,221,26,255,184,237,252,233,244,75,248,3,255,15,87,192,252, 233,244,2,255,217,252,238,252,233,244,2,255,248,4,255,252,242,15,16,2,72, 189,237,237,102,72,15,110,205,252,242,15,89,193,252,242,15,17,66,252,248, 255,221,2,199,4,36,0,0,128,90,216,12,36,221,90,252,248,255,139,106,252,252, - 184,52,4,0,0,209,229,252,233,244,1,255,248,109,129,252,248,239,15,130,244, - 59,129,122,253,4,239,15,131,244,59,252,242,15,16,2,255,248,109,129,252,248, - 239,15,130,244,59,129,122,253,4,239,15,131,244,59,221,2,255,139,106,4,139, + 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,110,252,242,15,92,224,248,1,252,242,15,17,66,252,248,252,242,15,17, - 34,255,217,192,232,244,110,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,74,248, + 232,244,111,252,242,15,92,224,248,1,252,242,15,17,66,252,248,252,242,15,17, + 34,255,217,192,232,244,111,220,252,233,248,1,221,90,252,248,221,26,255,139, + 66,252,252,139,106,4,49,232,15,136,244,249,248,2,184,237,252,233,244,75,248, 3,129,252,245,0,0,0,128,137,106,4,252,233,244,2,248,4,255,15,87,228,252,233, - 244,1,255,217,252,238,217,201,252,233,244,1,255,248,111,129,252,248,239,15, - 130,244,59,129,122,253,4,239,15,131,244,59,129,122,253,12,239,15,131,244, - 59,221,66,8,221,2,248,1,217,252,248,223,224,158,15,138,244,1,221,217,252, - 233,244,69,255,248,112,129,252,248,239,15,130,244,59,129,122,253,4,239,15, - 131,244,59,129,122,253,12,239,15,131,244,59,252,242,15,16,2,252,242,15,16, - 74,8,232,244,113,252,233,244,68,255,248,112,129,252,248,239,15,130,244,59, - 129,122,253,4,239,15,131,244,59,129,122,253,12,239,15,131,244,59,221,2,221, - 66,8,232,244,113,252,233,244,69,255,248,114,185,2,0,0,0,129,122,253,4,239, - 255,15,133,244,250,139,42,248,1,57,193,15,131,244,67,129,124,253,202,252, + 244,1,255,217,252,238,217,201,252,233,244,1,255,248,112,129,252,248,239,15, + 130,244,60,129,122,253,4,239,15,131,244,60,129,122,253,12,239,15,131,244, + 60,221,66,8,221,2,248,1,217,252,248,223,224,158,15,138,244,1,221,217,252, + 233,244,70,255,248,113,129,252,248,239,15,130,244,60,129,122,253,4,239,15, + 131,244,60,129,122,253,12,239,15,131,244,60,252,242,15,16,2,252,242,15,16, + 74,8,232,244,114,252,233,244,69,255,248,113,129,252,248,239,15,130,244,60, + 129,122,253,4,239,15,131,244,60,129,122,253,12,239,15,131,244,60,221,2,221, + 66,8,232,244,114,252,233,244,70,255,248,115,185,2,0,0,0,129,122,253,4,239, + 255,15,133,244,250,139,42,248,1,57,193,15,131,244,68,129,124,253,202,252, 252,239,15,133,244,249,59,108,202,252,248,15,79,108,202,252,248,131,193,1, - 252,233,244,1,248,3,15,135,244,59,255,252,233,244,252,248,4,15,135,244,59, - 255,252,242,15,16,2,248,5,57,193,15,131,244,68,129,124,253,202,252,252,239, - 255,15,130,244,252,15,135,244,59,252,242,15,42,76,202,252,248,252,233,244, + 252,233,244,1,248,3,15,135,244,60,255,252,233,244,252,248,4,15,135,244,60, + 255,252,242,15,16,2,248,5,57,193,15,131,244,69,129,124,253,202,252,252,239, + 255,15,130,244,252,15,135,244,60,252,242,15,42,76,202,252,248,252,233,244, 253,255,248,6,252,242,15,16,76,202,252,248,248,7,252,242,15,93,193,131,193, - 1,252,233,244,5,255,248,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,67,129,124,253,202,252,252,239,15,133, + 1,252,233,244,5,255,248,116,185,2,0,0,0,129,122,253,4,239,255,15,133,244, + 250,139,42,248,1,57,193,15,131,244,68,129,124,253,202,252,252,239,15,133, 244,249,59,108,202,252,248,15,76,108,202,252,248,131,193,1,252,233,244,1, - 248,3,15,135,244,59,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,59,255,248, - 116,129,252,248,239,15,130,244,59,129,122,253,4,239,15,133,244,59,139,42, - 255,139,173,233,252,233,244,67,255,252,242,15,42,133,233,252,233,244,68,255, - 219,133,233,252,233,244,69,255,248,117,129,252,248,239,15,133,244,59,129, - 122,253,4,239,15,133,244,59,139,42,139,90,252,252,131,189,233,1,15,130,244, - 77,15,182,173,233,255,252,242,15,42,197,252,233,244,68,255,137,44,36,219, - 4,36,252,233,244,69,255,248,118,65,139,174,233,65,59,174,233,15,130,244,247, - 232,244,71,248,1,129,252,248,239,15,133,244,59,129,122,253,4,239,255,15,133, - 244,59,139,42,129,252,253,252,255,0,0,0,15,135,244,59,137,108,36,4,255,15, - 131,244,59,252,242,15,44,42,129,252,253,252,255,0,0,0,15,135,244,59,137,108, - 36,4,255,15,131,244,59,221,2,219,92,36,4,129,124,36,4,252,255,0,0,0,15,135, - 244,59,255,199,68,36,8,1,0,0,0,72,141,68,36,4,248,119,139,108,36,24,137,149, - 233,139,84,36,8,72,137,198,137,252,239,137,92,36,28,232,251,1,19,139,149, - 233,139,90,252,252,199,66,252,252,237,137,66,252,248,252,233,244,62,248,120, - 65,139,174,233,65,59,174,233,15,130,244,247,232,244,71,248,1,199,68,36,4, - 252,255,252,255,252,255,252,255,129,252,248,239,15,130,244,59,15,134,244, - 247,129,122,253,20,239,255,15,133,244,59,139,106,16,137,108,36,4,255,15,131, - 244,59,252,242,15,44,106,16,137,108,36,4,255,15,131,244,59,221,66,16,219, - 92,36,4,255,248,1,129,122,253,4,239,15,133,244,59,129,122,253,12,239,255, + 248,3,15,135,244,60,255,248,6,252,242,15,16,76,202,252,248,248,7,252,242, + 15,95,193,131,193,1,252,233,244,5,255,248,9,221,216,252,233,244,60,255,248, + 117,129,252,248,239,15,130,244,60,129,122,253,4,239,15,133,244,60,139,42, + 255,139,173,233,252,233,244,68,255,252,242,15,42,133,233,252,233,244,69,255, + 219,133,233,252,233,244,70,255,248,118,129,252,248,239,15,133,244,60,129, + 122,253,4,239,15,133,244,60,139,42,139,90,252,252,131,189,233,1,15,130,244, + 78,15,182,173,233,255,252,242,15,42,197,252,233,244,69,255,137,44,36,219, + 4,36,252,233,244,70,255,248,119,65,139,174,233,65,59,174,233,15,130,244,247, + 232,244,72,248,1,129,252,248,239,15,133,244,60,129,122,253,4,239,255,15,133, + 244,60,139,42,129,252,253,252,255,0,0,0,15,135,244,60,137,108,36,4,255,15, + 131,244,60,252,242,15,44,42,129,252,253,252,255,0,0,0,15,135,244,60,137,108, + 36,4,255,15,131,244,60,221,2,219,92,36,4,129,124,36,4,252,255,0,0,0,15,135, + 244,60,255,199,68,36,8,1,0,0,0,72,141,68,36,4,248,120,139,108,36,24,137,149, + 233,139,84,36,8,72,137,198,137,252,239,137,92,36,28,232,251,1,20,139,149, + 233,139,90,252,252,199,66,252,252,237,137,66,252,248,252,233,244,63,248,121, + 65,139,174,233,65,59,174,233,15,130,244,247,232,244,72,248,1,199,68,36,4, + 252,255,252,255,252,255,252,255,129,252,248,239,15,130,244,60,15,134,244, + 247,129,122,253,20,239,255,15,133,244,60,139,106,16,137,108,36,4,255,15,131, + 244,60,252,242,15,44,106,16,137,108,36,4,255,15,131,244,60,221,66,16,219, + 92,36,4,255,248,1,129,122,253,4,239,15,133,244,60,129,122,253,12,239,255, 139,42,137,108,36,8,139,173,233,255,139,74,8,255,252,242,15,44,74,8,255,139, 68,36,4,57,197,15,130,244,251,248,2,133,201,15,142,244,253,248,3,139,108, - 36,8,41,200,15,140,244,121,141,172,253,13,233,131,192,1,248,4,137,68,36,8, - 137,232,252,233,244,119,248,5,15,140,244,252,141,68,40,1,252,233,244,2,248, + 36,8,41,200,15,140,244,122,141,172,253,13,233,131,192,1,248,4,137,68,36,8, + 137,232,252,233,244,120,248,5,15,140,244,252,141,68,40,1,252,233,244,2,248, 6,137,232,252,233,244,2,248,7,255,15,132,244,254,1,252,233,131,193,1,15,143, - 244,3,248,8,185,1,0,0,0,252,233,244,3,248,121,49,192,252,233,244,4,248,122, - 129,252,248,239,15,130,244,59,65,139,174,233,65,59,174,233,15,130,244,247, - 232,244,71,248,1,255,129,122,253,4,239,15,133,244,59,129,122,253,12,239,139, - 42,255,15,133,244,59,139,66,8,255,15,131,244,59,252,242,15,44,66,8,255,15, - 131,244,59,221,66,8,219,92,36,4,139,68,36,4,255,133,192,15,142,244,121,131, - 189,233,1,15,130,244,121,15,133,244,123,65,57,134,233,15,130,244,123,15,182, + 244,3,248,8,185,1,0,0,0,252,233,244,3,248,122,49,192,252,233,244,4,248,123, + 129,252,248,239,15,130,244,60,65,139,174,233,65,59,174,233,15,130,244,247, + 232,244,72,248,1,255,129,122,253,4,239,15,133,244,60,129,122,253,12,239,139, + 42,255,15,133,244,60,139,66,8,255,15,131,244,60,252,242,15,44,66,8,255,15, + 131,244,60,221,66,8,219,92,36,4,139,68,36,4,255,133,192,15,142,244,122,131, + 189,233,1,15,130,244,122,15,133,244,124,65,57,134,233,15,130,244,124,15,182, 141,233,65,139,174,233,137,68,36,8,248,1,136,77,0,131,197,1,131,232,1,15, - 133,244,1,65,139,134,233,252,233,244,119,248,124,129,252,248,239,255,15,130, - 244,59,65,139,174,233,65,59,174,233,15,130,244,247,232,244,71,248,1,129,122, - 253,4,239,15,133,244,59,139,42,139,133,233,133,192,15,132,244,121,65,57,134, - 233,15,130,244,125,129,197,239,137,92,36,4,137,68,36,8,65,139,158,233,248, + 133,244,1,65,139,134,233,252,233,244,120,248,125,129,252,248,239,255,15,130, + 244,60,65,139,174,233,65,59,174,233,15,130,244,247,232,244,72,248,1,129,122, + 253,4,239,15,133,244,60,139,42,139,133,233,133,192,15,132,244,122,65,57,134, + 233,15,130,244,126,129,197,239,137,92,36,4,137,68,36,8,65,139,158,233,248, 1,255,15,182,77,0,131,197,1,131,232,1,136,12,3,15,133,244,1,137,216,139,92, - 36,4,252,233,244,119,248,126,129,252,248,239,15,130,244,59,65,139,174,233, - 65,59,174,233,15,130,244,247,232,244,71,248,1,129,122,253,4,239,15,133,244, - 59,139,42,139,133,233,65,57,134,233,255,15,130,244,125,129,197,239,137,92, + 36,4,252,233,244,120,248,127,129,252,248,239,15,130,244,60,65,139,174,233, + 65,59,174,233,15,130,244,247,232,244,72,248,1,129,122,253,4,239,15,133,244, + 60,139,42,139,133,233,65,57,134,233,255,15,130,244,126,129,197,239,137,92, 36,4,137,68,36,8,65,139,158,233,252,233,244,249,248,1,15,182,76,5,0,131,252, 249,65,15,130,244,248,131,252,249,90,15,135,244,248,131,252,241,32,248,2, - 136,12,3,248,3,131,232,1,15,137,244,1,137,216,139,92,36,4,252,233,244,119, - 248,127,129,252,248,239,15,130,244,59,255,65,139,174,233,65,59,174,233,15, - 130,244,247,232,244,71,248,1,129,122,253,4,239,15,133,244,59,139,42,139,133, - 233,65,57,134,233,15,130,244,125,129,197,239,137,92,36,4,137,68,36,8,65,139, + 136,12,3,248,3,131,232,1,15,137,244,1,137,216,139,92,36,4,252,233,244,120, + 248,128,129,252,248,239,15,130,244,60,255,65,139,174,233,65,59,174,233,15, + 130,244,247,232,244,72,248,1,129,122,253,4,239,15,133,244,60,139,42,139,133, + 233,65,57,134,233,15,130,244,126,129,197,239,137,92,36,4,137,68,36,8,65,139, 158,233,252,233,244,249,248,1,15,182,76,5,0,131,252,249,97,15,130,244,248, 255,131,252,249,122,15,135,244,248,131,252,241,32,248,2,136,12,3,248,3,131, - 232,1,15,137,244,1,137,216,139,92,36,4,252,233,244,119,248,128,129,252,248, - 239,15,130,244,59,129,122,253,4,239,15,133,244,59,137,213,139,58,232,251, - 1,20,137,252,234,255,137,197,252,233,244,67,255,252,242,15,42,192,252,233, - 244,68,255,248,129,129,122,253,4,239,255,15,133,244,247,139,42,252,233,244, - 85,248,1,15,135,244,59,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,85,255,248,130,255,72,189, + 232,1,15,137,244,1,137,216,139,92,36,4,252,233,244,120,248,129,129,252,248, + 239,15,130,244,60,129,122,253,4,239,15,133,244,60,137,213,139,58,232,251, + 1,21,137,252,234,255,137,197,252,233,244,68,255,252,242,15,42,192,252,233, + 244,69,255,248,130,129,122,253,4,239,255,15,133,244,247,139,42,252,233,244, + 86,248,1,15,135,244,60,255,252,242,15,16,2,72,189,237,237,102,72,15,110,205, + 252,242,15,88,193,102,15,126,197,255,252,233,244,86,255,248,131,255,72,189, 237,237,102,72,15,110,205,255,199,4,36,0,0,192,89,255,15,133,244,247,139, - 42,252,233,244,248,248,1,15,135,244,59,255,252,242,15,16,2,252,242,15,88, + 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,85,129,120,253,4,239,255,15,133,244,248,35,40,131,232,8,252,233, - 244,1,248,2,15,135,244,131,255,15,131,244,131,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,132,255,15, - 133,244,248,11,40,131,232,8,252,233,244,1,248,2,15,135,244,131,255,252,242, + 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,133,255,15,133,244,248,51,40,131,232,8,252,233,244,1,248,2,15,135,244, - 131,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,134,129,122,253,4,239,255,248,2,15,205,252,233,244,85, - 248,135,129,122,253,4,239,255,248,2,252,247,213,255,248,85,252,242,15,42, - 197,252,233,244,68,255,248,131,139,68,36,4,252,233,244,59,255,248,136,129, - 122,253,4,239,255,248,2,129,122,253,12,239,15,133,244,59,139,74,8,255,248, - 136,129,252,248,239,15,130,244,59,129,122,253,4,239,15,131,244,59,129,122, - 253,12,239,15,131,244,59,252,242,15,16,2,252,242,15,16,74,8,72,189,237,237, + 1,248,134,255,15,133,244,248,51,40,131,232,8,252,233,244,1,248,2,15,135,244, + 132,255,252,242,15,16,0,252,242,15,88,193,102,15,126,193,49,205,255,131,232, + 8,252,233,244,1,248,135,129,122,253,4,239,255,248,2,15,205,252,233,244,86, + 248,136,129,122,253,4,239,255,248,2,252,247,213,255,248,86,252,242,15,42, + 197,252,233,244,69,255,248,132,139,68,36,4,252,233,244,60,255,248,137,129, + 122,253,4,239,255,248,2,129,122,253,12,239,15,133,244,60,139,74,8,255,248, + 137,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131,244,60,129,122, + 253,12,239,15,131,244,60,252,242,15,16,2,252,242,15,16,74,8,72,189,237,237, 102,72,15,110,213,252,242,15,88,194,252,242,15,88,202,102,15,126,197,102, - 15,126,201,255,211,229,252,233,244,85,255,248,137,129,122,253,4,239,255,248, - 137,129,252,248,239,15,130,244,59,129,122,253,4,239,15,131,244,59,129,122, - 253,12,239,15,131,244,59,252,242,15,16,2,252,242,15,16,74,8,72,189,237,237, + 15,126,201,255,211,229,252,233,244,86,255,248,138,129,122,253,4,239,255,248, + 138,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131,244,60,129,122, + 253,12,239,15,131,244,60,252,242,15,16,2,252,242,15,16,74,8,72,189,237,237, 102,72,15,110,213,252,242,15,88,194,252,242,15,88,202,102,15,126,197,102, - 15,126,201,255,211,252,237,252,233,244,85,255,248,138,129,122,253,4,239,255, - 248,138,129,252,248,239,15,130,244,59,129,122,253,4,239,15,131,244,59,129, - 122,253,12,239,15,131,244,59,252,242,15,16,2,252,242,15,16,74,8,72,189,237, + 15,126,201,255,211,252,237,252,233,244,86,255,248,139,129,122,253,4,239,255, + 248,139,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131,244,60,129, + 122,253,12,239,15,131,244,60,252,242,15,16,2,252,242,15,16,74,8,72,189,237, 237,102,72,15,110,213,252,242,15,88,194,252,242,15,88,202,102,15,126,197, - 102,15,126,201,255,211,252,253,252,233,244,85,255,248,139,129,122,253,4,239, - 255,248,139,129,252,248,239,15,130,244,59,129,122,253,4,239,15,131,244,59, - 129,122,253,12,239,15,131,244,59,252,242,15,16,2,252,242,15,16,74,8,72,189, + 102,15,126,201,255,211,252,253,252,233,244,86,255,248,140,129,122,253,4,239, + 255,248,140,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131,244,60, + 129,122,253,12,239,15,131,244,60,252,242,15,16,2,252,242,15,16,74,8,72,189, 237,237,102,72,15,110,213,252,242,15,88,194,252,242,15,88,202,102,15,126, - 197,102,15,126,201,255,211,197,252,233,244,85,255,248,140,129,122,253,4,239, - 255,248,140,129,252,248,239,15,130,244,59,129,122,253,4,239,15,131,244,59, - 129,122,253,12,239,15,131,244,59,252,242,15,16,2,252,242,15,16,74,8,72,189, + 197,102,15,126,201,255,211,197,252,233,244,86,255,248,141,129,122,253,4,239, + 255,248,141,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131,244,60, + 129,122,253,12,239,15,131,244,60,252,242,15,16,2,252,242,15,16,74,8,72,189, 237,237,102,72,15,110,213,252,242,15,88,194,252,242,15,88,202,102,15,126, - 197,102,15,126,201,255,211,205,252,233,244,85,248,123,184,237,252,233,244, - 59,248,125,184,237,248,59,139,108,36,24,139,90,252,252,137,92,36,28,137,149, + 197,102,15,126,201,255,211,205,252,233,244,86,248,124,184,237,252,233,244, + 60,248,126,184,237,248,60,139,108,36,24,139,90,252,252,137,92,36,28,137,149, 233,141,68,194,252,248,141,136,233,137,133,233,139,66,252,248,59,141,233, 15,135,244,251,137,252,239,252,255,144,233,139,149,233,133,192,15,143,244, - 74,248,1,255,139,141,233,41,209,193,252,233,3,133,192,141,65,1,139,106,252, + 75,248,1,255,139,141,233,41,209,193,252,233,3,133,192,141,65,1,139,106,252, 248,15,133,244,248,139,157,233,139,11,15,182,252,233,15,182,205,131,195,4, 65,252,255,36,252,238,248,2,137,209,252,247,195,237,15,133,244,249,15,182, - 107,252,253,72,252,247,213,141,20,252,234,252,233,244,27,248,3,137,221,131, - 229,252,248,41,252,234,252,233,244,27,248,5,190,237,137,252,239,232,251,1, - 0,139,149,233,49,192,252,233,244,1,248,71,93,72,137,108,36,8,139,108,36,24, + 107,252,253,72,252,247,213,141,20,252,234,252,233,244,28,248,3,137,221,131, + 229,252,248,41,252,234,252,233,244,28,248,5,190,237,137,252,239,232,251,1, + 0,139,149,233,49,192,252,233,244,1,248,72,93,72,137,108,36,8,139,108,36,24, 137,92,36,28,137,149,233,255,141,68,194,252,248,137,252,239,137,133,233,232, - 251,1,21,139,149,233,139,133,233,41,208,193,232,3,131,192,1,72,139,108,36, - 8,85,195,248,141,255,65,15,182,134,233,168,235,15,133,244,251,168,235,15, + 251,1,22,139,149,233,139,133,233,41,208,193,232,3,131,192,1,72,139,108,36, + 8,85,195,248,142,255,65,15,182,134,233,168,235,15,133,244,251,168,235,15, 133,244,247,168,235,15,132,244,247,65,252,255,142,233,252,233,244,247,255, - 248,142,65,15,182,134,233,168,235,15,133,244,251,252,233,244,247,248,143, + 248,143,65,15,182,134,233,168,235,15,133,244,251,252,233,244,247,248,144, 65,15,182,134,233,168,235,15,133,244,251,168,235,15,132,244,251,65,252,255, 142,233,15,132,244,247,168,235,15,132,244,251,248,1,255,139,108,36,24,137, - 149,233,137,222,137,252,239,232,251,1,22,248,3,139,149,233,248,4,15,182,75, + 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,144,131,195,4,139,77,232,137,76,36,4,252,233,244,4,248,145,255, + 238,233,248,145,131,195,4,139,77,232,137,76,36,4,252,233,244,4,248,146,255, 139,106,252,248,139,173,233,15,182,133,233,141,4,194,139,108,36,24,137,149, 233,137,133,233,137,222,65,141,190,233,73,137,174,233,137,92,36,28,232,251, - 1,23,252,233,244,3,255,248,146,137,92,36,28,255,248,147,255,137,92,36,28, + 1,24,252,233,244,3,255,248,147,137,92,36,28,255,248,148,255,137,92,36,28, 131,203,1,248,1,255,141,68,194,252,248,139,108,36,24,137,149,233,137,133, - 233,137,222,137,252,239,232,251,1,24,199,68,36,28,0,0,0,0,255,131,227,252, + 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,148,255,65,85,65,84,65,83,65,82,65, + 253,193,232,3,131,192,1,252,255,229,248,149,255,65,85,65,84,65,83,65,82,65, 81,65,80,87,86,85,72,141,108,36,88,85,83,82,81,80,15,182,69,252,248,138,101, 252,240,76,137,125,252,248,76,137,117,252,240,68,139,117,0,65,139,142,233, 65,199,134,233,237,65,137,134,233,65,137,142,233,72,129,252,236,239,72,131, @@ -387,32 +388,32 @@ static const unsigned char build_actionlist[15952] = { 17,125,184,252,242,15,17,117,176,252,242,15,17,109,168,252,242,15,17,101, 160,252,242,15,17,93,152,252,242,15,17,85,144,252,242,15,17,77,136,252,242, 15,17,69,128,65,139,174,233,65,139,150,233,73,137,174,233,65,199,134,233, - 0,0,0,0,137,149,233,72,137,230,65,141,190,233,232,251,1,25,72,139,141,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,149,255,72,131,196,16,248,1,76,139,108,36,8,76,139,36,36,133, + 247,255,248,150,255,72,131,196,16,248,1,76,139,108,36,8,76,139,36,36,133, 192,15,136,244,249,137,68,36,4,68,139,122,252,248,69,139,191,233,69,139,191, 233,65,199,134,233,0,0,0,0,65,199,134,233,237,139,3,15,182,204,15,182,232, 131,195,4,193,232,16,129,252,253,239,15,130,244,248,139,68,36,4,248,2,65, - 252,255,36,252,238,248,3,252,247,216,137,252,239,137,198,232,251,1,26,255, - 248,87,255,217,124,36,4,137,68,36,8,102,184,0,4,102,11,68,36,4,102,37,252, + 252,255,36,252,238,248,3,252,247,216,137,252,239,137,198,232,251,1,1,255, + 248,88,255,217,124,36,4,137,68,36,8,102,184,0,4,102,11,68,36,4,102,37,252, 255,252,247,102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,139,68, - 36,8,195,255,248,150,72,184,237,237,102,72,15,110,208,72,184,237,237,102, + 36,8,195,255,248,151,72,184,237,237,102,72,15,110,208,72,184,237,237,102, 72,15,110,216,15,40,200,102,15,84,202,102,15,46,217,15,134,244,247,102,15, 85,208,252,242,15,88,203,252,242,15,92,203,102,15,86,202,72,184,237,237,102, 72,15,110,208,252,242,15,194,193,1,102,15,84,194,252,242,15,92,200,15,40, - 193,248,1,195,248,89,255,217,124,36,4,137,68,36,8,102,184,0,8,102,11,68,36, + 193,248,1,195,248,90,255,217,124,36,4,137,68,36,8,102,184,0,8,102,11,68,36, 4,102,37,252,255,252,251,102,137,68,36,6,217,108,36,6,217,252,252,217,108, - 36,4,139,68,36,8,195,255,248,151,72,184,237,237,102,72,15,110,208,72,184, + 36,4,139,68,36,8,195,255,248,152,72,184,237,237,102,72,15,110,208,72,184, 237,237,102,72,15,110,216,15,40,200,102,15,84,202,102,15,46,217,15,134,244, 247,102,15,85,208,252,242,15,88,203,252,242,15,92,203,102,15,86,202,72,184, 237,237,102,72,15,110,208,252,242,15,194,193,6,102,15,84,194,252,242,15,92, - 200,15,40,193,248,1,195,248,110,255,217,124,36,4,137,68,36,8,102,184,0,12, + 200,15,40,193,248,1,195,248,111,255,217,124,36,4,137,68,36,8,102,184,0,12, 102,11,68,36,4,102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,139, - 68,36,8,195,255,248,152,72,184,237,237,102,72,15,110,208,72,184,237,237,102, + 68,36,8,195,255,248,153,72,184,237,237,102,72,15,110,208,72,184,237,237,102, 72,15,110,216,15,40,200,102,15,84,202,102,15,46,217,15,134,244,247,102,15, 85,208,15,40,193,252,242,15,88,203,252,242,15,92,203,72,184,237,237,102,72, 15,110,216,252,242,15,194,193,1,102,15,84,195,252,242,15,92,200,102,15,86, - 202,15,40,193,248,1,195,248,153,255,15,40,232,252,242,15,94,193,72,184,237, + 202,15,40,193,248,1,195,248,154,255,15,40,232,252,242,15,94,193,72,184,237, 237,102,72,15,110,208,72,184,237,237,102,72,15,110,216,15,40,224,102,15,84, 226,102,15,46,220,15,134,244,247,102,15,85,208,252,242,15,88,227,252,242, 15,92,227,102,15,86,226,72,184,237,237,102,72,15,110,208,252,242,15,194,196, @@ -420,12 +421,12 @@ static const unsigned char build_actionlist[15952] = { 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,94,217,252,234,222,201,248,154,217,84,36,252,248,129,124, + 233,195,255,248,95,217,252,234,222,201,248,155,217,84,36,252,248,129,124, 36,252,248,0,0,128,127,15,132,244,247,129,124,36,252,248,0,0,128,252,255, - 15,132,244,248,248,155,217,192,217,252,252,220,252,233,217,201,217,252,240, + 15,132,244,248,248,156,217,192,217,252,252,220,252,233,217,201,217,252,240, 217,232,222,193,217,252,253,221,217,248,1,195,248,2,221,216,217,252,238,195, - 255,248,113,255,248,156,252,242,15,45,193,252,242,15,42,208,102,15,46,202, - 15,133,244,254,15,138,244,255,248,157,131,252,248,1,15,142,244,252,248,1, + 255,248,114,255,248,157,252,242,15,45,193,252,242,15,42,208,102,15,46,202, + 15,133,244,254,15,138,244,255,248,158,131,252,248,1,15,142,244,252,248,1, 169,1,0,0,0,15,133,244,248,252,242,15,89,192,209,232,252,233,244,1,248,2, 209,232,15,132,244,251,15,40,200,248,3,252,242,15,89,192,209,232,15,132,244, 250,15,131,244,3,255,252,242,15,89,200,252,233,244,3,248,4,252,242,15,89, @@ -442,28 +443,28 @@ static const unsigned char build_actionlist[15952] = { 72,184,237,237,102,72,15,110,208,102,15,46,194,15,132,244,1,102,15,80,193, 15,87,192,136,196,15,146,208,48,224,15,133,244,1,248,3,72,184,237,237,255, 102,72,15,110,192,195,248,4,102,15,80,193,133,192,15,133,244,3,15,87,192, - 195,248,5,102,15,80,193,133,192,15,132,244,3,15,87,192,195,248,158,255,131, - 252,255,1,15,130,244,87,15,132,244,89,131,252,255,3,15,130,244,110,15,135, + 195,248,5,102,15,80,193,133,192,15,132,244,3,15,87,192,195,248,159,255,131, + 252,255,1,15,130,244,88,15,132,244,90,131,252,255,3,15,130,244,111,15,135, 244,248,252,242,15,81,192,195,248,2,252,242,15,17,68,36,252,248,221,68,36, - 252,248,131,252,255,5,15,135,244,248,15,132,244,247,232,244,94,252,233,244, - 253,248,1,232,244,154,255,252,233,244,253,248,2,131,252,255,7,15,132,244, + 252,248,131,252,255,5,15,135,244,248,15,132,244,247,232,244,95,252,233,244, + 253,248,1,232,244,155,255,252,233,244,253,248,2,131,252,255,7,15,132,244, 247,15,135,244,248,217,252,237,217,201,217,252,241,252,233,244,253,248,1, 217,232,217,201,217,252,241,252,233,244,253,248,2,131,252,255,9,15,132,244, 247,15,135,244,248,217,252,236,217,201,217,252,241,252,233,244,253,248,1, 255,217,252,254,252,233,244,253,248,2,131,252,255,11,15,132,244,247,15,135, 244,255,217,252,255,252,233,244,253,248,1,217,252,242,221,216,248,7,221,92, 36,252,248,252,242,15,16,68,36,252,248,195,255,139,124,36,12,221,68,36,4, - 131,252,255,1,15,130,244,87,15,132,244,89,131,252,255,3,15,130,244,110,15, - 135,244,248,217,252,250,195,248,2,131,252,255,5,15,130,244,94,15,132,244, - 154,131,252,255,7,15,132,244,247,15,135,244,248,217,252,237,217,201,217,252, + 131,252,255,1,15,130,244,88,15,132,244,90,131,252,255,3,15,130,244,111,15, + 135,244,248,217,252,250,195,248,2,131,252,255,5,15,130,244,95,15,132,244, + 155,131,252,255,7,15,132,244,247,15,135,244,248,217,252,237,217,201,217,252, 241,195,248,1,217,232,217,201,217,252,241,195,248,2,131,252,255,9,15,132, 244,247,255,15,135,244,248,217,252,236,217,201,217,252,241,195,248,1,217, 252,254,195,248,2,131,252,255,11,15,132,244,247,15,135,244,255,217,252,255, - 195,248,1,217,252,242,221,216,195,255,248,9,204,255,248,159,255,131,252,255, + 195,248,1,217,252,242,221,216,195,255,248,9,204,255,248,160,255,131,252,255, 1,15,132,244,247,15,135,244,248,252,242,15,88,193,195,248,1,252,242,15,92, 193,195,248,2,131,252,255,3,15,132,244,247,15,135,244,248,252,242,15,89,193, - 195,248,1,252,242,15,94,193,195,248,2,131,252,255,5,15,130,244,153,15,132, - 244,113,131,252,255,7,15,132,244,247,15,135,244,248,72,184,237,237,255,102, + 195,248,1,252,242,15,94,193,195,248,2,131,252,255,5,15,130,244,154,15,132, + 244,114,131,252,255,7,15,132,244,247,15,135,244,248,72,184,237,237,255,102, 72,15,110,200,15,87,193,195,248,1,72,184,237,237,102,72,15,110,200,15,84, 193,195,248,2,131,252,255,9,15,135,244,248,252,242,15,17,68,36,252,248,252, 242,15,17,76,36,252,240,221,68,36,252,248,221,68,36,252,240,15,132,244,247, @@ -473,14 +474,14 @@ static const unsigned char build_actionlist[15952] = { 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,153,15,132,244,113,131,252,248,7,15,132,244,247,15,135, + 252,248,5,15,130,244,154,15,132,244,114,131,252,248,7,15,132,244,247,15,135, 244,248,255,221,216,217,224,195,248,1,221,216,217,225,195,248,2,131,252,248, 9,15,132,244,247,15,135,244,248,217,252,243,195,248,1,217,201,217,252,253, 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, - 160,137,252,248,83,15,162,137,6,137,94,4,137,78,8,137,86,12,91,195,248,161, + 161,137,252,248,83,15,162,137,6,137,94,4,137,78,8,137,86,12,91,195,248,162, 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, @@ -488,17 +489,17 @@ static const unsigned char build_actionlist[15952] = { 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,162,255,249,255, + 147,233,15,41,139,233,255,72,139,93,252,248,201,195,255,248,163,255,249,255, 129,124,253,202,4,239,15,133,244,253,129,124,253,194,4,239,15,133,244,254, 139,44,202,131,195,4,59,44,194,255,15,141,244,255,255,15,140,244,255,255, 15,143,244,255,255,15,142,244,255,255,248,6,15,183,67,252,254,141,156,253, 131,233,248,9,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255, - 36,252,238,248,7,15,135,244,41,129,124,253,194,4,239,15,130,244,247,15,133, - 244,41,255,252,242,15,42,4,194,252,233,244,248,255,221,4,202,219,4,194,252, - 233,244,249,255,248,8,15,135,244,41,255,252,242,15,42,12,202,252,242,15,16, + 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, 4,194,131,195,4,102,15,46,193,255,15,134,244,9,255,15,135,244,9,255,15,130, 244,9,255,15,131,244,9,255,252,233,244,6,255,219,4,202,252,233,244,248,255, - 129,124,253,202,4,239,15,131,244,41,129,124,253,194,4,239,15,131,244,41,255, + 129,124,253,202,4,239,15,131,244,42,129,124,253,194,4,239,15,131,244,42,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, @@ -516,11 +517,11 @@ static const unsigned char build_actionlist[15952] = { 248,4,255,15,138,244,248,15,133,244,248,255,15,138,244,248,15,132,244,247, 255,248,1,15,183,67,252,254,141,156,253,131,233,248,2,255,248,2,15,183,67, 252,254,141,156,253,131,233,248,1,255,252,233,244,9,255,248,5,255,129,252, - 253,239,15,132,244,46,129,124,253,202,4,239,15,132,244,46,255,57,108,202, + 253,239,15,132,244,47,129,124,253,202,4,239,15,132,244,47,255,57,108,202, 4,15,133,244,2,129,252,253,239,15,131,244,1,139,12,202,139,4,194,57,193,15, 132,244,1,129,252,253,239,15,135,244,2,139,169,233,133,252,237,15,132,244, 2,252,246,133,233,235,15,133,244,2,255,49,252,237,255,189,1,0,0,0,255,252, - 233,244,45,255,248,3,129,252,253,239,255,15,133,244,9,255,252,233,244,46, + 233,244,46,255,248,3,129,252,253,239,255,15,133,244,9,255,252,233,244,47, 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, @@ -533,7 +534,7 @@ static const unsigned char build_actionlist[15952] = { 4,202,248,4,255,72,252,247,208,139,108,202,4,131,195,4,57,197,255,15,133, 244,249,15,183,67,252,254,141,156,253,131,233,248,2,139,3,15,182,204,15,182, 232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,129,252,253,239,15,133, - 244,2,252,233,244,46,255,15,132,244,248,129,252,253,239,15,132,244,46,15, + 244,2,252,233,244,47,255,15,132,244,248,129,252,253,239,15,132,244,47,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, @@ -543,40 +544,40 @@ static const unsigned char build_actionlist[15952] = { 124,253,194,4,239,15,133,244,251,139,44,194,252,247,221,15,128,244,250,199, 68,202,4,237,137,44,202,248,9,139,3,15,182,204,15,182,232,131,195,4,193,232, 16,65,252,255,36,252,238,248,4,199,68,202,4,0,0,224,65,199,4,202,0,0,0,0, - 252,233,244,9,248,5,15,135,244,51,255,129,124,253,194,4,239,15,131,244,51, + 252,233,244,9,248,5,15,135,244,52,255,129,124,253,194,4,239,15,131,244,52, 255,252,242,15,16,4,194,72,184,237,237,102,72,15,110,200,15,87,193,252,242, 15,17,4,202,255,221,4,194,217,224,221,28,202,255,129,124,253,194,4,239,15, 133,244,248,139,4,194,255,139,128,233,248,1,199,68,202,4,237,137,4,202,255, 15,87,192,252,242,15,42,128,233,248,1,252,242,15,17,4,202,255,219,128,233, 248,1,221,28,202,255,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65, - 252,255,36,252,238,248,2,129,124,253,194,4,239,15,133,244,54,139,60,194,137, - 213,232,251,1,20,255,252,242,15,42,192,255,137,252,234,15,182,75,252,253, + 252,255,36,252,238,248,2,129,124,253,194,4,239,15,133,244,55,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,48,65,129,124,253,199,4,239,15,133,244,48,139,44,252,234,65,3, - 44,199,15,128,244,47,255,129,124,253,252,234,4,239,15,133,244,50,65,129,124, - 253,199,4,239,15,133,244,50,65,139,4,199,3,4,252,234,15,128,244,49,255,129, - 124,253,252,234,4,239,15,133,244,53,129,124,253,194,4,239,15,133,244,53,139, - 44,252,234,3,44,194,15,128,244,52,255,199,68,202,4,237,255,129,124,253,252, - 234,4,239,15,131,244,48,255,65,129,124,253,199,4,239,15,131,244,48,255,252, + 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, 242,15,16,4,252,234,252,242,65,15,88,4,199,255,221,4,252,234,65,220,4,199, - 255,129,124,253,252,234,4,239,15,131,244,50,255,65,129,124,253,199,4,239, - 15,131,244,50,255,252,242,65,15,16,4,199,252,242,15,88,4,252,234,255,65,221, - 4,199,220,4,252,234,255,129,124,253,252,234,4,239,15,131,244,53,129,124,253, - 194,4,239,15,131,244,53,255,252,242,15,16,4,252,234,252,242,15,88,4,194,255, - 221,4,252,234,220,4,194,255,129,124,253,252,234,4,239,15,133,244,48,65,129, - 124,253,199,4,239,15,133,244,48,139,44,252,234,65,43,44,199,15,128,244,47, - 255,129,124,253,252,234,4,239,15,133,244,50,65,129,124,253,199,4,239,15,133, - 244,50,65,139,4,199,43,4,252,234,15,128,244,49,255,129,124,253,252,234,4, - 239,15,133,244,53,129,124,253,194,4,239,15,133,244,53,139,44,252,234,43,44, - 194,15,128,244,52,255,252,242,15,16,4,252,234,252,242,65,15,92,4,199,255, + 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, 221,4,252,234,65,220,36,199,255,252,242,65,15,16,4,199,252,242,15,92,4,252, 234,255,65,221,4,199,220,36,252,234,255,252,242,15,16,4,252,234,252,242,15, 92,4,194,255,221,4,252,234,220,36,194,255,129,124,253,252,234,4,239,15,133, - 244,48,65,129,124,253,199,4,239,15,133,244,48,139,44,252,234,65,15,175,44, - 199,15,128,244,47,255,129,124,253,252,234,4,239,15,133,244,50,65,129,124, - 253,199,4,239,15,133,244,50,65,139,4,199,15,175,4,252,234,15,128,244,49,255, - 129,124,253,252,234,4,239,15,133,244,53,129,124,253,194,4,239,15,133,244, - 53,139,44,252,234,15,175,44,194,15,128,244,52,255,252,242,15,16,4,252,234, + 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, 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, @@ -586,10 +587,10 @@ static const unsigned char build_actionlist[15952] = { 234,220,52,194,255,252,242,15,16,4,252,234,252,242,65,15,16,12,199,255,221, 4,252,234,65,221,4,199,255,252,242,65,15,16,4,199,252,242,15,16,12,252,234, 255,65,221,4,199,221,4,252,234,255,252,242,15,16,4,252,234,252,242,15,16, - 12,194,255,221,4,252,234,221,4,194,255,248,163,232,244,153,255,252,233,244, - 163,255,232,244,113,255,15,182,252,236,15,182,192,139,124,36,24,137,151,233, - 141,52,194,137,194,41,252,234,248,33,137,252,253,137,92,36,28,232,251,1,27, - 139,149,233,133,192,15,133,244,42,15,182,107,252,255,15,182,75,252,253,72, + 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, 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, @@ -632,56 +633,56 @@ static const unsigned char build_actionlist[15952] = { 253,137,4,202,199,68,202,4,237,139,3,15,182,204,15,182,232,131,195,4,193, 232,16,65,252,255,36,252,238,248,3,137,252,239,232,251,1,32,15,183,67,252, 254,72,252,247,208,252,233,244,2,255,72,252,247,208,139,106,252,248,139,173, - 233,65,139,4,135,252,233,244,164,255,72,252,247,208,139,106,252,248,139,173, - 233,65,139,4,135,252,233,244,165,255,15,182,252,236,15,182,192,129,124,253, - 252,234,4,239,15,133,244,36,139,44,252,234,255,129,124,253,194,4,239,15,133, + 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, 244,251,139,4,194,255,129,124,253,194,4,239,15,131,244,251,255,252,242,15, 16,4,194,252,242,15,45,192,252,242,15,42,200,102,15,46,193,255,15,133,244, - 36,255,59,133,233,15,131,244,36,193,224,3,3,133,233,129,120,253,4,239,15, + 37,255,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,15,182,75,252,253,248,3,199, - 68,202,4,237,252,233,244,1,248,5,255,129,124,253,194,4,239,15,133,244,36, - 139,4,194,252,233,244,164,255,15,182,252,236,15,182,192,72,252,247,208,65, - 139,4,135,129,124,253,252,234,4,239,15,133,244,34,139,44,252,234,248,164, + 139,141,233,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,35,136,233,105,201,239,3,141,233,248,1,129,185,233,239,15,133, 244,250,57,129,233,15,133,244,250,129,121,253,4,239,15,132,244,251,15,182, 67,252,253,72,139,41,72,137,44,194,248,2,255,139,3,15,182,204,15,182,232, 131,195,4,193,232,16,65,252,255,36,252,238,248,3,15,182,67,252,253,199,68, 194,4,237,252,233,244,2,248,4,139,137,233,133,201,15,133,244,1,248,5,139, 141,233,133,201,15,132,244,3,252,246,129,233,235,15,133,244,3,252,233,244, - 34,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,35, - 139,44,252,234,59,133,233,15,131,244,35,193,224,3,3,133,233,129,120,253,4, + 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, 239,15,132,244,248,72,139,40,72,137,44,202,248,1,139,3,15,182,204,15,182, 232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,131,189,233,0,15,132, - 244,249,139,141,233,252,246,129,233,235,15,132,244,35,255,15,182,75,252,253, + 244,249,139,141,233,252,246,129,233,235,15,132,244,36,255,15,182,75,252,253, 248,3,199,68,202,4,237,252,233,244,1,255,15,182,252,236,15,182,192,129,124, - 253,252,234,4,239,15,133,244,39,139,44,252,234,255,15,133,244,39,255,59,133, - 233,15,131,244,39,193,224,3,3,133,233,129,120,253,4,239,15,132,244,249,248, + 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, 1,252,246,133,233,235,15,133,244,253,248,2,72,139,44,202,72,137,40,139,3, 15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,131, - 189,233,0,15,132,244,1,139,141,233,252,246,129,233,235,255,15,132,244,39, - 15,182,75,252,253,252,233,244,1,248,5,129,124,253,194,4,239,15,133,244,39, - 139,4,194,252,233,244,165,248,7,128,165,233,235,65,139,142,233,65,137,174, + 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, 233,137,141,233,15,182,75,252,253,252,233,244,2,255,15,182,252,236,15,182, - 192,72,252,247,208,65,139,4,135,129,124,253,252,234,4,239,15,133,244,37,139, - 44,252,234,248,165,139,141,233,35,136,233,105,201,239,198,133,233,0,3,141, + 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, 233,248,1,129,185,233,239,15,133,244,251,57,129,233,15,133,244,251,129,121, 253,4,239,15,132,244,250,248,2,255,252,246,133,233,235,15,133,244,253,248, 3,15,182,67,252,253,72,139,44,194,72,137,41,139,3,15,182,204,15,182,232,131, 195,4,193,232,16,65,252,255,36,252,238,248,4,131,189,233,0,15,132,244,2,137, - 12,36,139,141,233,252,246,129,233,235,15,132,244,37,139,12,36,252,233,244, + 12,36,139,141,233,252,246,129,233,235,15,132,244,38,139,12,36,252,233,244, 2,248,5,139,137,233,133,201,15,133,244,1,255,139,141,233,133,201,15,132,244, - 252,252,246,129,233,235,15,132,244,37,248,6,137,4,36,199,68,36,4,237,137, + 252,252,246,129,233,235,15,132,244,38,248,6,137,4,36,199,68,36,4,237,137, 108,36,8,139,124,36,24,137,151,233,72,141,20,36,137,252,238,137,252,253,137, 92,36,28,232,251,1,34,139,149,233,139,108,36,8,137,193,252,233,244,2,248, 7,128,165,233,235,65,139,134,233,65,137,174,233,137,133,233,252,233,244,3, - 255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,38,139, - 44,252,234,59,133,233,15,131,244,38,193,224,3,3,133,233,129,120,253,4,239, + 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, 15,132,244,249,248,1,252,246,133,233,235,15,133,244,253,248,2,72,139,12,202, 72,137,8,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252, 238,248,3,131,189,233,0,15,132,244,1,255,139,141,233,252,246,129,233,235, - 15,132,244,38,15,182,75,252,253,252,233,244,1,248,7,128,165,233,235,65,139, + 15,132,244,39,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, @@ -691,10 +692,10 @@ static const unsigned char build_actionlist[15952] = { 238,248,5,139,124,36,24,137,151,233,137,252,238,137,194,137,252,253,137,92, 36,28,232,251,1,35,139,149,233,15,182,75,252,253,252,233,244,1,248,7,255, 128,165,233,235,65,139,134,233,65,137,174,233,137,133,233,252,233,244,2,255, - 3,68,36,4,255,129,124,253,202,4,239,139,44,202,15,133,244,55,141,84,202,8, + 3,68,36,4,255,129,124,253,202,4,239,139,44,202,15,133,244,56,141,84,202,8, 137,90,252,252,139,157,233,139,11,15,182,252,233,15,182,205,131,195,4,65, 252,255,36,252,238,255,141,76,202,8,65,137,215,139,105,252,248,129,121,253, - 252,252,239,15,133,244,28,248,56,139,90,252,252,252,247,195,237,15,133,244, + 252,252,239,15,133,244,29,248,57,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, @@ -704,7 +705,7 @@ static const unsigned char build_actionlist[15952] = { 252,247,195,237,15,133,244,254,41,218,65,137,215,139,90,252,252,252,233,244, 1,248,8,129,195,239,252,233,244,1,255,141,76,202,8,72,139,105,232,72,139, 65,252,240,72,137,41,72,137,65,8,139,105,224,139,65,228,137,105,252,248,137, - 65,252,252,129,252,248,239,184,237,15,133,244,28,137,202,137,90,252,252,139, + 65,252,252,129,252,248,239,184,237,15,133,244,29,137,202,137,90,252,252,139, 157,233,139,11,15,182,252,233,15,182,205,131,195,4,65,252,255,36,252,238, 255,68,137,60,36,68,137,116,36,4,139,108,202,252,240,139,68,202,252,248,68, 139,181,233,131,195,4,68,139,189,233,248,1,68,57,252,240,15,131,244,251,65, @@ -742,19 +743,19 @@ static const unsigned char build_actionlist[15952] = { 65,199,71,252,252,237,65,131,199,8,255,199,68,194,252,244,237,255,131,192, 1,252,233,244,5,248,7,141,171,233,252,247,197,237,15,133,244,14,41,252,234, 255,1,252,233,255,137,221,209,252,237,129,229,239,102,65,131,172,253,46,233, - 1,15,132,244,145,255,141,12,202,255,129,121,253,4,239,15,133,244,255,255, - 129,121,253,12,239,15,133,244,57,129,121,253,20,239,15,133,244,57,139,41, - 131,121,16,0,15,140,244,251,255,129,121,253,12,239,15,133,244,162,129,121, - 253,20,239,15,133,244,162,255,139,105,16,133,252,237,15,136,244,251,3,41, + 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, 15,128,244,247,137,41,255,59,105,8,199,65,28,237,137,105,24,255,15,142,244, 253,248,1,248,6,141,156,253,131,233,255,141,156,253,131,233,15,183,67,252, 254,15,142,245,248,1,248,6,255,15,143,244,253,248,6,141,156,253,131,233,248, 1,255,248,7,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36, 252,238,248,5,255,3,41,15,128,244,1,137,41,255,15,141,244,7,255,141,156,253, 131,233,15,183,67,252,254,15,141,245,255,15,140,244,7,255,252,233,244,6,248, - 9,255,129,121,253,4,239,255,15,131,244,57,129,121,253,12,239,15,131,244,57, - 255,129,121,253,12,239,15,131,244,162,129,121,253,20,239,15,131,244,162,255, - 139,105,20,255,129,252,253,239,15,131,244,57,255,252,242,15,16,1,252,242, + 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, 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, @@ -768,11 +769,11 @@ static const unsigned char build_actionlist[15952] = { 233,76,137,36,36,76,137,108,36,8,72,131,252,236,16,252,255,224,255,141,156, 253,131,233,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36, 252,238,255,137,221,209,252,237,129,229,239,102,65,131,172,253,46,233,1,15, - 132,244,147,255,68,139,187,233,139,108,36,24,141,12,202,59,141,233,15,135, - 244,23,15,182,139,233,57,200,15,134,244,249,248,2,255,15,183,67,252,254,252, + 132,244,148,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, - 68,137,120,252,248,139,108,36,24,141,12,200,59,141,233,15,135,244,22,137, + 68,137,120,252,248,139,108,36,24,141,12,200,59,141,233,15,135,244,23,137, 209,137,194,15,182,171,233,133,252,237,15,132,244,248,248,1,131,193,8,57, 209,15,131,244,249,68,139,121,252,248,68,137,56,68,139,121,252,252,68,137, 120,4,131,192,8,199,65,252,252,237,131,252,237,1,15,133,244,1,248,2,255,68, @@ -780,7 +781,7 @@ static const unsigned char build_actionlist[15952] = { 252,238,255,248,3,199,64,4,237,131,192,8,131,252,237,1,15,133,244,3,252,233, 244,2,255,139,106,252,248,76,139,189,233,139,108,36,24,141,68,194,252,248, 137,149,233,141,136,233,59,141,233,137,133,233,255,76,137,252,254,137,252, - 239,255,15,135,244,21,65,199,134,233,237,255,65,252,255,215,255,65,252,255, + 239,255,15,135,244,22,65,199,134,233,237,255,65,252,255,215,255,65,252,255, 150,233,255,65,199,134,233,237,139,149,233,141,12,194,252,247,217,3,141,233, 139,90,252,252,252,233,244,12,255,254,0 }; @@ -795,6 +796,7 @@ enum { GLOB_vm_leave_unw, GLOB_vm_unwind_c, GLOB_vm_unwind_c_eh, + GLOB_vm_unwind_rethrow, GLOB_vm_unwind_ff, GLOB_vm_unwind_ff_eh, GLOB_vm_growstack_c, @@ -954,6 +956,7 @@ static const char *const globnames[] = { "vm_leave_unw", "vm_unwind_c@8", "vm_unwind_c_eh", + "vm_unwind_rethrow", "vm_unwind_ff@4", "vm_unwind_ff_eh", "vm_growstack_c", @@ -1105,6 +1108,7 @@ static const char *const globnames[] = { }; static const char *const extnames[] = { "lj_state_growstack@8", + "lj_err_throw@8", "lj_meta_tget", "lj_meta_tset", "lj_meta_comp", @@ -1130,7 +1134,6 @@ static const char *const extnames[] = { "lj_trace_hot@8", "lj_dispatch_call@8", "lj_trace_exit@8", - "lj_err_throw@8", "lj_meta_cat", "lj_gc_barrieruv@8", "lj_func_closeuv@8", @@ -1166,674 +1169,674 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse) dasm_put(Dst, 0); dasm_put(Dst, 2, FRAME_P, LJ_TTRUE, FRAME_TYPE, FRAME_C, FRAME_TYPE, DISPATCH_GL(vmstate), ~LJ_VMST_C); dasm_put(Dst, 109, Dt1(->base), Dt1(->top), Dt1(->cframe), Dt1(->maxstack), LJ_TNIL); - dasm_put(Dst, 200, Dt1(->top), Dt1(->top), Dt1(->glref), Dt2(->vmstate), ~LJ_VMST_C, CFRAME_RAWMASK, 1+1); - dasm_put(Dst, 296, Dt1(->base), Dt1(->glref), GG_G2DISP, LJ_TFALSE, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, LUA_MINSTACK, -4+PC2PROTO(framesize), Dt1(->base), Dt1(->top)); - dasm_put(Dst, 365, 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, 529, FRAME_CP, FRAME_C, Dt1(->cframe), Dt1(->cframe), Dt1(->glref), GG_G2DISP, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); - dasm_put(Dst, 642, LJ_TFUNC, Dt7(->pc), Dt1(->stack), Dt1(->top), Dt1(->cframe), Dt1(->cframe), FRAME_CP, LJ_TNIL, 0, Dt7(->pc)); - dasm_put(Dst, 807, PC2PROTO(k), Dt1(->base), LJ_TSTR, BC_GGET, DISPATCH_GL(tmptv), LJ_TTAB); + dasm_put(Dst, 200, Dt1(->top), Dt1(->top), Dt1(->glref), Dt2(->vmstate), ~LJ_VMST_C, CFRAME_RAWMASK); + 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); if (LJ_DUALNUM) { - dasm_put(Dst, 912, LJ_TISNUM); + dasm_put(Dst, 935, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 921); + dasm_put(Dst, 944); } else { } - dasm_put(Dst, 933, Dt1(->base), Dt1(->base), Dt1(->top), FRAME_CONT, 2+1, LJ_TSTR, BC_GSET); - dasm_put(Dst, 1079, DISPATCH_GL(tmptv), LJ_TTAB); + 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); if (LJ_DUALNUM) { - dasm_put(Dst, 912, LJ_TISNUM); + dasm_put(Dst, 935, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 921); + dasm_put(Dst, 944); } else { } - dasm_put(Dst, 1103, Dt1(->base), Dt1(->base), Dt1(->top), FRAME_CONT, 3+1, Dt1(->base), Dt1(->base)); - dasm_put(Dst, 1275, -BCBIAS_J*4, LJ_TISTRUECOND, LJ_TISTRUECOND, Dt1(->base)); - dasm_put(Dst, 1374); + 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); #if LJ_HASFFI - dasm_put(Dst, 1394, Dt1(->base)); + dasm_put(Dst, 1417, Dt1(->base)); #endif - dasm_put(Dst, 1425); + dasm_put(Dst, 1448); #if LJ_DUALNUM - dasm_put(Dst, 1428); + dasm_put(Dst, 1451); #endif - dasm_put(Dst, 1434); + dasm_put(Dst, 1457); #if LJ_DUALNUM - dasm_put(Dst, 906); + dasm_put(Dst, 929); #endif - dasm_put(Dst, 1447); + dasm_put(Dst, 1470); #if LJ_DUALNUM - dasm_put(Dst, 1428); + dasm_put(Dst, 1451); #endif - dasm_put(Dst, 1476, Dt1(->base), Dt1(->base), FRAME_CONT, 2+1, Dt1(->base), Dt1(->base), Dt1(->base)); - dasm_put(Dst, 1608, Dt1(->base), Dt7(->pc), Dt1(->base), Dt1(->base), GG_DISP2STATIC, 1+1, LJ_TISTRUECOND); - dasm_put(Dst, 1792, 1+1, ~LJ_TNUMX); + 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); if (cmov) { - dasm_put(Dst, 1837); + dasm_put(Dst, 1860); } else { - dasm_put(Dst, 1841); + dasm_put(Dst, 1864); } - dasm_put(Dst, 1850, ((char *)(&((GCfuncC *)0)->upvalue)), LJ_TSTR, ~LJ_TLIGHTUD, 1+1, LJ_TTAB, Dt6(->metatable), LJ_TNIL); - dasm_put(Dst, 1929, 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, 1987, LJ_TNIL, LJ_TUDATA, LJ_TISNUM, LJ_TNUMX, DISPATCH_GL(gcroot[GCROOT_BASEMT])); - dasm_put(Dst, 2056, 2+1, LJ_TTAB, Dt6(->metatable), LJ_TTAB, Dt6(->metatable), LJ_TTAB, Dt6(->marked), LJ_GC_BLACK, Dt6(->marked), (uint8_t)~LJ_GC_BLACK); - dasm_put(Dst, 2125, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist), 2+1, LJ_TTAB, 1+1, LJ_TISNUM); + dasm_put(Dst, 1873, ((char *)(&((GCfuncC *)0)->upvalue)), LJ_TSTR, ~LJ_TLIGHTUD, 1+1, LJ_TTAB, Dt6(->metatable), LJ_TNIL); + dasm_put(Dst, 1952, DISPATCH_GL(gcroot)+4*(GCROOT_MMNAME+MM_metatable), LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), DtB(->next)); + dasm_put(Dst, 2010, LJ_TNIL, LJ_TUDATA, LJ_TISNUM, LJ_TNUMX, DISPATCH_GL(gcroot[GCROOT_BASEMT])); + dasm_put(Dst, 2079, 2+1, LJ_TTAB, Dt6(->metatable), LJ_TTAB, Dt6(->metatable), LJ_TTAB, Dt6(->marked), LJ_GC_BLACK, Dt6(->marked), (uint8_t)~LJ_GC_BLACK); + dasm_put(Dst, 2148, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist), 2+1, LJ_TTAB, 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 2211); + dasm_put(Dst, 2234); } else { - dasm_put(Dst, 2228); + dasm_put(Dst, 2251); } if (sse) { - dasm_put(Dst, 2233); + dasm_put(Dst, 2256); } else { - dasm_put(Dst, 2243); + dasm_put(Dst, 2266); } - dasm_put(Dst, 2250, 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, 2319, Dt1(->base)); + dasm_put(Dst, 2273, 1+1, LJ_TSTR, LJ_TSTR, LJ_TISNUM, DISPATCH_GL(gcroot[GCROOT_BASEMT_NUM]), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); + dasm_put(Dst, 2342, Dt1(->base)); if (LJ_DUALNUM) { - dasm_put(Dst, 2345); + dasm_put(Dst, 2368); } else { - dasm_put(Dst, 2350); + dasm_put(Dst, 2373); } - dasm_put(Dst, 2355, Dt1(->base), 1+1, LJ_TTAB, Dt1(->base), Dt1(->top), Dt1(->base), 1+2); - dasm_put(Dst, 2447, LJ_TNIL, LJ_TNIL, 1+1, LJ_TTAB); + dasm_put(Dst, 2378, Dt1(->base), 1+1, LJ_TTAB, Dt1(->base), Dt1(->top), Dt1(->base), 1+2); + dasm_put(Dst, 2470, LJ_TNIL, LJ_TNIL, 1+1, LJ_TTAB); #ifdef LUAJIT_ENABLE_LUA52COMPAT - dasm_put(Dst, 2494, Dt6(->metatable)); + dasm_put(Dst, 2517, Dt6(->metatable)); #endif - dasm_put(Dst, 2503, Dt8(->upvalue[0]), LJ_TFUNC, LJ_TNIL, 1+3, 1+1, LJ_TTAB, LJ_TISNUM); + dasm_put(Dst, 2526, Dt8(->upvalue[0]), LJ_TFUNC, LJ_TNIL, 1+3, 1+1, LJ_TTAB, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 2489); + dasm_put(Dst, 2512); } else { - dasm_put(Dst, 2228); + dasm_put(Dst, 2251); } - dasm_put(Dst, 2558); + dasm_put(Dst, 2581); if (LJ_DUALNUM) { - dasm_put(Dst, 2563, LJ_TISNUM); + dasm_put(Dst, 2586, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 2579, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); + dasm_put(Dst, 2602, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); } else { } - dasm_put(Dst, 2612, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->hmask), 1+0); - dasm_put(Dst, 2474, 1+1, LJ_TTAB); + dasm_put(Dst, 2635, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->hmask), 1+0); + dasm_put(Dst, 2497, 1+1, LJ_TTAB); #ifdef LUAJIT_ENABLE_LUA52COMPAT - dasm_put(Dst, 2494, Dt6(->metatable)); + dasm_put(Dst, 2517, Dt6(->metatable)); #endif - dasm_put(Dst, 2689, Dt8(->upvalue[0]), LJ_TFUNC); + dasm_put(Dst, 2712, Dt8(->upvalue[0]), LJ_TFUNC); if (LJ_DUALNUM) { - dasm_put(Dst, 2710, LJ_TISNUM); + dasm_put(Dst, 2733, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 2722); + dasm_put(Dst, 2745); } else { - dasm_put(Dst, 2732); + dasm_put(Dst, 2755); } - dasm_put(Dst, 2739, 1+3, 1+1, 8+FRAME_PCALL, DISPATCH_GL(hookmask), HOOK_ACTIVE_SHIFT, 2+1, LJ_TFUNC); - dasm_put(Dst, 2804, LJ_TFUNC, 16+FRAME_PCALL, 1+1, LJ_TTHREAD, Dt1(->cframe), Dt1(->status), LUA_YIELD, Dt1(->top)); - dasm_put(Dst, 2893, Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP); - dasm_put(Dst, 2980, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack), LJ_TTRUE, FRAME_TYPE); - dasm_put(Dst, 3095, LJ_TFALSE, Dt1(->top), Dt1(->top), 1+2, Dt1(->top), Dt1(->base), Dt8(->upvalue[0].gcr), Dt1(->cframe)); - dasm_put(Dst, 3190, Dt1(->status), LUA_YIELD, Dt1(->top), Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top)); - dasm_put(Dst, 3256, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack)); - dasm_put(Dst, 3345, FRAME_TYPE, Dt1(->top), Dt1(->base), Dt1(->cframe), CFRAME_RESUME); - dasm_put(Dst, 3455, Dt1(->base), Dt1(->top), Dt1(->cframe), LUA_YIELD, Dt1(->status)); + dasm_put(Dst, 2762, 1+3, 1+1, 8+FRAME_PCALL, DISPATCH_GL(hookmask), HOOK_ACTIVE_SHIFT, 2+1, LJ_TFUNC); + dasm_put(Dst, 2827, LJ_TFUNC, 16+FRAME_PCALL, 1+1, LJ_TTHREAD, Dt1(->cframe), Dt1(->status), LUA_YIELD, Dt1(->top)); + dasm_put(Dst, 2916, Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP); + dasm_put(Dst, 3003, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack), LJ_TTRUE, FRAME_TYPE); + dasm_put(Dst, 3118, LJ_TFALSE, Dt1(->top), Dt1(->top), 1+2, Dt1(->top), Dt1(->base), Dt8(->upvalue[0].gcr), Dt1(->cframe)); + dasm_put(Dst, 3213, Dt1(->status), LUA_YIELD, Dt1(->top), Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 3279, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack)); + dasm_put(Dst, 3368, FRAME_TYPE, Dt1(->top), Dt1(->base), Dt1(->cframe), CFRAME_RESUME); + dasm_put(Dst, 3478, Dt1(->base), Dt1(->top), Dt1(->cframe), LUA_YIELD, Dt1(->status)); if (!LJ_DUALNUM) { - dasm_put(Dst, 3482); + dasm_put(Dst, 3505); } if (sse) { - dasm_put(Dst, 3485); + dasm_put(Dst, 3508); } - dasm_put(Dst, 3500, 1+1); + dasm_put(Dst, 3523, 1+1); if (LJ_DUALNUM) { - dasm_put(Dst, 3511, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 3534, LJ_TISNUM, LJ_TISNUM); } else { - dasm_put(Dst, 3591, LJ_TISNUM); + dasm_put(Dst, 3614, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 3601, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); + dasm_put(Dst, 3624, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); } else { - dasm_put(Dst, 3632); + dasm_put(Dst, 3655); } - dasm_put(Dst, 3649, 1+1, FRAME_TYPE, LJ_TNIL); + dasm_put(Dst, 3672, 1+1, FRAME_TYPE, LJ_TNIL); if (LJ_DUALNUM) { - dasm_put(Dst, 3746, LJ_TISNUM); + dasm_put(Dst, 3769, LJ_TISNUM); } else { - dasm_put(Dst, 3591, LJ_TISNUM); + dasm_put(Dst, 3614, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 3768); + dasm_put(Dst, 3791); if (LJ_DUALNUM) { - dasm_put(Dst, 3777); + dasm_put(Dst, 3800); } - dasm_put(Dst, 2238); + dasm_put(Dst, 2261); } else { - dasm_put(Dst, 3811); + dasm_put(Dst, 3834); if (LJ_DUALNUM) { } else { - dasm_put(Dst, 2245); + dasm_put(Dst, 2268); } } - dasm_put(Dst, 3817); + dasm_put(Dst, 3840); if (LJ_DUALNUM) { - dasm_put(Dst, 3746, LJ_TISNUM); + dasm_put(Dst, 3769, LJ_TISNUM); } else { - dasm_put(Dst, 3591, LJ_TISNUM); + dasm_put(Dst, 3614, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 3820); + dasm_put(Dst, 3843); if (LJ_DUALNUM) { - dasm_put(Dst, 3777); + dasm_put(Dst, 3800); } - dasm_put(Dst, 2238); + dasm_put(Dst, 2261); } else { - dasm_put(Dst, 3829); + dasm_put(Dst, 3852); if (LJ_DUALNUM) { } else { - dasm_put(Dst, 2245); + dasm_put(Dst, 2268); } } if (sse) { - dasm_put(Dst, 3835, 1+1, LJ_TISNUM); + dasm_put(Dst, 3858, 1+1, LJ_TISNUM); } else { - dasm_put(Dst, 3864, 1+1, LJ_TISNUM); + dasm_put(Dst, 3887, 1+1, LJ_TISNUM); } - dasm_put(Dst, 3893, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); - dasm_put(Dst, 3962, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); - dasm_put(Dst, 4019, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); - dasm_put(Dst, 4082, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM); - dasm_put(Dst, 4172); + dasm_put(Dst, 3916, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); + dasm_put(Dst, 3985, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); + dasm_put(Dst, 4042, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); + dasm_put(Dst, 4105, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM); + dasm_put(Dst, 4195); if (sse) { - dasm_put(Dst, 4184, 1+1, LJ_TISNUM); + dasm_put(Dst, 4207, 1+1, LJ_TISNUM); } else { } - dasm_put(Dst, 4209); + dasm_put(Dst, 4232); if (sse) { - dasm_put(Dst, 4223, 1+1, LJ_TISNUM); + dasm_put(Dst, 4246, 1+1, LJ_TISNUM); } else { } - dasm_put(Dst, 4248); + dasm_put(Dst, 4271); if (sse) { - dasm_put(Dst, 4262, 1+1, LJ_TISNUM); + dasm_put(Dst, 4285, 1+1, LJ_TISNUM); } else { } - dasm_put(Dst, 4287); + dasm_put(Dst, 4310); if (sse) { - dasm_put(Dst, 4303, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); + dasm_put(Dst, 4326, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); } else { - dasm_put(Dst, 4342, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); + dasm_put(Dst, 4365, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); } - dasm_put(Dst, 4375, 2+1, LJ_TISNUM, LJ_TISNUM, 2+1, LJ_TISNUM, LJ_TISNUM); - dasm_put(Dst, 4440, 1+1, LJ_TISNUM); + dasm_put(Dst, 4398, 2+1, LJ_TISNUM, LJ_TISNUM, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 4463, 1+1, LJ_TISNUM); if (sse) { - dasm_put(Dst, 4539); + dasm_put(Dst, 4562); } else { - dasm_put(Dst, 4545); + dasm_put(Dst, 4568); } - dasm_put(Dst, 4552); + dasm_put(Dst, 4575); if (sse) { - dasm_put(Dst, 4577); + dasm_put(Dst, 4600); } else { - dasm_put(Dst, 4583); + dasm_put(Dst, 4606); } - dasm_put(Dst, 4586, 1+2); + dasm_put(Dst, 4609, 1+2); if (sse) { - dasm_put(Dst, 4595); + dasm_put(Dst, 4618); } else { - dasm_put(Dst, 4603); + dasm_put(Dst, 4626); } - dasm_put(Dst, 4611); + dasm_put(Dst, 4634); if (sse) { - dasm_put(Dst, 4614, (unsigned int)(U64x(43500000,00000000)), (unsigned int)((U64x(43500000,00000000))>>32)); + dasm_put(Dst, 4637, (unsigned int)(U64x(43500000,00000000)), (unsigned int)((U64x(43500000,00000000))>>32)); } else { - dasm_put(Dst, 4641); + dasm_put(Dst, 4664); } - dasm_put(Dst, 4658); + dasm_put(Dst, 4681); if (sse) { - dasm_put(Dst, 4674, 1+1, LJ_TISNUM); + dasm_put(Dst, 4697, 1+1, LJ_TISNUM); } else { - dasm_put(Dst, 4699, 1+1, LJ_TISNUM); + dasm_put(Dst, 4722, 1+1, LJ_TISNUM); } - dasm_put(Dst, 4721); + dasm_put(Dst, 4744); if (sse) { - dasm_put(Dst, 4743); + dasm_put(Dst, 4766); } else { - dasm_put(Dst, 4769); + dasm_put(Dst, 4792); } - dasm_put(Dst, 4786, 1+2); + dasm_put(Dst, 4809, 1+2); if (sse) { - dasm_put(Dst, 4826); + dasm_put(Dst, 4849); } else { - dasm_put(Dst, 4834); + dasm_put(Dst, 4857); } - dasm_put(Dst, 4844, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 4867, 2+1, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 4896, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 4919, 2+1, LJ_TISNUM, LJ_TISNUM); } else { - dasm_put(Dst, 4943, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 4966, 2+1, LJ_TISNUM, LJ_TISNUM); } - dasm_put(Dst, 4984, LJ_TISNUM); + dasm_put(Dst, 5007, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 4997, LJ_TISNUM); + dasm_put(Dst, 5020, LJ_TISNUM); if (sse) { - dasm_put(Dst, 4539); + dasm_put(Dst, 4562); } else { } - dasm_put(Dst, 5047); + dasm_put(Dst, 5070); } else { - dasm_put(Dst, 2228); + dasm_put(Dst, 2251); } if (sse) { - dasm_put(Dst, 5058, LJ_TISNUM); + dasm_put(Dst, 5081, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5079); + dasm_put(Dst, 5102); } else { - dasm_put(Dst, 2228); + dasm_put(Dst, 2251); } - dasm_put(Dst, 5100); + dasm_put(Dst, 5123); } else { } - dasm_put(Dst, 5125, LJ_TISNUM); + dasm_put(Dst, 5148, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5138, LJ_TISNUM); + dasm_put(Dst, 5161, LJ_TISNUM); if (sse) { - dasm_put(Dst, 4539); + dasm_put(Dst, 4562); } else { } - dasm_put(Dst, 5047); + dasm_put(Dst, 5070); } else { - dasm_put(Dst, 2228); + dasm_put(Dst, 2251); } if (sse) { - dasm_put(Dst, 5058, LJ_TISNUM); + dasm_put(Dst, 5081, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5079); + dasm_put(Dst, 5102); } else { - dasm_put(Dst, 2228); + dasm_put(Dst, 2251); } - dasm_put(Dst, 5188); + dasm_put(Dst, 5211); } else { } if (!sse) { - dasm_put(Dst, 5213); + dasm_put(Dst, 5236); } - dasm_put(Dst, 5222, 1+1, LJ_TSTR); + dasm_put(Dst, 5245, 1+1, LJ_TSTR); if (LJ_DUALNUM) { - dasm_put(Dst, 5244, Dt5(->len)); + dasm_put(Dst, 5267, Dt5(->len)); } else if (sse) { - dasm_put(Dst, 5252, Dt5(->len)); + dasm_put(Dst, 5275, Dt5(->len)); } else { - dasm_put(Dst, 5263, Dt5(->len)); + dasm_put(Dst, 5286, Dt5(->len)); } - dasm_put(Dst, 5271, 1+1, LJ_TSTR, Dt5(->len), Dt5([1])); + dasm_put(Dst, 5294, 1+1, LJ_TSTR, Dt5(->len), Dt5([1])); if (LJ_DUALNUM) { - dasm_put(Dst, 5247); + dasm_put(Dst, 5270); } else if (sse) { - dasm_put(Dst, 5309); + dasm_put(Dst, 5332); } else { - dasm_put(Dst, 5319); + dasm_put(Dst, 5342); } - dasm_put(Dst, 5330, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+1, LJ_TISNUM); + dasm_put(Dst, 5353, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5363); - } else if (sse) { dasm_put(Dst, 5386); - } else { - dasm_put(Dst, 5412); - } - dasm_put(Dst, 5436, Dt1(->base), Dt1(->base), LJ_TSTR, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+2, LJ_TISNUM); - if (LJ_DUALNUM) { - dasm_put(Dst, 5545); } else if (sse) { - dasm_put(Dst, 5557); + dasm_put(Dst, 5409); } else { - dasm_put(Dst, 5572); + dasm_put(Dst, 5435); } - dasm_put(Dst, 5584, LJ_TSTR, LJ_TISNUM); + dasm_put(Dst, 5459, Dt1(->base), Dt1(->base), LJ_TSTR, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+2, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 2489); - } else { - dasm_put(Dst, 2228); - } - dasm_put(Dst, 5601, Dt5(->len)); - if (LJ_DUALNUM) { - dasm_put(Dst, 5611); + dasm_put(Dst, 5568); } else if (sse) { - dasm_put(Dst, 5615); + dasm_put(Dst, 5580); } else { + dasm_put(Dst, 5595); } - dasm_put(Dst, 5622, sizeof(GCstr)-1); - dasm_put(Dst, 5697, 2+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); - dasm_put(Dst, 5758, LJ_TSTR, LJ_TISNUM); + dasm_put(Dst, 5607, LJ_TSTR, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5775); + dasm_put(Dst, 2512); + } else { + dasm_put(Dst, 2251); + } + dasm_put(Dst, 5624, Dt5(->len)); + if (LJ_DUALNUM) { + dasm_put(Dst, 5634); } else if (sse) { - dasm_put(Dst, 5783); + dasm_put(Dst, 5638); } else { - dasm_put(Dst, 5794); } - dasm_put(Dst, 5810, Dt5(->len), DISPATCH_GL(tmpbuf.sz), Dt5([1]), DISPATCH_GL(tmpbuf.buf), DISPATCH_GL(tmpbuf.buf), 1+1); - dasm_put(Dst, 5878, 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, 5945, 1+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz)); - dasm_put(Dst, 6018, sizeof(GCstr), DISPATCH_GL(tmpbuf.buf), 1+1); - dasm_put(Dst, 6103, 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, 6177, 1+1, LJ_TTAB); + dasm_put(Dst, 5645, sizeof(GCstr)-1); + dasm_put(Dst, 5720, 2+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); + dasm_put(Dst, 5781, LJ_TSTR, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6244); + dasm_put(Dst, 5798); } else if (sse) { - dasm_put(Dst, 6251); + dasm_put(Dst, 5806); + } else { + dasm_put(Dst, 5817); + } + dasm_put(Dst, 5833, Dt5(->len), DISPATCH_GL(tmpbuf.sz), Dt5([1]), DISPATCH_GL(tmpbuf.buf), DISPATCH_GL(tmpbuf.buf), 1+1); + dasm_put(Dst, 5901, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz), sizeof(GCstr), DISPATCH_GL(tmpbuf.buf)); + dasm_put(Dst, 5968, 1+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz)); + dasm_put(Dst, 6041, sizeof(GCstr), DISPATCH_GL(tmpbuf.buf), 1+1); + dasm_put(Dst, 6126, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz), sizeof(GCstr), DISPATCH_GL(tmpbuf.buf)); + dasm_put(Dst, 6200, 1+1, LJ_TTAB); + if (LJ_DUALNUM) { + dasm_put(Dst, 6267); + } else if (sse) { + dasm_put(Dst, 6274); } else { } - dasm_put(Dst, 6261, LJ_TISNUM); + dasm_put(Dst, 6284, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6269); + dasm_put(Dst, 6292); } else { - dasm_put(Dst, 2228); + dasm_put(Dst, 2251); } if (sse) { - dasm_put(Dst, 6286, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6309, (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, 6310); + dasm_put(Dst, 6333); } else { } - dasm_put(Dst, 6315); + dasm_put(Dst, 6338); if (sse) { - dasm_put(Dst, 6318, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6341, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { - dasm_put(Dst, 6328); + dasm_put(Dst, 6351); } - dasm_put(Dst, 2205, LJ_TISNUM); + dasm_put(Dst, 2228, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6336); + dasm_put(Dst, 6359); } else { - dasm_put(Dst, 2228); + dasm_put(Dst, 2251); } if (sse) { - dasm_put(Dst, 6353); + dasm_put(Dst, 6376); } else { } - dasm_put(Dst, 6368, LJ_TISNUM); + dasm_put(Dst, 6391, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6393); + dasm_put(Dst, 6416); } else { - dasm_put(Dst, 6413); + dasm_put(Dst, 6436); } if (sse) { - dasm_put(Dst, 6418); + dasm_put(Dst, 6441); } else { } - dasm_put(Dst, 6435); + dasm_put(Dst, 6458); if (sse) { - dasm_put(Dst, 6318, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6341, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { - dasm_put(Dst, 6328); + dasm_put(Dst, 6351); } - dasm_put(Dst, 2205, LJ_TISNUM); + dasm_put(Dst, 2228, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6336); + dasm_put(Dst, 6359); } else { - dasm_put(Dst, 2228); + dasm_put(Dst, 2251); } if (sse) { - dasm_put(Dst, 6353); + dasm_put(Dst, 6376); } else { } - dasm_put(Dst, 6368, LJ_TISNUM); + dasm_put(Dst, 6391, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6445); + dasm_put(Dst, 6468); } else { - dasm_put(Dst, 6413); + dasm_put(Dst, 6436); } if (sse) { - dasm_put(Dst, 6465); + dasm_put(Dst, 6488); } else { } - dasm_put(Dst, 6482); + dasm_put(Dst, 6505); if (sse) { - dasm_put(Dst, 6318, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6341, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { - dasm_put(Dst, 6328); + dasm_put(Dst, 6351); } - dasm_put(Dst, 2205, LJ_TISNUM); + dasm_put(Dst, 2228, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6336); + dasm_put(Dst, 6359); } else { - dasm_put(Dst, 2228); + dasm_put(Dst, 2251); } if (sse) { - dasm_put(Dst, 6353); + dasm_put(Dst, 6376); } else { } - dasm_put(Dst, 6368, LJ_TISNUM); + dasm_put(Dst, 6391, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6492); + dasm_put(Dst, 6515); } else { - dasm_put(Dst, 6413); + dasm_put(Dst, 6436); } if (sse) { - dasm_put(Dst, 6512); + dasm_put(Dst, 6535); } else { } - dasm_put(Dst, 6529, LJ_TISNUM); + dasm_put(Dst, 6552, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6336); + dasm_put(Dst, 6359); } else { - dasm_put(Dst, 2228); + dasm_put(Dst, 2251); } if (sse) { - dasm_put(Dst, 6286, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6309, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6544, LJ_TISNUM); + dasm_put(Dst, 6567, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6336); + dasm_put(Dst, 6359); } else { - dasm_put(Dst, 2228); + dasm_put(Dst, 2251); } if (sse) { - dasm_put(Dst, 6286, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6309, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6560); + dasm_put(Dst, 6583); if (LJ_DUALNUM) { - dasm_put(Dst, 6310); + dasm_put(Dst, 6333); } else if (sse) { - dasm_put(Dst, 6566); + dasm_put(Dst, 6589); } else { } - dasm_put(Dst, 6578); + dasm_put(Dst, 6601); if (LJ_DUALNUM) { - dasm_put(Dst, 6589, LJ_TISNUM); + dasm_put(Dst, 6612, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6336); + dasm_put(Dst, 6359); } else { - dasm_put(Dst, 2228); + dasm_put(Dst, 2251); } if (sse) { - dasm_put(Dst, 6286, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6309, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6597, LJ_TISNUM); + dasm_put(Dst, 6620, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 6612, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6635, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6679); + dasm_put(Dst, 6702); if (LJ_DUALNUM) { - dasm_put(Dst, 6686, LJ_TISNUM); + dasm_put(Dst, 6709, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6336); + dasm_put(Dst, 6359); } else { - dasm_put(Dst, 2228); + dasm_put(Dst, 2251); } if (sse) { - dasm_put(Dst, 6286, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6309, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6597, LJ_TISNUM); + dasm_put(Dst, 6620, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 6694, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6717, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6761); + dasm_put(Dst, 6784); if (LJ_DUALNUM) { - dasm_put(Dst, 6769, LJ_TISNUM); + dasm_put(Dst, 6792, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6336); + dasm_put(Dst, 6359); } else { - dasm_put(Dst, 2228); + dasm_put(Dst, 2251); } if (sse) { - dasm_put(Dst, 6286, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6309, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6597, LJ_TISNUM); + dasm_put(Dst, 6620, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 6777, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6800, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6844); + dasm_put(Dst, 6867); if (LJ_DUALNUM) { - dasm_put(Dst, 6852, LJ_TISNUM); + dasm_put(Dst, 6875, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6336); + dasm_put(Dst, 6359); } else { - dasm_put(Dst, 2228); + dasm_put(Dst, 2251); } if (sse) { - dasm_put(Dst, 6286, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6309, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6597, LJ_TISNUM); + dasm_put(Dst, 6620, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 6860, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6883, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6927); + dasm_put(Dst, 6950); if (LJ_DUALNUM) { - dasm_put(Dst, 6934, LJ_TISNUM); + dasm_put(Dst, 6957, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6336); + dasm_put(Dst, 6359); } else { - dasm_put(Dst, 2228); + dasm_put(Dst, 2251); } if (sse) { - dasm_put(Dst, 6286, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6309, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6597, LJ_TISNUM); + dasm_put(Dst, 6620, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 6942, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6965, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 7009, 1+2, 1+1, Dt1(->base), 8*LUA_MINSTACK, Dt1(->top), Dt1(->maxstack), Dt8(->f), Dt1(->base)); - dasm_put(Dst, 7085, Dt1(->top), Dt7(->pc), FRAME_TYPE, LUA_MINSTACK, Dt1(->base), Dt1(->base)); - dasm_put(Dst, 7212, Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 7032, 1+2, 1+1, Dt1(->base), 8*LUA_MINSTACK, Dt1(->top), Dt1(->maxstack), Dt8(->f), Dt1(->base)); + dasm_put(Dst, 7108, Dt1(->top), Dt7(->pc), FRAME_TYPE, LUA_MINSTACK, Dt1(->base), Dt1(->base)); + dasm_put(Dst, 7235, Dt1(->top), Dt1(->base), Dt1(->top)); #if LJ_HASJIT - dasm_put(Dst, 7251, DISPATCH_GL(hookmask), HOOK_VMEVENT, HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount)); + dasm_put(Dst, 7274, DISPATCH_GL(hookmask), HOOK_VMEVENT, HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount)); #endif - dasm_put(Dst, 7284, DISPATCH_GL(hookmask), HOOK_ACTIVE, DISPATCH_GL(hookmask), HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount), LUA_MASKLINE); - dasm_put(Dst, 7338, Dt1(->base), Dt1(->base), GG_DISP2STATIC); + dasm_put(Dst, 7307, DISPATCH_GL(hookmask), HOOK_ACTIVE, DISPATCH_GL(hookmask), HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount), LUA_MASKLINE); + dasm_put(Dst, 7361, Dt1(->base), Dt1(->base), GG_DISP2STATIC); #if LJ_HASJIT - dasm_put(Dst, 7405, Dt7(->pc), PC2PROTO(framesize), Dt1(->base), Dt1(->top), GG_DISP2J, DISPATCH_J(L)); + dasm_put(Dst, 7428, Dt7(->pc), PC2PROTO(framesize), Dt1(->base), Dt1(->top), GG_DISP2J, DISPATCH_J(L)); #endif - dasm_put(Dst, 7452); + dasm_put(Dst, 7475); #if LJ_HASJIT - dasm_put(Dst, 7279); + dasm_put(Dst, 7302); #endif - dasm_put(Dst, 7459); + dasm_put(Dst, 7482); #if LJ_HASJIT - dasm_put(Dst, 7462); + dasm_put(Dst, 7485); #endif - dasm_put(Dst, 7472, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 7495, Dt1(->base), Dt1(->top)); #if LJ_HASJIT - dasm_put(Dst, 7505); + dasm_put(Dst, 7528); #endif - dasm_put(Dst, 7510, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 7533, Dt1(->base), Dt1(->top)); #if LJ_HASJIT - dasm_put(Dst, 7541, 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, 7564, DISPATCH_GL(vmstate), DISPATCH_GL(vmstate), ~LJ_VMST_EXIT, DISPATCH_J(exitno), DISPATCH_J(parent), 16*8, DISPATCH_GL(jit_L), DISPATCH_GL(jit_base), DISPATCH_J(L), DISPATCH_GL(jit_L), Dt1(->base), GG_DISP2J, Dt1(->cframe), CFRAME_RAWMASK, CFRAME_OFS_L, Dt1(->base), CFRAME_OFS_PC); #endif - dasm_put(Dst, 7780); + dasm_put(Dst, 7803); #if LJ_HASJIT - dasm_put(Dst, 7783, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, BC_FUNCF); + dasm_put(Dst, 7806, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, BC_FUNCF); #endif - dasm_put(Dst, 7883); + dasm_put(Dst, 7906); if (!sse) { - dasm_put(Dst, 7886); + dasm_put(Dst, 7909); } - dasm_put(Dst, 7931, (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, 7954, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); if (!sse) { - dasm_put(Dst, 8017); + dasm_put(Dst, 8040); } - dasm_put(Dst, 8062, (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, 8085, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(bff00000,00000000)), (unsigned int)((U64x(bff00000,00000000))>>32)); if (!sse) { - dasm_put(Dst, 8148); + dasm_put(Dst, 8171); } - dasm_put(Dst, 8187, (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, 8210, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); if (sse) { - dasm_put(Dst, 8276, (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, 8299, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); } else { - dasm_put(Dst, 8390); + dasm_put(Dst, 8413); } - dasm_put(Dst, 8437); + dasm_put(Dst, 8460); if (!sse) { } else { - dasm_put(Dst, 8514); + dasm_put(Dst, 8537); } - dasm_put(Dst, 8517); - dasm_put(Dst, 8602, (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, 8705, (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, 8867); + dasm_put(Dst, 8540); + dasm_put(Dst, 8625, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); + dasm_put(Dst, 8728, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(7ff00000,00000000)), (unsigned int)((U64x(7ff00000,00000000))>>32)); + dasm_put(Dst, 8890); #if LJ_HASJIT if (sse) { - dasm_put(Dst, 8908); - dasm_put(Dst, 8978); - dasm_put(Dst, 9050); + dasm_put(Dst, 8931); + dasm_put(Dst, 9001); + dasm_put(Dst, 9073); } else { - dasm_put(Dst, 9102); - dasm_put(Dst, 9194); + dasm_put(Dst, 9125); + dasm_put(Dst, 9217); } - dasm_put(Dst, 9240); + dasm_put(Dst, 9263); #endif - dasm_put(Dst, 9244); + dasm_put(Dst, 9267); if (sse) { - dasm_put(Dst, 9247, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); - dasm_put(Dst, 9332, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); + dasm_put(Dst, 9270, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); + dasm_put(Dst, 9355, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); } else { - dasm_put(Dst, 9460); - dasm_put(Dst, 9543); + dasm_put(Dst, 9483); + dasm_put(Dst, 9566); if (cmov) { - dasm_put(Dst, 9598); + dasm_put(Dst, 9621); } else { - dasm_put(Dst, 9617); + dasm_put(Dst, 9640); } - dasm_put(Dst, 9240); + dasm_put(Dst, 9263); } - dasm_put(Dst, 9658); + dasm_put(Dst, 9681); #if LJ_HASFFI #define DtE(_V) (int)(ptrdiff_t)&(((CCallState *)0)_V) - dasm_put(Dst, 9682, DtE(->spadj)); + dasm_put(Dst, 9705, DtE(->spadj)); #if LJ_TARGET_WINDOWS #endif - dasm_put(Dst, 9698, 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, 9777, 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, 9721, DtE(->nsp), offsetof(CCallState, stack), CCALL_SPS_EXTRA*8, DtE(->nfpr), DtE(->gpr[0]), DtE(->gpr[1]), DtE(->gpr[2]), DtE(->gpr[3]), DtE(->gpr[4]), DtE(->gpr[5]), DtE(->fpr[0]), DtE(->fpr[1])); + dasm_put(Dst, 9800, DtE(->fpr[2]), DtE(->fpr[3]), DtE(->fpr[4]), DtE(->fpr[5]), DtE(->fpr[6]), DtE(->fpr[7]), DtE(->func), DtE(->gpr[0]), DtE(->fpr[0]), DtE(->gpr[1]), DtE(->fpr[1])); #if LJ_TARGET_WINDOWS #endif - dasm_put(Dst, 9832); + dasm_put(Dst, 9855); #endif - dasm_put(Dst, 9840); + dasm_put(Dst, 9863); #ifdef LUA_USE_ASSERT - dasm_put(Dst, 9242); + dasm_put(Dst, 9265); #endif - dasm_put(Dst, 9242); + dasm_put(Dst, 9265); } /* 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, 9843, defop); + dasm_put(Dst, 9866, defop); switch (op) { @@ -1844,296 +1847,296 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_ISLT: case BC_ISGE: case BC_ISLE: case BC_ISGT: if (LJ_DUALNUM) { - dasm_put(Dst, 9845, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 9868, LJ_TISNUM, LJ_TISNUM); switch (op) { case BC_ISLT: - dasm_put(Dst, 9875); + dasm_put(Dst, 9898); break; case BC_ISGE: - dasm_put(Dst, 9880); + dasm_put(Dst, 9903); break; case BC_ISLE: - dasm_put(Dst, 9885); + dasm_put(Dst, 9908); break; case BC_ISGT: - dasm_put(Dst, 9890); + dasm_put(Dst, 9913); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 9895, -BCBIAS_J*4, LJ_TISNUM); + dasm_put(Dst, 9918, -BCBIAS_J*4, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9950); + dasm_put(Dst, 9973); } else { - dasm_put(Dst, 9961); + dasm_put(Dst, 9984); } - dasm_put(Dst, 9972); + dasm_put(Dst, 9995); if (sse) { - dasm_put(Dst, 9979); + dasm_put(Dst, 10002); switch (op) { case BC_ISLT: - dasm_put(Dst, 9999); + dasm_put(Dst, 10022); break; case BC_ISGE: - dasm_put(Dst, 10004); + dasm_put(Dst, 10027); break; case BC_ISLE: - dasm_put(Dst, 10009); + dasm_put(Dst, 10032); break; case BC_ISGT: - dasm_put(Dst, 10014); + dasm_put(Dst, 10037); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 10019); + dasm_put(Dst, 10042); } else { - dasm_put(Dst, 10024); + dasm_put(Dst, 10047); } } else { - dasm_put(Dst, 10032, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10055, LJ_TISNUM, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 10053); + dasm_put(Dst, 10076); } else { - dasm_put(Dst, 10074); + dasm_put(Dst, 10097); if (cmov) { - dasm_put(Dst, 10090); + dasm_put(Dst, 10113); } else { - dasm_put(Dst, 10096); + dasm_put(Dst, 10119); } } if (LJ_DUALNUM) { switch (op) { case BC_ISLT: - dasm_put(Dst, 9999); + dasm_put(Dst, 10022); break; case BC_ISGE: - dasm_put(Dst, 10004); + dasm_put(Dst, 10027); break; case BC_ISLE: - dasm_put(Dst, 10009); + dasm_put(Dst, 10032); break; case BC_ISGT: - dasm_put(Dst, 10014); + dasm_put(Dst, 10037); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 10019); + dasm_put(Dst, 10042); } else { switch (op) { case BC_ISLT: - dasm_put(Dst, 10103); + dasm_put(Dst, 10126); break; case BC_ISGE: - dasm_put(Dst, 10108); + dasm_put(Dst, 10131); break; case BC_ISLE: - dasm_put(Dst, 10113); + dasm_put(Dst, 10136); break; case BC_ISGT: - dasm_put(Dst, 10118); + dasm_put(Dst, 10141); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 10123, -BCBIAS_J*4); + dasm_put(Dst, 10146, -BCBIAS_J*4); } break; case BC_ISEQV: case BC_ISNEV: vk = op == BC_ISEQV; - dasm_put(Dst, 10156); + dasm_put(Dst, 10179); if (LJ_DUALNUM) { - dasm_put(Dst, 10164, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10187, LJ_TISNUM, LJ_TISNUM); if (vk) { - dasm_put(Dst, 10189); + dasm_put(Dst, 10212); } else { - dasm_put(Dst, 10194); + dasm_put(Dst, 10217); } - dasm_put(Dst, 10199, -BCBIAS_J*4, LJ_TISNUM); + dasm_put(Dst, 10222, -BCBIAS_J*4, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10252); + dasm_put(Dst, 10275); } else { - dasm_put(Dst, 10259); + dasm_put(Dst, 10282); } - dasm_put(Dst, 10263); + dasm_put(Dst, 10286); if (sse) { - dasm_put(Dst, 10274); + dasm_put(Dst, 10297); } else { - dasm_put(Dst, 10286); + dasm_put(Dst, 10309); } - dasm_put(Dst, 10293); + dasm_put(Dst, 10316); } else { - dasm_put(Dst, 10298, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10321, LJ_TISNUM, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 10317); + dasm_put(Dst, 10340); } else { - dasm_put(Dst, 10335); + dasm_put(Dst, 10358); if (cmov) { - dasm_put(Dst, 10090); + dasm_put(Dst, 10113); } else { - dasm_put(Dst, 10096); + dasm_put(Dst, 10119); } } iseqne_fp: if (vk) { - dasm_put(Dst, 10348); + dasm_put(Dst, 10371); } else { - dasm_put(Dst, 10357); + dasm_put(Dst, 10380); } iseqne_end: if (vk) { - dasm_put(Dst, 10366, -BCBIAS_J*4); + dasm_put(Dst, 10389, -BCBIAS_J*4); if (!LJ_HASFFI) { - dasm_put(Dst, 4592); + dasm_put(Dst, 4615); } } else { if (!LJ_HASFFI) { - dasm_put(Dst, 4592); + dasm_put(Dst, 4615); } - dasm_put(Dst, 10381, -BCBIAS_J*4); + dasm_put(Dst, 10404, -BCBIAS_J*4); } if (LJ_DUALNUM && (op == BC_ISEQV || op == BC_ISNEV || op == BC_ISEQN || op == BC_ISNEN)) { - dasm_put(Dst, 10396); + dasm_put(Dst, 10419); } else { - dasm_put(Dst, 10135); + dasm_put(Dst, 10158); } if (op == BC_ISEQV || op == BC_ISNEV) { - dasm_put(Dst, 10401); + dasm_put(Dst, 10424); if (LJ_HASFFI) { - dasm_put(Dst, 10404, LJ_TCDATA, LJ_TCDATA); + dasm_put(Dst, 10427, LJ_TCDATA, LJ_TCDATA); } - dasm_put(Dst, 10423, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<metatable), Dt6(->nomm), 1<>32)); + dasm_put(Dst, 11017, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); } else { - dasm_put(Dst, 11019); + dasm_put(Dst, 11042); } if (LJ_DUALNUM) { - dasm_put(Dst, 10396); + dasm_put(Dst, 10419); } else { - dasm_put(Dst, 10135); + dasm_put(Dst, 10158); } break; case BC_LEN: - dasm_put(Dst, 11028, LJ_TSTR); + dasm_put(Dst, 11051, LJ_TSTR); if (LJ_DUALNUM) { - dasm_put(Dst, 11042, Dt5(->len), LJ_TISNUM); + dasm_put(Dst, 11065, Dt5(->len), LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 11056, Dt5(->len)); + dasm_put(Dst, 11079, Dt5(->len)); } else { - dasm_put(Dst, 11074, Dt5(->len)); + dasm_put(Dst, 11097, Dt5(->len)); } - dasm_put(Dst, 11083, LJ_TTAB); + dasm_put(Dst, 11106, LJ_TTAB); if (LJ_DUALNUM) { } else if (sse) { - dasm_put(Dst, 11125); + dasm_put(Dst, 11148); } else { } - dasm_put(Dst, 11131); + dasm_put(Dst, 11154); break; /* -- Binary ops -------------------------------------------------------- */ @@ -2141,605 +2144,605 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_ADDVN: case BC_ADDNV: case BC_ADDVV: if (LJ_DUALNUM) { - dasm_put(Dst, 11144); + dasm_put(Dst, 11167); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11152, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11175, LJ_TISNUM, LJ_TISNUM); break; case 1: - dasm_put(Dst, 11187, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11210, LJ_TISNUM, LJ_TISNUM); break; default: - dasm_put(Dst, 11222, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11245, LJ_TISNUM, LJ_TISNUM); break; } - dasm_put(Dst, 11255, LJ_TISNUM); + dasm_put(Dst, 11278, LJ_TISNUM); if (vk == 1) { - dasm_put(Dst, 11052); + dasm_put(Dst, 11075); } else { - dasm_put(Dst, 10835); + dasm_put(Dst, 10858); } - dasm_put(Dst, 10135); + dasm_put(Dst, 10158); } else { - dasm_put(Dst, 11144); + dasm_put(Dst, 11167); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11261, LJ_TISNUM); + dasm_put(Dst, 11284, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11273, LJ_TISNUM); + dasm_put(Dst, 11296, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11285); + dasm_put(Dst, 11308); } else { - dasm_put(Dst, 11300); + dasm_put(Dst, 11323); } break; case 1: - dasm_put(Dst, 11309, LJ_TISNUM); + dasm_put(Dst, 11332, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11321, LJ_TISNUM); + dasm_put(Dst, 11344, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11333); + dasm_put(Dst, 11356); } else { - dasm_put(Dst, 11348); + dasm_put(Dst, 11371); } break; default: - dasm_put(Dst, 11357, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11380, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11379); + dasm_put(Dst, 11402); } else { - dasm_put(Dst, 11393); + dasm_put(Dst, 11416); } break; } if (sse) { - dasm_put(Dst, 11012); + dasm_put(Dst, 11035); } else { - dasm_put(Dst, 11024); + dasm_put(Dst, 11047); } - dasm_put(Dst, 10135); + dasm_put(Dst, 10158); } break; case BC_SUBVN: case BC_SUBNV: case BC_SUBVV: if (LJ_DUALNUM) { - dasm_put(Dst, 11144); + dasm_put(Dst, 11167); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11401, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11424, LJ_TISNUM, LJ_TISNUM); break; case 1: - dasm_put(Dst, 11436, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11459, LJ_TISNUM, LJ_TISNUM); break; default: - dasm_put(Dst, 11471, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11494, LJ_TISNUM, LJ_TISNUM); break; } - dasm_put(Dst, 11255, LJ_TISNUM); + dasm_put(Dst, 11278, LJ_TISNUM); if (vk == 1) { - dasm_put(Dst, 11052); + dasm_put(Dst, 11075); } else { - dasm_put(Dst, 10835); + dasm_put(Dst, 10858); } - dasm_put(Dst, 10135); + dasm_put(Dst, 10158); } else { - dasm_put(Dst, 11144); + dasm_put(Dst, 11167); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11261, LJ_TISNUM); + dasm_put(Dst, 11284, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11273, LJ_TISNUM); + dasm_put(Dst, 11296, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11504); + dasm_put(Dst, 11527); } else { - dasm_put(Dst, 11519); + dasm_put(Dst, 11542); } break; case 1: - dasm_put(Dst, 11309, LJ_TISNUM); + dasm_put(Dst, 11332, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11321, LJ_TISNUM); + dasm_put(Dst, 11344, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11528); - } else { - dasm_put(Dst, 11543); - } - break; - default: - dasm_put(Dst, 11357, LJ_TISNUM, LJ_TISNUM); - if (sse) { - dasm_put(Dst, 11552); + dasm_put(Dst, 11551); } else { dasm_put(Dst, 11566); + } + break; + default: + dasm_put(Dst, 11380, LJ_TISNUM, LJ_TISNUM); + if (sse) { + dasm_put(Dst, 11575); + } else { + dasm_put(Dst, 11589); } break; } if (sse) { - dasm_put(Dst, 11012); + dasm_put(Dst, 11035); } else { - dasm_put(Dst, 11024); + dasm_put(Dst, 11047); } - dasm_put(Dst, 10135); + dasm_put(Dst, 10158); } break; case BC_MULVN: case BC_MULNV: case BC_MULVV: if (LJ_DUALNUM) { - dasm_put(Dst, 11144); + dasm_put(Dst, 11167); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11574, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11597, LJ_TISNUM, LJ_TISNUM); break; case 1: - dasm_put(Dst, 11610, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11633, LJ_TISNUM, LJ_TISNUM); break; default: - dasm_put(Dst, 11646, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11669, LJ_TISNUM, LJ_TISNUM); break; } - dasm_put(Dst, 11255, LJ_TISNUM); + dasm_put(Dst, 11278, LJ_TISNUM); if (vk == 1) { - dasm_put(Dst, 11052); + dasm_put(Dst, 11075); } else { - dasm_put(Dst, 10835); + dasm_put(Dst, 10858); } - dasm_put(Dst, 10135); + dasm_put(Dst, 10158); } else { - dasm_put(Dst, 11144); + dasm_put(Dst, 11167); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11261, LJ_TISNUM); + dasm_put(Dst, 11284, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11273, LJ_TISNUM); + dasm_put(Dst, 11296, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11680); + dasm_put(Dst, 11703); } else { - dasm_put(Dst, 11695); + dasm_put(Dst, 11718); } break; case 1: - dasm_put(Dst, 11309, LJ_TISNUM); + dasm_put(Dst, 11332, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11321, LJ_TISNUM); + dasm_put(Dst, 11344, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11704); - } else { - dasm_put(Dst, 11719); - } - break; - default: - dasm_put(Dst, 11357, LJ_TISNUM, LJ_TISNUM); - if (sse) { - dasm_put(Dst, 11728); + dasm_put(Dst, 11727); } else { dasm_put(Dst, 11742); } break; - } + default: + dasm_put(Dst, 11380, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11012); - } else { - dasm_put(Dst, 11024); - } - dasm_put(Dst, 10135); - } - break; - case BC_DIVVN: case BC_DIVNV: case BC_DIVVV: - dasm_put(Dst, 11144); - vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); - switch (vk) { - case 0: - dasm_put(Dst, 11261, LJ_TISNUM); - if (LJ_DUALNUM) { - dasm_put(Dst, 11273, LJ_TISNUM); - } - if (sse) { - dasm_put(Dst, 11750); + dasm_put(Dst, 11751); } else { dasm_put(Dst, 11765); } break; - case 1: - dasm_put(Dst, 11309, LJ_TISNUM); - if (LJ_DUALNUM) { - dasm_put(Dst, 11321, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11774); + dasm_put(Dst, 11035); } else { - dasm_put(Dst, 11789); + dasm_put(Dst, 11047); + } + dasm_put(Dst, 10158); + } + break; + case BC_DIVVN: case BC_DIVNV: case BC_DIVVV: + dasm_put(Dst, 11167); + vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); + switch (vk) { + case 0: + dasm_put(Dst, 11284, LJ_TISNUM); + if (LJ_DUALNUM) { + dasm_put(Dst, 11296, LJ_TISNUM); + } + if (sse) { + dasm_put(Dst, 11773); + } else { + dasm_put(Dst, 11788); } break; - default: - dasm_put(Dst, 11357, LJ_TISNUM, LJ_TISNUM); + case 1: + dasm_put(Dst, 11332, LJ_TISNUM); + if (LJ_DUALNUM) { + dasm_put(Dst, 11344, LJ_TISNUM); + } if (sse) { - dasm_put(Dst, 11798); + dasm_put(Dst, 11797); } else { dasm_put(Dst, 11812); + } + break; + default: + dasm_put(Dst, 11380, LJ_TISNUM, LJ_TISNUM); + if (sse) { + dasm_put(Dst, 11821); + } else { + dasm_put(Dst, 11835); } break; } if (sse) { - dasm_put(Dst, 11012); + dasm_put(Dst, 11035); } else { - dasm_put(Dst, 11024); + dasm_put(Dst, 11047); } - dasm_put(Dst, 10135); + dasm_put(Dst, 10158); break; case BC_MODVN: - dasm_put(Dst, 11144); + dasm_put(Dst, 11167); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11261, LJ_TISNUM); + dasm_put(Dst, 11284, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11273, LJ_TISNUM); + dasm_put(Dst, 11296, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11820); + dasm_put(Dst, 11843); } else { - dasm_put(Dst, 11835); + dasm_put(Dst, 11858); } break; case 1: - dasm_put(Dst, 11309, LJ_TISNUM); + dasm_put(Dst, 11332, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11321, LJ_TISNUM); + dasm_put(Dst, 11344, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11844); - } else { - dasm_put(Dst, 11859); - } - break; - default: - dasm_put(Dst, 11357, LJ_TISNUM, LJ_TISNUM); - if (sse) { - dasm_put(Dst, 11868); + dasm_put(Dst, 11867); } else { dasm_put(Dst, 11882); } break; - } - dasm_put(Dst, 11890); + default: + dasm_put(Dst, 11380, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11012); + dasm_put(Dst, 11891); } else { - dasm_put(Dst, 11024); + dasm_put(Dst, 11905); } - dasm_put(Dst, 10135); + break; + } + dasm_put(Dst, 11913); + if (sse) { + dasm_put(Dst, 11035); + } else { + dasm_put(Dst, 11047); + } + dasm_put(Dst, 10158); break; case BC_MODNV: case BC_MODVV: - dasm_put(Dst, 11144); + dasm_put(Dst, 11167); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11261, LJ_TISNUM); + dasm_put(Dst, 11284, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11273, LJ_TISNUM); + dasm_put(Dst, 11296, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11820); + dasm_put(Dst, 11843); } else { - dasm_put(Dst, 11835); + dasm_put(Dst, 11858); } break; case 1: - dasm_put(Dst, 11309, LJ_TISNUM); + dasm_put(Dst, 11332, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11321, LJ_TISNUM); + dasm_put(Dst, 11344, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11844); - } else { - dasm_put(Dst, 11859); - } - break; - default: - dasm_put(Dst, 11357, LJ_TISNUM, LJ_TISNUM); - if (sse) { - dasm_put(Dst, 11868); + dasm_put(Dst, 11867); } else { dasm_put(Dst, 11882); } break; + default: + dasm_put(Dst, 11380, LJ_TISNUM, LJ_TISNUM); + if (sse) { + dasm_put(Dst, 11891); + } else { + dasm_put(Dst, 11905); } - dasm_put(Dst, 11896); + break; + } + dasm_put(Dst, 11919); break; case BC_POW: - dasm_put(Dst, 11144); + dasm_put(Dst, 11167); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11261, LJ_TISNUM); + dasm_put(Dst, 11284, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11273, LJ_TISNUM); + dasm_put(Dst, 11296, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11820); + dasm_put(Dst, 11843); } else { - dasm_put(Dst, 11835); + dasm_put(Dst, 11858); } break; case 1: - dasm_put(Dst, 11309, LJ_TISNUM); + dasm_put(Dst, 11332, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11321, LJ_TISNUM); + dasm_put(Dst, 11344, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11844); - } else { - dasm_put(Dst, 11859); - } - break; - default: - dasm_put(Dst, 11357, LJ_TISNUM, LJ_TISNUM); - if (sse) { - dasm_put(Dst, 11868); + dasm_put(Dst, 11867); } else { dasm_put(Dst, 11882); } break; - } - dasm_put(Dst, 11901); + default: + dasm_put(Dst, 11380, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11012); + dasm_put(Dst, 11891); } else { - dasm_put(Dst, 11024); + dasm_put(Dst, 11905); } - dasm_put(Dst, 10135); + break; + } + dasm_put(Dst, 11924); + if (sse) { + dasm_put(Dst, 11035); + } else { + dasm_put(Dst, 11047); + } + dasm_put(Dst, 10158); break; case BC_CAT: - dasm_put(Dst, 11905, Dt1(->base), Dt1(->base)); + dasm_put(Dst, 11928, Dt1(->base), Dt1(->base)); break; /* -- Constant ops ------------------------------------------------------ */ case BC_KSTR: - dasm_put(Dst, 11989, LJ_TSTR); + dasm_put(Dst, 12012, LJ_TSTR); break; case BC_KCDATA: #if LJ_HASFFI - dasm_put(Dst, 11989, LJ_TCDATA); + dasm_put(Dst, 12012, LJ_TCDATA); #endif break; case BC_KSHORT: if (LJ_DUALNUM) { - dasm_put(Dst, 12026, LJ_TISNUM); + dasm_put(Dst, 12049, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 12038); + dasm_put(Dst, 12061); } else { - dasm_put(Dst, 12053); + dasm_put(Dst, 12076); } - dasm_put(Dst, 10135); + dasm_put(Dst, 10158); break; case BC_KNUM: if (sse) { - dasm_put(Dst, 12061); + dasm_put(Dst, 12084); } else { - dasm_put(Dst, 12075); + dasm_put(Dst, 12098); } - dasm_put(Dst, 10135); + dasm_put(Dst, 10158); break; case BC_KPRI: - dasm_put(Dst, 12083); + dasm_put(Dst, 12106); break; case BC_KNIL: - dasm_put(Dst, 12112, LJ_TNIL); + dasm_put(Dst, 12135, LJ_TNIL); break; /* -- Upvalue and function ops ------------------------------------------ */ case BC_UGET: - dasm_put(Dst, 12160, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12183, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_USETV: #define TV2MARKOFS \ ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv)) - dasm_put(Dst, 12201, offsetof(GCfuncL, uvptr), DtA(->closed), DtA(->v), TV2MARKOFS, LJ_GC_BLACK, LJ_TISGCV, LJ_TISNUM - LJ_TISGCV, Dt4(->gch.marked), LJ_GC_WHITES, GG_DISP2G); - dasm_put(Dst, 12297); + dasm_put(Dst, 12224, offsetof(GCfuncL, uvptr), DtA(->closed), DtA(->v), TV2MARKOFS, LJ_GC_BLACK, LJ_TISGCV, LJ_TISNUM - LJ_TISGCV, Dt4(->gch.marked), LJ_GC_WHITES, GG_DISP2G); + dasm_put(Dst, 12320); break; #undef TV2MARKOFS case BC_USETS: - dasm_put(Dst, 12309, offsetof(GCfuncL, uvptr), DtA(->v), LJ_TSTR, DtA(->marked), LJ_GC_BLACK, Dt4(->gch.marked), LJ_GC_WHITES, DtA(->closed), GG_DISP2G); + dasm_put(Dst, 12332, offsetof(GCfuncL, uvptr), DtA(->v), LJ_TSTR, DtA(->marked), LJ_GC_BLACK, Dt4(->gch.marked), LJ_GC_WHITES, DtA(->closed), GG_DISP2G); break; case BC_USETN: - dasm_put(Dst, 12405); + dasm_put(Dst, 12428); if (sse) { - dasm_put(Dst, 12410); - } else { - dasm_put(Dst, 10659); - } - dasm_put(Dst, 12418, offsetof(GCfuncL, uvptr), DtA(->v)); - if (sse) { - dasm_put(Dst, 12427); - } else { dasm_put(Dst, 12433); + } else { + dasm_put(Dst, 10682); } - dasm_put(Dst, 10135); + dasm_put(Dst, 12441, offsetof(GCfuncL, uvptr), DtA(->v)); + if (sse) { + dasm_put(Dst, 12450); + } else { + dasm_put(Dst, 12456); + } + dasm_put(Dst, 10158); break; case BC_USETP: - dasm_put(Dst, 12436, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12459, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_UCLO: - dasm_put(Dst, 12476, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 12499, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); break; case BC_FNEW: - dasm_put(Dst, 12532, Dt1(->base), Dt1(->base), LJ_TFUNC); + dasm_put(Dst, 12555, Dt1(->base), Dt1(->base), LJ_TFUNC); break; /* -- Table ops --------------------------------------------------------- */ case BC_TNEW: - dasm_put(Dst, 12599, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 12622, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); break; case BC_TDUP: - dasm_put(Dst, 12723, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 12746, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); break; case BC_GGET: - dasm_put(Dst, 12822, Dt7(->env)); + dasm_put(Dst, 12845, Dt7(->env)); break; case BC_GSET: - dasm_put(Dst, 12842, Dt7(->env)); + dasm_put(Dst, 12865, Dt7(->env)); break; case BC_TGETV: - dasm_put(Dst, 12862, LJ_TTAB); + dasm_put(Dst, 12885, LJ_TTAB); if (LJ_DUALNUM) { - dasm_put(Dst, 12885, LJ_TISNUM); + dasm_put(Dst, 12908, LJ_TISNUM); } else { - dasm_put(Dst, 12899, LJ_TISNUM); + dasm_put(Dst, 12922, LJ_TISNUM); if (sse) { - dasm_put(Dst, 12910); + dasm_put(Dst, 12933); } else { } - dasm_put(Dst, 12931); + dasm_put(Dst, 12954); } - dasm_put(Dst, 12936, 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, 13131, 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, 13154, 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, 13367, 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, 13484, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->nomm), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); - dasm_put(Dst, 13561, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); - dasm_put(Dst, 13648, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13507, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->nomm), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); + dasm_put(Dst, 13584, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); + dasm_put(Dst, 13671, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETB: - dasm_put(Dst, 13740, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); - dasm_put(Dst, 13835, Dt6(->metatable), Dt6(->nomm), 1<marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13763, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); + dasm_put(Dst, 13858, Dt6(->metatable), Dt6(->nomm), 1<marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETM: - dasm_put(Dst, 13883, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); - dasm_put(Dst, 14033, Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13906, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 14056, Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; /* -- Calls and vararg handling ----------------------------------------- */ case BC_CALL: case BC_CALLM: - dasm_put(Dst, 11148); + dasm_put(Dst, 11171); if (op == BC_CALLM) { - dasm_put(Dst, 14053); + dasm_put(Dst, 14076); } - dasm_put(Dst, 14058, LJ_TFUNC, Dt7(->pc)); + dasm_put(Dst, 14081, LJ_TFUNC, Dt7(->pc)); break; case BC_CALLMT: - dasm_put(Dst, 14053); + dasm_put(Dst, 14076); break; case BC_CALLT: - dasm_put(Dst, 14101, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); - dasm_put(Dst, 14219, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG); + dasm_put(Dst, 14124, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); + dasm_put(Dst, 14242, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG); break; case BC_ITERC: - dasm_put(Dst, 14293, LJ_TFUNC, 2+1, Dt7(->pc)); + dasm_put(Dst, 14316, LJ_TFUNC, 2+1, Dt7(->pc)); break; case BC_ITERN: #if LJ_HASJIT #endif - dasm_put(Dst, 14365, Dt6(->asize), Dt6(->array), LJ_TNIL); + dasm_put(Dst, 14388, Dt6(->asize), Dt6(->array), LJ_TNIL); if (LJ_DUALNUM) { - dasm_put(Dst, 11047, LJ_TISNUM); + dasm_put(Dst, 11070, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 11125); + dasm_put(Dst, 11148); } else { - dasm_put(Dst, 14417); + dasm_put(Dst, 14440); } - dasm_put(Dst, 14423); + dasm_put(Dst, 14446); if (LJ_DUALNUM) { } else if (sse) { - dasm_put(Dst, 11012); + dasm_put(Dst, 11035); } else { - dasm_put(Dst, 11024); + dasm_put(Dst, 11047); } - dasm_put(Dst, 14436, -BCBIAS_J*4); + dasm_put(Dst, 14459, -BCBIAS_J*4); if (!LJ_DUALNUM && !sse) { - dasm_put(Dst, 14490); + dasm_put(Dst, 14513); } - dasm_put(Dst, 14496, Dt6(->hmask), sizeof(Node), Dt6(->node), DtB(->val.it), LJ_TNIL, DtB(->key), DtB(->val)); + dasm_put(Dst, 14519, Dt6(->hmask), sizeof(Node), Dt6(->node), DtB(->val.it), LJ_TNIL, DtB(->key), DtB(->val)); break; case BC_ISNEXT: - dasm_put(Dst, 14575, LJ_TFUNC, LJ_TTAB, LJ_TNIL, Dt8(->ffid), FF_next_N, -BCBIAS_J*4, BC_JMP, -BCBIAS_J*4, BC_ITERC); + dasm_put(Dst, 14598, LJ_TFUNC, LJ_TTAB, LJ_TNIL, Dt8(->ffid), FF_next_N, -BCBIAS_J*4, BC_JMP, -BCBIAS_J*4, BC_ITERC); break; case BC_VARG: - dasm_put(Dst, 14676, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); - dasm_put(Dst, 14843, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 14699, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); + dasm_put(Dst, 14866, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); break; /* -- Returns ----------------------------------------------------------- */ case BC_RETM: - dasm_put(Dst, 14053); + dasm_put(Dst, 14076); break; case BC_RET: case BC_RET0: case BC_RET1: if (op != BC_RET0) { - dasm_put(Dst, 14913); + dasm_put(Dst, 14936); } - dasm_put(Dst, 14917, FRAME_TYPE); + dasm_put(Dst, 14940, FRAME_TYPE); switch (op) { case BC_RET: - dasm_put(Dst, 14936); + dasm_put(Dst, 14959); break; case BC_RET1: - dasm_put(Dst, 14990); + dasm_put(Dst, 15013); /* fallthrough */ case BC_RET0: - dasm_put(Dst, 15000); + dasm_put(Dst, 15023); default: break; } - dasm_put(Dst, 15011, Dt7(->pc), PC2PROTO(k)); + dasm_put(Dst, 15034, Dt7(->pc), PC2PROTO(k)); if (op == BC_RET) { - dasm_put(Dst, 15059, LJ_TNIL); + dasm_put(Dst, 15082, LJ_TNIL); } else { - dasm_put(Dst, 15070, LJ_TNIL); + dasm_put(Dst, 15093, LJ_TNIL); } - dasm_put(Dst, 15077, -FRAME_VARG, FRAME_TYPEP); + dasm_put(Dst, 15100, -FRAME_VARG, FRAME_TYPEP); if (op != BC_RET0) { - dasm_put(Dst, 15101); + dasm_put(Dst, 15124); } - dasm_put(Dst, 4669); + dasm_put(Dst, 4692); break; /* -- Loops and branches ------------------------------------------------ */ @@ -2747,7 +2750,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORL: #if LJ_HASJIT - dasm_put(Dst, 15105, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 15128, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2759,111 +2762,111 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORI: case BC_IFORL: vk = (op == BC_IFORL || op == BC_JFORL); - dasm_put(Dst, 15126); + dasm_put(Dst, 15149); if (LJ_DUALNUM) { - dasm_put(Dst, 15130, LJ_TISNUM); + dasm_put(Dst, 15153, LJ_TISNUM); if (!vk) { - dasm_put(Dst, 15140, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 15163, LJ_TISNUM, LJ_TISNUM); } else { #ifdef LUA_USE_ASSERT - dasm_put(Dst, 15169, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 15192, LJ_TISNUM, LJ_TISNUM); #endif - dasm_put(Dst, 15188); + dasm_put(Dst, 15211); } - dasm_put(Dst, 15207, LJ_TISNUM); + dasm_put(Dst, 15230, LJ_TISNUM); if (op == BC_FORI) { - dasm_put(Dst, 15218, -BCBIAS_J*4); + dasm_put(Dst, 15241, -BCBIAS_J*4); } else if (op == BC_JFORI) { - dasm_put(Dst, 15232, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 15255, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 15250, -BCBIAS_J*4); + dasm_put(Dst, 15273, -BCBIAS_J*4); } else { - dasm_put(Dst, 15242, BC_JLOOP); + dasm_put(Dst, 15265, BC_JLOOP); } - dasm_put(Dst, 15264); + dasm_put(Dst, 15287); if (vk) { - dasm_put(Dst, 15289); + dasm_put(Dst, 15312); } - dasm_put(Dst, 15207, LJ_TISNUM); + dasm_put(Dst, 15230, LJ_TISNUM); if (op == BC_FORI) { - dasm_put(Dst, 15298); + dasm_put(Dst, 15321); } else if (op == BC_JFORI) { - dasm_put(Dst, 15303, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 15326, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 15317); + dasm_put(Dst, 15340); } else { - dasm_put(Dst, 15313, BC_JLOOP); + dasm_put(Dst, 15336, BC_JLOOP); } - dasm_put(Dst, 15322); + dasm_put(Dst, 15345); } else if (!vk) { - dasm_put(Dst, 15329, LJ_TISNUM); + dasm_put(Dst, 15352, LJ_TISNUM); } if (!vk) { - dasm_put(Dst, 15335, LJ_TISNUM); + dasm_put(Dst, 15358, LJ_TISNUM); } else { #ifdef LUA_USE_ASSERT - dasm_put(Dst, 15349, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 15372, LJ_TISNUM, LJ_TISNUM); #endif } - dasm_put(Dst, 15368); + dasm_put(Dst, 15391); if (!vk) { - dasm_put(Dst, 15372, LJ_TISNUM); + dasm_put(Dst, 15395, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 15381); + dasm_put(Dst, 15404); if (vk) { - dasm_put(Dst, 15393); + dasm_put(Dst, 15416); } else { - dasm_put(Dst, 15412); + dasm_put(Dst, 15435); } - dasm_put(Dst, 15417); + dasm_put(Dst, 15440); } else { - dasm_put(Dst, 15430); + dasm_put(Dst, 15453); if (vk) { - dasm_put(Dst, 15436); + dasm_put(Dst, 15459); } else { - dasm_put(Dst, 15452); + dasm_put(Dst, 15475); } - dasm_put(Dst, 15460); + dasm_put(Dst, 15483); if (cmov) { - dasm_put(Dst, 10090); + dasm_put(Dst, 10113); } else { - dasm_put(Dst, 10096); + dasm_put(Dst, 10119); } if (!cmov) { - dasm_put(Dst, 15465); + dasm_put(Dst, 15488); } } if (op == BC_FORI) { if (LJ_DUALNUM) { - dasm_put(Dst, 15471); + dasm_put(Dst, 15494); } else { - dasm_put(Dst, 15476, -BCBIAS_J*4); + dasm_put(Dst, 15499, -BCBIAS_J*4); } } else if (op == BC_JFORI) { - dasm_put(Dst, 15486, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 15509, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { if (LJ_DUALNUM) { - dasm_put(Dst, 15500); + dasm_put(Dst, 15523); } else { - dasm_put(Dst, 15505, -BCBIAS_J*4); + dasm_put(Dst, 15528, -BCBIAS_J*4); } } else { - dasm_put(Dst, 15496, BC_JLOOP); + dasm_put(Dst, 15519, BC_JLOOP); } if (LJ_DUALNUM) { - dasm_put(Dst, 10019); + dasm_put(Dst, 10042); } else { - dasm_put(Dst, 10793); + dasm_put(Dst, 10816); } if (sse) { - dasm_put(Dst, 15515); + dasm_put(Dst, 15538); } break; case BC_ITERL: #if LJ_HASJIT - dasm_put(Dst, 15105, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 15128, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2872,33 +2875,33 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IITERL: - dasm_put(Dst, 15526, LJ_TNIL); + dasm_put(Dst, 15549, LJ_TNIL); if (op == BC_JITERL) { - dasm_put(Dst, 15541, BC_JLOOP); + dasm_put(Dst, 15564, BC_JLOOP); } else { - dasm_put(Dst, 15555, -BCBIAS_J*4); + dasm_put(Dst, 15578, -BCBIAS_J*4); } - dasm_put(Dst, 10133); + dasm_put(Dst, 10156); break; case BC_LOOP: #if LJ_HASJIT - dasm_put(Dst, 15105, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 15128, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; case BC_ILOOP: - dasm_put(Dst, 10135); + dasm_put(Dst, 10158); break; case BC_JLOOP: #if LJ_HASJIT - dasm_put(Dst, 15571, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); + dasm_put(Dst, 15594, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); #endif break; case BC_JMP: - dasm_put(Dst, 15612, -BCBIAS_J*4); + dasm_put(Dst, 15635, -BCBIAS_J*4); break; /* -- Function headers -------------------------------------------------- */ @@ -2912,7 +2915,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FUNCF: #if LJ_HASJIT - dasm_put(Dst, 15638, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 15661, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif case BC_FUNCV: /* NYI: compiled vararg functions. */ break; @@ -2922,47 +2925,47 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IFUNCF: - dasm_put(Dst, 15659, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); + dasm_put(Dst, 15682, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); if (op == BC_JFUNCF) { - dasm_put(Dst, 15690, BC_JLOOP); + dasm_put(Dst, 15713, BC_JLOOP); } else { - dasm_put(Dst, 10135); + dasm_put(Dst, 10158); } - dasm_put(Dst, 15699, LJ_TNIL); + dasm_put(Dst, 15722, LJ_TNIL); break; case BC_JFUNCV: #if !LJ_HASJIT break; #endif - dasm_put(Dst, 9242); + dasm_put(Dst, 9265); break; /* NYI: compiled vararg functions. */ case BC_IFUNCV: - dasm_put(Dst, 15721, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); + dasm_put(Dst, 15744, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); if (op == BC_JFUNCV) { - dasm_put(Dst, 15690, BC_JLOOP); + dasm_put(Dst, 15713, BC_JLOOP); } else { - dasm_put(Dst, 15818, -4+PC2PROTO(k)); + dasm_put(Dst, 15841, -4+PC2PROTO(k)); } - dasm_put(Dst, 15843, LJ_TNIL); + dasm_put(Dst, 15866, LJ_TNIL); break; case BC_FUNCC: case BC_FUNCCW: - dasm_put(Dst, 15865, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); + dasm_put(Dst, 15888, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); if (op == BC_FUNCC) { - dasm_put(Dst, 2341); + dasm_put(Dst, 2364); } else { - dasm_put(Dst, 15895); + dasm_put(Dst, 15918); } - dasm_put(Dst, 15903, DISPATCH_GL(vmstate), ~LJ_VMST_C); + dasm_put(Dst, 15926, DISPATCH_GL(vmstate), ~LJ_VMST_C); if (op == BC_FUNCC) { - dasm_put(Dst, 15913); + dasm_put(Dst, 15936); } else { - dasm_put(Dst, 15918, DISPATCH_GL(wrapf)); + dasm_put(Dst, 15941, DISPATCH_GL(wrapf)); } - dasm_put(Dst, 15924, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 15947, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); break; /* ---------------------------------------------------------------------- */ @@ -2990,7 +2993,7 @@ static int build_backend(BuildCtx *ctx) build_subroutines(ctx, cmov, sse); - dasm_put(Dst, 15950); + dasm_put(Dst, 15973); for (op = 0; op < BC__MAX; op++) build_ins(ctx, (BCOp)op, op, cmov, sse); diff --git a/src/buildvm_x64win.h b/src/buildvm_x64win.h index 7bed2e94..244225f3 100644 --- a/src/buildvm_x64win.h +++ b/src/buildvm_x64win.h @@ -12,7 +12,7 @@ #define DASM_SECTION_CODE_OP 0 #define DASM_SECTION_CODE_SUB 1 #define DASM_MAXSECTION 2 -static const unsigned char build_actionlist[15828] = { +static const unsigned char build_actionlist[15830] = { 254,1,248,10,252,247,198,237,15,132,244,11,131,230,252,248,41,252,242,72, 141,76,49,252,248,139,114,252,252,199,68,10,4,237,248,12,131,192,1,137,68, 36,84,252,247,198,237,15,132,244,13,248,14,129,252,246,239,252,247,198,237, @@ -25,138 +25,138 @@ static const unsigned char build_actionlist[15828] = { 194,8,131,192,1,252,233,244,4,248,7,255,133,201,15,132,244,5,41,193,141,20, 202,252,233,244,5,248,8,137,149,233,137,68,36,84,137,202,137,252,233,232, 251,1,0,139,149,233,252,233,244,3,248,17,137,208,72,137,204,248,18,139,108, - 36,96,139,173,233,199,133,233,237,252,233,244,16,248,19,72,129,225,239,72, - 137,204,248,20,139,108,36,96,72,199,193,252,248,252,255,252,255,252,255,184, - 237,255,139,149,233,139,157,233,129,195,239,139,114,252,252,199,66,252,252, - 237,199,131,233,237,252,233,244,12,248,21,186,237,252,233,244,248,248,22, - 131,232,8,252,233,244,247,248,23,141,68,194,252,248,248,1,15,182,142,233, - 131,198,4,137,149,233,137,133,233,255,137,116,36,100,137,202,248,2,137,252, - 233,232,251,1,0,139,149,233,139,133,233,139,106,252,248,41,208,193,232,3, - 131,192,1,139,181,233,139,14,15,182,252,233,15,182,205,131,198,4,252,255, - 36,252,235,248,24,85,87,86,83,72,131,252,236,40,137,205,137,76,36,96,137, + 36,96,139,173,233,199,133,233,237,252,233,244,16,248,19,248,20,72,129,225, + 239,72,137,204,248,21,255,139,108,36,96,72,199,193,252,248,252,255,252,255, + 252,255,184,237,139,149,233,139,157,233,129,195,239,139,114,252,252,199,66, + 252,252,237,199,131,233,237,252,233,244,12,248,22,186,237,252,233,244,248, + 248,23,131,232,8,252,233,244,247,248,24,141,68,194,252,248,248,1,15,182,142, + 233,131,198,4,137,149,233,255,137,133,233,137,116,36,100,137,202,248,2,137, + 252,233,232,251,1,0,139,149,233,139,133,233,139,106,252,248,41,208,193,232, + 3,131,192,1,139,181,233,139,14,15,182,252,233,15,182,205,131,198,4,252,255, + 36,252,235,248,25,85,87,86,83,72,131,252,236,40,137,205,137,76,36,96,137, 209,190,237,49,192,72,141,188,253,36,233,139,157,233,129,195,239,72,137,189, 233,137,68,36,100,72,137,68,36,104,137,68,36,88,137,68,36,92,56,133,233,15, 132,244,249,199,131,233,237,136,133,233,139,149,233,139,133,233,41,200,193, - 232,3,131,192,1,41,209,139,114,252,252,137,68,36,84,252,247,198,237,15,132, - 244,13,255,252,233,244,14,248,25,85,87,86,83,72,131,252,236,40,190,237,68, - 137,76,36,92,252,233,244,247,248,26,85,87,86,83,72,131,252,236,40,190,237, + 232,3,131,192,1,41,209,139,114,252,252,137,68,36,84,252,247,198,237,255,15, + 132,244,13,252,233,244,14,248,26,85,87,86,83,72,131,252,236,40,190,237,68, + 137,76,36,92,252,233,244,247,248,27,85,87,86,83,72,131,252,236,40,190,237, 248,1,68,137,68,36,88,137,205,137,76,36,96,137,209,72,139,189,233,72,137, 124,36,104,137,108,36,100,72,137,165,233,248,2,139,157,233,129,195,239,248, - 3,199,131,233,237,139,149,233,1,206,41,214,139,133,233,41,200,193,232,3,131, - 192,1,248,27,255,139,105,252,248,129,121,253,252,252,239,15,133,244,28,248, - 29,137,202,137,114,252,252,139,181,233,139,14,15,182,252,233,15,182,205,131, - 198,4,252,255,36,252,235,248,30,85,87,86,83,72,131,252,236,40,137,205,137, - 76,36,96,137,108,36,100,139,189,233,43,189,233,199,68,36,92,0,0,0,0,137,124, - 36,88,72,139,189,233,72,137,124,36,104,72,137,165,233,65,252,255,209,133, - 192,15,132,244,15,137,193,190,237,252,233,244,2,248,11,1,209,131,230,252, - 248,137,213,41,252,242,199,68,193,252,252,237,137,200,139,117,252,244,72, - 99,77,252,240,72,141,61,245,72,1,252,249,139,122,252,248,139,191,233,255, - 139,191,233,252,255,225,248,31,15,182,78,252,255,131,252,237,16,141,12,202, - 41,252,233,15,132,244,32,252,247,217,193,252,233,3,65,137,200,139,76,36,96, - 137,145,233,72,139,0,72,137,69,0,137,252,234,252,233,244,33,248,34,137,68, + 3,199,131,233,237,139,149,233,255,1,206,41,214,139,133,233,41,200,193,232, + 3,131,192,1,248,28,139,105,252,248,129,121,253,252,252,239,15,133,244,29, + 248,30,137,202,137,114,252,252,139,181,233,139,14,15,182,252,233,15,182,205, + 131,198,4,252,255,36,252,235,248,31,85,87,86,83,72,131,252,236,40,137,205, + 137,76,36,96,137,108,36,100,139,189,233,43,189,233,199,68,36,92,0,0,0,0,137, + 124,36,88,72,139,189,233,72,137,124,36,104,72,137,165,233,65,252,255,209, + 133,192,15,132,244,15,137,193,190,237,252,233,244,2,248,11,1,209,131,230, + 252,248,137,213,41,252,242,199,68,193,252,252,237,137,200,139,117,252,244, + 72,99,77,252,240,72,141,61,245,255,72,1,252,249,139,122,252,248,139,191,233, + 139,191,233,252,255,225,248,32,15,182,78,252,255,131,252,237,16,141,12,202, + 41,252,233,15,132,244,33,252,247,217,193,252,233,3,65,137,200,139,76,36,96, + 137,145,233,72,139,0,72,137,69,0,137,252,234,252,233,244,34,248,35,137,68, 36,80,199,68,36,84,237,72,141,68,36,80,128,126,252,252,235,15,133,244,247, - 141,139,233,137,41,199,65,4,237,137,205,252,233,244,248,248,35,15,182,70, + 141,139,233,137,41,199,65,4,237,137,205,252,233,244,248,248,36,15,182,70, 252,254,255,199,68,36,84,237,137,68,36,80,255,252,242,15,42,192,252,242,15, - 17,68,36,80,255,72,141,68,36,80,252,233,244,247,248,36,15,182,70,252,254, + 17,68,36,80,255,72,141,68,36,80,252,233,244,247,248,37,15,182,70,252,254, 141,4,194,248,1,15,182,110,252,255,141,44,252,234,248,2,139,76,36,96,137, 145,233,137,252,234,73,137,192,137,205,137,116,36,100,232,251,1,1,139,149, - 233,133,192,15,132,244,249,248,32,15,182,78,252,253,72,139,40,72,137,44,202, + 233,133,192,15,132,244,249,248,33,15,182,78,252,253,72,139,40,72,137,44,202, 139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,3, 139,141,233,137,113,252,244,141,177,233,41,214,139,105,252,248,184,237,252, - 233,244,29,248,37,137,68,36,80,199,68,36,84,237,72,141,68,36,80,128,126,252, + 233,244,30,248,38,137,68,36,80,199,68,36,84,237,72,141,68,36,80,128,126,252, 252,235,15,133,244,247,255,141,139,233,137,41,199,65,4,237,137,205,252,233, - 244,248,248,38,15,182,70,252,254,255,72,141,68,36,80,252,233,244,247,248, - 39,15,182,70,252,254,141,4,194,248,1,15,182,110,252,255,141,44,252,234,248, + 244,248,248,39,15,182,70,252,254,255,72,141,68,36,80,252,233,244,247,248, + 40,15,182,70,252,254,141,4,194,248,1,15,182,110,252,255,141,44,252,234,248, 2,139,76,36,96,137,145,233,137,252,234,73,137,192,137,205,137,116,36,100, 232,251,1,2,139,149,233,133,192,15,132,244,249,15,182,78,252,253,72,139,44, - 202,72,137,40,248,40,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, + 202,72,137,40,248,41,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, 255,36,252,235,248,3,139,141,233,137,113,252,244,15,182,70,252,253,72,139, 44,194,72,137,105,16,141,177,233,41,214,139,105,252,248,184,237,252,233,244, - 29,248,41,139,108,36,96,137,149,233,68,141,4,194,141,20,202,137,252,233,68, + 30,248,42,139,108,36,96,137,149,233,68,141,4,194,141,20,202,137,252,233,68, 15,182,78,252,252,137,116,36,100,232,251,1,3,248,3,139,149,233,255,131,252, - 248,1,15,135,244,42,248,4,141,118,4,15,130,244,252,248,5,15,183,70,252,254, + 248,1,15,135,244,43,248,4,141,118,4,15,130,244,252,248,5,15,183,70,252,254, 141,180,253,134,233,248,6,139,6,15,182,204,15,182,232,131,198,4,193,232,16, - 252,255,36,252,235,248,43,131,198,4,129,120,253,4,239,15,130,244,5,252,233, - 244,6,248,44,129,120,253,4,239,252,233,244,4,248,45,131,252,238,4,65,137, + 252,255,36,252,235,248,44,131,198,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,238,4,65,137, 192,65,137,252,233,139,108,36,96,137,149,233,255,137,202,137,252,233,137, - 116,36,100,232,251,1,4,252,233,244,3,248,46,255,131,252,238,4,139,108,36, + 116,36,100,232,251,1,4,252,233,244,3,248,47,255,131,252,238,4,139,108,36, 96,137,149,233,137,252,233,139,86,252,252,137,116,36,100,232,251,1,5,252, - 233,244,3,255,248,47,255,15,182,110,252,255,255,248,48,141,4,199,252,233, - 244,247,248,49,255,248,50,141,4,199,141,44,252,234,149,252,233,244,248,248, - 51,141,4,194,137,197,252,233,244,248,248,52,255,248,53,141,4,194,248,1,141, + 233,244,3,255,248,48,255,15,182,110,252,255,255,248,49,141,4,199,252,233, + 244,247,248,50,255,248,51,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,12,202,65,137,232,65,137,193,15,182,70,252,252,137,68, 36,32,139,108,36,96,137,149,233,137,202,137,252,233,137,116,36,100,232,251, - 1,6,139,149,233,133,192,15,132,244,40,248,42,137,193,41,208,137,113,252,244, - 141,176,233,184,237,252,233,244,27,248,54,139,108,36,96,137,149,233,141,20, - 194,137,252,233,137,116,36,100,232,251,1,7,139,149,233,252,233,244,42,248, - 55,141,76,202,8,248,28,137,76,36,84,137,68,36,80,131,252,233,8,139,108,36, + 1,6,139,149,233,133,192,15,132,244,41,248,43,137,193,41,208,137,113,252,244, + 141,176,233,184,237,252,233,244,28,248,55,139,108,36,96,137,149,233,141,20, + 194,137,252,233,137,116,36,100,232,251,1,7,139,149,233,252,233,244,43,248, + 56,141,76,202,8,248,29,137,76,36,84,137,68,36,80,131,252,233,8,139,108,36, 96,137,149,233,255,137,202,68,141,4,193,137,252,233,137,116,36,100,232,251, 1,8,139,149,233,139,76,36,84,139,68,36,80,139,105,252,248,131,192,1,57,215, - 15,132,244,56,137,202,137,114,252,252,139,181,233,139,14,15,182,252,233,15, - 182,205,131,198,4,252,255,36,252,235,248,57,139,108,36,96,137,149,233,137, + 15,132,244,57,137,202,137,114,252,252,139,181,233,139,14,15,182,252,233,15, + 182,205,131,198,4,252,255,36,252,235,248,58,139,108,36,96,137,149,233,137, 202,137,252,233,137,116,36,100,232,251,1,9,139,149,233,139,70,252,252,15, - 182,204,15,182,232,193,232,16,252,255,164,253,252,235,233,248,58,129,252, - 248,239,15,130,244,59,139,106,4,129,252,253,239,15,131,244,59,139,114,252, + 182,204,15,182,232,193,232,16,252,255,164,253,252,235,233,248,59,129,252, + 248,239,15,130,244,60,139,106,4,129,252,253,239,15,131,244,60,139,114,252, 252,137,68,36,84,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,84,252,233,244,60,248,61,129,252,248,239,15, - 130,244,59,139,106,4,137,252,233,193,252,249,15,131,252,249,252,254,15,132, + 133,244,1,248,2,255,139,68,36,84,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,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,114,252,252,199,66, - 252,252,237,137,66,252,248,252,233,244,62,248,3,184,237,252,233,244,2,248, - 63,129,252,248,239,15,130,244,59,139,106,4,139,114,252,252,129,252,253,239, + 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,114,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,62,139,131,233,199,66,252,252,237,137,106,252,248,139, + 237,255,15,132,244,63,139,131,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,62,248,5,139,105,4,129,252,253,239,15,132,244,62,139,1,137,106, - 252,252,137,66,252,248,252,233,244,62,248,6,129,252,253,239,15,132,244,1, + 252,233,244,63,248,5,139,105,4,129,252,253,239,15,132,244,63,139,1,137,106, + 252,252,137,66,252,248,252,233,244,63,248,6,129,252,253,239,15,132,244,1, 129,252,253,239,15,135,244,253,189,237,248,7,252,247,213,139,172,253,171, - 233,252,233,244,2,248,64,255,129,252,248,239,15,130,244,59,129,122,253,4, - 239,15,133,244,59,139,42,131,189,233,0,15,133,244,59,129,122,253,12,239,15, - 133,244,59,139,66,8,137,133,233,139,114,252,252,199,66,252,252,237,137,106, + 233,252,233,244,2,248,65,255,129,252,248,239,15,130,244,60,129,122,253,4, + 239,15,133,244,60,139,42,131,189,233,0,15,133,244,60,129,122,253,12,239,15, + 133,244,60,139,66,8,137,133,233,139,114,252,252,199,66,252,252,237,137,106, 252,248,252,246,133,233,235,15,132,244,247,128,165,233,235,255,139,131,233, - 137,171,233,137,133,233,248,1,252,233,244,62,248,65,129,252,248,239,15,130, - 244,59,129,122,253,4,239,15,133,244,59,137,213,68,141,66,8,139,18,139,76, + 137,171,233,137,133,233,248,1,252,233,244,63,248,66,129,252,248,239,15,130, + 244,60,129,122,253,4,239,15,133,244,60,137,213,68,141,66,8,139,18,139,76, 36,96,232,251,1,10,137,252,234,72,139,40,139,114,252,252,72,137,106,252,248, - 252,233,244,62,248,66,129,252,248,239,15,133,244,59,129,122,253,4,239,255, - 15,133,244,247,139,42,252,233,244,67,248,1,15,135,244,59,255,15,131,244,59, - 255,252,242,15,16,2,252,233,244,68,255,221,2,252,233,244,69,255,248,70,129, - 252,248,239,15,130,244,59,139,114,252,252,129,122,253,4,239,15,133,244,249, - 139,2,248,2,199,66,252,252,237,137,66,252,248,252,233,244,62,248,3,129,122, - 253,4,239,15,135,244,59,131,187,233,0,15,133,244,59,139,171,233,59,171,233, - 255,15,130,244,247,232,244,71,248,1,139,108,36,96,137,149,233,137,116,36, + 252,233,244,63,248,67,129,252,248,239,15,133,244,60,129,122,253,4,239,255, + 15,133,244,247,139,42,252,233,244,68,248,1,15,135,244,60,255,15,131,244,60, + 255,252,242,15,16,2,252,233,244,69,255,221,2,252,233,244,70,255,248,71,129, + 252,248,239,15,130,244,60,139,114,252,252,129,122,253,4,239,15,133,244,249, + 139,2,248,2,199,66,252,252,237,137,66,252,248,252,233,244,63,248,3,129,122, + 253,4,239,15,135,244,60,131,187,233,0,15,133,244,60,139,171,233,59,171,233, + 255,15,130,244,247,232,244,72,248,1,139,108,36,96,137,149,233,137,116,36, 100,137,252,233,255,232,251,1,11,255,232,251,1,12,255,139,149,233,252,233, - 244,2,248,72,129,252,248,239,15,130,244,59,15,132,244,248,248,1,129,122,253, - 4,239,15,133,244,59,139,108,36,96,137,149,233,137,149,233,139,114,252,252, + 244,2,248,73,129,252,248,239,15,130,244,60,15,132,244,248,248,1,129,122,253, + 4,239,15,133,244,60,139,108,36,96,137,149,233,137,149,233,139,114,252,252, 68,141,66,8,139,18,137,252,233,137,116,36,100,232,251,1,13,139,149,233,133, 192,15,132,244,249,72,139,106,8,72,139,66,16,72,137,106,252,248,72,137,2, - 248,73,184,237,255,252,233,244,74,248,2,199,66,12,237,252,233,244,1,248,3, - 199,66,252,252,237,252,233,244,62,248,75,129,252,248,239,15,130,244,59,139, - 42,129,122,253,4,239,15,133,244,59,255,131,189,233,0,15,133,244,59,255,139, + 248,74,184,237,255,252,233,244,75,248,2,199,66,12,237,252,233,244,1,248,3, + 199,66,252,252,237,252,233,244,63,248,76,129,252,248,239,15,130,244,60,139, + 42,129,122,253,4,239,15,133,244,60,255,131,189,233,0,15,133,244,60,255,139, 106,252,248,139,133,233,139,114,252,252,199,66,252,252,237,137,66,252,248, - 199,66,12,237,184,237,252,233,244,74,248,76,129,252,248,239,15,130,244,59, - 129,122,253,4,239,15,133,244,59,129,122,253,12,239,255,139,114,252,252,255, + 199,66,12,237,184,237,252,233,244,75,248,77,129,252,248,239,15,130,244,60, + 129,122,253,4,239,15,133,244,60,129,122,253,12,239,255,139,114,252,252,255, 139,66,8,131,192,1,199,66,252,252,237,137,66,252,248,255,252,242,15,16,66, 8,72,189,237,237,102,72,15,110,205,252,242,15,88,193,252,242,15,45,192,252, 242,15,17,66,252,248,255,139,42,59,133,233,15,131,244,248,193,224,3,3,133, - 233,248,1,129,120,253,4,239,15,132,244,77,72,139,40,72,137,42,252,233,244, - 73,248,2,131,189,233,0,15,132,244,77,137,252,233,137,213,137,194,232,251, - 1,14,137,252,234,133,192,15,133,244,1,248,77,184,237,252,233,244,74,248,78, + 233,248,1,129,120,253,4,239,15,132,244,78,72,139,40,72,137,42,252,233,244, + 74,248,2,131,189,233,0,15,132,244,78,137,252,233,137,213,137,194,232,251, + 1,14,137,252,234,133,192,15,133,244,1,248,78,184,237,252,233,244,75,248,79, 255,139,106,252,248,139,133,233,139,114,252,252,199,66,252,252,237,137,66, 252,248,255,199,66,12,237,199,66,8,0,0,0,0,255,15,87,192,252,242,15,17,66, - 8,255,217,252,238,221,90,8,255,184,237,252,233,244,74,248,79,129,252,248, - 239,15,130,244,59,141,74,8,131,232,1,190,237,248,1,15,182,171,233,193,252, - 237,235,131,229,1,1,252,238,252,233,244,27,248,80,129,252,248,239,15,130, - 244,59,129,122,253,12,239,15,133,244,59,255,139,106,4,137,106,12,199,66,4, + 8,255,217,252,238,221,90,8,255,184,237,252,233,244,75,248,80,129,252,248, + 239,15,130,244,60,141,74,8,131,232,1,190,237,248,1,15,182,171,233,193,252, + 237,235,131,229,1,1,252,238,252,233,244,28,248,81,129,252,248,239,15,130, + 244,60,129,122,253,12,239,15,133,244,60,255,139,106,4,137,106,12,199,66,4, 237,139,42,139,114,8,137,106,8,137,50,141,74,16,131,232,2,190,237,252,233, - 244,1,248,81,129,252,248,239,15,130,244,59,139,42,139,114,252,252,137,116, - 36,100,137,108,36,80,129,122,253,4,239,15,133,244,59,72,131,189,233,0,15, - 133,244,59,128,189,233,235,15,135,244,59,139,141,233,15,132,244,247,255,59, - 141,233,15,132,244,59,248,1,141,116,193,252,240,59,181,233,15,135,244,59, + 244,1,248,82,129,252,248,239,15,130,244,60,139,42,139,114,252,252,137,116, + 36,100,137,108,36,80,129,122,253,4,239,15,133,244,60,72,131,189,233,0,15, + 133,244,60,128,189,233,235,15,135,244,60,139,141,233,15,132,244,247,255,59, + 141,233,15,132,244,60,248,1,141,116,193,252,240,59,181,233,15,135,244,60, 137,181,233,139,108,36,96,137,149,233,131,194,8,137,149,233,141,108,194,232, 72,41,252,245,57,206,15,132,244,249,248,2,72,139,4,46,72,137,70,252,248,131, - 252,238,8,57,206,15,133,244,2,248,3,137,202,139,76,36,80,232,244,24,199,131, + 252,238,8,57,206,15,133,244,2,248,3,137,202,139,76,36,80,232,244,25,199,131, 233,237,255,139,108,36,96,139,116,36,80,139,149,233,129,252,248,239,15,135, 244,254,248,4,139,142,233,139,190,233,137,142,233,137,252,254,41,206,15,132, 244,252,141,4,50,193,252,238,3,59,133,233,15,135,244,255,137,213,72,41,205, @@ -165,220 +165,220 @@ static const unsigned char build_actionlist[15828] = { 252,255,252,255,252,255,252,247,198,237,255,15,132,244,13,252,233,244,14, 248,8,199,66,252,252,237,139,142,233,131,252,233,8,137,142,233,72,139,1,72, 137,2,184,237,252,233,244,7,248,9,139,76,36,80,137,185,233,137,252,242,137, - 252,233,232,251,1,0,139,116,36,80,139,149,233,252,233,244,4,248,82,139,106, + 252,233,232,251,1,0,139,116,36,80,139,149,233,252,233,244,4,248,83,139,106, 252,248,139,173,233,139,114,252,252,137,116,36,100,137,108,36,80,72,131,189, - 233,0,15,133,244,59,255,128,189,233,235,15,135,244,59,139,141,233,15,132, - 244,247,59,141,233,15,132,244,59,248,1,141,116,193,252,248,59,181,233,15, - 135,244,59,137,181,233,139,108,36,96,137,149,233,137,149,233,141,108,194, + 233,0,15,133,244,60,255,128,189,233,235,15,135,244,60,139,141,233,15,132, + 244,247,59,141,233,15,132,244,60,248,1,141,116,193,252,248,59,181,233,15, + 135,244,60,137,181,233,139,108,36,96,137,149,233,137,149,233,141,108,194, 252,240,72,41,252,245,57,206,15,132,244,249,248,2,255,72,139,4,46,72,137, 70,252,248,131,252,238,8,57,206,15,133,244,2,248,3,137,202,139,76,36,80,232, - 244,24,199,131,233,237,139,108,36,96,139,116,36,80,139,149,233,129,252,248, + 244,25,199,131,233,237,139,108,36,96,139,116,36,80,139,149,233,129,252,248, 239,15,135,244,254,248,4,139,142,233,139,190,233,137,142,233,137,252,254, 41,206,15,132,244,252,141,4,50,193,252,238,3,59,133,233,15,135,244,255,255, 137,213,72,41,205,248,5,72,139,1,72,137,4,41,131,193,8,57,252,249,15,133, 244,5,248,6,141,70,1,248,7,139,116,36,100,137,68,36,84,49,201,252,247,198, 237,15,132,244,13,252,233,244,14,248,8,137,252,242,137,252,233,232,251,1, 15,248,9,139,76,36,80,137,185,233,137,252,242,137,252,233,232,251,1,0,139, - 116,36,80,139,149,233,252,233,244,4,248,83,139,108,36,96,72,252,247,133,233, - 237,15,132,244,59,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,67,255,248,69,139, - 114,252,252,221,90,252,248,252,233,244,62,255,248,84,129,252,248,239,15,130, - 244,59,255,129,122,253,4,239,15,133,244,248,139,42,131,252,253,0,15,137,244, - 67,252,247,221,15,136,244,247,248,85,248,67,139,114,252,252,199,66,252,252, - 237,137,106,252,248,252,233,244,62,248,1,139,114,252,252,199,66,252,252,0, - 0,224,65,199,66,252,248,0,0,0,0,252,233,244,62,248,2,15,135,244,59,255,129, - 122,253,4,239,15,131,244,59,255,252,242,15,16,2,72,184,237,237,102,72,15, - 110,200,15,84,193,248,68,139,114,252,252,252,242,15,17,66,252,248,255,221, - 2,217,225,248,68,248,69,139,114,252,252,221,90,252,248,255,248,62,184,237, - 248,74,137,68,36,84,248,60,252,247,198,237,15,133,244,253,248,5,56,70,252, + 116,36,80,139,149,233,252,233,244,4,248,84,139,108,36,96,72,252,247,133,233, + 237,15,132,244,60,255,137,149,233,141,68,194,252,248,137,133,233,49,192,72, + 137,133,233,176,235,136,133,233,252,233,244,16,255,248,68,255,248,70,139, + 114,252,252,221,90,252,248,252,233,244,63,255,248,85,129,252,248,239,15,130, + 244,60,255,129,122,253,4,239,15,133,244,248,139,42,131,252,253,0,15,137,244, + 68,252,247,221,15,136,244,247,248,86,248,68,139,114,252,252,199,66,252,252, + 237,137,106,252,248,252,233,244,63,248,1,139,114,252,252,199,66,252,252,0, + 0,224,65,199,66,252,248,0,0,0,0,252,233,244,63,248,2,15,135,244,60,255,129, + 122,253,4,239,15,131,244,60,255,252,242,15,16,2,72,184,237,237,102,72,15, + 110,200,15,84,193,248,69,139,114,252,252,252,242,15,17,66,252,248,255,221, + 2,217,225,248,69,248,70,139,114,252,252,221,90,252,248,255,248,63,184,237, + 248,75,137,68,36,84,248,61,252,247,198,237,15,133,244,253,248,5,56,70,252, 255,15,135,244,252,15,182,78,252,253,72,252,247,209,141,20,202,139,6,15,182, 204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,6,199,68,194,252, 244,237,131,192,1,252,233,244,5,248,7,72,199,193,252,248,252,255,252,255, - 252,255,252,233,244,14,248,86,255,129,122,253,4,239,15,133,244,247,139,42, - 252,233,244,67,248,1,15,135,244,59,255,252,242,15,16,2,232,244,87,255,252, - 242,15,45,232,129,252,253,0,0,0,128,15,133,244,67,252,242,15,42,205,102,15, - 46,193,15,138,244,68,15,132,244,67,255,221,2,232,244,87,255,248,88,255,252, - 242,15,16,2,232,244,89,255,221,2,232,244,89,255,248,90,129,252,248,239,15, - 130,244,59,129,122,253,4,239,15,131,244,59,252,242,15,81,2,252,233,244,68, - 255,248,90,129,252,248,239,15,130,244,59,129,122,253,4,239,15,131,244,59, - 221,2,217,252,250,252,233,244,69,255,248,91,129,252,248,239,15,130,244,59, - 129,122,253,4,239,15,131,244,59,217,252,237,221,2,217,252,241,252,233,244, - 69,248,92,129,252,248,239,15,130,244,59,129,122,253,4,239,15,131,244,59,217, - 252,236,221,2,217,252,241,252,233,244,69,248,93,129,252,248,239,255,15,130, - 244,59,129,122,253,4,239,15,131,244,59,221,2,232,244,94,252,233,244,69,248, - 95,129,252,248,239,15,130,244,59,129,122,253,4,239,15,131,244,59,221,2,217, - 252,254,252,233,244,69,248,96,129,252,248,239,255,15,130,244,59,129,122,253, - 4,239,15,131,244,59,221,2,217,252,255,252,233,244,69,248,97,129,252,248,239, - 15,130,244,59,129,122,253,4,239,15,131,244,59,221,2,217,252,242,221,216,252, - 233,244,69,248,98,129,252,248,239,15,130,244,59,255,129,122,253,4,239,15, - 131,244,59,221,2,217,192,216,200,217,232,222,225,217,252,250,217,252,243, - 252,233,244,69,248,99,129,252,248,239,15,130,244,59,129,122,253,4,239,15, - 131,244,59,221,2,217,192,216,200,217,232,222,225,217,252,250,217,201,217, - 252,243,252,233,244,69,248,100,129,252,248,239,15,130,244,59,129,122,253, - 4,239,15,131,244,59,255,221,2,217,232,217,252,243,252,233,244,69,255,248, - 101,129,252,248,239,15,130,244,59,129,122,253,4,239,15,131,244,59,252,242, - 15,16,2,255,137,213,232,251,1,16,137,252,234,252,233,244,68,255,248,102,129, - 252,248,239,15,130,244,59,129,122,253,4,239,15,131,244,59,252,242,15,16,2, - 255,137,213,232,251,1,17,137,252,234,252,233,244,68,255,248,103,129,252,248, - 239,15,130,244,59,129,122,253,4,239,15,131,244,59,252,242,15,16,2,255,137, - 213,232,251,1,18,137,252,234,252,233,244,68,248,104,255,248,105,129,252,248, - 239,15,130,244,59,129,122,253,4,239,15,131,244,59,252,242,15,16,2,139,106, - 252,248,252,242,15,89,133,233,252,233,244,68,255,248,105,129,252,248,239, - 15,130,244,59,129,122,253,4,239,15,131,244,59,221,2,139,106,252,248,220,141, - 233,252,233,244,69,255,248,106,129,252,248,239,15,130,244,59,129,122,253, - 4,239,15,131,244,59,129,122,253,12,239,15,131,244,59,221,2,221,66,8,217,252, - 243,252,233,244,69,248,107,129,252,248,239,15,130,244,59,129,122,253,4,239, - 15,131,244,59,129,122,253,12,239,255,15,131,244,59,221,66,8,221,2,217,252, - 253,221,217,252,233,244,69,248,108,129,252,248,239,15,130,244,59,139,106, - 4,129,252,253,239,15,131,244,59,139,114,252,252,139,2,137,106,252,252,137, + 252,255,252,233,244,14,248,87,255,129,122,253,4,239,15,133,244,247,139,42, + 252,233,244,68,248,1,15,135,244,60,255,252,242,15,16,2,232,244,88,255,252, + 242,15,45,232,129,252,253,0,0,0,128,15,133,244,68,252,242,15,42,205,102,15, + 46,193,15,138,244,69,15,132,244,68,255,221,2,232,244,88,255,248,89,255,252, + 242,15,16,2,232,244,90,255,221,2,232,244,90,255,248,91,129,252,248,239,15, + 130,244,60,129,122,253,4,239,15,131,244,60,252,242,15,81,2,252,233,244,69, + 255,248,91,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131,244,60, + 221,2,217,252,250,252,233,244,70,255,248,92,129,252,248,239,15,130,244,60, + 129,122,253,4,239,15,131,244,60,217,252,237,221,2,217,252,241,252,233,244, + 70,248,93,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131,244,60,217, + 252,236,221,2,217,252,241,252,233,244,70,248,94,129,252,248,239,255,15,130, + 244,60,129,122,253,4,239,15,131,244,60,221,2,232,244,95,252,233,244,70,248, + 96,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131,244,60,221,2,217, + 252,254,252,233,244,70,248,97,129,252,248,239,255,15,130,244,60,129,122,253, + 4,239,15,131,244,60,221,2,217,252,255,252,233,244,70,248,98,129,252,248,239, + 15,130,244,60,129,122,253,4,239,15,131,244,60,221,2,217,252,242,221,216,252, + 233,244,70,248,99,129,252,248,239,15,130,244,60,255,129,122,253,4,239,15, + 131,244,60,221,2,217,192,216,200,217,232,222,225,217,252,250,217,252,243, + 252,233,244,70,248,100,129,252,248,239,15,130,244,60,129,122,253,4,239,15, + 131,244,60,221,2,217,192,216,200,217,232,222,225,217,252,250,217,201,217, + 252,243,252,233,244,70,248,101,129,252,248,239,15,130,244,60,129,122,253, + 4,239,15,131,244,60,255,221,2,217,232,217,252,243,252,233,244,70,255,248, + 102,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131,244,60,252,242, + 15,16,2,255,137,213,232,251,1,16,137,252,234,252,233,244,69,255,248,103,129, + 252,248,239,15,130,244,60,129,122,253,4,239,15,131,244,60,252,242,15,16,2, + 255,137,213,232,251,1,17,137,252,234,252,233,244,69,255,248,104,129,252,248, + 239,15,130,244,60,129,122,253,4,239,15,131,244,60,252,242,15,16,2,255,137, + 213,232,251,1,18,137,252,234,252,233,244,69,248,105,255,248,106,129,252,248, + 239,15,130,244,60,129,122,253,4,239,15,131,244,60,252,242,15,16,2,139,106, + 252,248,252,242,15,89,133,233,252,233,244,69,255,248,106,129,252,248,239, + 15,130,244,60,129,122,253,4,239,15,131,244,60,221,2,139,106,252,248,220,141, + 233,252,233,244,70,255,248,107,129,252,248,239,15,130,244,60,129,122,253, + 4,239,15,131,244,60,129,122,253,12,239,15,131,244,60,221,2,221,66,8,217,252, + 243,252,233,244,70,248,108,129,252,248,239,15,130,244,60,129,122,253,4,239, + 15,131,244,60,129,122,253,12,239,255,15,131,244,60,221,66,8,221,2,217,252, + 253,221,217,252,233,244,70,248,109,129,252,248,239,15,130,244,60,139,106, + 4,129,252,253,239,15,131,244,60,139,114,252,252,139,2,137,106,252,252,137, 66,252,248,209,229,129,252,253,0,0,224,252,255,15,131,244,249,9,232,15,132, 244,249,184,252,254,3,0,0,129,252,253,0,0,32,0,15,130,244,250,248,1,193,252, 237,21,41,197,255,252,242,15,42,197,255,137,108,36,80,219,68,36,80,255,139, 106,252,252,129,229,252,255,252,255,15,128,129,205,0,0,224,63,137,106,252, - 252,248,2,255,252,242,15,17,2,255,221,26,255,184,237,252,233,244,74,248,3, + 252,248,2,255,252,242,15,17,2,255,221,26,255,184,237,252,233,244,75,248,3, 255,15,87,192,252,233,244,2,255,217,252,238,252,233,244,2,255,248,4,255,252, 242,15,16,2,72,189,237,237,102,72,15,110,205,252,242,15,89,193,252,242,15, 17,66,252,248,255,221,2,199,68,36,80,0,0,128,90,216,76,36,80,221,90,252,248, - 255,139,106,252,252,184,52,4,0,0,209,229,252,233,244,1,255,248,109,129,252, - 248,239,15,130,244,59,129,122,253,4,239,15,131,244,59,252,242,15,16,2,255, - 248,109,129,252,248,239,15,130,244,59,129,122,253,4,239,15,131,244,59,221, + 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,114,252,252,209,229,129,252,253,0,0,224,252,255,15,132, - 244,250,255,15,40,224,232,244,110,252,242,15,92,224,248,1,252,242,15,17,66, - 252,248,252,242,15,17,34,255,217,192,232,244,110,220,252,233,248,1,221,90, + 244,250,255,15,40,224,232,244,111,252,242,15,92,224,248,1,252,242,15,17,66, + 252,248,252,242,15,17,34,255,217,192,232,244,111,220,252,233,248,1,221,90, 252,248,221,26,255,139,66,252,252,139,106,4,49,232,15,136,244,249,248,2,184, - 237,252,233,244,74,248,3,129,252,245,0,0,0,128,137,106,4,252,233,244,2,248, + 237,252,233,244,75,248,3,129,252,245,0,0,0,128,137,106,4,252,233,244,2,248, 4,255,15,87,228,252,233,244,1,255,217,252,238,217,201,252,233,244,1,255,248, - 111,129,252,248,239,15,130,244,59,129,122,253,4,239,15,131,244,59,129,122, - 253,12,239,15,131,244,59,221,66,8,221,2,248,1,217,252,248,223,224,158,15, - 138,244,1,221,217,252,233,244,69,255,248,112,129,252,248,239,15,130,244,59, - 129,122,253,4,239,15,131,244,59,129,122,253,12,239,15,131,244,59,252,242, - 15,16,2,252,242,15,16,74,8,232,244,113,252,233,244,68,255,248,112,129,252, - 248,239,15,130,244,59,129,122,253,4,239,15,131,244,59,129,122,253,12,239, - 15,131,244,59,221,2,221,66,8,232,244,113,252,233,244,69,255,248,114,185,2, + 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, - 67,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,59,255,252,233,244,252, - 248,4,15,135,244,59,255,252,242,15,16,2,248,5,57,193,15,131,244,68,129,124, - 253,202,252,252,239,255,15,130,244,252,15,135,244,59,252,242,15,42,76,202, + 68,129,124,253,202,252,252,239,15,133,244,249,59,108,202,252,248,15,79,108, + 202,252,248,131,193,1,252,233,244,1,248,3,15,135,244,60,255,252,233,244,252, + 248,4,15,135,244,60,255,252,242,15,16,2,248,5,57,193,15,131,244,69,129,124, + 253,202,252,252,239,255,15,130,244,252,15,135,244,60,252,242,15,42,76,202, 252,248,252,233,244,253,255,248,6,252,242,15,16,76,202,252,248,248,7,252, - 242,15,93,193,131,193,1,252,233,244,5,255,248,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,67,129,124,253,202, + 242,15,93,193,131,193,1,252,233,244,5,255,248,116,185,2,0,0,0,129,122,253, + 4,239,255,15,133,244,250,139,42,248,1,57,193,15,131,244,68,129,124,253,202, 252,252,239,15,133,244,249,59,108,202,252,248,15,76,108,202,252,248,131,193, - 1,252,233,244,1,248,3,15,135,244,59,255,248,6,252,242,15,16,76,202,252,248, + 1,252,233,244,1,248,3,15,135,244,60,255,248,6,252,242,15,16,76,202,252,248, 248,7,252,242,15,95,193,131,193,1,252,233,244,5,255,248,9,221,216,252,233, - 244,59,255,248,116,129,252,248,239,15,130,244,59,129,122,253,4,239,15,133, - 244,59,139,42,255,139,173,233,252,233,244,67,255,252,242,15,42,133,233,252, - 233,244,68,255,219,133,233,252,233,244,69,255,248,117,129,252,248,239,15, - 133,244,59,129,122,253,4,239,15,133,244,59,139,42,139,114,252,252,131,189, - 233,1,15,130,244,77,15,182,173,233,255,252,242,15,42,197,252,233,244,68,255, - 137,108,36,80,219,68,36,80,252,233,244,69,255,248,118,139,171,233,59,171, - 233,15,130,244,247,232,244,71,248,1,129,252,248,239,15,133,244,59,129,122, - 253,4,239,255,15,133,244,59,139,42,129,252,253,252,255,0,0,0,15,135,244,59, - 137,108,36,84,255,15,131,244,59,252,242,15,44,42,129,252,253,252,255,0,0, - 0,15,135,244,59,137,108,36,84,255,15,131,244,59,221,2,219,92,36,84,129,124, - 36,84,252,255,0,0,0,15,135,244,59,255,199,68,36,32,1,0,0,0,72,141,68,36,84, - 248,119,139,108,36,96,137,149,233,68,139,68,36,32,72,137,194,137,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,114,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,108,36,80,219,68,36,80,252,233,244,70,255,248,119,139,171,233,59,171, + 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,84,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,84,255,15,131,244,60,221,2,219,92,36,84,129,124, + 36,84,252,255,0,0,0,15,135,244,60,255,199,68,36,32,1,0,0,0,72,141,68,36,84, + 248,120,139,108,36,96,137,149,233,68,139,68,36,32,72,137,194,137,252,233, 137,116,36,100,232,251,1,19,139,149,233,139,114,252,252,199,66,252,252,237, - 137,66,252,248,252,233,244,62,248,120,139,171,233,59,171,233,15,130,244,247, - 232,244,71,248,1,199,68,36,84,252,255,252,255,252,255,252,255,129,252,248, - 239,15,130,244,59,15,134,244,247,129,122,253,20,239,255,15,133,244,59,139, - 106,16,137,108,36,84,255,15,131,244,59,252,242,15,44,106,16,137,108,36,84, - 255,15,131,244,59,221,66,16,219,92,36,84,255,248,1,129,122,253,4,239,15,133, - 244,59,129,122,253,12,239,255,139,42,137,108,36,32,139,173,233,255,139,74, + 137,66,252,248,252,233,244,63,248,121,139,171,233,59,171,233,15,130,244,247, + 232,244,72,248,1,199,68,36,84,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,84,255,15,131,244,60,252,242,15,44,106,16,137,108,36,84, + 255,15,131,244,60,221,66,16,219,92,36,84,255,248,1,129,122,253,4,239,15,133, + 244,60,129,122,253,12,239,255,139,42,137,108,36,32,139,173,233,255,139,74, 8,255,252,242,15,44,74,8,255,139,68,36,84,57,197,15,130,244,251,248,2,133, - 201,15,142,244,253,248,3,139,108,36,32,41,200,15,140,244,121,141,172,253, - 13,233,131,192,1,248,4,137,68,36,32,137,232,252,233,244,119,248,5,15,140, + 201,15,142,244,253,248,3,139,108,36,32,41,200,15,140,244,122,141,172,253, + 13,233,131,192,1,248,4,137,68,36,32,137,232,252,233,244,120,248,5,15,140, 244,252,141,68,40,1,252,233,244,2,248,6,137,232,252,233,244,2,248,7,255,15, 132,244,254,1,252,233,131,193,1,15,143,244,3,248,8,185,1,0,0,0,252,233,244, - 3,248,121,49,192,252,233,244,4,248,122,129,252,248,239,15,130,244,59,139, - 171,233,59,171,233,15,130,244,247,232,244,71,248,1,255,129,122,253,4,239, - 15,133,244,59,129,122,253,12,239,139,42,255,15,133,244,59,139,66,8,255,15, - 131,244,59,252,242,15,44,66,8,255,15,131,244,59,221,66,8,219,92,36,84,139, - 68,36,84,255,133,192,15,142,244,121,131,189,233,1,15,130,244,121,15,133,244, - 123,57,131,233,15,130,244,123,15,182,141,233,139,171,233,137,68,36,32,248, - 1,136,77,0,131,197,1,131,232,1,15,133,244,1,139,131,233,252,233,244,119,248, - 124,129,252,248,239,255,15,130,244,59,139,171,233,59,171,233,15,130,244,247, - 232,244,71,248,1,129,122,253,4,239,15,133,244,59,139,42,139,133,233,133,192, - 15,132,244,121,57,131,233,15,130,244,125,129,197,239,137,116,36,84,137,68, + 3,248,122,49,192,252,233,244,4,248,123,129,252,248,239,15,130,244,60,139, + 171,233,59,171,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,84,139, + 68,36,84,255,133,192,15,142,244,122,131,189,233,1,15,130,244,122,15,133,244, + 124,57,131,233,15,130,244,124,15,182,141,233,139,171,233,137,68,36,32,248, + 1,136,77,0,131,197,1,131,232,1,15,133,244,1,139,131,233,252,233,244,120,248, + 125,129,252,248,239,255,15,130,244,60,139,171,233,59,171,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,57,131,233,15,130,244,126,129,197,239,137,116,36,84,137,68, 36,32,139,179,233,248,1,255,15,182,77,0,131,197,1,131,232,1,136,12,6,15,133, - 244,1,137,252,240,139,116,36,84,252,233,244,119,248,126,129,252,248,239,15, - 130,244,59,139,171,233,59,171,233,15,130,244,247,232,244,71,248,1,129,122, - 253,4,239,15,133,244,59,139,42,139,133,233,57,131,233,255,15,130,244,125, + 244,1,137,252,240,139,116,36,84,252,233,244,120,248,127,129,252,248,239,15, + 130,244,60,139,171,233,59,171,233,15,130,244,247,232,244,72,248,1,129,122, + 253,4,239,15,133,244,60,139,42,139,133,233,57,131,233,255,15,130,244,126, 129,197,239,137,116,36,84,137,68,36,32,139,179,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,6,248,3,131,232,1,15,137,244,1,137,252,240,139, - 116,36,84,252,233,244,119,248,127,129,252,248,239,15,130,244,59,255,139,171, - 233,59,171,233,15,130,244,247,232,244,71,248,1,129,122,253,4,239,15,133,244, - 59,139,42,139,133,233,57,131,233,15,130,244,125,129,197,239,137,116,36,84, + 116,36,84,252,233,244,120,248,128,129,252,248,239,15,130,244,60,255,139,171, + 233,59,171,233,15,130,244,247,232,244,72,248,1,129,122,253,4,239,15,133,244, + 60,139,42,139,133,233,57,131,233,15,130,244,126,129,197,239,137,116,36,84, 137,68,36,32,139,179,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,6,248,3,131,232,1,15,137,244,1,137,252,240,139,116,36,84,252,233,244, - 119,248,128,129,252,248,239,15,130,244,59,129,122,253,4,239,15,133,244,59, - 137,213,139,10,232,251,1,20,137,252,234,255,137,197,252,233,244,67,255,252, - 242,15,42,192,252,233,244,68,255,248,129,129,122,253,4,239,255,15,133,244, - 247,139,42,252,233,244,85,248,1,15,135,244,59,255,252,242,15,16,2,72,189, + 120,248,129,129,252,248,239,15,130,244,60,129,122,253,4,239,15,133,244,60, + 137,213,139,10,232,251,1,20,137,252,234,255,137,197,252,233,244,68,255,252, + 242,15,42,192,252,233,244,69,255,248,130,129,122,253,4,239,255,15,133,244, + 247,139,42,252,233,244,86,248,1,15,135,244,60,255,252,242,15,16,2,72,189, 237,237,102,72,15,110,205,252,242,15,88,193,102,15,126,197,255,252,233,244, - 85,255,248,130,255,72,189,237,237,102,72,15,110,205,255,199,68,36,80,0,0, - 192,89,255,15,133,244,247,139,42,252,233,244,248,248,1,15,135,244,59,255, + 86,255,248,131,255,72,189,237,237,102,72,15,110,205,255,199,68,36,80,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,84,141, - 68,194,252,240,248,1,57,208,15,134,244,85,129,120,253,4,239,255,15,133,244, - 248,35,40,131,232,8,252,233,244,1,248,2,15,135,244,131,255,15,131,244,131, + 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,132,255,15,133,244,248,11,40,131,232,8,252,233,244,1,248, - 2,15,135,244,131,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,133,255,15,133,244,248,51,40,131,232,8,252, - 233,244,1,248,2,15,135,244,131,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,134,129,122,253,4,239,255, - 248,2,15,205,252,233,244,85,248,135,129,122,253,4,239,255,248,2,252,247,213, - 255,248,85,252,242,15,42,197,252,233,244,68,255,248,131,139,68,36,84,252, - 233,244,59,255,248,136,129,122,253,4,239,255,248,2,129,122,253,12,239,15, - 133,244,59,139,74,8,255,248,136,129,252,248,239,15,130,244,59,129,122,253, - 4,239,15,131,244,59,129,122,253,12,239,15,131,244,59,252,242,15,16,2,252, + 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,84,252, + 233,244,60,255,248,137,129,122,253,4,239,255,248,2,129,122,253,12,239,15, + 133,244,60,139,74,8,255,248,137,129,252,248,239,15,130,244,60,129,122,253, + 4,239,15,131,244,60,129,122,253,12,239,15,131,244,60,252,242,15,16,2,252, 242,15,16,74,8,72,189,237,237,102,72,15,110,213,252,242,15,88,194,252,242, - 15,88,202,102,15,126,197,102,15,126,201,255,211,229,252,233,244,85,255,248, - 137,129,122,253,4,239,255,248,137,129,252,248,239,15,130,244,59,129,122,253, - 4,239,15,131,244,59,129,122,253,12,239,15,131,244,59,252,242,15,16,2,252, + 15,88,202,102,15,126,197,102,15,126,201,255,211,229,252,233,244,86,255,248, + 138,129,122,253,4,239,255,248,138,129,252,248,239,15,130,244,60,129,122,253, + 4,239,15,131,244,60,129,122,253,12,239,15,131,244,60,252,242,15,16,2,252, 242,15,16,74,8,72,189,237,237,102,72,15,110,213,252,242,15,88,194,252,242, - 15,88,202,102,15,126,197,102,15,126,201,255,211,252,237,252,233,244,85,255, - 248,138,129,122,253,4,239,255,248,138,129,252,248,239,15,130,244,59,129,122, - 253,4,239,15,131,244,59,129,122,253,12,239,15,131,244,59,252,242,15,16,2, + 15,88,202,102,15,126,197,102,15,126,201,255,211,252,237,252,233,244,86,255, + 248,139,129,122,253,4,239,255,248,139,129,252,248,239,15,130,244,60,129,122, + 253,4,239,15,131,244,60,129,122,253,12,239,15,131,244,60,252,242,15,16,2, 252,242,15,16,74,8,72,189,237,237,102,72,15,110,213,252,242,15,88,194,252, - 242,15,88,202,102,15,126,197,102,15,126,201,255,211,252,253,252,233,244,85, - 255,248,139,129,122,253,4,239,255,248,139,129,252,248,239,15,130,244,59,129, - 122,253,4,239,15,131,244,59,129,122,253,12,239,15,131,244,59,252,242,15,16, + 242,15,88,202,102,15,126,197,102,15,126,201,255,211,252,253,252,233,244,86, + 255,248,140,129,122,253,4,239,255,248,140,129,252,248,239,15,130,244,60,129, + 122,253,4,239,15,131,244,60,129,122,253,12,239,15,131,244,60,252,242,15,16, 2,252,242,15,16,74,8,72,189,237,237,102,72,15,110,213,252,242,15,88,194,252, - 242,15,88,202,102,15,126,197,102,15,126,201,255,211,197,252,233,244,85,255, - 248,140,129,122,253,4,239,255,248,140,129,252,248,239,15,130,244,59,129,122, - 253,4,239,15,131,244,59,129,122,253,12,239,15,131,244,59,252,242,15,16,2, + 242,15,88,202,102,15,126,197,102,15,126,201,255,211,197,252,233,244,86,255, + 248,141,129,122,253,4,239,255,248,141,129,252,248,239,15,130,244,60,129,122, + 253,4,239,15,131,244,60,129,122,253,12,239,15,131,244,60,252,242,15,16,2, 252,242,15,16,74,8,72,189,237,237,102,72,15,110,213,252,242,15,88,194,252, - 242,15,88,202,102,15,126,197,102,15,126,201,255,211,205,252,233,244,85,248, - 123,184,237,252,233,244,59,248,125,184,237,248,59,139,108,36,96,139,114,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,96,139,114,252, 252,137,116,36,100,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,233,252,255,144,233,139, - 149,233,133,192,15,143,244,74,248,1,255,139,141,233,41,209,193,252,233,3, + 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,181,233,139,14,15,182, 252,233,15,182,205,131,198,4,252,255,36,252,235,248,2,137,209,252,247,198, 237,15,133,244,249,15,182,110,252,253,72,252,247,213,141,20,252,234,252,233, - 244,27,248,3,137,252,245,131,229,252,248,41,252,234,252,233,244,27,248,5, - 186,237,137,252,233,232,251,1,0,139,149,233,49,192,252,233,244,1,248,71,93, + 244,28,248,3,137,252,245,131,229,252,248,41,252,234,252,233,244,28,248,5, + 186,237,137,252,233,232,251,1,0,139,149,233,49,192,252,233,244,1,248,72,93, 72,137,108,36,32,139,108,36,96,137,116,36,100,137,149,233,255,141,68,194, 252,248,137,252,233,137,133,233,232,251,1,21,139,149,233,139,133,233,41,208, - 193,232,3,131,192,1,72,139,108,36,32,85,195,248,141,255,15,182,131,233,168, + 193,232,3,131,192,1,72,139,108,36,32,85,195,248,142,255,15,182,131,233,168, 235,15,133,244,251,168,235,15,133,244,247,168,235,15,132,244,247,252,255, - 139,233,252,233,244,247,255,248,142,15,182,131,233,168,235,15,133,244,251, - 252,233,244,247,248,143,15,182,131,233,168,235,15,133,244,251,168,235,15, + 139,233,252,233,244,247,255,248,143,15,182,131,233,168,235,15,133,244,251, + 252,233,244,247,248,144,15,182,131,233,168,235,15,133,244,251,168,235,15, 132,244,251,252,255,139,233,15,132,244,247,168,235,15,132,244,251,248,1,255, 139,108,36,96,137,149,233,137,252,242,137,252,233,232,251,1,22,248,3,139, 149,233,248,4,15,182,78,252,253,248,5,15,182,110,252,252,15,183,70,252,254, - 252,255,164,253,252,235,233,248,144,131,198,4,139,77,232,137,76,36,84,252, - 233,244,4,248,145,255,139,106,252,248,139,173,233,15,182,133,233,141,4,194, + 252,255,164,253,252,235,233,248,145,131,198,4,139,77,232,137,76,36,84,252, + 233,244,4,248,146,255,139,106,252,248,139,173,233,15,182,133,233,141,4,194, 139,108,36,96,137,149,233,137,133,233,137,252,242,141,139,233,72,137,171, - 233,137,116,36,100,232,251,1,23,252,233,244,3,255,248,146,137,116,36,100, - 255,248,147,255,137,116,36,100,131,206,1,248,1,255,141,68,194,252,248,139, + 233,137,116,36,100,232,251,1,23,252,233,244,3,255,248,147,137,116,36,100, + 255,248,148,255,137,116,36,100,131,206,1,248,1,255,141,68,194,252,248,139, 108,36,96,137,149,233,137,133,233,137,252,242,137,252,233,232,251,1,24,199, 68,36,100,0,0,0,0,255,131,230,252,254,255,139,149,233,72,137,193,139,133, 233,41,208,72,137,205,15,182,78,252,253,193,232,3,131,192,1,252,255,229,248, - 148,255,65,85,65,84,65,83,65,82,65,81,65,80,87,86,85,72,141,108,36,88,85, + 149,255,65,85,65,84,65,83,65,82,65,81,65,80,87,86,85,72,141,108,36,88,85, 83,82,81,80,15,182,69,252,248,138,101,252,240,76,137,125,252,248,76,137,117, 252,240,139,93,0,139,139,233,199,131,233,237,137,131,233,137,139,233,72,129, 252,236,239,72,131,197,128,252,242,68,15,17,125,252,248,252,242,68,15,17, @@ -389,7 +389,7 @@ static const unsigned char build_actionlist[15828] = { 17,77,136,252,242,15,17,69,128,139,171,233,139,147,233,72,137,171,233,199, 131,233,0,0,0,0,137,149,233,72,141,148,253,36,233,141,139,233,232,251,1,25, 72,139,141,233,72,129,225,239,137,169,233,139,149,233,139,177,233,252,233, - 244,247,255,248,149,255,72,141,140,253,36,233,248,1,102,68,15,111,185,233, + 244,247,255,248,150,255,72,141,140,253,36,233,248,1,102,68,15,111,185,233, 102,68,15,111,177,233,102,68,15,111,169,233,102,68,15,111,161,233,102,68, 15,111,153,233,102,68,15,111,145,233,102,68,15,111,137,233,102,68,15,111, 129,233,102,15,111,185,233,72,137,204,102,15,111,49,76,139,124,36,16,76,139, @@ -397,25 +397,25 @@ static const unsigned char build_actionlist[15828] = { 36,84,139,122,252,248,139,191,233,139,191,233,199,131,233,0,0,0,0,199,131, 233,237,139,6,15,182,204,15,182,232,131,198,4,193,232,16,129,252,253,239, 15,130,244,248,255,139,68,36,84,248,2,252,255,36,252,235,248,3,252,247,216, - 137,252,233,137,194,232,251,1,26,255,248,87,255,217,124,36,4,137,68,36,8, + 137,252,233,137,194,232,251,1,26,255,248,88,255,217,124,36,4,137,68,36,8, 102,184,0,4,102,11,68,36,4,102,37,252,255,252,247,102,137,68,36,6,217,108, - 36,6,217,252,252,217,108,36,4,139,68,36,8,195,255,248,150,72,184,237,237, + 36,6,217,252,252,217,108,36,4,139,68,36,8,195,255,248,151,72,184,237,237, 102,72,15,110,208,72,184,237,237,102,72,15,110,216,15,40,200,102,15,84,202, 102,15,46,217,15,134,244,247,102,15,85,208,252,242,15,88,203,252,242,15,92, 203,102,15,86,202,72,184,237,237,102,72,15,110,208,252,242,15,194,193,1,102, - 15,84,194,252,242,15,92,200,15,40,193,248,1,195,248,89,255,217,124,36,4,137, + 15,84,194,252,242,15,92,200,15,40,193,248,1,195,248,90,255,217,124,36,4,137, 68,36,8,102,184,0,8,102,11,68,36,4,102,37,252,255,252,251,102,137,68,36,6, - 217,108,36,6,217,252,252,217,108,36,4,139,68,36,8,195,255,248,151,72,184, + 217,108,36,6,217,252,252,217,108,36,4,139,68,36,8,195,255,248,152,72,184, 237,237,102,72,15,110,208,72,184,237,237,102,72,15,110,216,15,40,200,102, 15,84,202,102,15,46,217,15,134,244,247,102,15,85,208,252,242,15,88,203,252, 242,15,92,203,102,15,86,202,72,184,237,237,102,72,15,110,208,252,242,15,194, - 193,6,102,15,84,194,252,242,15,92,200,15,40,193,248,1,195,248,110,255,217, + 193,6,102,15,84,194,252,242,15,92,200,15,40,193,248,1,195,248,111,255,217, 124,36,4,137,68,36,8,102,184,0,12,102,11,68,36,4,102,137,68,36,6,217,108, - 36,6,217,252,252,217,108,36,4,139,68,36,8,195,255,248,152,72,184,237,237, + 36,6,217,252,252,217,108,36,4,139,68,36,8,195,255,248,153,72,184,237,237, 102,72,15,110,208,72,184,237,237,102,72,15,110,216,15,40,200,102,15,84,202, 102,15,46,217,15,134,244,247,102,15,85,208,15,40,193,252,242,15,88,203,252, 242,15,92,203,72,184,237,237,102,72,15,110,216,252,242,15,194,193,1,102,15, - 84,195,252,242,15,92,200,102,15,86,202,15,40,193,248,1,195,248,153,255,15, + 84,195,252,242,15,92,200,102,15,86,202,15,40,193,248,1,195,248,154,255,15, 40,232,252,242,15,94,193,72,184,237,237,102,72,15,110,208,72,184,237,237, 102,72,15,110,216,15,40,224,102,15,84,226,102,15,46,220,15,134,244,247,102, 15,85,208,252,242,15,88,227,252,242,15,92,227,102,15,86,226,72,184,237,237, @@ -423,12 +423,12 @@ static const unsigned char build_actionlist[15828] = { 40,197,252,242,15,89,204,252,242,15,92,193,195,248,1,252,242,15,89,200,15, 40,197,252,242,15,92,193,195,255,217,193,216,252,241,217,124,36,4,102,184, 0,4,102,11,68,36,4,102,37,252,255,252,247,102,137,68,36,6,217,108,36,6,217, - 252,252,217,108,36,4,222,201,222,252,233,195,255,248,94,217,252,234,222,201, - 248,154,217,84,36,8,129,124,36,8,0,0,128,127,15,132,244,247,129,124,36,8, - 0,0,128,252,255,15,132,244,248,248,155,217,192,217,252,252,220,252,233,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,8,129,124,36,8,0,0,128,127,15,132,244,247,129,124,36,8, + 0,0,128,252,255,15,132,244,248,248,156,217,192,217,252,252,220,252,233,217, 201,217,252,240,217,232,222,193,217,252,253,221,217,248,1,195,248,2,221,216, - 217,252,238,195,255,248,113,255,248,156,252,242,15,45,193,252,242,15,42,208, - 102,15,46,202,15,133,244,254,15,138,244,255,248,157,131,252,248,1,15,142, + 217,252,238,195,255,248,114,255,248,157,252,242,15,45,193,252,242,15,42,208, + 102,15,46,202,15,133,244,254,15,138,244,255,248,158,131,252,248,1,15,142, 244,252,248,1,169,1,0,0,0,15,133,244,248,252,242,15,89,192,209,232,252,233, 244,1,248,2,209,232,15,132,244,251,15,40,200,248,3,252,242,15,89,192,209, 232,15,132,244,250,15,131,244,3,255,252,242,15,89,200,252,233,244,3,248,4, @@ -445,27 +445,27 @@ static const unsigned char build_actionlist[15828] = { 15,110,208,102,15,46,194,15,132,244,1,102,15,80,193,15,87,192,136,196,15, 146,208,48,224,15,133,244,1,248,3,72,184,237,237,255,102,72,15,110,192,195, 248,4,102,15,80,193,133,192,15,133,244,3,15,87,192,195,248,5,102,15,80,193, - 133,192,15,132,244,3,15,87,192,195,248,158,255,131,252,250,1,15,130,244,87, - 15,132,244,89,131,252,250,3,15,130,244,110,15,135,244,248,252,242,15,81,192, + 133,192,15,132,244,3,15,87,192,195,248,159,255,131,252,250,1,15,130,244,88, + 15,132,244,90,131,252,250,3,15,130,244,111,15,135,244,248,252,242,15,81,192, 195,248,2,252,242,15,17,68,36,8,221,68,36,8,131,252,250,5,15,135,244,248, - 88,15,132,244,247,232,244,94,80,252,233,244,253,248,1,232,244,154,255,80, + 88,15,132,244,247,232,244,95,80,252,233,244,253,248,1,232,244,155,255,80, 252,233,244,253,248,2,131,252,250,7,15,132,244,247,15,135,244,248,217,252, 237,217,201,217,252,241,252,233,244,253,248,1,217,232,217,201,217,252,241, 252,233,244,253,248,2,131,252,250,9,15,132,244,247,15,135,244,248,217,252, 236,217,201,217,252,241,252,233,244,253,248,1,255,217,252,254,252,233,244, 253,248,2,131,252,250,11,15,132,244,247,15,135,244,255,217,252,255,252,233, 244,253,248,1,217,252,242,221,216,248,7,221,92,36,8,252,242,15,16,68,36,8, - 195,255,139,84,36,12,221,68,36,4,131,252,250,1,15,130,244,87,15,132,244,89, - 131,252,250,3,15,130,244,110,15,135,244,248,217,252,250,195,248,2,131,252, - 250,5,15,130,244,94,15,132,244,154,131,252,250,7,15,132,244,247,15,135,244, + 195,255,139,84,36,12,221,68,36,4,131,252,250,1,15,130,244,88,15,132,244,90, + 131,252,250,3,15,130,244,111,15,135,244,248,217,252,250,195,248,2,131,252, + 250,5,15,130,244,95,15,132,244,155,131,252,250,7,15,132,244,247,15,135,244, 248,217,252,237,217,201,217,252,241,195,248,1,217,232,217,201,217,252,241, 195,248,2,131,252,250,9,15,132,244,247,255,15,135,244,248,217,252,236,217, 201,217,252,241,195,248,1,217,252,254,195,248,2,131,252,250,11,15,132,244, 247,15,135,244,255,217,252,255,195,248,1,217,252,242,221,216,195,255,248, - 9,204,255,248,159,255,65,131,252,248,1,15,132,244,247,15,135,244,248,252, + 9,204,255,248,160,255,65,131,252,248,1,15,132,244,247,15,135,244,248,252, 242,15,88,193,195,248,1,252,242,15,92,193,195,248,2,65,131,252,248,3,15,132, 244,247,15,135,244,248,252,242,15,89,193,195,248,1,252,242,15,94,193,195, - 248,2,65,131,252,248,5,15,130,244,153,15,132,244,113,65,131,252,248,7,15, + 248,2,65,131,252,248,5,15,130,244,154,15,132,244,114,65,131,252,248,7,15, 132,244,247,15,135,244,248,72,184,237,237,255,102,72,15,110,200,15,87,193, 195,248,1,72,184,237,237,102,72,15,110,200,15,84,193,195,248,2,65,131,252, 248,9,15,135,244,248,252,242,15,17,68,36,8,252,242,15,17,76,36,16,221,68, @@ -475,31 +475,31 @@ static const unsigned char build_actionlist[15828] = { 242,15,95,193,195,248,9,204,255,139,68,36,20,221,68,36,4,221,68,36,12,131, 252,248,1,15,132,244,247,15,135,244,248,222,193,195,248,1,222,252,233,195, 248,2,131,252,248,3,15,132,244,247,15,135,244,248,222,201,195,248,1,222,252, - 249,195,248,2,131,252,248,5,15,130,244,153,15,132,244,113,131,252,248,7,15, + 249,195,248,2,131,252,248,5,15,130,244,154,15,132,244,114,131,252,248,7,15, 132,244,247,15,135,244,248,255,221,216,217,224,195,248,1,221,216,217,225, 195,248,2,131,252,248,9,15,132,244,247,15,135,244,248,217,252,243,195,248, 1,217,201,217,252,253,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,160,137,200,86,72,137,214,83,15,162,137,6,137,94, - 4,137,78,8,137,86,12,91,94,195,248,161,255,85,72,137,229,83,72,137,203,139, + 248,2,221,216,195,255,248,161,137,200,86,72,137,214,83,15,162,137,6,137,94, + 4,137,78,8,137,86,12,91,94,195,248,162,255,85,72,137,229,83,72,137,203,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,139,233,72,139,147,233,76,139,131,233,76,139,139, 233,133,192,15,132,244,251,15,40,131,233,15,40,139,233,15,40,147,233,15,40, 155,233,248,5,255,252,255,147,233,72,137,131,233,15,41,131,233,255,72,139, - 93,252,248,201,195,255,248,162,255,249,255,129,124,253,202,4,239,15,133,244, + 93,252,248,201,195,255,248,163,255,249,255,129,124,253,202,4,239,15,133,244, 253,129,124,253,194,4,239,15,133,244,254,139,44,202,131,198,4,59,44,194,255, 15,141,244,255,255,15,140,244,255,255,15,143,244,255,255,15,142,244,255,255, 248,6,15,183,70,252,254,141,180,253,134,233,248,9,139,6,15,182,204,15,182, - 232,131,198,4,193,232,16,252,255,36,252,235,248,7,15,135,244,41,129,124,253, - 194,4,239,15,130,244,247,15,133,244,41,255,252,242,15,42,4,194,252,233,244, - 248,255,221,4,202,219,4,194,252,233,244,249,255,248,8,15,135,244,41,255,252, + 232,131,198,4,193,232,16,252,255,36,252,235,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,4,194,131,198,4,102,15,46,193,255,15,134,244, 9,255,15,135,244,9,255,15,130,244,9,255,15,131,244,9,255,252,233,244,6,255, - 219,4,202,252,233,244,248,255,129,124,253,202,4,239,15,131,244,41,129,124, - 253,194,4,239,15,131,244,41,255,248,1,252,242,15,16,4,194,248,2,131,198,4, + 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,248,1,252,242,15,16,4,194,248,2,131,198,4, 102,15,46,4,202,248,3,255,248,1,221,4,202,248,2,221,4,194,248,3,131,198,4, 255,223,252,233,221,216,255,218,252,233,223,224,158,255,15,134,244,247,255, 15,135,244,247,255,15,130,244,247,255,15,131,244,247,255,15,183,70,252,254, @@ -516,12 +516,12 @@ static const unsigned char build_actionlist[15828] = { 1,221,4,202,248,2,221,4,194,248,4,255,15,138,244,248,15,133,244,248,255,15, 138,244,248,15,132,244,247,255,248,1,15,183,70,252,254,141,180,253,134,233, 248,2,255,248,2,15,183,70,252,254,141,180,253,134,233,248,1,255,252,233,244, - 9,255,129,252,253,239,15,132,244,46,129,124,253,202,4,239,15,132,244,46,255, + 9,255,129,252,253,239,15,132,244,47,129,124,253,202,4,239,15,132,244,47,255, 57,108,202,4,15,133,244,2,129,252,253,239,15,131,244,1,139,12,202,139,4,194, 57,193,15,132,244,1,129,252,253,239,15,135,244,2,139,169,233,133,252,237, 15,132,244,2,252,246,133,233,235,15,133,244,2,255,49,252,237,255,189,1,0, - 0,0,255,252,233,244,45,255,248,3,129,252,253,239,255,15,133,244,9,255,252, - 233,244,46,255,72,252,247,208,139,108,202,4,131,198,4,129,252,253,239,15, + 0,0,255,252,233,244,46,255,248,3,129,252,253,239,255,15,133,244,9,255,252, + 233,244,47,255,72,252,247,208,139,108,202,4,131,198,4,129,252,253,239,15, 133,244,249,139,12,202,59,12,135,255,139,108,202,4,131,198,4,255,129,252, 253,239,15,133,244,253,129,124,253,199,4,239,15,133,244,254,139,44,199,59, 44,202,255,15,183,70,252,254,141,180,253,134,233,248,9,139,6,15,182,204,15, @@ -533,7 +533,7 @@ static const unsigned char build_actionlist[15828] = { 72,252,247,208,139,108,202,4,131,198,4,57,197,255,15,133,244,249,15,183,70, 252,254,141,180,253,134,233,248,2,139,6,15,182,204,15,182,232,131,198,4,193, 232,16,252,255,36,252,235,248,3,129,252,253,239,15,133,244,2,252,233,244, - 46,255,15,132,244,248,129,252,253,239,15,132,244,46,15,183,70,252,254,141, + 47,255,15,132,244,248,129,252,253,239,15,132,244,47,15,183,70,252,254,141, 180,253,134,233,248,2,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, 255,36,252,235,255,139,108,194,4,131,198,4,129,252,253,239,255,137,108,202, 4,139,44,194,137,44,202,255,72,139,44,194,72,137,44,202,139,6,15,182,204, @@ -542,40 +542,40 @@ static const unsigned char build_actionlist[15828] = { 4,193,232,16,252,255,36,252,235,255,129,124,253,194,4,239,15,133,244,251, 139,44,194,252,247,221,15,128,244,250,199,68,202,4,237,137,44,202,248,9,139, 6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,4,199, - 68,202,4,0,0,224,65,199,4,202,0,0,0,0,252,233,244,9,248,5,15,135,244,51,255, - 129,124,253,194,4,239,15,131,244,51,255,252,242,15,16,4,194,72,184,237,237, + 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,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,6,15,182,204, 15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,2,129,124,253,194, - 4,239,15,133,244,54,139,12,194,137,213,232,251,1,20,255,252,242,15,42,192, + 4,239,15,133,244,55,139,12,194,137,213,232,251,1,20,255,252,242,15,42,192, 255,137,252,234,15,182,78,252,253,252,233,244,1,255,15,182,252,236,15,182, - 192,255,129,124,253,252,234,4,239,15,133,244,48,129,124,253,199,4,239,15, - 133,244,48,139,44,252,234,3,44,199,15,128,244,47,255,129,124,253,252,234, - 4,239,15,133,244,50,129,124,253,199,4,239,15,133,244,50,139,4,199,3,4,252, - 234,15,128,244,49,255,129,124,253,252,234,4,239,15,133,244,53,129,124,253, - 194,4,239,15,133,244,53,139,44,252,234,3,44,194,15,128,244,52,255,199,68, - 202,4,237,255,129,124,253,252,234,4,239,15,131,244,48,255,129,124,253,199, - 4,239,15,131,244,48,255,252,242,15,16,4,252,234,252,242,15,88,4,199,255,221, - 4,252,234,220,4,199,255,129,124,253,252,234,4,239,15,131,244,50,255,129,124, - 253,199,4,239,15,131,244,50,255,252,242,15,16,4,199,252,242,15,88,4,252,234, - 255,221,4,199,220,4,252,234,255,129,124,253,252,234,4,239,15,131,244,53,129, - 124,253,194,4,239,15,131,244,53,255,252,242,15,16,4,252,234,252,242,15,88, + 192,255,129,124,253,252,234,4,239,15,133,244,49,129,124,253,199,4,239,15, + 133,244,49,139,44,252,234,3,44,199,15,128,244,48,255,129,124,253,252,234, + 4,239,15,133,244,51,129,124,253,199,4,239,15,133,244,51,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,129,124,253,199, + 4,239,15,131,244,49,255,252,242,15,16,4,252,234,252,242,15,88,4,199,255,221, + 4,252,234,220,4,199,255,129,124,253,252,234,4,239,15,131,244,51,255,129,124, + 253,199,4,239,15,131,244,51,255,252,242,15,16,4,199,252,242,15,88,4,252,234, + 255,221,4,199,220,4,252,234,255,129,124,253,252,234,4,239,15,131,244,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, - 48,129,124,253,199,4,239,15,133,244,48,139,44,252,234,43,44,199,15,128,244, - 47,255,129,124,253,252,234,4,239,15,133,244,50,129,124,253,199,4,239,15,133, - 244,50,139,4,199,43,4,252,234,15,128,244,49,255,129,124,253,252,234,4,239, - 15,133,244,53,129,124,253,194,4,239,15,133,244,53,139,44,252,234,43,44,194, - 15,128,244,52,255,252,242,15,16,4,252,234,252,242,15,92,4,199,255,221,4,252, + 49,129,124,253,199,4,239,15,133,244,49,139,44,252,234,43,44,199,15,128,244, + 48,255,129,124,253,252,234,4,239,15,133,244,51,129,124,253,199,4,239,15,133, + 244,51,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,15,92,4,199,255,221,4,252, 234,220,36,199,255,252,242,15,16,4,199,252,242,15,92,4,252,234,255,221,4, 199,220,36,252,234,255,252,242,15,16,4,252,234,252,242,15,92,4,194,255,221, - 4,252,234,220,36,194,255,129,124,253,252,234,4,239,15,133,244,48,129,124, - 253,199,4,239,15,133,244,48,139,44,252,234,15,175,44,199,15,128,244,47,255, - 129,124,253,252,234,4,239,15,133,244,50,129,124,253,199,4,239,15,133,244, - 50,139,4,199,15,175,4,252,234,15,128,244,49,255,129,124,253,252,234,4,239, - 15,133,244,53,129,124,253,194,4,239,15,133,244,53,139,44,252,234,15,175,44, - 194,15,128,244,52,255,252,242,15,16,4,252,234,252,242,15,89,4,199,255,221, + 4,252,234,220,36,194,255,129,124,253,252,234,4,239,15,133,244,49,129,124, + 253,199,4,239,15,133,244,49,139,44,252,234,15,175,44,199,15,128,244,48,255, + 129,124,253,252,234,4,239,15,133,244,51,129,124,253,199,4,239,15,133,244, + 51,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,252,242,15,89,4,199,255,221, 4,252,234,220,12,199,255,252,242,15,16,4,199,252,242,15,89,4,252,234,255, 221,4,199,220,12,252,234,255,252,242,15,16,4,252,234,252,242,15,89,4,194, 255,221,4,252,234,220,12,194,255,252,242,15,16,4,252,234,252,242,15,94,4, @@ -584,10 +584,10 @@ static const unsigned char build_actionlist[15828] = { 15,94,4,194,255,221,4,252,234,220,52,194,255,252,242,15,16,4,252,234,252, 242,15,16,12,199,255,221,4,252,234,221,4,199,255,252,242,15,16,4,199,252, 242,15,16,12,252,234,255,221,4,199,221,4,252,234,255,252,242,15,16,4,252, - 234,252,242,15,16,12,194,255,221,4,252,234,221,4,194,255,248,163,232,244, - 153,255,252,233,244,163,255,232,244,113,255,15,182,252,236,15,182,192,139, - 76,36,96,137,145,233,141,20,194,65,137,192,65,41,232,248,33,137,205,137,116, - 36,100,232,251,1,27,139,149,233,133,192,15,133,244,42,15,182,110,252,255, + 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, + 76,36,96,137,145,233,141,20,194,65,137,192,65,41,232,248,34,137,205,137,116, + 36,100,232,251,1,27,139,149,233,133,192,15,133,244,43,15,182,110,252,255, 15,182,78,252,253,72,139,4,252,234,72,137,4,202,139,6,15,182,204,15,182,232, 131,198,4,193,232,16,252,255,36,252,235,255,72,252,247,208,139,4,135,199, 68,202,4,237,137,4,202,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, @@ -629,56 +629,56 @@ static const unsigned char build_actionlist[15828] = { 233,15,182,78,252,253,137,4,202,199,68,202,4,237,139,6,15,182,204,15,182, 232,131,198,4,193,232,16,252,255,36,252,235,248,3,137,252,233,232,251,1,32, 15,183,70,252,254,72,252,247,208,252,233,244,2,255,72,252,247,208,139,106, - 252,248,139,173,233,139,4,135,252,233,244,164,255,72,252,247,208,139,106, - 252,248,139,173,233,139,4,135,252,233,244,165,255,15,182,252,236,15,182,192, - 129,124,253,252,234,4,239,15,133,244,36,139,44,252,234,255,129,124,253,194, + 252,248,139,173,233,139,4,135,252,233,244,165,255,72,252,247,208,139,106, + 252,248,139,173,233,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,244,251,139,4,194,255,129,124,253,194,4,239,15,131,244,251,255, 252,242,15,16,4,194,252,242,15,45,192,252,242,15,42,200,102,15,46,193,255, - 15,133,244,36,255,59,133,233,15,131,244,36,193,224,3,3,133,233,129,120,253, + 15,133,244,37,255,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,6,15,182,204,15,182, 232,131,198,4,193,232,16,252,255,36,252,235,248,2,131,189,233,0,15,132,244, - 249,139,141,233,252,246,129,233,235,15,132,244,36,15,182,78,252,253,248,3, + 249,139,141,233,252,246,129,233,235,15,132,244,37,15,182,78,252,253,248,3, 199,68,202,4,237,252,233,244,1,248,5,255,129,124,253,194,4,239,15,133,244, - 36,139,4,194,252,233,244,164,255,15,182,252,236,15,182,192,72,252,247,208, - 139,4,135,129,124,253,252,234,4,239,15,133,244,34,139,44,252,234,248,164, + 37,139,4,194,252,233,244,165,255,15,182,252,236,15,182,192,72,252,247,208, + 139,4,135,129,124,253,252,234,4,239,15,133,244,35,139,44,252,234,248,165, 139,141,233,35,136,233,105,201,239,3,141,233,248,1,129,185,233,239,15,133, 244,250,57,129,233,15,133,244,250,129,121,253,4,239,15,132,244,251,15,182, 70,252,253,72,139,41,72,137,44,194,248,2,255,139,6,15,182,204,15,182,232, 131,198,4,193,232,16,252,255,36,252,235,248,3,15,182,70,252,253,199,68,194, 4,237,252,233,244,2,248,4,139,137,233,133,201,15,133,244,1,248,5,139,141, - 233,133,201,15,132,244,3,252,246,129,233,235,15,133,244,3,252,233,244,34, - 255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,35,139, - 44,252,234,59,133,233,15,131,244,35,193,224,3,3,133,233,129,120,253,4,239, + 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,239, 15,132,244,248,72,139,40,72,137,44,202,248,1,139,6,15,182,204,15,182,232, 131,198,4,193,232,16,252,255,36,252,235,248,2,131,189,233,0,15,132,244,249, - 139,141,233,252,246,129,233,235,15,132,244,35,255,15,182,78,252,253,248,3, + 139,141,233,252,246,129,233,235,15,132,244,36,255,15,182,78,252,253,248,3, 199,68,202,4,237,252,233,244,1,255,15,182,252,236,15,182,192,129,124,253, - 252,234,4,239,15,133,244,39,139,44,252,234,255,15,133,244,39,255,59,133,233, - 15,131,244,39,193,224,3,3,133,233,129,120,253,4,239,15,132,244,249,248,1, + 252,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,1, 252,246,133,233,235,15,133,244,253,248,2,72,139,44,202,72,137,40,139,6,15, 182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,3,131,189, - 233,0,15,132,244,1,139,141,233,252,246,129,233,235,255,15,132,244,39,15,182, - 78,252,253,252,233,244,1,248,5,129,124,253,194,4,239,15,133,244,39,139,4, - 194,252,233,244,165,248,7,128,165,233,235,139,139,233,137,171,233,137,141, + 233,0,15,132,244,1,139,141,233,252,246,129,233,235,255,15,132,244,40,15,182, + 78,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,139,139,233,137,171,233,137,141, 233,15,182,78,252,253,252,233,244,2,255,15,182,252,236,15,182,192,72,252, - 247,208,139,4,135,129,124,253,252,234,4,239,15,133,244,37,139,44,252,234, - 248,165,139,141,233,35,136,233,105,201,239,198,133,233,0,3,141,233,248,1, + 247,208,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,233,248,1, 129,185,233,239,15,133,244,251,57,129,233,15,133,244,251,129,121,253,4,239, 15,132,244,250,248,2,255,252,246,133,233,235,15,133,244,253,248,3,15,182, 70,252,253,72,139,44,194,72,137,41,139,6,15,182,204,15,182,232,131,198,4, 193,232,16,252,255,36,252,235,248,4,131,189,233,0,15,132,244,2,137,76,36, - 80,139,141,233,252,246,129,233,235,15,132,244,37,139,76,36,80,252,233,244, + 80,139,141,233,252,246,129,233,235,15,132,244,38,139,76,36,80,252,233,244, 2,248,5,139,137,233,133,201,15,133,244,1,255,139,141,233,133,201,15,132,244, - 252,252,246,129,233,235,15,132,244,37,248,6,137,68,36,80,199,68,36,84,237, + 252,252,246,129,233,235,15,132,244,38,248,6,137,68,36,80,199,68,36,84,237, 137,108,36,32,139,76,36,96,137,145,233,76,141,68,36,80,137,252,234,137,205, 137,116,36,100,232,251,1,34,139,149,233,139,108,36,32,137,193,252,233,244, 2,248,7,128,165,233,235,139,131,233,137,171,233,137,133,233,252,233,244,3, - 255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,38,139, - 44,252,234,59,133,233,15,131,244,38,193,224,3,3,133,233,129,120,253,4,239, + 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, 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,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252, 235,248,3,131,189,233,0,15,132,244,1,255,139,141,233,252,246,129,233,235, - 15,132,244,38,15,182,78,252,253,252,233,244,1,248,7,128,165,233,235,139,139, + 15,132,244,39,15,182,78,252,253,252,233,244,1,248,7,128,165,233,235,139,139, 233,137,171,233,137,141,233,15,182,78,252,253,252,233,244,2,255,137,124,36, 80,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,84,131,232,1,15,132,244,250,1,252,248,59,133,233, @@ -688,9 +688,9 @@ static const unsigned char build_actionlist[15828] = { 137,145,233,137,252,234,65,137,192,137,205,137,116,36,100,232,251,1,35,139, 149,233,15,182,78,252,253,252,233,244,1,248,7,255,128,165,233,235,139,131, 233,137,171,233,137,133,233,252,233,244,2,255,3,68,36,84,255,129,124,253, - 202,4,239,139,44,202,15,133,244,55,141,84,202,8,137,114,252,252,139,181,233, + 202,4,239,139,44,202,15,133,244,56,141,84,202,8,137,114,252,252,139,181,233, 139,14,15,182,252,233,15,182,205,131,198,4,252,255,36,252,235,255,141,76, - 202,8,137,215,139,105,252,248,129,121,253,252,252,239,15,133,244,28,248,56, + 202,8,137,215,139,105,252,248,129,121,253,252,252,239,15,133,244,29,248,57, 139,114,252,252,252,247,198,237,15,133,244,253,248,1,137,106,252,248,137, 68,36,84,131,232,1,15,132,244,249,248,2,72,139,41,131,193,8,72,137,47,131, 199,8,131,232,1,15,133,244,2,139,106,252,248,248,3,139,68,36,84,128,189,233, @@ -701,7 +701,7 @@ static const unsigned char build_actionlist[15828] = { 137,215,139,114,252,252,252,233,244,1,248,8,129,198,239,252,233,244,1,255, 141,76,202,8,72,139,105,232,72,139,65,252,240,72,137,41,72,137,65,8,139,105, 224,139,65,228,137,105,252,248,137,65,252,252,129,252,248,239,184,237,15, - 133,244,28,137,202,137,114,252,252,139,181,233,139,14,15,182,252,233,15,182, + 133,244,29,137,202,137,114,252,252,139,181,233,139,14,15,182,252,233,15,182, 205,131,198,4,252,255,36,252,235,255,137,124,36,80,137,92,36,84,139,108,202, 252,240,139,68,202,252,248,139,157,233,131,198,4,139,189,233,248,1,57,216, 15,131,244,251,129,124,253,199,4,239,15,132,244,250,255,219,68,202,252,248, @@ -737,19 +737,19 @@ static const unsigned char build_actionlist[15828] = { 36,252,235,248,6,255,199,71,252,252,237,131,199,8,255,199,68,194,252,244, 237,255,131,192,1,252,233,244,5,248,7,141,174,233,252,247,197,237,15,133, 244,14,41,252,234,255,1,252,233,255,137,252,245,209,252,237,129,229,239,102, - 131,172,253,43,233,1,15,132,244,145,255,141,12,202,255,129,121,253,4,239, - 15,133,244,255,255,129,121,253,12,239,15,133,244,57,129,121,253,20,239,15, - 133,244,57,139,41,131,121,16,0,15,140,244,251,255,129,121,253,12,239,15,133, - 244,162,129,121,253,20,239,15,133,244,162,255,139,105,16,133,252,237,15,136, + 131,172,253,43,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,15,128,244,247,137,41,255,59,105,8,199,65,28,237,137,105,24, 255,15,142,244,253,248,1,248,6,141,180,253,134,233,255,141,180,253,134,233, 15,183,70,252,254,15,142,245,248,1,248,6,255,15,143,244,253,248,6,141,180, 253,134,233,248,1,255,248,7,139,6,15,182,204,15,182,232,131,198,4,193,232, 16,252,255,36,252,235,248,5,255,3,41,15,128,244,1,137,41,255,15,141,244,7, 255,141,180,253,134,233,15,183,70,252,254,15,141,245,255,15,140,244,7,255, - 252,233,244,6,248,9,255,129,121,253,4,239,255,15,131,244,57,129,121,253,12, - 239,15,131,244,57,255,129,121,253,12,239,15,131,244,162,129,121,253,20,239, - 15,131,244,162,255,139,105,20,255,129,252,253,239,15,131,244,57,255,252,242, + 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,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, @@ -766,19 +766,19 @@ static const unsigned char build_actionlist[15828] = { 15,127,153,233,102,68,15,127,161,233,102,68,15,127,169,233,102,68,15,127, 177,233,102,68,15,127,185,233,252,255,224,255,141,180,253,134,233,139,6,15, 182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,137,252,245, - 209,252,237,129,229,239,102,131,172,253,43,233,1,15,132,244,147,255,139,190, - 233,139,108,36,96,141,12,202,59,141,233,15,135,244,23,15,182,142,233,57,200, + 209,252,237,129,229,239,102,131,172,253,43,233,1,15,132,244,148,255,139,190, + 233,139,108,36,96,141,12,202,59,141,233,15,135,244,24,15,182,142,233,57,200, 15,134,244,249,248,2,255,15,183,70,252,254,252,233,245,255,248,3,199,68,194, 252,252,237,131,192,1,57,200,15,134,244,3,252,233,244,2,255,141,44,197,237, 141,4,194,139,122,252,248,137,104,252,252,137,120,252,248,139,108,36,96,141, - 12,200,59,141,233,15,135,244,22,137,209,137,194,15,182,174,233,133,252,237, + 12,200,59,141,233,15,135,244,23,137,209,137,194,15,182,174,233,133,252,237, 15,132,244,248,248,1,131,193,8,57,209,15,131,244,249,139,121,252,248,137, 56,139,121,252,252,137,120,4,131,192,8,199,65,252,252,237,131,252,237,1,15, 133,244,1,248,2,255,139,190,233,139,6,15,182,204,15,182,232,131,198,4,193, 232,16,252,255,36,252,235,255,248,3,199,64,4,237,131,192,8,131,252,237,1, 15,133,244,3,252,233,244,2,255,139,106,252,248,72,139,189,233,139,108,36, 96,141,68,194,252,248,137,149,233,141,136,233,59,141,233,137,133,233,255, - 72,137,252,250,137,252,233,255,15,135,244,21,199,131,233,237,255,252,255, + 72,137,252,250,137,252,233,255,15,135,244,22,199,131,233,237,255,252,255, 215,255,252,255,147,233,255,199,131,233,237,139,149,233,141,12,194,252,247, 217,3,141,233,139,114,252,252,252,233,244,12,255,254,0 }; @@ -793,6 +793,7 @@ enum { GLOB_vm_leave_unw, GLOB_vm_unwind_c, GLOB_vm_unwind_c_eh, + GLOB_vm_unwind_rethrow, GLOB_vm_unwind_ff, GLOB_vm_unwind_ff_eh, GLOB_vm_growstack_c, @@ -952,6 +953,7 @@ static const char *const globnames[] = { "vm_leave_unw", "vm_unwind_c@8", "vm_unwind_c_eh", + "vm_unwind_rethrow", "vm_unwind_ff@4", "vm_unwind_ff_eh", "vm_growstack_c", @@ -1164,675 +1166,675 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse) dasm_put(Dst, 0); dasm_put(Dst, 2, FRAME_P, LJ_TTRUE, FRAME_TYPE, FRAME_C, FRAME_TYPE, DISPATCH_GL(vmstate), ~LJ_VMST_C); dasm_put(Dst, 109, Dt1(->base), Dt1(->top), Dt1(->cframe), Dt1(->maxstack), LJ_TNIL); - dasm_put(Dst, 198, Dt1(->top), Dt1(->top), Dt1(->glref), Dt2(->vmstate), ~LJ_VMST_C, CFRAME_RAWMASK, 1+1); - dasm_put(Dst, 291, Dt1(->base), Dt1(->glref), GG_G2DISP, LJ_TFALSE, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, LUA_MINSTACK, -4+PC2PROTO(framesize), Dt1(->base), Dt1(->top)); - dasm_put(Dst, 357, 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, 513, FRAME_CP, FRAME_C, Dt1(->cframe), Dt1(->cframe), Dt1(->glref), GG_G2DISP, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); - dasm_put(Dst, 619, LJ_TFUNC, Dt7(->pc), Dt1(->stack), Dt1(->top), Dt1(->cframe), Dt1(->cframe), FRAME_CP, LJ_TNIL, 0, Dt7(->pc)); - dasm_put(Dst, 777, PC2PROTO(k), Dt1(->base), LJ_TSTR, BC_GGET, DISPATCH_GL(tmptv), LJ_TTAB); + dasm_put(Dst, 198, Dt1(->top), Dt1(->top), Dt1(->glref), Dt2(->vmstate), ~LJ_VMST_C, CFRAME_RAWMASK); + dasm_put(Dst, 276, 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, 356, 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, 511, FRAME_CP, FRAME_C, Dt1(->cframe), Dt1(->cframe), Dt1(->glref), GG_G2DISP, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base)); + dasm_put(Dst, 604, Dt1(->top), LJ_TFUNC, Dt7(->pc), Dt1(->stack), Dt1(->top), Dt1(->cframe), Dt1(->cframe), FRAME_CP, LJ_TNIL, 0); + dasm_put(Dst, 768, Dt7(->pc), PC2PROTO(k), Dt1(->base), LJ_TSTR, BC_GGET, DISPATCH_GL(tmptv), LJ_TTAB); if (LJ_DUALNUM) { - dasm_put(Dst, 883, LJ_TISNUM); + dasm_put(Dst, 885, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 893); + dasm_put(Dst, 895); } else { } - dasm_put(Dst, 906, Dt1(->base), Dt1(->base), Dt1(->top), FRAME_CONT, 2+1, LJ_TSTR, BC_GSET); - dasm_put(Dst, 1053, DISPATCH_GL(tmptv), LJ_TTAB); + dasm_put(Dst, 908, Dt1(->base), Dt1(->base), Dt1(->top), FRAME_CONT, 2+1, LJ_TSTR, BC_GSET); + dasm_put(Dst, 1055, DISPATCH_GL(tmptv), LJ_TTAB); if (LJ_DUALNUM) { - dasm_put(Dst, 883, LJ_TISNUM); + dasm_put(Dst, 885, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 893); + dasm_put(Dst, 895); } else { } - dasm_put(Dst, 1076, Dt1(->base), Dt1(->base), Dt1(->top), FRAME_CONT, 3+1, Dt1(->base), Dt1(->base)); - dasm_put(Dst, 1249, -BCBIAS_J*4, LJ_TISTRUECOND, LJ_TISTRUECOND, Dt1(->base)); - dasm_put(Dst, 1349); + dasm_put(Dst, 1078, Dt1(->base), Dt1(->base), Dt1(->top), FRAME_CONT, 3+1, Dt1(->base), Dt1(->base)); + dasm_put(Dst, 1251, -BCBIAS_J*4, LJ_TISTRUECOND, LJ_TISTRUECOND, Dt1(->base)); + dasm_put(Dst, 1351); #if LJ_HASFFI - dasm_put(Dst, 1369, Dt1(->base)); + dasm_put(Dst, 1371, Dt1(->base)); #endif - dasm_put(Dst, 1400); + dasm_put(Dst, 1402); #if LJ_DUALNUM - dasm_put(Dst, 1403); + dasm_put(Dst, 1405); #endif - dasm_put(Dst, 1409); + dasm_put(Dst, 1411); #if LJ_DUALNUM - dasm_put(Dst, 877); + dasm_put(Dst, 879); #endif - dasm_put(Dst, 1421); + dasm_put(Dst, 1423); #if LJ_DUALNUM - dasm_put(Dst, 1403); + dasm_put(Dst, 1405); #endif - dasm_put(Dst, 1449, Dt1(->base), Dt1(->base), FRAME_CONT, 2+1, Dt1(->base), Dt1(->base), Dt1(->base)); - dasm_put(Dst, 1586, Dt1(->base), Dt7(->pc), Dt1(->base), Dt1(->base), GG_DISP2STATIC, 1+1, LJ_TISTRUECOND); - dasm_put(Dst, 1769, 1+1, ~LJ_TNUMX); + dasm_put(Dst, 1451, Dt1(->base), Dt1(->base), FRAME_CONT, 2+1, Dt1(->base), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 1588, Dt1(->base), Dt7(->pc), Dt1(->base), Dt1(->base), GG_DISP2STATIC, 1+1, LJ_TISTRUECOND); + dasm_put(Dst, 1771, 1+1, ~LJ_TNUMX); if (cmov) { - dasm_put(Dst, 1814); + dasm_put(Dst, 1816); } else { - dasm_put(Dst, 1818); + dasm_put(Dst, 1820); } - dasm_put(Dst, 1827, ((char *)(&((GCfuncC *)0)->upvalue)), LJ_TSTR, ~LJ_TLIGHTUD, 1+1, LJ_TTAB, Dt6(->metatable), LJ_TNIL); - dasm_put(Dst, 1906, 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, 1963, LJ_TNIL, LJ_TUDATA, LJ_TISNUM, LJ_TNUMX, DISPATCH_GL(gcroot[GCROOT_BASEMT])); - dasm_put(Dst, 2031, 2+1, LJ_TTAB, Dt6(->metatable), LJ_TTAB, Dt6(->metatable), LJ_TTAB, Dt6(->marked), LJ_GC_BLACK, Dt6(->marked), (uint8_t)~LJ_GC_BLACK); - dasm_put(Dst, 2100, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist), 2+1, LJ_TTAB, 1+1, LJ_TISNUM); + dasm_put(Dst, 1829, ((char *)(&((GCfuncC *)0)->upvalue)), LJ_TSTR, ~LJ_TLIGHTUD, 1+1, LJ_TTAB, Dt6(->metatable), LJ_TNIL); + dasm_put(Dst, 1908, DISPATCH_GL(gcroot)+4*(GCROOT_MMNAME+MM_metatable), LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), DtB(->next)); + dasm_put(Dst, 1965, LJ_TNIL, LJ_TUDATA, LJ_TISNUM, LJ_TNUMX, DISPATCH_GL(gcroot[GCROOT_BASEMT])); + dasm_put(Dst, 2033, 2+1, LJ_TTAB, Dt6(->metatable), LJ_TTAB, Dt6(->metatable), LJ_TTAB, Dt6(->marked), LJ_GC_BLACK, Dt6(->marked), (uint8_t)~LJ_GC_BLACK); + dasm_put(Dst, 2102, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist), 2+1, LJ_TTAB, 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 2185); + dasm_put(Dst, 2187); } else { - dasm_put(Dst, 2202); + dasm_put(Dst, 2204); } if (sse) { - dasm_put(Dst, 2207); + dasm_put(Dst, 2209); } else { - dasm_put(Dst, 2217); + dasm_put(Dst, 2219); } - dasm_put(Dst, 2224, 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, 2290, Dt1(->base)); + dasm_put(Dst, 2226, 1+1, LJ_TSTR, LJ_TSTR, LJ_TISNUM, DISPATCH_GL(gcroot[GCROOT_BASEMT_NUM]), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); + dasm_put(Dst, 2292, Dt1(->base)); if (LJ_DUALNUM) { - dasm_put(Dst, 2314); + dasm_put(Dst, 2316); } else { - dasm_put(Dst, 2319); + dasm_put(Dst, 2321); } - dasm_put(Dst, 2324, Dt1(->base), 1+1, LJ_TTAB, Dt1(->base), Dt1(->top), Dt1(->base), 1+2); - dasm_put(Dst, 2417, LJ_TNIL, LJ_TNIL, 1+1, LJ_TTAB); + dasm_put(Dst, 2326, Dt1(->base), 1+1, LJ_TTAB, Dt1(->base), Dt1(->top), Dt1(->base), 1+2); + dasm_put(Dst, 2419, LJ_TNIL, LJ_TNIL, 1+1, LJ_TTAB); #ifdef LUAJIT_ENABLE_LUA52COMPAT - dasm_put(Dst, 2464, Dt6(->metatable)); + dasm_put(Dst, 2466, Dt6(->metatable)); #endif - dasm_put(Dst, 2473, Dt8(->upvalue[0]), LJ_TFUNC, LJ_TNIL, 1+3, 1+1, LJ_TTAB, LJ_TISNUM); + dasm_put(Dst, 2475, Dt8(->upvalue[0]), LJ_TFUNC, LJ_TNIL, 1+3, 1+1, LJ_TTAB, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 2459); + dasm_put(Dst, 2461); } else { - dasm_put(Dst, 2202); + dasm_put(Dst, 2204); } - dasm_put(Dst, 2528); + dasm_put(Dst, 2530); if (LJ_DUALNUM) { - dasm_put(Dst, 2533, LJ_TISNUM); + dasm_put(Dst, 2535, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 2549, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); + dasm_put(Dst, 2551, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); } else { } - dasm_put(Dst, 2582, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->hmask), 1+0); - dasm_put(Dst, 2444, 1+1, LJ_TTAB); + dasm_put(Dst, 2584, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->hmask), 1+0); + dasm_put(Dst, 2446, 1+1, LJ_TTAB); #ifdef LUAJIT_ENABLE_LUA52COMPAT - dasm_put(Dst, 2464, Dt6(->metatable)); + dasm_put(Dst, 2466, Dt6(->metatable)); #endif - dasm_put(Dst, 2659, Dt8(->upvalue[0]), LJ_TFUNC); + dasm_put(Dst, 2661, Dt8(->upvalue[0]), LJ_TFUNC); if (LJ_DUALNUM) { - dasm_put(Dst, 2680, LJ_TISNUM); + dasm_put(Dst, 2682, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 2692); + dasm_put(Dst, 2694); } else { - dasm_put(Dst, 2702); + dasm_put(Dst, 2704); } - dasm_put(Dst, 2709, 1+3, 1+1, 8+FRAME_PCALL, DISPATCH_GL(hookmask), HOOK_ACTIVE_SHIFT, 2+1, LJ_TFUNC); - dasm_put(Dst, 2773, LJ_TFUNC, 16+FRAME_PCALL, 1+1, LJ_TTHREAD, Dt1(->cframe), Dt1(->status), LUA_YIELD, Dt1(->top)); - dasm_put(Dst, 2863, Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP); - dasm_put(Dst, 2951, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack), LJ_TTRUE, FRAME_TYPE); - dasm_put(Dst, 3064, LJ_TFALSE, Dt1(->top), Dt1(->top), 1+2, Dt1(->top), Dt1(->base), Dt8(->upvalue[0].gcr), Dt1(->cframe)); - dasm_put(Dst, 3162, Dt1(->status), LUA_YIELD, Dt1(->top), Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top)); - dasm_put(Dst, 3229, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack)); - dasm_put(Dst, 3317, FRAME_TYPE, Dt1(->top), Dt1(->base), Dt1(->cframe), CFRAME_RESUME); - dasm_put(Dst, 3429, Dt1(->base), Dt1(->top), Dt1(->cframe), LUA_YIELD, Dt1(->status)); + dasm_put(Dst, 2711, 1+3, 1+1, 8+FRAME_PCALL, DISPATCH_GL(hookmask), HOOK_ACTIVE_SHIFT, 2+1, LJ_TFUNC); + dasm_put(Dst, 2775, LJ_TFUNC, 16+FRAME_PCALL, 1+1, LJ_TTHREAD, Dt1(->cframe), Dt1(->status), LUA_YIELD, Dt1(->top)); + dasm_put(Dst, 2865, Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP); + dasm_put(Dst, 2953, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack), LJ_TTRUE, FRAME_TYPE); + dasm_put(Dst, 3066, LJ_TFALSE, Dt1(->top), Dt1(->top), 1+2, Dt1(->top), Dt1(->base), Dt8(->upvalue[0].gcr), Dt1(->cframe)); + dasm_put(Dst, 3164, Dt1(->status), LUA_YIELD, Dt1(->top), Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 3231, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack)); + dasm_put(Dst, 3319, FRAME_TYPE, Dt1(->top), Dt1(->base), Dt1(->cframe), CFRAME_RESUME); + dasm_put(Dst, 3431, Dt1(->base), Dt1(->top), Dt1(->cframe), LUA_YIELD, Dt1(->status)); if (!LJ_DUALNUM) { - dasm_put(Dst, 3456); + dasm_put(Dst, 3458); } if (sse) { - dasm_put(Dst, 3459); + dasm_put(Dst, 3461); } - dasm_put(Dst, 3474, 1+1); + dasm_put(Dst, 3476, 1+1); if (LJ_DUALNUM) { - dasm_put(Dst, 3485, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 3487, LJ_TISNUM, LJ_TISNUM); } else { - dasm_put(Dst, 3565, LJ_TISNUM); + dasm_put(Dst, 3567, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 3575, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); + dasm_put(Dst, 3577, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); } else { - dasm_put(Dst, 3606); + dasm_put(Dst, 3608); } - dasm_put(Dst, 3623, 1+1, FRAME_TYPE, LJ_TNIL); + dasm_put(Dst, 3625, 1+1, FRAME_TYPE, LJ_TNIL); if (LJ_DUALNUM) { - dasm_put(Dst, 3719, LJ_TISNUM); + dasm_put(Dst, 3721, LJ_TISNUM); } else { - dasm_put(Dst, 3565, LJ_TISNUM); + dasm_put(Dst, 3567, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 3741); + dasm_put(Dst, 3743); if (LJ_DUALNUM) { - dasm_put(Dst, 3750); + dasm_put(Dst, 3752); } - dasm_put(Dst, 2212); + dasm_put(Dst, 2214); } else { - dasm_put(Dst, 3784); + dasm_put(Dst, 3786); if (LJ_DUALNUM) { } else { - dasm_put(Dst, 2219); + dasm_put(Dst, 2221); } } - dasm_put(Dst, 3790); + dasm_put(Dst, 3792); if (LJ_DUALNUM) { - dasm_put(Dst, 3719, LJ_TISNUM); + dasm_put(Dst, 3721, LJ_TISNUM); } else { - dasm_put(Dst, 3565, LJ_TISNUM); + dasm_put(Dst, 3567, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 3793); + dasm_put(Dst, 3795); if (LJ_DUALNUM) { - dasm_put(Dst, 3750); + dasm_put(Dst, 3752); } - dasm_put(Dst, 2212); + dasm_put(Dst, 2214); } else { - dasm_put(Dst, 3802); + dasm_put(Dst, 3804); if (LJ_DUALNUM) { } else { - dasm_put(Dst, 2219); + dasm_put(Dst, 2221); } } if (sse) { - dasm_put(Dst, 3808, 1+1, LJ_TISNUM); + dasm_put(Dst, 3810, 1+1, LJ_TISNUM); } else { - dasm_put(Dst, 3837, 1+1, LJ_TISNUM); + dasm_put(Dst, 3839, 1+1, LJ_TISNUM); } - dasm_put(Dst, 3866, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); - dasm_put(Dst, 3935, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); - dasm_put(Dst, 3992, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); - dasm_put(Dst, 4055, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM); - dasm_put(Dst, 4145); + dasm_put(Dst, 3868, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); + dasm_put(Dst, 3937, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); + dasm_put(Dst, 3994, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); + dasm_put(Dst, 4057, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM); + dasm_put(Dst, 4147); if (sse) { - dasm_put(Dst, 4157, 1+1, LJ_TISNUM); + dasm_put(Dst, 4159, 1+1, LJ_TISNUM); } else { } - dasm_put(Dst, 4182); + dasm_put(Dst, 4184); if (sse) { - dasm_put(Dst, 4196, 1+1, LJ_TISNUM); + dasm_put(Dst, 4198, 1+1, LJ_TISNUM); } else { } - dasm_put(Dst, 4221); + dasm_put(Dst, 4223); if (sse) { - dasm_put(Dst, 4235, 1+1, LJ_TISNUM); + dasm_put(Dst, 4237, 1+1, LJ_TISNUM); } else { } - dasm_put(Dst, 4260); + dasm_put(Dst, 4262); if (sse) { - dasm_put(Dst, 4276, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); + dasm_put(Dst, 4278, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); } else { - dasm_put(Dst, 4315, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); + dasm_put(Dst, 4317, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); } - dasm_put(Dst, 4348, 2+1, LJ_TISNUM, LJ_TISNUM, 2+1, LJ_TISNUM, LJ_TISNUM); - dasm_put(Dst, 4413, 1+1, LJ_TISNUM); + dasm_put(Dst, 4350, 2+1, LJ_TISNUM, LJ_TISNUM, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 4415, 1+1, LJ_TISNUM); if (sse) { - dasm_put(Dst, 4512); + dasm_put(Dst, 4514); } else { - dasm_put(Dst, 4518); + dasm_put(Dst, 4520); } - dasm_put(Dst, 4527); + dasm_put(Dst, 4529); if (sse) { - dasm_put(Dst, 4552); + dasm_put(Dst, 4554); } else { - dasm_put(Dst, 4558); + dasm_put(Dst, 4560); } - dasm_put(Dst, 4561, 1+2); + dasm_put(Dst, 4563, 1+2); if (sse) { - dasm_put(Dst, 4570); + dasm_put(Dst, 4572); } else { - dasm_put(Dst, 4578); + dasm_put(Dst, 4580); } - dasm_put(Dst, 4586); + dasm_put(Dst, 4588); if (sse) { - dasm_put(Dst, 4589, (unsigned int)(U64x(43500000,00000000)), (unsigned int)((U64x(43500000,00000000))>>32)); + dasm_put(Dst, 4591, (unsigned int)(U64x(43500000,00000000)), (unsigned int)((U64x(43500000,00000000))>>32)); } else { - dasm_put(Dst, 4616); + dasm_put(Dst, 4618); } - dasm_put(Dst, 4635); + dasm_put(Dst, 4637); if (sse) { - dasm_put(Dst, 4651, 1+1, LJ_TISNUM); + dasm_put(Dst, 4653, 1+1, LJ_TISNUM); } else { - dasm_put(Dst, 4676, 1+1, LJ_TISNUM); + dasm_put(Dst, 4678, 1+1, LJ_TISNUM); } - dasm_put(Dst, 4698); + dasm_put(Dst, 4700); if (sse) { - dasm_put(Dst, 4720); + dasm_put(Dst, 4722); } else { - dasm_put(Dst, 4746); + dasm_put(Dst, 4748); } - dasm_put(Dst, 4763, 1+2); + dasm_put(Dst, 4765, 1+2); if (sse) { - dasm_put(Dst, 4803); + dasm_put(Dst, 4805); } else { - dasm_put(Dst, 4811); + dasm_put(Dst, 4813); } - dasm_put(Dst, 4821, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 4823, 2+1, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 4873, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 4875, 2+1, LJ_TISNUM, LJ_TISNUM); } else { - dasm_put(Dst, 4920, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 4922, 2+1, LJ_TISNUM, LJ_TISNUM); } - dasm_put(Dst, 4961, LJ_TISNUM); + dasm_put(Dst, 4963, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 4974, LJ_TISNUM); + dasm_put(Dst, 4976, LJ_TISNUM); if (sse) { - dasm_put(Dst, 4512); + dasm_put(Dst, 4514); } else { } - dasm_put(Dst, 5024); + dasm_put(Dst, 5026); } else { - dasm_put(Dst, 2202); + dasm_put(Dst, 2204); } if (sse) { - dasm_put(Dst, 5035, LJ_TISNUM); + dasm_put(Dst, 5037, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5056); + dasm_put(Dst, 5058); } else { - dasm_put(Dst, 2202); + dasm_put(Dst, 2204); } - dasm_put(Dst, 5077); + dasm_put(Dst, 5079); } else { } - dasm_put(Dst, 5102, LJ_TISNUM); + dasm_put(Dst, 5104, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5115, LJ_TISNUM); + dasm_put(Dst, 5117, LJ_TISNUM); if (sse) { - dasm_put(Dst, 4512); + dasm_put(Dst, 4514); } else { } - dasm_put(Dst, 5024); + dasm_put(Dst, 5026); } else { - dasm_put(Dst, 2202); + dasm_put(Dst, 2204); } if (sse) { - dasm_put(Dst, 5035, LJ_TISNUM); + dasm_put(Dst, 5037, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5056); + dasm_put(Dst, 5058); } else { - dasm_put(Dst, 2202); + dasm_put(Dst, 2204); } - dasm_put(Dst, 5165); + dasm_put(Dst, 5167); } else { } if (!sse) { - dasm_put(Dst, 5190); + dasm_put(Dst, 5192); } - dasm_put(Dst, 5199, 1+1, LJ_TSTR); + dasm_put(Dst, 5201, 1+1, LJ_TSTR); if (LJ_DUALNUM) { - dasm_put(Dst, 5221, Dt5(->len)); + dasm_put(Dst, 5223, Dt5(->len)); } else if (sse) { - dasm_put(Dst, 5229, Dt5(->len)); + dasm_put(Dst, 5231, Dt5(->len)); } else { - dasm_put(Dst, 5240, Dt5(->len)); + dasm_put(Dst, 5242, Dt5(->len)); } - dasm_put(Dst, 5248, 1+1, LJ_TSTR, Dt5(->len), Dt5([1])); + dasm_put(Dst, 5250, 1+1, LJ_TSTR, Dt5(->len), Dt5([1])); if (LJ_DUALNUM) { - dasm_put(Dst, 5224); + dasm_put(Dst, 5226); } else if (sse) { - dasm_put(Dst, 5286); + dasm_put(Dst, 5288); } else { - dasm_put(Dst, 5296); + dasm_put(Dst, 5298); } - dasm_put(Dst, 5309, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+1, LJ_TISNUM); + dasm_put(Dst, 5311, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5340); + dasm_put(Dst, 5342); } else if (sse) { - dasm_put(Dst, 5363); + dasm_put(Dst, 5365); } else { - dasm_put(Dst, 5389); + dasm_put(Dst, 5391); } - dasm_put(Dst, 5413, Dt1(->base), Dt1(->base), LJ_TSTR, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+2, LJ_TISNUM); + dasm_put(Dst, 5415, Dt1(->base), Dt1(->base), LJ_TSTR, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+2, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5521); + dasm_put(Dst, 5523); } else if (sse) { - dasm_put(Dst, 5533); + dasm_put(Dst, 5535); } else { - dasm_put(Dst, 5548); + dasm_put(Dst, 5550); } - dasm_put(Dst, 5560, LJ_TSTR, LJ_TISNUM); + dasm_put(Dst, 5562, LJ_TSTR, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 2459); + dasm_put(Dst, 2461); } else { - dasm_put(Dst, 2202); + dasm_put(Dst, 2204); } - dasm_put(Dst, 5577, Dt5(->len)); + dasm_put(Dst, 5579, Dt5(->len)); if (LJ_DUALNUM) { - dasm_put(Dst, 5587); + dasm_put(Dst, 5589); } else if (sse) { - dasm_put(Dst, 5591); + dasm_put(Dst, 5593); } else { } - dasm_put(Dst, 5598, sizeof(GCstr)-1); - dasm_put(Dst, 5673, 2+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); - dasm_put(Dst, 5732, LJ_TSTR, LJ_TISNUM); + dasm_put(Dst, 5600, sizeof(GCstr)-1); + dasm_put(Dst, 5675, 2+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); + dasm_put(Dst, 5734, LJ_TSTR, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5749); + dasm_put(Dst, 5751); } else if (sse) { - dasm_put(Dst, 5757); + dasm_put(Dst, 5759); } else { - dasm_put(Dst, 5768); + dasm_put(Dst, 5770); } - dasm_put(Dst, 5784, Dt5(->len), DISPATCH_GL(tmpbuf.sz), Dt5([1]), DISPATCH_GL(tmpbuf.buf), DISPATCH_GL(tmpbuf.buf), 1+1); - dasm_put(Dst, 5849, 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, 5912, 1+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz)); - dasm_put(Dst, 5983, sizeof(GCstr), DISPATCH_GL(tmpbuf.buf), 1+1); - dasm_put(Dst, 6068, 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, 6138, 1+1, LJ_TTAB); + dasm_put(Dst, 5786, Dt5(->len), DISPATCH_GL(tmpbuf.sz), Dt5([1]), DISPATCH_GL(tmpbuf.buf), DISPATCH_GL(tmpbuf.buf), 1+1); + dasm_put(Dst, 5851, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz), sizeof(GCstr), DISPATCH_GL(tmpbuf.buf)); + dasm_put(Dst, 5914, 1+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz)); + dasm_put(Dst, 5985, sizeof(GCstr), DISPATCH_GL(tmpbuf.buf), 1+1); + dasm_put(Dst, 6070, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz), sizeof(GCstr), DISPATCH_GL(tmpbuf.buf)); + dasm_put(Dst, 6140, 1+1, LJ_TTAB); if (LJ_DUALNUM) { - dasm_put(Dst, 6206); + dasm_put(Dst, 6208); } else if (sse) { - dasm_put(Dst, 6213); + dasm_put(Dst, 6215); } else { } - dasm_put(Dst, 6223, LJ_TISNUM); + dasm_put(Dst, 6225, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6231); + dasm_put(Dst, 6233); } else { - dasm_put(Dst, 2202); + dasm_put(Dst, 2204); } if (sse) { - dasm_put(Dst, 6248, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6250, (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, 6272); + dasm_put(Dst, 6274); } else { } - dasm_put(Dst, 6277); + dasm_put(Dst, 6279); if (sse) { - dasm_put(Dst, 6280, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6282, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { - dasm_put(Dst, 6290); + dasm_put(Dst, 6292); } - dasm_put(Dst, 2179, LJ_TISNUM); + dasm_put(Dst, 2181, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6299); + dasm_put(Dst, 6301); } else { - dasm_put(Dst, 2202); + dasm_put(Dst, 2204); } if (sse) { - dasm_put(Dst, 6316); + dasm_put(Dst, 6318); } else { } - dasm_put(Dst, 6331, LJ_TISNUM); + dasm_put(Dst, 6333, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6356); + dasm_put(Dst, 6358); } else { - dasm_put(Dst, 6376); + dasm_put(Dst, 6378); } if (sse) { - dasm_put(Dst, 6381); + dasm_put(Dst, 6383); } else { } - dasm_put(Dst, 6398); + dasm_put(Dst, 6400); if (sse) { - dasm_put(Dst, 6280, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6282, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { - dasm_put(Dst, 6290); + dasm_put(Dst, 6292); } - dasm_put(Dst, 2179, LJ_TISNUM); + dasm_put(Dst, 2181, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6299); + dasm_put(Dst, 6301); } else { - dasm_put(Dst, 2202); + dasm_put(Dst, 2204); } if (sse) { - dasm_put(Dst, 6316); + dasm_put(Dst, 6318); } else { } - dasm_put(Dst, 6331, LJ_TISNUM); + dasm_put(Dst, 6333, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6408); + dasm_put(Dst, 6410); } else { - dasm_put(Dst, 6376); + dasm_put(Dst, 6378); } if (sse) { - dasm_put(Dst, 6428); + dasm_put(Dst, 6430); } else { } - dasm_put(Dst, 6445); + dasm_put(Dst, 6447); if (sse) { - dasm_put(Dst, 6280, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6282, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { - dasm_put(Dst, 6290); + dasm_put(Dst, 6292); } - dasm_put(Dst, 2179, LJ_TISNUM); + dasm_put(Dst, 2181, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6299); + dasm_put(Dst, 6301); } else { - dasm_put(Dst, 2202); + dasm_put(Dst, 2204); } if (sse) { - dasm_put(Dst, 6316); + dasm_put(Dst, 6318); } else { } - dasm_put(Dst, 6331, LJ_TISNUM); + dasm_put(Dst, 6333, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6455); + dasm_put(Dst, 6457); } else { - dasm_put(Dst, 6376); + dasm_put(Dst, 6378); } if (sse) { - dasm_put(Dst, 6475); + dasm_put(Dst, 6477); } else { } - dasm_put(Dst, 6492, LJ_TISNUM); + dasm_put(Dst, 6494, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6299); + dasm_put(Dst, 6301); } else { - dasm_put(Dst, 2202); + dasm_put(Dst, 2204); } if (sse) { - dasm_put(Dst, 6248, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6250, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6507, LJ_TISNUM); + dasm_put(Dst, 6509, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6299); + dasm_put(Dst, 6301); } else { - dasm_put(Dst, 2202); + dasm_put(Dst, 2204); } if (sse) { - dasm_put(Dst, 6248, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6250, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6523); + dasm_put(Dst, 6525); if (LJ_DUALNUM) { - dasm_put(Dst, 6272); + dasm_put(Dst, 6274); } else if (sse) { - dasm_put(Dst, 6529); + dasm_put(Dst, 6531); } else { } - dasm_put(Dst, 6541); + dasm_put(Dst, 6543); if (LJ_DUALNUM) { - dasm_put(Dst, 6552, LJ_TISNUM); + dasm_put(Dst, 6554, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6299); + dasm_put(Dst, 6301); } else { - dasm_put(Dst, 2202); + dasm_put(Dst, 2204); } if (sse) { - dasm_put(Dst, 6248, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6250, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6560, LJ_TISNUM); + dasm_put(Dst, 6562, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 6575, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6577, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6642); + dasm_put(Dst, 6644); if (LJ_DUALNUM) { - dasm_put(Dst, 6649, LJ_TISNUM); + dasm_put(Dst, 6651, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6299); + dasm_put(Dst, 6301); } else { - dasm_put(Dst, 2202); + dasm_put(Dst, 2204); } if (sse) { - dasm_put(Dst, 6248, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6250, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6560, LJ_TISNUM); + dasm_put(Dst, 6562, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 6657, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6659, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6724); + dasm_put(Dst, 6726); if (LJ_DUALNUM) { - dasm_put(Dst, 6732, LJ_TISNUM); + dasm_put(Dst, 6734, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6299); + dasm_put(Dst, 6301); } else { - dasm_put(Dst, 2202); + dasm_put(Dst, 2204); } if (sse) { - dasm_put(Dst, 6248, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6250, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6560, LJ_TISNUM); + dasm_put(Dst, 6562, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 6740, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6742, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6807); + dasm_put(Dst, 6809); if (LJ_DUALNUM) { - dasm_put(Dst, 6815, LJ_TISNUM); + dasm_put(Dst, 6817, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6299); + dasm_put(Dst, 6301); } else { - dasm_put(Dst, 2202); + dasm_put(Dst, 2204); } if (sse) { - dasm_put(Dst, 6248, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6250, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6560, LJ_TISNUM); + dasm_put(Dst, 6562, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 6823, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6825, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6890); + dasm_put(Dst, 6892); if (LJ_DUALNUM) { - dasm_put(Dst, 6897, LJ_TISNUM); + dasm_put(Dst, 6899, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6299); + dasm_put(Dst, 6301); } else { - dasm_put(Dst, 2202); + dasm_put(Dst, 2204); } if (sse) { - dasm_put(Dst, 6248, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6250, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6560, LJ_TISNUM); + dasm_put(Dst, 6562, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 6905, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); + dasm_put(Dst, 6907, 2+1, LJ_TISNUM, LJ_TISNUM, (unsigned int)(U64x(43380000,00000000)), (unsigned int)((U64x(43380000,00000000))>>32)); } else { } - dasm_put(Dst, 6972, 1+2, 1+1, Dt1(->base), 8*LUA_MINSTACK, Dt1(->top), Dt1(->maxstack), Dt8(->f), Dt1(->base)); - dasm_put(Dst, 7048, Dt1(->top), Dt7(->pc), FRAME_TYPE, LUA_MINSTACK, Dt1(->base), Dt1(->base)); - dasm_put(Dst, 7175, Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 6974, 1+2, 1+1, Dt1(->base), 8*LUA_MINSTACK, Dt1(->top), Dt1(->maxstack), Dt8(->f), Dt1(->base)); + dasm_put(Dst, 7050, Dt1(->top), Dt7(->pc), FRAME_TYPE, LUA_MINSTACK, Dt1(->base), Dt1(->base)); + dasm_put(Dst, 7177, Dt1(->top), Dt1(->base), Dt1(->top)); #if LJ_HASJIT - dasm_put(Dst, 7214, DISPATCH_GL(hookmask), HOOK_VMEVENT, HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount)); + dasm_put(Dst, 7216, DISPATCH_GL(hookmask), HOOK_VMEVENT, HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount)); #endif - dasm_put(Dst, 7245, DISPATCH_GL(hookmask), HOOK_ACTIVE, DISPATCH_GL(hookmask), HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount), LUA_MASKLINE); - dasm_put(Dst, 7296, Dt1(->base), Dt1(->base), GG_DISP2STATIC); + dasm_put(Dst, 7247, DISPATCH_GL(hookmask), HOOK_ACTIVE, DISPATCH_GL(hookmask), HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount), LUA_MASKLINE); + dasm_put(Dst, 7298, Dt1(->base), Dt1(->base), GG_DISP2STATIC); #if LJ_HASJIT - dasm_put(Dst, 7363, Dt7(->pc), PC2PROTO(framesize), Dt1(->base), Dt1(->top), GG_DISP2J, DISPATCH_J(L)); + dasm_put(Dst, 7365, Dt7(->pc), PC2PROTO(framesize), Dt1(->base), Dt1(->top), GG_DISP2J, DISPATCH_J(L)); #endif - dasm_put(Dst, 7410); + dasm_put(Dst, 7412); #if LJ_HASJIT - dasm_put(Dst, 7240); + dasm_put(Dst, 7242); #endif - dasm_put(Dst, 7417); + dasm_put(Dst, 7419); #if LJ_HASJIT - dasm_put(Dst, 7420); + dasm_put(Dst, 7422); #endif - dasm_put(Dst, 7430, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 7432, Dt1(->base), Dt1(->top)); #if LJ_HASJIT - dasm_put(Dst, 7464); + dasm_put(Dst, 7466); #endif - dasm_put(Dst, 7469, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 7471, Dt1(->base), Dt1(->top)); #if LJ_HASJIT - dasm_put(Dst, 7500, DISPATCH_GL(vmstate), DISPATCH_GL(vmstate), ~LJ_VMST_EXIT, DISPATCH_J(exitno), DISPATCH_J(parent), 16*8+4*8, DISPATCH_GL(jit_L), DISPATCH_GL(jit_base), DISPATCH_J(L), DISPATCH_GL(jit_L), Dt1(->base), 4*8, GG_DISP2J, Dt1(->cframe), CFRAME_RAWMASK, CFRAME_OFS_L, Dt1(->base), CFRAME_OFS_PC); + dasm_put(Dst, 7502, DISPATCH_GL(vmstate), DISPATCH_GL(vmstate), ~LJ_VMST_EXIT, DISPATCH_J(exitno), DISPATCH_J(parent), 16*8+4*8, DISPATCH_GL(jit_L), DISPATCH_GL(jit_base), DISPATCH_J(L), DISPATCH_GL(jit_L), Dt1(->base), 4*8, GG_DISP2J, Dt1(->cframe), CFRAME_RAWMASK, CFRAME_OFS_L, Dt1(->base), CFRAME_OFS_PC); #endif - dasm_put(Dst, 7730); + dasm_put(Dst, 7732); #if LJ_HASJIT - dasm_put(Dst, 7733, 9*16+4*8, -9*16, -8*16, -7*16, -6*16, -5*16, -4*16, -3*16, -2*16, -1*16, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, BC_FUNCF); - dasm_put(Dst, 7875); + dasm_put(Dst, 7735, 9*16+4*8, -9*16, -8*16, -7*16, -6*16, -5*16, -4*16, -3*16, -2*16, -1*16, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, BC_FUNCF); + dasm_put(Dst, 7877); #endif - dasm_put(Dst, 7901); + dasm_put(Dst, 7903); if (!sse) { - dasm_put(Dst, 7904); + dasm_put(Dst, 7906); } - dasm_put(Dst, 7949, (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, 7951, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); if (!sse) { - dasm_put(Dst, 8035); + dasm_put(Dst, 8037); } - dasm_put(Dst, 8080, (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, 8082, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(bff00000,00000000)), (unsigned int)((U64x(bff00000,00000000))>>32)); if (!sse) { - dasm_put(Dst, 8166); + dasm_put(Dst, 8168); } - dasm_put(Dst, 8205, (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, 8207, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); if (sse) { - dasm_put(Dst, 8294, (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, 8296, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); } else { - dasm_put(Dst, 8408); + dasm_put(Dst, 8410); } - dasm_put(Dst, 8455); + dasm_put(Dst, 8457); if (!sse) { } else { - dasm_put(Dst, 8529); + dasm_put(Dst, 8531); } - dasm_put(Dst, 8532); - dasm_put(Dst, 8617, (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, 8720, (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, 8876); + dasm_put(Dst, 8534); + dasm_put(Dst, 8619, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32)); + dasm_put(Dst, 8722, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(7ff00000,00000000)), (unsigned int)((U64x(7ff00000,00000000))>>32)); + dasm_put(Dst, 8878); #if LJ_HASJIT if (sse) { - dasm_put(Dst, 8917); - dasm_put(Dst, 8987); - dasm_put(Dst, 9060); + dasm_put(Dst, 8919); + dasm_put(Dst, 8989); + dasm_put(Dst, 9062); } else { - dasm_put(Dst, 9110); - dasm_put(Dst, 9202); + dasm_put(Dst, 9112); + dasm_put(Dst, 9204); } - dasm_put(Dst, 9248); + dasm_put(Dst, 9250); #endif - dasm_put(Dst, 9252); + dasm_put(Dst, 9254); if (sse) { - dasm_put(Dst, 9255, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); - dasm_put(Dst, 9344, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); + dasm_put(Dst, 9257, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); + dasm_put(Dst, 9346, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); } else { - dasm_put(Dst, 9468); - dasm_put(Dst, 9551); + dasm_put(Dst, 9470); + dasm_put(Dst, 9553); if (cmov) { - dasm_put(Dst, 9606); + dasm_put(Dst, 9608); } else { - dasm_put(Dst, 9625); + dasm_put(Dst, 9627); } - dasm_put(Dst, 9248); + dasm_put(Dst, 9250); } - dasm_put(Dst, 9666); + dasm_put(Dst, 9668); #if LJ_HASFFI #define DtE(_V) (int)(ptrdiff_t)&(((CCallState *)0)_V) - dasm_put(Dst, 9694, DtE(->spadj)); + dasm_put(Dst, 9696, DtE(->spadj)); #if LJ_TARGET_WINDOWS #endif - dasm_put(Dst, 9709, DtE(->nsp), offsetof(CCallState, stack), CCALL_SPS_EXTRA*8, DtE(->nfpr), DtE(->gpr[0]), DtE(->gpr[1]), DtE(->gpr[2]), DtE(->gpr[3]), DtE(->fpr[0]), DtE(->fpr[1]), DtE(->fpr[2]), DtE(->fpr[3])); - dasm_put(Dst, 9790, DtE(->func), DtE(->gpr[0]), DtE(->fpr[0])); + dasm_put(Dst, 9711, DtE(->nsp), offsetof(CCallState, stack), CCALL_SPS_EXTRA*8, DtE(->nfpr), DtE(->gpr[0]), DtE(->gpr[1]), DtE(->gpr[2]), DtE(->gpr[3]), DtE(->fpr[0]), DtE(->fpr[1]), DtE(->fpr[2]), DtE(->fpr[3])); + dasm_put(Dst, 9792, DtE(->func), DtE(->gpr[0]), DtE(->fpr[0])); #if LJ_TARGET_WINDOWS #endif - dasm_put(Dst, 9803); + dasm_put(Dst, 9805); #endif - dasm_put(Dst, 9811); + dasm_put(Dst, 9813); #ifdef LUA_USE_ASSERT - dasm_put(Dst, 9250); + dasm_put(Dst, 9252); #endif - dasm_put(Dst, 9250); + dasm_put(Dst, 9252); } /* 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, 9814, defop); + dasm_put(Dst, 9816, defop); switch (op) { @@ -1843,296 +1845,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, 9816, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 9818, LJ_TISNUM, LJ_TISNUM); switch (op) { case BC_ISLT: - dasm_put(Dst, 9846); + dasm_put(Dst, 9848); break; case BC_ISGE: - dasm_put(Dst, 9851); + dasm_put(Dst, 9853); break; case BC_ISLE: - dasm_put(Dst, 9856); + dasm_put(Dst, 9858); break; case BC_ISGT: - dasm_put(Dst, 9861); + dasm_put(Dst, 9863); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 9866, -BCBIAS_J*4, LJ_TISNUM); + dasm_put(Dst, 9868, -BCBIAS_J*4, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9920); + dasm_put(Dst, 9922); } else { - dasm_put(Dst, 9931); + dasm_put(Dst, 9933); } - dasm_put(Dst, 9942); + dasm_put(Dst, 9944); if (sse) { - dasm_put(Dst, 9949); + dasm_put(Dst, 9951); switch (op) { case BC_ISLT: - dasm_put(Dst, 9969); + dasm_put(Dst, 9971); break; case BC_ISGE: - dasm_put(Dst, 9974); + dasm_put(Dst, 9976); break; case BC_ISLE: - dasm_put(Dst, 9979); + dasm_put(Dst, 9981); break; case BC_ISGT: - dasm_put(Dst, 9984); + dasm_put(Dst, 9986); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 9989); + dasm_put(Dst, 9991); } else { - dasm_put(Dst, 9994); + dasm_put(Dst, 9996); } } else { - dasm_put(Dst, 10002, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10004, LJ_TISNUM, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 10023); + dasm_put(Dst, 10025); } else { - dasm_put(Dst, 10044); + dasm_put(Dst, 10046); if (cmov) { - dasm_put(Dst, 10060); + dasm_put(Dst, 10062); } else { - dasm_put(Dst, 10066); + dasm_put(Dst, 10068); } } if (LJ_DUALNUM) { switch (op) { case BC_ISLT: - dasm_put(Dst, 9969); + dasm_put(Dst, 9971); break; case BC_ISGE: - dasm_put(Dst, 9974); + dasm_put(Dst, 9976); break; case BC_ISLE: - dasm_put(Dst, 9979); + dasm_put(Dst, 9981); break; case BC_ISGT: - dasm_put(Dst, 9984); + dasm_put(Dst, 9986); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 9989); + dasm_put(Dst, 9991); } else { switch (op) { case BC_ISLT: - dasm_put(Dst, 10073); + dasm_put(Dst, 10075); break; case BC_ISGE: - dasm_put(Dst, 10078); + dasm_put(Dst, 10080); break; case BC_ISLE: - dasm_put(Dst, 10083); + dasm_put(Dst, 10085); break; case BC_ISGT: - dasm_put(Dst, 10088); + dasm_put(Dst, 10090); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 10093, -BCBIAS_J*4); + dasm_put(Dst, 10095, -BCBIAS_J*4); } break; case BC_ISEQV: case BC_ISNEV: vk = op == BC_ISEQV; - dasm_put(Dst, 10125); + dasm_put(Dst, 10127); if (LJ_DUALNUM) { - dasm_put(Dst, 10133, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10135, LJ_TISNUM, LJ_TISNUM); if (vk) { - dasm_put(Dst, 10158); + dasm_put(Dst, 10160); } else { - dasm_put(Dst, 10163); + dasm_put(Dst, 10165); } - dasm_put(Dst, 10168, -BCBIAS_J*4, LJ_TISNUM); + dasm_put(Dst, 10170, -BCBIAS_J*4, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10220); + dasm_put(Dst, 10222); } else { - dasm_put(Dst, 10227); + dasm_put(Dst, 10229); } - dasm_put(Dst, 10231); + dasm_put(Dst, 10233); if (sse) { - dasm_put(Dst, 10242); + dasm_put(Dst, 10244); } else { - dasm_put(Dst, 10254); + dasm_put(Dst, 10256); } - dasm_put(Dst, 10261); + dasm_put(Dst, 10263); } else { - dasm_put(Dst, 10266, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10268, LJ_TISNUM, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 10285); + dasm_put(Dst, 10287); } else { - dasm_put(Dst, 10303); + dasm_put(Dst, 10305); if (cmov) { - dasm_put(Dst, 10060); + dasm_put(Dst, 10062); } else { - dasm_put(Dst, 10066); + dasm_put(Dst, 10068); } } iseqne_fp: if (vk) { - dasm_put(Dst, 10316); + dasm_put(Dst, 10318); } else { - dasm_put(Dst, 10325); + dasm_put(Dst, 10327); } iseqne_end: if (vk) { - dasm_put(Dst, 10334, -BCBIAS_J*4); + dasm_put(Dst, 10336, -BCBIAS_J*4); if (!LJ_HASFFI) { - dasm_put(Dst, 4567); + dasm_put(Dst, 4569); } } else { if (!LJ_HASFFI) { - dasm_put(Dst, 4567); + dasm_put(Dst, 4569); } - dasm_put(Dst, 10349, -BCBIAS_J*4); + dasm_put(Dst, 10351, -BCBIAS_J*4); } if (LJ_DUALNUM && (op == BC_ISEQV || op == BC_ISNEV || op == BC_ISEQN || op == BC_ISNEN)) { - dasm_put(Dst, 10364); + dasm_put(Dst, 10366); } else { - dasm_put(Dst, 10105); + dasm_put(Dst, 10107); } if (op == BC_ISEQV || op == BC_ISNEV) { - dasm_put(Dst, 9787); + dasm_put(Dst, 9789); if (LJ_HASFFI) { - dasm_put(Dst, 10369, LJ_TCDATA, LJ_TCDATA); + dasm_put(Dst, 10371, LJ_TCDATA, LJ_TCDATA); } - dasm_put(Dst, 10388, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<metatable), Dt6(->nomm), 1<>32)); + dasm_put(Dst, 10945, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); } else { - dasm_put(Dst, 10968); + dasm_put(Dst, 10970); } if (LJ_DUALNUM) { - dasm_put(Dst, 10364); + dasm_put(Dst, 10366); } else { - dasm_put(Dst, 10105); + dasm_put(Dst, 10107); } break; case BC_LEN: - dasm_put(Dst, 10977, LJ_TSTR); + dasm_put(Dst, 10979, LJ_TSTR); if (LJ_DUALNUM) { - dasm_put(Dst, 10991, Dt5(->len), LJ_TISNUM); + dasm_put(Dst, 10993, Dt5(->len), LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 11005, Dt5(->len)); + dasm_put(Dst, 11007, Dt5(->len)); } else { - dasm_put(Dst, 11023, Dt5(->len)); + dasm_put(Dst, 11025, Dt5(->len)); } - dasm_put(Dst, 11032, LJ_TTAB); + dasm_put(Dst, 11034, LJ_TTAB); if (LJ_DUALNUM) { } else if (sse) { - dasm_put(Dst, 11073); + dasm_put(Dst, 11075); } else { } - dasm_put(Dst, 11079); + dasm_put(Dst, 11081); break; /* -- Binary ops -------------------------------------------------------- */ @@ -2140,605 +2142,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, 11092); + dasm_put(Dst, 11094); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11100, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11102, LJ_TISNUM, LJ_TISNUM); break; case 1: - dasm_put(Dst, 11133, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11135, LJ_TISNUM, LJ_TISNUM); break; default: - dasm_put(Dst, 11166, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11168, LJ_TISNUM, LJ_TISNUM); break; } - dasm_put(Dst, 11199, LJ_TISNUM); + dasm_put(Dst, 11201, LJ_TISNUM); if (vk == 1) { - dasm_put(Dst, 11001); + dasm_put(Dst, 11003); } else { - dasm_put(Dst, 10787); + dasm_put(Dst, 10789); } - dasm_put(Dst, 10105); + dasm_put(Dst, 10107); } else { - dasm_put(Dst, 11092); + dasm_put(Dst, 11094); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11205, LJ_TISNUM); + dasm_put(Dst, 11207, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11217, LJ_TISNUM); + dasm_put(Dst, 11219, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11228); + dasm_put(Dst, 11230); } else { - dasm_put(Dst, 11242); + dasm_put(Dst, 11244); } break; case 1: - dasm_put(Dst, 11250, LJ_TISNUM); + dasm_put(Dst, 11252, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11262, LJ_TISNUM); + dasm_put(Dst, 11264, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11273); + dasm_put(Dst, 11275); } else { - dasm_put(Dst, 11287); + dasm_put(Dst, 11289); } break; default: - dasm_put(Dst, 11295, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11297, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11317); + dasm_put(Dst, 11319); } else { - dasm_put(Dst, 11331); + dasm_put(Dst, 11333); } break; } if (sse) { - dasm_put(Dst, 10961); + dasm_put(Dst, 10963); } else { - dasm_put(Dst, 10973); + dasm_put(Dst, 10975); } - dasm_put(Dst, 10105); + dasm_put(Dst, 10107); } break; case BC_SUBVN: case BC_SUBNV: case BC_SUBVV: if (LJ_DUALNUM) { - dasm_put(Dst, 11092); + dasm_put(Dst, 11094); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11339, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11341, LJ_TISNUM, LJ_TISNUM); break; case 1: - dasm_put(Dst, 11372, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11374, LJ_TISNUM, LJ_TISNUM); break; default: - dasm_put(Dst, 11405, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11407, LJ_TISNUM, LJ_TISNUM); break; } - dasm_put(Dst, 11199, LJ_TISNUM); + dasm_put(Dst, 11201, LJ_TISNUM); if (vk == 1) { - dasm_put(Dst, 11001); + dasm_put(Dst, 11003); } else { - dasm_put(Dst, 10787); + dasm_put(Dst, 10789); } - dasm_put(Dst, 10105); + dasm_put(Dst, 10107); } else { - dasm_put(Dst, 11092); + dasm_put(Dst, 11094); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11205, LJ_TISNUM); + dasm_put(Dst, 11207, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11217, LJ_TISNUM); + dasm_put(Dst, 11219, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11438); + dasm_put(Dst, 11440); } else { - dasm_put(Dst, 11452); + dasm_put(Dst, 11454); } break; case 1: - dasm_put(Dst, 11250, LJ_TISNUM); + dasm_put(Dst, 11252, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11262, LJ_TISNUM); + dasm_put(Dst, 11264, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11460); + dasm_put(Dst, 11462); } else { - dasm_put(Dst, 11474); + dasm_put(Dst, 11476); } break; default: - dasm_put(Dst, 11295, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11297, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11482); + dasm_put(Dst, 11484); } else { - dasm_put(Dst, 11496); + dasm_put(Dst, 11498); } break; } if (sse) { - dasm_put(Dst, 10961); + dasm_put(Dst, 10963); } else { - dasm_put(Dst, 10973); + dasm_put(Dst, 10975); } - dasm_put(Dst, 10105); + dasm_put(Dst, 10107); } break; case BC_MULVN: case BC_MULNV: case BC_MULVV: if (LJ_DUALNUM) { - dasm_put(Dst, 11092); + dasm_put(Dst, 11094); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11504, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11506, LJ_TISNUM, LJ_TISNUM); break; case 1: - dasm_put(Dst, 11538, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11540, LJ_TISNUM, LJ_TISNUM); break; default: - dasm_put(Dst, 11572, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11574, LJ_TISNUM, LJ_TISNUM); break; } - dasm_put(Dst, 11199, LJ_TISNUM); + dasm_put(Dst, 11201, LJ_TISNUM); if (vk == 1) { - dasm_put(Dst, 11001); + dasm_put(Dst, 11003); } else { - dasm_put(Dst, 10787); + dasm_put(Dst, 10789); } - dasm_put(Dst, 10105); + dasm_put(Dst, 10107); } else { - dasm_put(Dst, 11092); + dasm_put(Dst, 11094); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11205, LJ_TISNUM); + dasm_put(Dst, 11207, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11217, LJ_TISNUM); + dasm_put(Dst, 11219, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11606); + dasm_put(Dst, 11608); } else { - dasm_put(Dst, 11620); + dasm_put(Dst, 11622); } break; case 1: - dasm_put(Dst, 11250, LJ_TISNUM); + dasm_put(Dst, 11252, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11262, LJ_TISNUM); + dasm_put(Dst, 11264, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11628); + dasm_put(Dst, 11630); } else { - dasm_put(Dst, 11642); + dasm_put(Dst, 11644); } break; default: - dasm_put(Dst, 11295, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11297, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11650); + dasm_put(Dst, 11652); } else { - dasm_put(Dst, 11664); + dasm_put(Dst, 11666); } break; } if (sse) { - dasm_put(Dst, 10961); + dasm_put(Dst, 10963); } else { - dasm_put(Dst, 10973); + dasm_put(Dst, 10975); } - dasm_put(Dst, 10105); + dasm_put(Dst, 10107); } break; case BC_DIVVN: case BC_DIVNV: case BC_DIVVV: - dasm_put(Dst, 11092); + dasm_put(Dst, 11094); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11205, LJ_TISNUM); + dasm_put(Dst, 11207, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11217, LJ_TISNUM); + dasm_put(Dst, 11219, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11672); + dasm_put(Dst, 11674); } else { - dasm_put(Dst, 11686); + dasm_put(Dst, 11688); } break; case 1: - dasm_put(Dst, 11250, LJ_TISNUM); + dasm_put(Dst, 11252, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11262, LJ_TISNUM); + dasm_put(Dst, 11264, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11694); + dasm_put(Dst, 11696); } else { - dasm_put(Dst, 11708); + dasm_put(Dst, 11710); } break; default: - dasm_put(Dst, 11295, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11297, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11716); + dasm_put(Dst, 11718); } else { - dasm_put(Dst, 11730); + dasm_put(Dst, 11732); } break; } if (sse) { - dasm_put(Dst, 10961); + dasm_put(Dst, 10963); } else { - dasm_put(Dst, 10973); + dasm_put(Dst, 10975); } - dasm_put(Dst, 10105); + dasm_put(Dst, 10107); break; case BC_MODVN: - dasm_put(Dst, 11092); + dasm_put(Dst, 11094); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11205, LJ_TISNUM); + dasm_put(Dst, 11207, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11217, LJ_TISNUM); + dasm_put(Dst, 11219, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11738); + dasm_put(Dst, 11740); } else { - dasm_put(Dst, 11752); + dasm_put(Dst, 11754); } break; case 1: - dasm_put(Dst, 11250, LJ_TISNUM); + dasm_put(Dst, 11252, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11262, LJ_TISNUM); + dasm_put(Dst, 11264, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11760); + dasm_put(Dst, 11762); } else { - dasm_put(Dst, 11774); + dasm_put(Dst, 11776); } break; default: - dasm_put(Dst, 11295, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11297, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11782); + dasm_put(Dst, 11784); } else { - dasm_put(Dst, 11796); + dasm_put(Dst, 11798); } break; } - dasm_put(Dst, 11804); + dasm_put(Dst, 11806); if (sse) { - dasm_put(Dst, 10961); + dasm_put(Dst, 10963); } else { - dasm_put(Dst, 10973); + dasm_put(Dst, 10975); } - dasm_put(Dst, 10105); + dasm_put(Dst, 10107); break; case BC_MODNV: case BC_MODVV: - dasm_put(Dst, 11092); + dasm_put(Dst, 11094); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11205, LJ_TISNUM); + dasm_put(Dst, 11207, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11217, LJ_TISNUM); + dasm_put(Dst, 11219, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11738); + dasm_put(Dst, 11740); } else { - dasm_put(Dst, 11752); + dasm_put(Dst, 11754); } break; case 1: - dasm_put(Dst, 11250, LJ_TISNUM); + dasm_put(Dst, 11252, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11262, LJ_TISNUM); + dasm_put(Dst, 11264, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11760); + dasm_put(Dst, 11762); } else { - dasm_put(Dst, 11774); + dasm_put(Dst, 11776); } break; default: - dasm_put(Dst, 11295, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11297, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11782); + dasm_put(Dst, 11784); } else { - dasm_put(Dst, 11796); + dasm_put(Dst, 11798); } break; } - dasm_put(Dst, 11810); + dasm_put(Dst, 11812); break; case BC_POW: - dasm_put(Dst, 11092); + dasm_put(Dst, 11094); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11205, LJ_TISNUM); + dasm_put(Dst, 11207, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11217, LJ_TISNUM); + dasm_put(Dst, 11219, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11738); + dasm_put(Dst, 11740); } else { - dasm_put(Dst, 11752); + dasm_put(Dst, 11754); } break; case 1: - dasm_put(Dst, 11250, LJ_TISNUM); + dasm_put(Dst, 11252, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 11262, LJ_TISNUM); + dasm_put(Dst, 11264, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11760); + dasm_put(Dst, 11762); } else { - dasm_put(Dst, 11774); + dasm_put(Dst, 11776); } break; default: - dasm_put(Dst, 11295, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11297, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11782); + dasm_put(Dst, 11784); } else { - dasm_put(Dst, 11796); + dasm_put(Dst, 11798); } break; } - dasm_put(Dst, 11815); + dasm_put(Dst, 11817); if (sse) { - dasm_put(Dst, 10961); + dasm_put(Dst, 10963); } else { - dasm_put(Dst, 10973); + dasm_put(Dst, 10975); } - dasm_put(Dst, 10105); + dasm_put(Dst, 10107); break; case BC_CAT: - dasm_put(Dst, 11819, Dt1(->base), Dt1(->base)); + dasm_put(Dst, 11821, Dt1(->base), Dt1(->base)); break; /* -- Constant ops ------------------------------------------------------ */ case BC_KSTR: - dasm_put(Dst, 11902, LJ_TSTR); + dasm_put(Dst, 11904, LJ_TSTR); break; case BC_KCDATA: #if LJ_HASFFI - dasm_put(Dst, 11902, LJ_TCDATA); + dasm_put(Dst, 11904, LJ_TCDATA); #endif break; case BC_KSHORT: if (LJ_DUALNUM) { - dasm_put(Dst, 11937, LJ_TISNUM); + dasm_put(Dst, 11939, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 11949); + dasm_put(Dst, 11951); } else { - dasm_put(Dst, 11964); + dasm_put(Dst, 11966); } - dasm_put(Dst, 10105); + dasm_put(Dst, 10107); break; case BC_KNUM: if (sse) { - dasm_put(Dst, 11972); + dasm_put(Dst, 11974); } else { - dasm_put(Dst, 11985); + dasm_put(Dst, 11987); } - dasm_put(Dst, 10105); + dasm_put(Dst, 10107); break; case BC_KPRI: - dasm_put(Dst, 11992); + dasm_put(Dst, 11994); break; case BC_KNIL: - dasm_put(Dst, 12020, LJ_TNIL); + dasm_put(Dst, 12022, LJ_TNIL); break; /* -- Upvalue and function ops ------------------------------------------ */ case BC_UGET: - dasm_put(Dst, 12067, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12069, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_USETV: #define TV2MARKOFS \ ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv)) - dasm_put(Dst, 12107, offsetof(GCfuncL, uvptr), DtA(->closed), DtA(->v), TV2MARKOFS, LJ_GC_BLACK, LJ_TISGCV, LJ_TISNUM - LJ_TISGCV, Dt4(->gch.marked), LJ_GC_WHITES, GG_DISP2G); - dasm_put(Dst, 12198); + dasm_put(Dst, 12109, offsetof(GCfuncL, uvptr), DtA(->closed), DtA(->v), TV2MARKOFS, LJ_GC_BLACK, LJ_TISGCV, LJ_TISNUM - LJ_TISGCV, Dt4(->gch.marked), LJ_GC_WHITES, GG_DISP2G); + dasm_put(Dst, 12200); break; #undef TV2MARKOFS case BC_USETS: - dasm_put(Dst, 12210, offsetof(GCfuncL, uvptr), DtA(->v), LJ_TSTR, DtA(->marked), LJ_GC_BLACK, Dt4(->gch.marked), LJ_GC_WHITES, DtA(->closed), GG_DISP2G); + dasm_put(Dst, 12212, offsetof(GCfuncL, uvptr), DtA(->v), LJ_TSTR, DtA(->marked), LJ_GC_BLACK, Dt4(->gch.marked), LJ_GC_WHITES, DtA(->closed), GG_DISP2G); break; case BC_USETN: - dasm_put(Dst, 12303); + dasm_put(Dst, 12305); if (sse) { - dasm_put(Dst, 12308); + dasm_put(Dst, 12310); } else { - dasm_put(Dst, 10616); + dasm_put(Dst, 10618); } - dasm_put(Dst, 12315, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12317, offsetof(GCfuncL, uvptr), DtA(->v)); if (sse) { - dasm_put(Dst, 12324); + dasm_put(Dst, 12326); } else { - dasm_put(Dst, 12330); + dasm_put(Dst, 12332); } - dasm_put(Dst, 10105); + dasm_put(Dst, 10107); break; case BC_USETP: - dasm_put(Dst, 12333, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12335, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_UCLO: - dasm_put(Dst, 12372, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 12374, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); break; case BC_FNEW: - dasm_put(Dst, 12427, Dt1(->base), Dt1(->base), LJ_TFUNC); + dasm_put(Dst, 12429, Dt1(->base), Dt1(->base), LJ_TFUNC); break; /* -- Table ops --------------------------------------------------------- */ case BC_TNEW: - dasm_put(Dst, 12493, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 12495, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); break; case BC_TDUP: - dasm_put(Dst, 12615, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 12617, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); break; case BC_GGET: - dasm_put(Dst, 12710, Dt7(->env)); + dasm_put(Dst, 12712, Dt7(->env)); break; case BC_GSET: - dasm_put(Dst, 12729, Dt7(->env)); + dasm_put(Dst, 12731, Dt7(->env)); break; case BC_TGETV: - dasm_put(Dst, 12748, LJ_TTAB); + dasm_put(Dst, 12750, LJ_TTAB); if (LJ_DUALNUM) { - dasm_put(Dst, 12771, LJ_TISNUM); + dasm_put(Dst, 12773, LJ_TISNUM); } else { - dasm_put(Dst, 12785, LJ_TISNUM); + dasm_put(Dst, 12787, LJ_TISNUM); if (sse) { - dasm_put(Dst, 12796); + dasm_put(Dst, 12798); } else { } - dasm_put(Dst, 12817); + dasm_put(Dst, 12819); } - dasm_put(Dst, 12822, 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, 13015, 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, 13017, 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, 13228, 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, 13363, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->nomm), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); - dasm_put(Dst, 13439, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); - dasm_put(Dst, 13527, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13365, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->nomm), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); + dasm_put(Dst, 13441, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); + dasm_put(Dst, 13529, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETB: - dasm_put(Dst, 13618, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); - dasm_put(Dst, 13712, Dt6(->metatable), Dt6(->nomm), 1<marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13620, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); + dasm_put(Dst, 13714, Dt6(->metatable), Dt6(->nomm), 1<marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETM: - dasm_put(Dst, 13758, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); - dasm_put(Dst, 13901, Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13760, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 13903, Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; /* -- Calls and vararg handling ----------------------------------------- */ case BC_CALL: case BC_CALLM: - dasm_put(Dst, 11096); + dasm_put(Dst, 11098); if (op == BC_CALLM) { - dasm_put(Dst, 13919); + dasm_put(Dst, 13921); } - dasm_put(Dst, 13924, LJ_TFUNC, Dt7(->pc)); + dasm_put(Dst, 13926, LJ_TFUNC, Dt7(->pc)); break; case BC_CALLMT: - dasm_put(Dst, 13919); + dasm_put(Dst, 13921); break; case BC_CALLT: - dasm_put(Dst, 13966, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); - dasm_put(Dst, 14081, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG); + dasm_put(Dst, 13968, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); + dasm_put(Dst, 14083, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG); break; case BC_ITERC: - dasm_put(Dst, 14152, LJ_TFUNC, 2+1, Dt7(->pc)); + dasm_put(Dst, 14154, LJ_TFUNC, 2+1, Dt7(->pc)); break; case BC_ITERN: #if LJ_HASJIT #endif - dasm_put(Dst, 14223, Dt6(->asize), Dt6(->array), LJ_TNIL); + dasm_put(Dst, 14225, Dt6(->asize), Dt6(->array), LJ_TNIL); if (LJ_DUALNUM) { - dasm_put(Dst, 10996, LJ_TISNUM); + dasm_put(Dst, 10998, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 11073); + dasm_put(Dst, 11075); } else { - dasm_put(Dst, 14269); + dasm_put(Dst, 14271); } - dasm_put(Dst, 14275); + dasm_put(Dst, 14277); if (LJ_DUALNUM) { } else if (sse) { - dasm_put(Dst, 10961); + dasm_put(Dst, 10963); } else { - dasm_put(Dst, 10973); + dasm_put(Dst, 10975); } - dasm_put(Dst, 14288, -BCBIAS_J*4); + dasm_put(Dst, 14290, -BCBIAS_J*4); if (!LJ_DUALNUM && !sse) { - dasm_put(Dst, 14340); + dasm_put(Dst, 14342); } - dasm_put(Dst, 14346, Dt6(->hmask), sizeof(Node), Dt6(->node), DtB(->val.it), LJ_TNIL, DtB(->key), DtB(->val)); + dasm_put(Dst, 14348, Dt6(->hmask), sizeof(Node), Dt6(->node), DtB(->val.it), LJ_TNIL, DtB(->key), DtB(->val)); break; case BC_ISNEXT: - dasm_put(Dst, 14418, LJ_TFUNC, LJ_TTAB, LJ_TNIL, Dt8(->ffid), FF_next_N, -BCBIAS_J*4, BC_JMP, -BCBIAS_J*4, BC_ITERC); + dasm_put(Dst, 14420, LJ_TFUNC, LJ_TTAB, LJ_TNIL, Dt8(->ffid), FF_next_N, -BCBIAS_J*4, BC_JMP, -BCBIAS_J*4, BC_ITERC); break; case BC_VARG: - dasm_put(Dst, 14518, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); - dasm_put(Dst, 14678, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 14520, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); + dasm_put(Dst, 14680, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); break; /* -- Returns ----------------------------------------------------------- */ case BC_RETM: - dasm_put(Dst, 13919); + dasm_put(Dst, 13921); break; case BC_RET: case BC_RET0: case BC_RET1: if (op != BC_RET0) { - dasm_put(Dst, 14744); + dasm_put(Dst, 14746); } - dasm_put(Dst, 14748, FRAME_TYPE); + dasm_put(Dst, 14750, FRAME_TYPE); switch (op) { case BC_RET: - dasm_put(Dst, 14767); + dasm_put(Dst, 14769); break; case BC_RET1: - dasm_put(Dst, 14819); + dasm_put(Dst, 14821); /* fallthrough */ case BC_RET0: - dasm_put(Dst, 14829); + dasm_put(Dst, 14831); default: break; } - dasm_put(Dst, 14840, Dt7(->pc), PC2PROTO(k)); + dasm_put(Dst, 14842, Dt7(->pc), PC2PROTO(k)); if (op == BC_RET) { - dasm_put(Dst, 14884, LJ_TNIL); + dasm_put(Dst, 14886, LJ_TNIL); } else { - dasm_put(Dst, 14893, LJ_TNIL); + dasm_put(Dst, 14895, LJ_TNIL); } - dasm_put(Dst, 14900, -FRAME_VARG, FRAME_TYPEP); + dasm_put(Dst, 14902, -FRAME_VARG, FRAME_TYPEP); if (op != BC_RET0) { - dasm_put(Dst, 14924); + dasm_put(Dst, 14926); } - dasm_put(Dst, 4646); + dasm_put(Dst, 4648); break; /* -- Loops and branches ------------------------------------------------ */ @@ -2746,7 +2748,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORL: #if LJ_HASJIT - dasm_put(Dst, 14928, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 14930, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2758,111 +2760,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, 14949); + dasm_put(Dst, 14951); if (LJ_DUALNUM) { - dasm_put(Dst, 14953, LJ_TISNUM); + dasm_put(Dst, 14955, LJ_TISNUM); if (!vk) { - dasm_put(Dst, 14963, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 14965, LJ_TISNUM, LJ_TISNUM); } else { #ifdef LUA_USE_ASSERT - dasm_put(Dst, 14992, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 14994, LJ_TISNUM, LJ_TISNUM); #endif - dasm_put(Dst, 15011); + dasm_put(Dst, 15013); } - dasm_put(Dst, 15030, LJ_TISNUM); + dasm_put(Dst, 15032, LJ_TISNUM); if (op == BC_FORI) { - dasm_put(Dst, 15041, -BCBIAS_J*4); + dasm_put(Dst, 15043, -BCBIAS_J*4); } else if (op == BC_JFORI) { - dasm_put(Dst, 15055, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 15057, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 15073, -BCBIAS_J*4); + dasm_put(Dst, 15075, -BCBIAS_J*4); } else { - dasm_put(Dst, 15065, BC_JLOOP); + dasm_put(Dst, 15067, BC_JLOOP); } - dasm_put(Dst, 15087); + dasm_put(Dst, 15089); if (vk) { - dasm_put(Dst, 15111); + dasm_put(Dst, 15113); } - dasm_put(Dst, 15030, LJ_TISNUM); + dasm_put(Dst, 15032, LJ_TISNUM); if (op == BC_FORI) { - dasm_put(Dst, 15120); + dasm_put(Dst, 15122); } else if (op == BC_JFORI) { - dasm_put(Dst, 15125, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 15127, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 15139); + dasm_put(Dst, 15141); } else { - dasm_put(Dst, 15135, BC_JLOOP); + dasm_put(Dst, 15137, BC_JLOOP); } - dasm_put(Dst, 15144); + dasm_put(Dst, 15146); } else if (!vk) { - dasm_put(Dst, 15151, LJ_TISNUM); + dasm_put(Dst, 15153, LJ_TISNUM); } if (!vk) { - dasm_put(Dst, 15157, LJ_TISNUM); + dasm_put(Dst, 15159, LJ_TISNUM); } else { #ifdef LUA_USE_ASSERT - dasm_put(Dst, 15171, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 15173, LJ_TISNUM, LJ_TISNUM); #endif } - dasm_put(Dst, 15190); + dasm_put(Dst, 15192); if (!vk) { - dasm_put(Dst, 15194, LJ_TISNUM); + dasm_put(Dst, 15196, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 15203); + dasm_put(Dst, 15205); if (vk) { - dasm_put(Dst, 15215); + dasm_put(Dst, 15217); } else { - dasm_put(Dst, 15234); + dasm_put(Dst, 15236); } - dasm_put(Dst, 15239); + dasm_put(Dst, 15241); } else { - dasm_put(Dst, 15252); + dasm_put(Dst, 15254); if (vk) { - dasm_put(Dst, 15258); + dasm_put(Dst, 15260); } else { - dasm_put(Dst, 15274); + dasm_put(Dst, 15276); } - dasm_put(Dst, 15282); + dasm_put(Dst, 15284); if (cmov) { - dasm_put(Dst, 10060); + dasm_put(Dst, 10062); } else { - dasm_put(Dst, 10066); + dasm_put(Dst, 10068); } if (!cmov) { - dasm_put(Dst, 15287); + dasm_put(Dst, 15289); } } if (op == BC_FORI) { if (LJ_DUALNUM) { - dasm_put(Dst, 15293); + dasm_put(Dst, 15295); } else { - dasm_put(Dst, 15298, -BCBIAS_J*4); + dasm_put(Dst, 15300, -BCBIAS_J*4); } } else if (op == BC_JFORI) { - dasm_put(Dst, 15308, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 15310, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { if (LJ_DUALNUM) { - dasm_put(Dst, 15322); + dasm_put(Dst, 15324); } else { - dasm_put(Dst, 15327, -BCBIAS_J*4); + dasm_put(Dst, 15329, -BCBIAS_J*4); } } else { - dasm_put(Dst, 15318, BC_JLOOP); + dasm_put(Dst, 15320, BC_JLOOP); } if (LJ_DUALNUM) { - dasm_put(Dst, 9989); + dasm_put(Dst, 9991); } else { - dasm_put(Dst, 10746); + dasm_put(Dst, 10748); } if (sse) { - dasm_put(Dst, 15337); + dasm_put(Dst, 15339); } break; case BC_ITERL: #if LJ_HASJIT - dasm_put(Dst, 14928, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 14930, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2871,33 +2873,33 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IITERL: - dasm_put(Dst, 15348, LJ_TNIL); + dasm_put(Dst, 15350, LJ_TNIL); if (op == BC_JITERL) { - dasm_put(Dst, 15363, BC_JLOOP); + dasm_put(Dst, 15365, BC_JLOOP); } else { - dasm_put(Dst, 15377, -BCBIAS_J*4); + dasm_put(Dst, 15379, -BCBIAS_J*4); } - dasm_put(Dst, 10103); + dasm_put(Dst, 10105); break; case BC_LOOP: #if LJ_HASJIT - dasm_put(Dst, 14928, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 14930, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; case BC_ILOOP: - dasm_put(Dst, 10105); + dasm_put(Dst, 10107); break; case BC_JLOOP: #if LJ_HASJIT - dasm_put(Dst, 15393, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L), 9*16+4*8, -1*16, -2*16, -3*16, -4*16, -5*16, -6*16, -7*16, -8*16, -9*16); + dasm_put(Dst, 15395, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L), 9*16+4*8, -1*16, -2*16, -3*16, -4*16, -5*16, -6*16, -7*16, -8*16, -9*16); #endif break; case BC_JMP: - dasm_put(Dst, 15502, -BCBIAS_J*4); + dasm_put(Dst, 15504, -BCBIAS_J*4); break; /* -- Function headers -------------------------------------------------- */ @@ -2911,7 +2913,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FUNCF: #if LJ_HASJIT - dasm_put(Dst, 15527, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 15529, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif case BC_FUNCV: /* NYI: compiled vararg functions. */ break; @@ -2921,47 +2923,47 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IFUNCF: - dasm_put(Dst, 15548, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); + dasm_put(Dst, 15550, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); if (op == BC_JFUNCF) { - dasm_put(Dst, 15578, BC_JLOOP); + dasm_put(Dst, 15580, BC_JLOOP); } else { - dasm_put(Dst, 10105); + dasm_put(Dst, 10107); } - dasm_put(Dst, 15587, LJ_TNIL); + dasm_put(Dst, 15589, LJ_TNIL); break; case BC_JFUNCV: #if !LJ_HASJIT break; #endif - dasm_put(Dst, 9250); + dasm_put(Dst, 9252); break; /* NYI: compiled vararg functions. */ case BC_IFUNCV: - dasm_put(Dst, 15609, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); + dasm_put(Dst, 15611, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); if (op == BC_JFUNCV) { - dasm_put(Dst, 15578, BC_JLOOP); + dasm_put(Dst, 15580, BC_JLOOP); } else { - dasm_put(Dst, 15700, -4+PC2PROTO(k)); + dasm_put(Dst, 15702, -4+PC2PROTO(k)); } - dasm_put(Dst, 15723, LJ_TNIL); + dasm_put(Dst, 15725, LJ_TNIL); break; case BC_FUNCC: case BC_FUNCCW: - dasm_put(Dst, 15745, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); + dasm_put(Dst, 15747, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); if (op == BC_FUNCC) { - dasm_put(Dst, 2310); + dasm_put(Dst, 2312); } else { - dasm_put(Dst, 15775); + dasm_put(Dst, 15777); } - dasm_put(Dst, 15783, DISPATCH_GL(vmstate), ~LJ_VMST_C); + dasm_put(Dst, 15785, DISPATCH_GL(vmstate), ~LJ_VMST_C); if (op == BC_FUNCC) { - dasm_put(Dst, 15792); + dasm_put(Dst, 15794); } else { - dasm_put(Dst, 15796, DISPATCH_GL(wrapf)); + dasm_put(Dst, 15798, DISPATCH_GL(wrapf)); } - dasm_put(Dst, 15801, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 15803, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); break; /* ---------------------------------------------------------------------- */ @@ -2989,7 +2991,7 @@ static int build_backend(BuildCtx *ctx) build_subroutines(ctx, cmov, sse); - dasm_put(Dst, 15826); + dasm_put(Dst, 15828); for (op = 0; op < BC__MAX; op++) build_ins(ctx, (BCOp)op, op, cmov, sse); diff --git a/src/buildvm_x86.dasc b/src/buildvm_x86.dasc index 6b2dc877..98998d83 100644 --- a/src/buildvm_x86.dasc +++ b/src/buildvm_x86.dasc @@ -530,6 +530,14 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse) | mov dword GL:RB->vmstate, ~LJ_VMST_C | jmp ->vm_leave_unw | + |->vm_unwind_rethrow: + |.if X64 and not X64WIN + | mov FCARG1, SAVE_L + | mov FCARG2, eax + | restoreregs + | jmp extern lj_err_throw@8 // (lua_State *L, int errcode) + |.endif + | |->vm_unwind_ff@4: // Unwind C stack, return from ff pcall. | // (void *cframe) |.if X64 diff --git a/src/buildvm_x86.h b/src/buildvm_x86.h index a49b3dd5..b7b86cfd 100644 --- a/src/buildvm_x86.h +++ b/src/buildvm_x86.h @@ -12,7 +12,7 @@ #define DASM_SECTION_CODE_OP 0 #define DASM_SECTION_CODE_SUB 1 #define DASM_MAXSECTION 2 -static const unsigned char build_actionlist[16945] = { +static const unsigned char build_actionlist[16947] = { 254,1,248,10,252,247,198,237,15,132,244,11,131,230,252,248,41,252,242,141, 76,49,252,248,139,114,252,252,199,68,10,4,237,248,12,131,192,1,137,68,36, 20,252,247,198,237,15,132,244,13,248,14,129,252,246,239,252,247,198,237,15, @@ -25,141 +25,141 @@ static const unsigned char build_actionlist[16945] = { 237,131,194,8,131,192,1,252,233,244,4,248,7,255,133,201,15,132,244,5,41,193, 141,20,202,252,233,244,5,248,8,137,149,233,137,68,36,20,137,202,137,252,233, 232,251,1,0,139,149,233,252,233,244,3,248,17,137,208,137,204,248,18,139,108, - 36,48,139,173,233,199,133,233,237,252,233,244,16,248,19,129,225,239,137,204, - 248,20,139,108,36,48,185,252,248,252,255,252,255,252,255,184,237,255,139, - 149,233,139,157,233,129,195,239,139,114,252,252,199,66,252,252,237,199,131, - 233,237,252,233,244,12,248,21,186,237,252,233,244,248,248,22,131,232,8,252, - 233,244,247,248,23,141,68,194,252,248,248,1,15,182,142,233,131,198,4,137, - 149,233,137,133,233,255,137,116,36,24,137,202,248,2,137,252,233,232,251,1, - 0,139,149,233,139,133,233,139,106,252,248,41,208,193,232,3,131,192,1,139, - 181,233,139,14,15,182,252,233,15,182,205,131,198,4,252,255,36,171,248,24, - 85,87,86,83,131,252,236,28,139,108,36,48,139,76,36,52,190,237,49,192,141, - 188,253,36,233,139,157,233,129,195,239,137,189,233,137,68,36,24,137,68,36, - 52,56,133,233,15,132,244,249,199,131,233,237,136,133,233,139,149,233,139, + 36,48,139,173,233,199,133,233,237,252,233,244,16,248,19,248,20,129,225,239, + 137,204,248,21,255,139,108,36,48,185,252,248,252,255,252,255,252,255,184, + 237,139,149,233,139,157,233,129,195,239,139,114,252,252,199,66,252,252,237, + 199,131,233,237,252,233,244,12,248,22,186,237,252,233,244,248,248,23,131, + 232,8,252,233,244,247,248,24,141,68,194,252,248,248,1,15,182,142,233,131, + 198,4,137,149,233,255,137,133,233,137,116,36,24,137,202,248,2,137,252,233, + 232,251,1,0,139,149,233,139,133,233,139,106,252,248,41,208,193,232,3,131, + 192,1,139,181,233,139,14,15,182,252,233,15,182,205,131,198,4,252,255,36,171, + 248,25,85,87,86,83,131,252,236,28,139,108,36,48,139,76,36,52,190,237,49,192, + 141,188,253,36,233,139,157,233,129,195,239,137,189,233,137,68,36,24,137,68, + 36,52,56,133,233,15,132,244,249,199,131,233,237,136,133,233,139,149,233,139, 133,233,41,200,193,232,3,131,192,1,41,209,139,114,252,252,137,68,36,20,252, - 247,198,237,15,132,244,13,255,252,233,244,14,248,25,85,87,86,83,131,252,236, - 28,190,237,252,233,244,247,248,26,85,87,86,83,131,252,236,28,190,237,248, + 247,198,237,255,15,132,244,13,252,233,244,14,248,26,85,87,86,83,131,252,236, + 28,190,237,252,233,244,247,248,27,85,87,86,83,131,252,236,28,190,237,248, 1,139,108,36,48,139,76,36,52,139,189,233,137,124,36,52,137,108,36,24,137, - 165,233,248,2,139,157,233,129,195,239,248,3,199,131,233,237,139,149,233,1, - 206,41,214,139,133,233,41,200,193,232,3,131,192,1,248,27,255,139,105,252, - 248,129,121,253,252,252,239,15,133,244,28,248,29,137,202,137,114,252,252, - 139,181,233,139,14,15,182,252,233,15,182,205,131,198,4,252,255,36,171,248, - 30,85,87,86,83,131,252,236,28,139,108,36,48,139,68,36,56,139,76,36,52,139, - 84,36,60,137,108,36,24,139,189,233,43,189,233,199,68,36,60,0,0,0,0,137,124, - 36,56,137,68,36,8,137,76,36,4,137,44,36,139,189,233,137,124,36,52,137,165, - 233,252,255,210,133,192,15,132,244,15,137,193,190,237,252,233,244,2,248,11, - 1,209,131,230,252,248,137,213,41,252,242,199,68,193,252,252,237,137,200,139, - 117,252,244,139,77,252,240,139,122,252,248,139,191,233,139,191,233,252,255, - 225,248,31,255,15,182,78,252,255,131,252,237,16,141,12,202,41,252,233,15, - 132,244,32,252,247,217,193,252,233,3,137,76,36,8,139,72,4,139,0,137,77,4, - 137,69,0,137,108,36,4,252,233,244,33,248,34,137,68,36,16,199,68,36,20,237, + 165,233,248,2,139,157,233,129,195,239,248,3,199,131,233,237,139,149,233,255, + 1,206,41,214,139,133,233,41,200,193,232,3,131,192,1,248,28,139,105,252,248, + 129,121,253,252,252,239,15,133,244,29,248,30,137,202,137,114,252,252,139, + 181,233,139,14,15,182,252,233,15,182,205,131,198,4,252,255,36,171,248,31, + 85,87,86,83,131,252,236,28,139,108,36,48,139,68,36,56,139,76,36,52,139,84, + 36,60,137,108,36,24,139,189,233,43,189,233,199,68,36,60,0,0,0,0,137,124,36, + 56,137,68,36,8,137,76,36,4,137,44,36,139,189,233,137,124,36,52,137,165,233, + 252,255,210,133,192,15,132,244,15,137,193,190,237,252,233,244,2,248,11,1, + 209,131,230,252,248,137,213,41,252,242,199,68,193,252,252,237,137,200,139, + 117,252,244,139,77,252,240,139,122,252,248,139,191,233,255,139,191,233,252, + 255,225,248,32,15,182,78,252,255,131,252,237,16,141,12,202,41,252,233,15, + 132,244,33,252,247,217,193,252,233,3,137,76,36,8,139,72,4,139,0,137,77,4, + 137,69,0,137,108,36,4,252,233,244,34,248,35,137,68,36,16,199,68,36,20,237, 141,68,36,16,128,126,252,252,235,15,133,244,247,141,139,233,137,41,199,65, - 4,237,137,205,252,233,244,248,248,35,15,182,70,252,254,255,199,68,36,20,237, + 4,237,137,205,252,233,244,248,248,36,15,182,70,252,254,255,199,68,36,20,237, 137,68,36,16,255,252,242,15,42,192,252,242,15,17,68,36,16,255,137,68,36,12, - 219,68,36,12,221,92,36,16,255,141,68,36,16,252,233,244,247,248,36,15,182, + 219,68,36,12,221,92,36,16,255,141,68,36,16,252,233,244,247,248,37,15,182, 70,252,254,141,4,194,248,1,15,182,110,252,255,141,44,252,234,248,2,137,108, 36,4,139,108,36,48,137,68,36,8,137,44,36,137,149,233,137,116,36,24,232,251, - 1,1,139,149,233,133,192,15,132,244,249,248,32,15,182,78,252,253,139,104,4, + 1,1,139,149,233,133,192,15,132,244,249,248,33,15,182,78,252,253,139,104,4, 139,0,137,108,202,4,137,4,202,139,6,15,182,204,15,182,232,131,198,4,193,232, 16,252,255,36,171,248,3,139,141,233,137,113,252,244,141,177,233,41,214,139, - 105,252,248,184,237,252,233,244,29,248,37,137,68,36,16,199,68,36,20,237,141, + 105,252,248,184,237,252,233,244,30,248,38,137,68,36,16,199,68,36,20,237,141, 68,36,16,128,126,252,252,235,15,133,244,247,255,141,139,233,137,41,199,65, - 4,237,137,205,252,233,244,248,248,38,15,182,70,252,254,255,141,68,36,16,252, - 233,244,247,248,39,15,182,70,252,254,141,4,194,248,1,15,182,110,252,255,141, + 4,237,137,205,252,233,244,248,248,39,15,182,70,252,254,255,141,68,36,16,252, + 233,244,247,248,40,15,182,70,252,254,141,4,194,248,1,15,182,110,252,255,141, 44,252,234,248,2,137,108,36,4,139,108,36,48,137,68,36,8,137,44,36,137,149, 233,137,116,36,24,232,251,1,2,139,149,233,133,192,15,132,244,249,15,182,78, - 252,253,139,108,202,4,139,12,202,137,104,4,137,8,248,40,139,6,15,182,204, + 252,253,139,108,202,4,139,12,202,137,104,4,137,8,248,41,139,6,15,182,204, 15,182,232,131,198,4,193,232,16,252,255,36,171,248,3,139,141,233,137,113, 252,244,15,182,70,252,253,139,108,194,4,139,4,194,137,105,20,137,65,16,141, - 177,233,41,214,139,105,252,248,184,237,252,233,244,29,248,41,15,182,110,252, + 177,233,41,214,139,105,252,248,184,237,252,233,244,30,248,42,15,182,110,252, 252,141,4,194,141,12,202,137,108,36,12,139,108,36,48,137,68,36,8,137,76,36, 4,137,44,36,137,149,233,137,116,36,24,232,251,1,3,248,3,139,149,233,255,131, - 252,248,1,15,135,244,42,248,4,141,118,4,15,130,244,252,248,5,15,183,70,252, + 252,248,1,15,135,244,43,248,4,141,118,4,15,130,244,252,248,5,15,183,70,252, 254,141,180,253,134,233,248,6,139,6,15,182,204,15,182,232,131,198,4,193,232, - 16,252,255,36,171,248,43,131,198,4,129,120,253,4,239,15,130,244,5,252,233, - 244,6,248,44,129,120,253,4,239,252,233,244,4,248,45,131,252,238,4,137,108, + 16,252,255,36,171,248,44,131,198,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,238,4,137,108, 36,12,139,108,36,48,137,68,36,8,137,76,36,4,137,44,36,137,149,233,255,137, - 116,36,24,232,251,1,4,252,233,244,3,248,46,255,131,252,238,4,139,108,36,48, + 116,36,24,232,251,1,4,252,233,244,3,248,47,255,131,252,238,4,139,108,36,48, 137,149,233,137,252,233,139,86,252,252,137,116,36,24,232,251,1,5,252,233, - 244,3,255,248,47,255,15,182,110,252,255,255,248,48,141,4,199,252,233,244, - 247,248,49,255,248,50,141,4,199,141,44,252,234,149,252,233,244,248,248,51, - 141,4,194,137,197,252,233,244,248,248,52,255,248,53,141,4,194,248,1,141,44, + 244,3,255,248,48,255,15,182,110,252,255,255,248,49,141,4,199,252,233,244, + 247,248,50,255,248,51,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,12,202,137,108,36,8,139,108,36,48,137,68,36,12,15,182,70, 252,252,137,76,36,4,137,68,36,16,137,44,36,137,149,233,137,116,36,24,232, - 251,1,6,139,149,233,133,192,15,132,244,40,248,42,137,193,41,208,137,113,252, - 244,141,176,233,184,237,252,233,244,27,248,54,139,108,36,48,137,149,233,141, - 20,194,137,252,233,137,116,36,24,232,251,1,7,139,149,233,252,233,244,42,248, - 55,141,76,202,8,248,28,137,76,36,20,137,68,36,16,131,252,233,8,141,4,193, + 251,1,6,139,149,233,133,192,15,132,244,41,248,43,137,193,41,208,137,113,252, + 244,141,176,233,184,237,252,233,244,28,248,55,139,108,36,48,137,149,233,141, + 20,194,137,252,233,137,116,36,24,232,251,1,7,139,149,233,252,233,244,43,248, + 56,141,76,202,8,248,29,137,76,36,20,137,68,36,16,131,252,233,8,141,4,193, 139,108,36,48,137,76,36,4,137,68,36,8,137,44,36,137,149,233,255,137,116,36, 24,232,251,1,8,139,149,233,139,76,36,20,139,68,36,16,139,105,252,248,131, - 192,1,57,215,15,132,244,56,137,202,137,114,252,252,139,181,233,139,14,15, - 182,252,233,15,182,205,131,198,4,252,255,36,171,248,57,139,108,36,48,137, + 192,1,57,215,15,132,244,57,137,202,137,114,252,252,139,181,233,139,14,15, + 182,252,233,15,182,205,131,198,4,252,255,36,171,248,58,139,108,36,48,137, 149,233,137,202,137,252,233,137,116,36,24,232,251,1,9,139,149,233,139,70, - 252,252,15,182,204,15,182,232,193,232,16,252,255,164,253,171,233,248,58,129, - 252,248,239,15,130,244,59,139,106,4,129,252,253,239,15,131,244,59,139,114, + 252,252,15,182,204,15,182,232,193,232,16,252,255,164,253,171,233,248,59,129, + 252,248,239,15,130,244,60,139,106,4,129,252,253,239,15,131,244,60,139,114, 252,252,137,68,36,20,137,106,252,252,139,42,137,106,252,248,131,232,2,15, 132,244,248,137,209,248,1,131,193,8,139,105,4,137,105,252,252,139,41,137, - 105,252,248,131,232,1,15,133,244,1,248,2,255,139,68,36,20,252,233,244,60, - 248,61,129,252,248,239,15,130,244,59,139,106,4,184,237,252,247,213,57,232, + 105,252,248,131,232,1,15,133,244,1,248,2,255,139,68,36,20,252,233,244,61, + 248,62,129,252,248,239,15,130,244,60,139,106,4,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,114,252,252,199,66,252,252,237,137,66,252,248,252, - 233,244,62,248,63,129,252,248,239,15,130,244,59,139,106,4,139,114,252,252, + 233,244,63,248,64,129,252,248,239,15,130,244,60,139,106,4,139,114,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,15,132,244,62,139,131,233,199,66,252,252,237,255,137,106, + 199,66,252,252,237,15,132,244,63,139,131,233,199,66,252,252,237,255,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,252,233,244,62,248,5,139,105,4,129,252,253,239,255,15,132,244,62,139, - 1,137,106,252,252,137,66,252,248,252,233,244,62,248,6,129,252,253,239,15, + 244,3,252,233,244,63,248,5,139,105,4,129,252,253,239,255,15,132,244,63,139, + 1,137,106,252,252,137,66,252,248,252,233,244,63,248,6,129,252,253,239,15, 132,244,1,129,252,253,239,15,135,244,253,189,237,248,7,252,247,213,139,172, - 253,171,233,252,233,244,2,248,64,129,252,248,239,15,130,244,59,255,129,122, - 253,4,239,15,133,244,59,139,42,131,189,233,0,15,133,244,59,129,122,253,12, - 239,15,133,244,59,139,66,8,137,133,233,139,114,252,252,199,66,252,252,237, + 253,171,233,252,233,244,2,248,65,129,252,248,239,15,130,244,60,255,129,122, + 253,4,239,15,133,244,60,139,42,131,189,233,0,15,133,244,60,129,122,253,12, + 239,15,133,244,60,139,66,8,137,133,233,139,114,252,252,199,66,252,252,237, 137,106,252,248,252,246,133,233,235,15,132,244,247,128,165,233,235,139,131, - 233,137,171,233,137,133,233,248,1,255,252,233,244,62,248,65,129,252,248,239, - 15,130,244,59,129,122,253,4,239,15,133,244,59,139,2,139,108,36,48,137,68, + 233,137,171,233,137,133,233,248,1,255,252,233,244,63,248,66,129,252,248,239, + 15,130,244,60,129,122,253,4,239,15,133,244,60,139,2,139,108,36,48,137,68, 36,4,137,44,36,137,213,131,194,8,137,84,36,8,232,251,1,10,137,252,234,139, - 40,139,64,4,139,114,252,252,137,106,252,248,137,66,252,252,252,233,244,62, - 248,66,129,252,248,239,15,133,244,59,129,122,253,4,239,255,15,133,244,247, - 139,42,252,233,244,67,248,1,15,135,244,59,255,15,131,244,59,255,252,242,15, - 16,2,252,233,244,68,255,221,2,252,233,244,69,255,248,70,129,252,248,239,15, - 130,244,59,139,114,252,252,129,122,253,4,239,15,133,244,249,139,2,248,2,199, - 66,252,252,237,137,66,252,248,252,233,244,62,248,3,129,122,253,4,239,15,135, - 244,59,131,187,233,0,15,133,244,59,139,171,233,59,171,233,255,15,130,244, - 247,232,244,71,248,1,139,108,36,48,137,149,233,137,116,36,24,137,252,233, - 255,232,251,1,11,255,232,251,1,12,255,139,149,233,252,233,244,2,248,72,129, - 252,248,239,15,130,244,59,15,132,244,248,248,1,129,122,253,4,239,15,133,244, - 59,139,108,36,48,137,149,233,137,149,233,139,114,252,252,139,2,137,68,36, + 40,139,64,4,139,114,252,252,137,106,252,248,137,66,252,252,252,233,244,63, + 248,67,129,252,248,239,15,133,244,60,129,122,253,4,239,255,15,133,244,247, + 139,42,252,233,244,68,248,1,15,135,244,60,255,15,131,244,60,255,252,242,15, + 16,2,252,233,244,69,255,221,2,252,233,244,70,255,248,71,129,252,248,239,15, + 130,244,60,139,114,252,252,129,122,253,4,239,15,133,244,249,139,2,248,2,199, + 66,252,252,237,137,66,252,248,252,233,244,63,248,3,129,122,253,4,239,15,135, + 244,60,131,187,233,0,15,133,244,60,139,171,233,59,171,233,255,15,130,244, + 247,232,244,72,248,1,139,108,36,48,137,149,233,137,116,36,24,137,252,233, + 255,232,251,1,11,255,232,251,1,12,255,139,149,233,252,233,244,2,248,73,129, + 252,248,239,15,130,244,60,15,132,244,248,248,1,129,122,253,4,239,15,133,244, + 60,139,108,36,48,137,149,233,137,149,233,139,114,252,252,139,2,137,68,36, 4,137,44,36,131,194,8,137,84,36,8,137,116,36,24,232,251,1,13,139,149,233, 133,192,15,132,244,249,139,106,8,139,66,12,137,106,252,248,137,66,252,252, - 139,106,16,139,66,20,137,42,137,66,4,248,73,184,237,255,252,233,244,74,248, - 2,199,66,12,237,252,233,244,1,248,3,199,66,252,252,237,252,233,244,62,248, - 75,129,252,248,239,15,130,244,59,139,42,129,122,253,4,239,15,133,244,59,255, - 131,189,233,0,15,133,244,59,255,139,106,252,248,139,133,233,139,114,252,252, - 199,66,252,252,237,137,66,252,248,199,66,12,237,184,237,252,233,244,74,248, - 76,129,252,248,239,15,130,244,59,129,122,253,4,239,15,133,244,59,129,122, + 139,106,16,139,66,20,137,42,137,66,4,248,74,184,237,255,252,233,244,75,248, + 2,199,66,12,237,252,233,244,1,248,3,199,66,252,252,237,252,233,244,63,248, + 76,129,252,248,239,15,130,244,60,139,42,129,122,253,4,239,15,133,244,60,255, + 131,189,233,0,15,133,244,60,255,139,106,252,248,139,133,233,139,114,252,252, + 199,66,252,252,237,137,66,252,248,199,66,12,237,184,237,252,233,244,75,248, + 77,129,252,248,239,15,130,244,60,129,122,253,4,239,15,133,244,60,129,122, 253,12,239,255,139,114,252,252,255,139,66,8,131,192,1,199,66,252,252,237, 137,66,252,248,255,252,242,15,16,66,8,189,0,0,252,240,63,102,15,110,205,102, 15,112,201,81,252,242,15,88,193,252,242,15,45,192,252,242,15,17,66,252,248, 255,221,66,8,217,232,222,193,219,20,36,221,90,252,248,139,4,36,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,77,139,40,139,64,4,137,42,137,66,4,252,233,244,73,248,2,131,189,233, - 0,15,132,244,77,137,252,233,137,213,137,194,232,251,1,14,137,252,234,133, - 192,15,133,244,1,248,77,184,237,252,233,244,74,248,78,255,139,106,252,248, + 132,244,78,139,40,139,64,4,137,42,137,66,4,252,233,244,74,248,2,131,189,233, + 0,15,132,244,78,137,252,233,137,213,137,194,232,251,1,14,137,252,234,133, + 192,15,133,244,1,248,78,184,237,252,233,244,75,248,79,255,139,106,252,248, 139,133,233,139,114,252,252,199,66,252,252,237,137,66,252,248,255,199,66, 12,237,199,66,8,0,0,0,0,255,15,87,192,252,242,15,17,66,8,255,217,252,238, - 221,90,8,255,184,237,252,233,244,74,248,79,129,252,248,239,15,130,244,59, + 221,90,8,255,184,237,252,233,244,75,248,80,129,252,248,239,15,130,244,60, 141,74,8,131,232,1,190,237,248,1,15,182,171,233,193,252,237,235,131,229,1, - 1,252,238,252,233,244,27,248,80,129,252,248,239,15,130,244,59,129,122,253, - 12,239,15,133,244,59,255,139,106,4,137,106,12,199,66,4,237,139,42,139,114, - 8,137,106,8,137,50,141,74,16,131,232,2,190,237,252,233,244,1,248,81,129,252, - 248,239,15,130,244,59,139,42,139,114,252,252,137,116,36,24,137,44,36,129, - 122,253,4,239,15,133,244,59,131,189,233,0,15,133,244,59,128,189,233,235,15, - 135,244,59,139,141,233,15,132,244,247,255,59,141,233,15,132,244,59,248,1, - 141,116,193,252,240,59,181,233,15,135,244,59,137,181,233,139,108,36,48,137, + 1,252,238,252,233,244,28,248,81,129,252,248,239,15,130,244,60,129,122,253, + 12,239,15,133,244,60,255,139,106,4,137,106,12,199,66,4,237,139,42,139,114, + 8,137,106,8,137,50,141,74,16,131,232,2,190,237,252,233,244,1,248,82,129,252, + 248,239,15,130,244,60,139,42,139,114,252,252,137,116,36,24,137,44,36,129, + 122,253,4,239,15,133,244,60,131,189,233,0,15,133,244,60,128,189,233,235,15, + 135,244,60,139,141,233,15,132,244,247,255,59,141,233,15,132,244,60,248,1, + 141,116,193,252,240,59,181,233,15,135,244,60,137,181,233,139,108,36,48,137, 149,233,131,194,8,137,149,233,141,108,194,232,41,252,245,57,206,15,132,244, 249,248,2,139,68,46,4,137,70,252,252,139,4,46,137,70,252,248,131,252,238, 8,57,206,15,133,244,2,248,3,137,76,36,4,49,201,137,76,36,12,137,76,36,8,232, - 244,24,199,131,233,237,255,139,108,36,48,139,52,36,139,149,233,129,252,248, + 244,25,199,131,233,237,255,139,108,36,48,139,52,36,139,149,233,129,252,248, 239,15,135,244,254,248,4,139,142,233,139,190,233,137,142,233,137,252,254, 41,206,15,132,244,252,141,4,50,193,252,238,3,59,133,233,15,135,244,255,137, 213,41,205,248,5,139,1,137,4,41,139,65,4,137,68,41,4,131,193,8,57,252,249, @@ -168,13 +168,13 @@ static const unsigned char build_actionlist[16945] = { 13,252,233,244,14,248,8,199,66,252,252,237,139,142,233,131,252,233,8,137, 142,233,139,1,137,2,139,65,4,137,66,4,184,237,252,233,244,7,248,9,139,12, 36,137,185,233,137,252,242,137,252,233,232,251,1,0,139,52,36,139,149,233, - 252,233,244,4,248,82,139,106,252,248,139,173,233,139,114,252,252,137,116, - 36,24,137,44,36,131,189,233,0,15,133,244,59,255,128,189,233,235,15,135,244, - 59,139,141,233,15,132,244,247,59,141,233,15,132,244,59,248,1,141,116,193, - 252,248,59,181,233,15,135,244,59,137,181,233,139,108,36,48,137,149,233,137, + 252,233,244,4,248,83,139,106,252,248,139,173,233,139,114,252,252,137,116, + 36,24,137,44,36,131,189,233,0,15,133,244,60,255,128,189,233,235,15,135,244, + 60,139,141,233,15,132,244,247,59,141,233,15,132,244,60,248,1,141,116,193, + 252,248,59,181,233,15,135,244,60,137,181,233,139,108,36,48,137,149,233,137, 149,233,141,108,194,252,240,41,252,245,57,206,15,132,244,249,248,2,255,139, 68,46,4,137,70,252,252,139,4,46,137,70,252,248,131,252,238,8,57,206,15,133, - 244,2,248,3,137,76,36,4,49,201,137,76,36,12,137,76,36,8,232,244,24,199,131, + 244,2,248,3,137,76,36,4,49,201,137,76,36,12,137,76,36,8,232,244,25,199,131, 233,237,139,108,36,48,139,52,36,139,149,233,129,252,248,239,15,135,244,254, 248,4,139,142,233,139,190,233,137,142,233,137,252,254,41,206,15,132,244,252, 141,4,50,193,252,238,3,59,133,233,15,135,244,255,255,137,213,41,205,248,5, @@ -182,271 +182,271 @@ static const unsigned char build_actionlist[16945] = { 6,141,70,1,248,7,139,116,36,24,137,68,36,20,49,201,252,247,198,237,15,132, 244,13,252,233,244,14,248,8,137,252,242,137,252,233,232,251,1,15,248,9,139, 12,36,137,185,233,137,252,242,137,252,233,232,251,1,0,139,52,36,139,149,233, - 252,233,244,4,248,83,139,108,36,48,252,247,133,233,237,15,132,244,59,255, + 252,233,244,4,248,84,139,108,36,48,252,247,133,233,237,15,132,244,60,255, 137,149,233,141,68,194,252,248,137,133,233,49,192,137,133,233,176,235,136, - 133,233,252,233,244,16,255,248,67,255,248,69,139,114,252,252,221,90,252,248, - 252,233,244,62,255,248,84,129,252,248,239,15,130,244,59,255,129,122,253,4, - 239,15,133,244,248,139,42,131,252,253,0,15,137,244,67,252,247,221,15,136, - 244,247,248,85,248,67,139,114,252,252,199,66,252,252,237,137,106,252,248, - 252,233,244,62,248,1,139,114,252,252,199,66,252,252,0,0,224,65,199,66,252, - 248,0,0,0,0,252,233,244,62,248,2,15,135,244,59,255,129,122,253,4,239,15,131, - 244,59,255,252,242,15,16,2,102,15,252,239,201,102,15,118,201,102,15,115,209, - 1,15,84,193,248,68,139,114,252,252,252,242,15,17,66,252,248,255,221,2,217, - 225,248,68,248,69,139,114,252,252,221,90,252,248,255,248,62,184,237,248,74, - 137,68,36,20,248,60,252,247,198,237,15,133,244,253,248,5,56,70,252,255,15, + 133,233,252,233,244,16,255,248,68,255,248,70,139,114,252,252,221,90,252,248, + 252,233,244,63,255,248,85,129,252,248,239,15,130,244,60,255,129,122,253,4, + 239,15,133,244,248,139,42,131,252,253,0,15,137,244,68,252,247,221,15,136, + 244,247,248,86,248,68,139,114,252,252,199,66,252,252,237,137,106,252,248, + 252,233,244,63,248,1,139,114,252,252,199,66,252,252,0,0,224,65,199,66,252, + 248,0,0,0,0,252,233,244,63,248,2,15,135,244,60,255,129,122,253,4,239,15,131, + 244,60,255,252,242,15,16,2,102,15,252,239,201,102,15,118,201,102,15,115,209, + 1,15,84,193,248,69,139,114,252,252,252,242,15,17,66,252,248,255,221,2,217, + 225,248,69,248,70,139,114,252,252,221,90,252,248,255,248,63,184,237,248,75, + 137,68,36,20,248,61,252,247,198,237,15,133,244,253,248,5,56,70,252,255,15, 135,244,252,15,182,78,252,253,252,247,209,141,20,202,139,6,15,182,204,15, 182,232,131,198,4,193,232,16,252,255,36,171,248,6,199,68,194,252,244,237, 131,192,1,252,233,244,5,248,7,185,252,248,252,255,252,255,252,255,252,233, - 244,14,248,86,255,129,122,253,4,239,15,133,244,247,139,42,252,233,244,67, - 248,1,15,135,244,59,255,252,242,15,16,2,232,244,87,255,252,242,15,45,232, - 129,252,253,0,0,0,128,15,133,244,67,252,242,15,42,205,102,15,46,193,15,138, - 244,68,15,132,244,67,255,221,2,232,244,87,255,219,20,36,139,44,36,129,252, + 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,219,20,36,139,44,36,129,252, 253,0,0,0,128,15,133,244,248,217,192,219,4,36,255,223,252,233,221,216,255, - 218,252,233,223,224,158,255,15,138,244,69,15,133,244,69,248,2,221,216,252, - 233,244,67,255,248,88,255,252,242,15,16,2,232,244,89,255,221,2,232,244,89, - 255,248,90,129,252,248,239,15,130,244,59,129,122,253,4,239,15,131,244,59, - 252,242,15,81,2,252,233,244,68,255,248,90,129,252,248,239,15,130,244,59,129, - 122,253,4,239,15,131,244,59,221,2,217,252,250,252,233,244,69,255,248,91,129, - 252,248,239,15,130,244,59,129,122,253,4,239,15,131,244,59,217,252,237,221, - 2,217,252,241,252,233,244,69,248,92,129,252,248,239,15,130,244,59,129,122, - 253,4,239,15,131,244,59,217,252,236,221,2,217,252,241,252,233,244,69,248, - 93,129,252,248,239,255,15,130,244,59,129,122,253,4,239,15,131,244,59,221, - 2,232,244,94,252,233,244,69,248,95,129,252,248,239,15,130,244,59,129,122, - 253,4,239,15,131,244,59,221,2,217,252,254,252,233,244,69,248,96,129,252,248, - 239,255,15,130,244,59,129,122,253,4,239,15,131,244,59,221,2,217,252,255,252, - 233,244,69,248,97,129,252,248,239,15,130,244,59,129,122,253,4,239,15,131, - 244,59,221,2,217,252,242,221,216,252,233,244,69,248,98,129,252,248,239,15, - 130,244,59,255,129,122,253,4,239,15,131,244,59,221,2,217,192,216,200,217, - 232,222,225,217,252,250,217,252,243,252,233,244,69,248,99,129,252,248,239, - 15,130,244,59,129,122,253,4,239,15,131,244,59,221,2,217,192,216,200,217,232, - 222,225,217,252,250,217,201,217,252,243,252,233,244,69,248,100,129,252,248, - 239,15,130,244,59,129,122,253,4,239,15,131,244,59,255,221,2,217,232,217,252, - 243,252,233,244,69,255,248,101,129,252,248,239,15,130,244,59,129,122,253, - 4,239,15,131,244,59,252,242,15,16,2,252,242,15,17,4,36,255,248,101,129,252, - 248,239,15,130,244,59,129,122,253,4,239,15,131,244,59,221,2,221,28,36,255, - 137,213,232,251,1,16,137,252,234,252,233,244,69,255,248,102,129,252,248,239, - 15,130,244,59,129,122,253,4,239,15,131,244,59,252,242,15,16,2,252,242,15, - 17,4,36,255,248,102,129,252,248,239,15,130,244,59,129,122,253,4,239,15,131, - 244,59,221,2,221,28,36,255,137,213,232,251,1,17,137,252,234,252,233,244,69, - 255,248,103,129,252,248,239,15,130,244,59,129,122,253,4,239,15,131,244,59, - 252,242,15,16,2,252,242,15,17,4,36,255,248,103,129,252,248,239,15,130,244, - 59,129,122,253,4,239,15,131,244,59,221,2,221,28,36,255,137,213,232,251,1, - 18,137,252,234,252,233,244,69,248,104,255,248,105,129,252,248,239,15,130, - 244,59,129,122,253,4,239,15,131,244,59,252,242,15,16,2,139,106,252,248,252, - 242,15,89,133,233,252,233,244,68,255,248,105,129,252,248,239,15,130,244,59, - 129,122,253,4,239,15,131,244,59,221,2,139,106,252,248,220,141,233,252,233, - 244,69,255,248,106,129,252,248,239,15,130,244,59,129,122,253,4,239,15,131, - 244,59,129,122,253,12,239,15,131,244,59,221,2,221,66,8,217,252,243,252,233, - 244,69,248,107,129,252,248,239,15,130,244,59,129,122,253,4,239,15,131,244, - 59,129,122,253,12,239,255,15,131,244,59,221,66,8,221,2,217,252,253,221,217, - 252,233,244,69,248,108,129,252,248,239,15,130,244,59,139,106,4,129,252,253, - 239,15,131,244,59,139,114,252,252,139,2,137,106,252,252,137,66,252,248,209, + 218,252,233,223,224,158,255,15,138,244,70,15,133,244,70,248,2,221,216,252, + 233,244,68,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,252,242,15,17,4,36,255,248,102,129,252, + 248,239,15,130,244,60,129,122,253,4,239,15,131,244,60,221,2,221,28,36,255, + 137,213,232,251,1,16,137,252,234,252,233,244,70,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,252,242,15, + 17,4,36,255,248,103,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131, + 244,60,221,2,221,28,36,255,137,213,232,251,1,17,137,252,234,252,233,244,70, + 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,252,242,15,17,4,36,255,248,104,129,252,248,239,15,130,244, + 60,129,122,253,4,239,15,131,244,60,221,2,221,28,36,255,137,213,232,251,1, + 18,137,252,234,252,233,244,70,248,105,255,248,106,129,252,248,239,15,130, + 244,60,129,122,253,4,239,15,131,244,60,252,242,15,16,2,139,106,252,248,252, + 242,15,89,133,233,252,233,244,69,255,248,106,129,252,248,239,15,130,244,60, + 129,122,253,4,239,15,131,244,60,221,2,139,106,252,248,220,141,233,252,233, + 244,70,255,248,107,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131, + 244,60,129,122,253,12,239,15,131,244,60,221,2,221,66,8,217,252,243,252,233, + 244,70,248,108,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131,244, + 60,129,122,253,12,239,255,15,131,244,60,221,66,8,221,2,217,252,253,221,217, + 252,233,244,70,248,109,129,252,248,239,15,130,244,60,139,106,4,129,252,253, + 239,15,131,244,60,139,114,252,252,139,2,137,106,252,252,137,66,252,248,209, 229,129,252,253,0,0,224,252,255,15,131,244,249,9,232,15,132,244,249,184,252, 254,3,0,0,129,252,253,0,0,32,0,15,130,244,250,248,1,193,252,237,21,41,197, 255,252,242,15,42,197,255,137,108,36,16,219,68,36,16,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,74,248,3,255,15,87,192, + 252,242,15,17,2,255,221,26,255,184,237,252,233,244,75,248,3,255,15,87,192, 252,233,244,2,255,217,252,238,252,233,244,2,255,248,4,255,252,242,15,16,2, 189,0,0,80,67,102,15,110,205,102,15,112,201,81,252,242,15,89,193,252,242, 15,17,66,252,248,255,221,2,199,68,36,16,0,0,128,90,216,76,36,16,221,90,252, - 248,255,139,106,252,252,184,52,4,0,0,209,229,252,233,244,1,255,248,109,129, - 252,248,239,15,130,244,59,129,122,253,4,239,15,131,244,59,252,242,15,16,2, - 255,248,109,129,252,248,239,15,130,244,59,129,122,253,4,239,15,131,244,59, + 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,114,252,252,209,229,129,252,253,0,0,224,252,255,15, - 132,244,250,255,15,40,224,232,244,110,252,242,15,92,224,248,1,252,242,15, - 17,66,252,248,252,242,15,17,34,255,217,192,232,244,110,220,252,233,248,1, + 132,244,250,255,15,40,224,232,244,111,252,242,15,92,224,248,1,252,242,15, + 17,66,252,248,252,242,15,17,34,255,217,192,232,244,111,220,252,233,248,1, 221,90,252,248,221,26,255,139,66,252,252,139,106,4,49,232,15,136,244,249, - 248,2,184,237,252,233,244,74,248,3,129,252,245,0,0,0,128,137,106,4,252,233, + 248,2,184,237,252,233,244,75,248,3,129,252,245,0,0,0,128,137,106,4,252,233, 244,2,248,4,255,15,87,228,252,233,244,1,255,217,252,238,217,201,252,233,244, - 1,255,248,111,129,252,248,239,15,130,244,59,129,122,253,4,239,15,131,244, - 59,129,122,253,12,239,15,131,244,59,221,66,8,221,2,248,1,217,252,248,223, - 224,158,15,138,244,1,221,217,252,233,244,69,255,248,112,129,252,248,239,15, - 130,244,59,129,122,253,4,239,15,131,244,59,129,122,253,12,239,15,131,244, - 59,252,242,15,16,2,252,242,15,16,74,8,232,244,113,252,233,244,68,255,248, - 112,129,252,248,239,15,130,244,59,129,122,253,4,239,15,131,244,59,129,122, - 253,12,239,15,131,244,59,221,2,221,66,8,232,244,113,252,233,244,69,255,248, - 114,185,2,0,0,0,129,122,253,4,239,255,15,133,244,250,139,42,248,1,57,193, - 15,131,244,67,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,59,255,252, - 233,244,252,248,4,15,135,244,59,255,252,242,15,16,2,248,5,57,193,15,131,244, - 68,129,124,253,202,252,252,239,255,15,130,244,252,15,135,244,59,252,242,15, + 1,255,248,112,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131,244, + 60,129,122,253,12,239,15,131,244,60,221,66,8,221,2,248,1,217,252,248,223, + 224,158,15,138,244,1,221,217,252,233,244,70,255,248,113,129,252,248,239,15, + 130,244,60,129,122,253,4,239,15,131,244,60,129,122,253,12,239,15,131,244, + 60,252,242,15,16,2,252,242,15,16,74,8,232,244,114,252,233,244,69,255,248, + 113,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131,244,60,129,122, + 253,12,239,15,131,244,60,221,2,221,66,8,232,244,114,252,233,244,70,255,248, + 115,185,2,0,0,0,129,122,253,4,239,255,15,133,244,250,139,42,248,1,57,193, + 15,131,244,68,129,124,253,202,252,252,239,15,133,244,249,59,108,202,252,248, + 15,79,108,202,252,248,131,193,1,252,233,244,1,248,3,15,135,244,60,255,252, + 233,244,252,248,4,15,135,244,60,255,252,242,15,16,2,248,5,57,193,15,131,244, + 69,129,124,253,202,252,252,239,255,15,130,244,252,15,135,244,60,252,242,15, 42,76,202,252,248,252,233,244,253,255,248,6,252,242,15,16,76,202,252,248, 248,7,252,242,15,93,193,131,193,1,252,233,244,5,255,221,2,248,5,57,193,15, - 131,244,69,129,124,253,202,252,252,239,255,15,130,244,252,15,135,244,255, + 131,244,70,129,124,253,202,252,252,239,255,15,130,244,252,15,135,244,255, 219,68,202,252,248,252,233,244,253,255,15,131,244,255,255,248,6,221,68,202, 252,248,248,7,255,219,252,233,219,209,221,217,255,80,221,225,223,224,252, - 246,196,1,15,132,244,248,217,201,248,2,221,216,88,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,67,129, + 246,196,1,15,132,244,248,217,201,248,2,221,216,88,255,248,116,185,2,0,0,0, + 129,122,253,4,239,255,15,133,244,250,139,42,248,1,57,193,15,131,244,68,129, 124,253,202,252,252,239,15,133,244,249,59,108,202,252,248,15,76,108,202,252, - 248,131,193,1,252,233,244,1,248,3,15,135,244,59,255,248,6,252,242,15,16,76, + 248,131,193,1,252,233,244,1,248,3,15,135,244,60,255,248,6,252,242,15,16,76, 202,252,248,248,7,252,242,15,95,193,131,193,1,252,233,244,5,255,219,252,233, 218,209,221,217,255,80,221,225,223,224,252,246,196,1,15,133,244,248,217,201, - 248,2,221,216,88,255,248,9,221,216,252,233,244,59,255,248,116,129,252,248, - 239,15,130,244,59,129,122,253,4,239,15,133,244,59,139,42,255,139,173,233, - 252,233,244,67,255,252,242,15,42,133,233,252,233,244,68,255,219,133,233,252, - 233,244,69,255,248,117,129,252,248,239,15,133,244,59,129,122,253,4,239,15, - 133,244,59,139,42,139,114,252,252,131,189,233,1,15,130,244,77,15,182,173, - 233,255,252,242,15,42,197,252,233,244,68,255,137,108,36,16,219,68,36,16,252, - 233,244,69,255,248,118,139,171,233,59,171,233,15,130,244,247,232,244,71,248, - 1,129,252,248,239,15,133,244,59,129,122,253,4,239,255,15,133,244,59,139,42, - 129,252,253,252,255,0,0,0,15,135,244,59,137,108,36,20,255,15,131,244,59,252, - 242,15,44,42,129,252,253,252,255,0,0,0,15,135,244,59,137,108,36,20,255,15, - 131,244,59,221,2,219,92,36,20,129,124,36,20,252,255,0,0,0,15,135,244,59,255, - 199,68,36,8,1,0,0,0,141,68,36,20,248,119,139,108,36,48,137,149,233,137,68, + 248,2,221,216,88,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,114,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,108,36,16,219,68,36,16,252, + 233,244,70,255,248,119,139,171,233,59,171,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,20,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,20,255,15, + 131,244,60,221,2,219,92,36,20,129,124,36,20,252,255,0,0,0,15,135,244,60,255, + 199,68,36,8,1,0,0,0,141,68,36,20,248,120,139,108,36,48,137,149,233,137,68, 36,4,137,44,36,137,116,36,24,232,251,1,19,139,149,233,139,114,252,252,199, - 66,252,252,237,137,66,252,248,252,233,244,62,248,120,139,171,233,59,171,233, - 15,130,244,247,232,244,71,248,1,199,68,36,20,252,255,252,255,252,255,252, - 255,129,252,248,239,15,130,244,59,15,134,244,247,129,122,253,20,239,255,15, - 133,244,59,139,106,16,137,108,36,20,255,15,131,244,59,252,242,15,44,106,16, - 137,108,36,20,255,15,131,244,59,221,66,16,219,92,36,20,255,248,1,129,122, - 253,4,239,15,133,244,59,129,122,253,12,239,255,139,42,137,108,36,12,139,173, + 66,252,252,237,137,66,252,248,252,233,244,63,248,121,139,171,233,59,171,233, + 15,130,244,247,232,244,72,248,1,199,68,36,20,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,20,255,15,131,244,60,252,242,15,44,106,16, + 137,108,36,20,255,15,131,244,60,221,66,16,219,92,36,20,255,248,1,129,122, + 253,4,239,15,133,244,60,129,122,253,12,239,255,139,42,137,108,36,12,139,173, 233,255,139,74,8,255,252,242,15,44,74,8,255,221,66,8,219,92,36,8,139,76,36, 8,255,139,68,36,20,57,197,15,130,244,251,248,2,133,201,15,142,244,253,248, - 3,139,108,36,12,41,200,15,140,244,121,141,172,253,13,233,131,192,1,248,4, - 137,68,36,8,137,232,252,233,244,119,248,5,15,140,244,252,141,68,40,1,252, + 3,139,108,36,12,41,200,15,140,244,122,141,172,253,13,233,131,192,1,248,4, + 137,68,36,8,137,232,252,233,244,120,248,5,15,140,244,252,141,68,40,1,252, 233,244,2,248,6,137,232,252,233,244,2,248,7,255,15,132,244,254,1,252,233, - 131,193,1,15,143,244,3,248,8,185,1,0,0,0,252,233,244,3,248,121,49,192,252, - 233,244,4,248,122,129,252,248,239,15,130,244,59,139,171,233,59,171,233,15, - 130,244,247,232,244,71,248,1,255,129,122,253,4,239,15,133,244,59,129,122, - 253,12,239,139,42,255,15,133,244,59,139,66,8,255,15,131,244,59,252,242,15, - 44,66,8,255,15,131,244,59,221,66,8,219,92,36,20,139,68,36,20,255,133,192, - 15,142,244,121,131,189,233,1,15,130,244,121,15,133,244,123,57,131,233,15, - 130,244,123,15,182,141,233,139,171,233,137,68,36,8,248,1,136,77,0,131,197, - 1,131,232,1,15,133,244,1,139,131,233,252,233,244,119,248,124,129,252,248, - 239,255,15,130,244,59,139,171,233,59,171,233,15,130,244,247,232,244,71,248, - 1,129,122,253,4,239,15,133,244,59,139,42,139,133,233,133,192,15,132,244,121, - 57,131,233,15,130,244,125,129,197,239,137,116,36,20,137,68,36,8,139,179,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,139,171,233,59,171,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,20,139,68,36,20,255,133,192, + 15,142,244,122,131,189,233,1,15,130,244,122,15,133,244,124,57,131,233,15, + 130,244,124,15,182,141,233,139,171,233,137,68,36,8,248,1,136,77,0,131,197, + 1,131,232,1,15,133,244,1,139,131,233,252,233,244,120,248,125,129,252,248, + 239,255,15,130,244,60,139,171,233,59,171,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, + 57,131,233,15,130,244,126,129,197,239,137,116,36,20,137,68,36,8,139,179,233, 248,1,255,15,182,77,0,131,197,1,131,232,1,136,12,6,15,133,244,1,137,252,240, - 139,116,36,20,252,233,244,119,248,126,129,252,248,239,15,130,244,59,139,171, - 233,59,171,233,15,130,244,247,232,244,71,248,1,129,122,253,4,239,15,133,244, - 59,139,42,139,133,233,57,131,233,255,15,130,244,125,129,197,239,137,116,36, + 139,116,36,20,252,233,244,120,248,127,129,252,248,239,15,130,244,60,139,171, + 233,59,171,233,15,130,244,247,232,244,72,248,1,129,122,253,4,239,15,133,244, + 60,139,42,139,133,233,57,131,233,255,15,130,244,126,129,197,239,137,116,36, 20,137,68,36,8,139,179,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,6,248,3,131,232,1,15,137,244,1,137,252,240,139,116,36,20,252,233,244,119, - 248,127,129,252,248,239,15,130,244,59,255,139,171,233,59,171,233,15,130,244, - 247,232,244,71,248,1,129,122,253,4,239,15,133,244,59,139,42,139,133,233,57, - 131,233,15,130,244,125,129,197,239,137,116,36,20,137,68,36,8,139,179,233, + 12,6,248,3,131,232,1,15,137,244,1,137,252,240,139,116,36,20,252,233,244,120, + 248,128,129,252,248,239,15,130,244,60,255,139,171,233,59,171,233,15,130,244, + 247,232,244,72,248,1,129,122,253,4,239,15,133,244,60,139,42,139,133,233,57, + 131,233,15,130,244,126,129,197,239,137,116,36,20,137,68,36,8,139,179,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,6,248,3,131,232,1, - 15,137,244,1,137,252,240,139,116,36,20,252,233,244,119,248,128,129,252,248, - 239,15,130,244,59,129,122,253,4,239,15,133,244,59,137,213,139,10,232,251, - 1,20,137,252,234,255,137,197,252,233,244,67,255,252,242,15,42,192,252,233, - 244,68,255,137,4,36,219,4,36,252,233,244,69,255,248,129,129,122,253,4,239, - 255,15,133,244,247,139,42,252,233,244,85,248,1,15,135,244,59,255,252,242, + 15,137,244,1,137,252,240,139,116,36,20,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,10,232,251, + 1,20,137,252,234,255,137,197,252,233,244,68,255,252,242,15,42,192,252,233, + 244,69,255,137,4,36,219,4,36,252,233,244,70,255,248,130,129,122,253,4,239, + 255,15,133,244,247,139,42,252,233,244,86,248,1,15,135,244,60,255,252,242, 15,16,2,189,0,0,56,67,102,15,110,205,102,15,112,201,81,252,242,15,88,193, 102,15,126,197,255,221,2,199,68,36,16,0,0,192,89,216,68,36,16,221,28,36,255, - 139,44,36,255,252,233,244,85,255,248,130,255,189,0,0,56,67,102,15,110,205, + 139,44,36,255,252,233,244,86,255,248,131,255,189,0,0,56,67,102,15,110,205, 102,15,112,201,81,255,199,68,36,16,0,0,192,89,255,15,133,244,247,139,42,252, - 233,244,248,248,1,15,135,244,59,255,252,242,15,16,2,252,242,15,88,193,102, + 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,221,2,216,68,36,16,221,28,36,139,44,36,255,248,2,137,68,36, - 20,141,68,194,252,240,248,1,57,208,15,134,244,85,129,120,253,4,239,255,15, - 133,244,248,35,40,131,232,8,252,233,244,1,248,2,15,135,244,131,255,15,131, - 244,131,255,252,242,15,16,0,252,242,15,88,193,102,15,126,193,33,205,255,221, - 0,216,68,36,16,221,28,36,35,44,36,255,131,232,8,252,233,244,1,248,132,255, - 15,133,244,248,11,40,131,232,8,252,233,244,1,248,2,15,135,244,131,255,252, + 20,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,221, + 0,216,68,36,16,221,28,36,35,44,36,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,221,0,216,68,36,16, - 221,28,36,11,44,36,255,131,232,8,252,233,244,1,248,133,255,15,133,244,248, - 51,40,131,232,8,252,233,244,1,248,2,15,135,244,131,255,252,242,15,16,0,252, + 221,28,36,11,44,36,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,221,0,216,68,36,16,221,28,36,51,44, - 36,255,131,232,8,252,233,244,1,248,134,129,122,253,4,239,255,221,2,199,68, + 36,255,131,232,8,252,233,244,1,248,135,129,122,253,4,239,255,221,2,199,68, 36,16,0,0,192,89,216,68,36,16,221,28,36,139,44,36,255,248,2,15,205,252,233, - 244,85,248,135,129,122,253,4,239,255,248,2,252,247,213,255,248,85,252,242, - 15,42,197,252,233,244,68,255,248,85,137,44,36,219,4,36,252,233,244,69,255, - 248,131,139,68,36,20,252,233,244,59,255,248,136,129,122,253,4,239,255,248, - 2,129,122,253,12,239,15,133,244,59,139,74,8,255,248,136,129,252,248,239,15, - 130,244,59,129,122,253,4,239,15,131,244,59,129,122,253,12,239,15,131,244, - 59,252,242,15,16,2,252,242,15,16,74,8,189,0,0,56,67,102,15,110,213,102,15, + 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,86,137,44,36,219,4,36,252,233,244,70,255, + 248,132,139,68,36,20,252,233,244,60,255,248,137,129,122,253,4,239,255,248, + 2,129,122,253,12,239,15,133,244,60,139,74,8,255,248,137,129,252,248,239,15, + 130,244,60,129,122,253,4,239,15,131,244,60,129,122,253,12,239,15,131,244, + 60,252,242,15,16,2,252,242,15,16,74,8,189,0,0,56,67,102,15,110,213,102,15, 112,210,81,252,242,15,88,194,252,242,15,88,202,102,15,126,197,102,15,126, - 201,255,248,136,129,252,248,239,15,130,244,59,129,122,253,4,239,15,131,244, - 59,129,122,253,12,239,15,131,244,59,221,2,221,66,8,199,68,36,16,0,0,192,89, + 201,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,221,2,221,66,8,199,68,36,16,0,0,192,89, 216,68,36,16,221,92,36,8,216,68,36,16,221,28,36,139,76,36,8,139,44,36,255, - 211,229,252,233,244,85,255,248,137,129,122,253,4,239,255,248,137,129,252, - 248,239,15,130,244,59,129,122,253,4,239,15,131,244,59,129,122,253,12,239, - 15,131,244,59,252,242,15,16,2,252,242,15,16,74,8,189,0,0,56,67,102,15,110, + 211,229,252,233,244,86,255,248,138,129,122,253,4,239,255,248,138,129,252, + 248,239,15,130,244,60,129,122,253,4,239,15,131,244,60,129,122,253,12,239, + 15,131,244,60,252,242,15,16,2,252,242,15,16,74,8,189,0,0,56,67,102,15,110, 213,102,15,112,210,81,252,242,15,88,194,252,242,15,88,202,102,15,126,197, - 102,15,126,201,255,248,137,129,252,248,239,15,130,244,59,129,122,253,4,239, - 15,131,244,59,129,122,253,12,239,15,131,244,59,221,2,221,66,8,199,68,36,16, + 102,15,126,201,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,221,2,221,66,8,199,68,36,16, 0,0,192,89,216,68,36,16,221,92,36,8,216,68,36,16,221,28,36,139,76,36,8,139, - 44,36,255,211,252,237,252,233,244,85,255,248,138,129,122,253,4,239,255,248, - 138,129,252,248,239,15,130,244,59,129,122,253,4,239,15,131,244,59,129,122, - 253,12,239,15,131,244,59,252,242,15,16,2,252,242,15,16,74,8,189,0,0,56,67, + 44,36,255,211,252,237,252,233,244,86,255,248,139,129,122,253,4,239,255,248, + 139,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131,244,60,129,122, + 253,12,239,15,131,244,60,252,242,15,16,2,252,242,15,16,74,8,189,0,0,56,67, 102,15,110,213,102,15,112,210,81,252,242,15,88,194,252,242,15,88,202,102, - 15,126,197,102,15,126,201,255,248,138,129,252,248,239,15,130,244,59,129,122, - 253,4,239,15,131,244,59,129,122,253,12,239,15,131,244,59,221,2,221,66,8,199, + 15,126,197,102,15,126,201,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,221,2,221,66,8,199, 68,36,16,0,0,192,89,216,68,36,16,221,92,36,8,216,68,36,16,221,28,36,139,76, - 36,8,139,44,36,255,211,252,253,252,233,244,85,255,248,139,129,122,253,4,239, - 255,248,139,129,252,248,239,15,130,244,59,129,122,253,4,239,15,131,244,59, - 129,122,253,12,239,15,131,244,59,252,242,15,16,2,252,242,15,16,74,8,189,0, + 36,8,139,44,36,255,211,252,253,252,233,244,86,255,248,140,129,122,253,4,239, + 255,248,140,129,252,248,239,15,130,244,60,129,122,253,4,239,15,131,244,60, + 129,122,253,12,239,15,131,244,60,252,242,15,16,2,252,242,15,16,74,8,189,0, 0,56,67,102,15,110,213,102,15,112,210,81,252,242,15,88,194,252,242,15,88, - 202,102,15,126,197,102,15,126,201,255,248,139,129,252,248,239,15,130,244, - 59,129,122,253,4,239,15,131,244,59,129,122,253,12,239,15,131,244,59,221,2, + 202,102,15,126,197,102,15,126,201,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,221,2, 221,66,8,199,68,36,16,0,0,192,89,216,68,36,16,221,92,36,8,216,68,36,16,221, - 28,36,139,76,36,8,139,44,36,255,211,197,252,233,244,85,255,248,140,129,122, - 253,4,239,255,248,140,129,252,248,239,15,130,244,59,129,122,253,4,239,15, - 131,244,59,129,122,253,12,239,15,131,244,59,252,242,15,16,2,252,242,15,16, + 28,36,139,76,36,8,139,44,36,255,211,197,252,233,244,86,255,248,141,129,122, + 253,4,239,255,248,141,129,252,248,239,15,130,244,60,129,122,253,4,239,15, + 131,244,60,129,122,253,12,239,15,131,244,60,252,242,15,16,2,252,242,15,16, 74,8,189,0,0,56,67,102,15,110,213,102,15,112,210,81,252,242,15,88,194,252, - 242,15,88,202,102,15,126,197,102,15,126,201,255,248,140,129,252,248,239,15, - 130,244,59,129,122,253,4,239,15,131,244,59,129,122,253,12,239,15,131,244, - 59,221,2,221,66,8,199,68,36,16,0,0,192,89,216,68,36,16,221,92,36,8,216,68, - 36,16,221,28,36,139,76,36,8,139,44,36,255,211,205,252,233,244,85,248,123, - 184,237,252,233,244,59,248,125,184,237,248,59,139,108,36,48,139,114,252,252, + 242,15,88,202,102,15,126,197,102,15,126,201,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,221,2,221,66,8,199,68,36,16,0,0,192,89,216,68,36,16,221,92,36,8,216,68, + 36,16,221,28,36,139,76,36,8,139,44,36,255,211,205,252,233,244,86,248,124, + 184,237,252,233,244,60,248,126,184,237,248,60,139,108,36,48,139,114,252,252, 137,116,36,24,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,44,36,252,255,144,233,139,149,233, - 133,192,15,143,244,74,248,1,255,139,141,233,41,209,193,252,233,3,133,192, + 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,181,233,139,14,15,182,252,233, 15,182,205,131,198,4,252,255,36,171,248,2,137,209,252,247,198,237,15,133, - 244,249,15,182,110,252,253,252,247,213,141,20,252,234,252,233,244,27,248, - 3,137,252,245,131,229,252,248,41,252,234,252,233,244,27,248,5,186,237,137, - 252,233,232,251,1,0,139,149,233,49,192,252,233,244,1,248,71,93,137,108,36, + 244,249,15,182,110,252,253,252,247,213,141,20,252,234,252,233,244,28,248, + 3,137,252,245,131,229,252,248,41,252,234,252,233,244,28,248,5,186,237,137, + 252,233,232,251,1,0,139,149,233,49,192,252,233,244,1,248,72,93,137,108,36, 16,139,108,36,48,137,116,36,24,137,149,233,255,141,68,194,252,248,137,252, 233,137,133,233,232,251,1,21,139,149,233,139,133,233,41,208,193,232,3,131, - 192,1,139,108,36,16,85,195,248,141,255,15,182,131,233,168,235,15,133,244, + 192,1,139,108,36,16,85,195,248,142,255,15,182,131,233,168,235,15,133,244, 251,168,235,15,133,244,247,168,235,15,132,244,247,252,255,139,233,252,233, - 244,247,255,248,142,15,182,131,233,168,235,15,133,244,251,252,233,244,247, - 248,143,15,182,131,233,168,235,15,133,244,251,168,235,15,132,244,251,252, + 244,247,255,248,143,15,182,131,233,168,235,15,133,244,251,252,233,244,247, + 248,144,15,182,131,233,168,235,15,133,244,251,168,235,15,132,244,251,252, 255,139,233,15,132,244,247,168,235,15,132,244,251,248,1,255,139,108,36,48, 137,149,233,137,252,242,137,252,233,232,251,1,22,248,3,139,149,233,248,4, 15,182,78,252,253,248,5,15,182,110,252,252,15,183,70,252,254,252,255,164, - 253,171,233,248,144,131,198,4,139,77,232,137,76,36,20,252,233,244,4,248,145, + 253,171,233,248,145,131,198,4,139,77,232,137,76,36,20,252,233,244,4,248,146, 255,139,106,252,248,139,173,233,15,182,133,233,141,4,194,139,108,36,48,137, 149,233,137,133,233,137,252,242,141,139,233,137,171,233,137,116,36,24,232, - 251,1,23,252,233,244,3,255,248,146,137,116,36,24,255,248,147,255,137,116, + 251,1,23,252,233,244,3,255,248,147,137,116,36,24,255,248,148,255,137,116, 36,24,131,206,1,248,1,255,141,68,194,252,248,139,108,36,48,137,149,233,137, 133,233,137,252,242,137,252,233,232,251,1,24,199,68,36,24,0,0,0,0,255,131, 230,252,254,255,139,149,233,137,193,139,133,233,41,208,137,205,15,182,78, - 252,253,193,232,3,131,192,1,252,255,229,248,148,255,85,141,108,36,12,85,83, + 252,253,193,232,3,131,192,1,252,255,229,248,149,255,85,141,108,36,12,85,83, 82,81,80,15,182,69,252,252,138,101,252,248,137,125,252,252,137,117,252,248, 139,93,0,139,139,233,199,131,233,237,137,131,233,137,139,233,129,252,236, 239,252,242,15,17,125,216,252,242,15,17,117,208,252,242,15,17,109,200,252, 242,15,17,101,192,252,242,15,17,93,184,252,242,15,17,85,176,252,242,15,17, 77,168,252,242,15,17,69,160,139,171,233,139,147,233,137,171,233,199,131,233, 0,0,0,0,137,149,233,141,84,36,16,141,139,233,232,251,1,25,139,141,233,129, - 225,239,137,204,137,169,233,139,149,233,139,177,233,255,248,149,255,133,192, + 225,239,137,204,137,169,233,139,149,233,139,177,233,255,248,150,255,133,192, 15,136,244,249,137,68,36,20,139,122,252,248,139,191,233,139,191,233,199,131, 233,0,0,0,0,199,131,233,237,139,6,15,182,204,15,182,232,131,198,4,193,232, 16,129,252,253,239,15,130,244,248,139,68,36,20,248,2,252,255,36,171,248,3, - 252,247,216,137,252,233,137,194,232,251,1,26,255,248,87,255,217,124,36,4, + 252,247,216,137,252,233,137,194,232,251,1,26,255,248,88,255,217,124,36,4, 137,68,36,8,102,184,0,4,102,11,68,36,4,102,37,252,255,252,247,102,137,68, - 36,6,217,108,36,6,217,252,252,217,108,36,4,139,68,36,8,195,255,248,150,102, + 36,6,217,108,36,6,217,252,252,217,108,36,4,139,68,36,8,195,255,248,151,102, 15,252,239,210,102,15,118,210,102,15,115,210,1,184,0,0,48,67,102,15,110,216, 102,15,112,219,81,15,40,200,102,15,84,202,102,15,46,217,15,134,244,247,102, 15,85,208,252,242,15,88,203,252,242,15,92,203,102,15,86,202,184,0,0,252,240, 63,102,15,110,208,102,15,112,210,81,252,242,15,194,193,1,102,15,84,194,252, - 242,15,92,200,15,40,193,248,1,195,248,89,255,217,124,36,4,137,68,36,8,102, + 242,15,92,200,15,40,193,248,1,195,248,90,255,217,124,36,4,137,68,36,8,102, 184,0,8,102,11,68,36,4,102,37,252,255,252,251,102,137,68,36,6,217,108,36, - 6,217,252,252,217,108,36,4,139,68,36,8,195,255,248,151,102,15,252,239,210, + 6,217,252,252,217,108,36,4,139,68,36,8,195,255,248,152,102,15,252,239,210, 102,15,118,210,102,15,115,210,1,184,0,0,48,67,102,15,110,216,102,15,112,219, 81,15,40,200,102,15,84,202,102,15,46,217,15,134,244,247,102,15,85,208,252, 242,15,88,203,252,242,15,92,203,102,15,86,202,184,0,0,252,240,191,102,15, 110,208,102,15,112,210,81,252,242,15,194,193,6,102,15,84,194,252,242,15,92, - 200,15,40,193,248,1,195,248,110,255,217,124,36,4,137,68,36,8,102,184,0,12, + 200,15,40,193,248,1,195,248,111,255,217,124,36,4,137,68,36,8,102,184,0,12, 102,11,68,36,4,102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,139, - 68,36,8,195,255,248,152,102,15,252,239,210,102,15,118,210,102,15,115,210, + 68,36,8,195,255,248,153,102,15,252,239,210,102,15,118,210,102,15,115,210, 1,184,0,0,48,67,102,15,110,216,102,15,112,219,81,15,40,200,102,15,84,202, 102,15,46,217,15,134,244,247,102,15,85,208,15,40,193,252,242,15,88,203,252, 242,15,92,203,184,0,0,252,240,63,102,15,110,216,102,15,112,219,81,252,242, 15,194,193,1,102,15,84,195,252,242,15,92,200,102,15,86,202,15,40,193,248, - 1,195,248,153,255,15,40,232,252,242,15,94,193,102,15,252,239,210,102,15,118, + 1,195,248,154,255,15,40,232,252,242,15,94,193,102,15,252,239,210,102,15,118, 210,102,15,115,210,1,184,0,0,48,67,102,15,110,216,102,15,112,219,81,15,40, 224,102,15,84,226,102,15,46,220,15,134,244,247,102,15,85,208,252,242,15,88, 227,252,242,15,92,227,102,15,86,226,184,0,0,252,240,63,102,15,110,208,102, @@ -454,11 +454,11 @@ static const unsigned char build_actionlist[16945] = { 197,252,242,15,89,204,252,242,15,92,193,195,248,1,252,242,15,89,200,15,40, 197,252,242,15,92,193,195,255,217,193,216,252,241,217,124,36,4,102,184,0, 4,102,11,68,36,4,102,37,252,255,252,247,102,137,68,36,6,217,108,36,6,217, - 252,252,217,108,36,4,222,201,222,252,233,195,255,248,94,217,252,234,222,201, - 248,154,217,84,36,4,129,124,36,4,0,0,128,127,15,132,244,247,129,124,36,4, - 0,0,128,252,255,15,132,244,248,248,155,217,192,217,252,252,220,252,233,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,129,124,36,4,0,0,128,127,15,132,244,247,129,124,36,4, + 0,0,128,252,255,15,132,244,248,248,156,217,192,217,252,252,220,252,233,217, 201,217,252,240,217,232,222,193,217,252,253,221,217,248,1,195,248,2,221,216, - 217,252,238,195,255,248,113,219,84,36,4,219,68,36,4,255,223,252,233,255,221, + 217,252,238,195,255,248,114,219,84,36,4,219,68,36,4,255,223,252,233,255,221, 252,233,223,224,158,255,15,133,244,254,15,138,244,255,221,216,139,68,36,4, 131,252,248,1,15,142,244,252,248,1,169,1,0,0,0,15,133,244,248,216,200,209, 232,252,233,244,1,248,2,209,232,15,132,244,251,217,192,248,3,216,200,209, @@ -467,14 +467,14 @@ static const unsigned char build_actionlist[16945] = { 252,248,1,15,132,244,5,252,233,244,1,248,7,221,216,217,232,195,248,8,217, 84,36,4,217,201,217,84,36,8,139,68,36,4,209,224,61,0,0,0,252,255,15,132,244, 248,139,68,36,8,209,224,15,132,244,250,61,0,0,0,252,255,15,132,244,250,217, - 252,241,252,233,244,155,248,9,255,217,232,255,223,252,234,255,221,252,234, + 252,241,252,233,244,156,248,9,255,217,232,255,223,252,234,255,221,252,234, 223,224,158,255,15,132,244,247,217,201,248,1,221,216,195,248,2,217,225,217, 232,255,15,132,244,249,221,216,217,225,217,252,238,184,0,0,0,0,15,146,208, 209,200,51,68,36,4,15,137,244,249,217,201,248,3,221,217,217,225,195,248,4, 131,124,36,4,0,15,141,244,3,221,216,221,216,133,192,15,132,244,251,217,252, - 238,195,248,5,199,68,36,4,0,0,128,127,217,68,36,4,195,255,248,113,255,248, - 156,252,242,15,45,193,252,242,15,42,208,102,15,46,202,15,133,244,254,15,138, - 244,255,248,157,131,252,248,1,15,142,244,252,248,1,169,1,0,0,0,15,133,244, + 238,195,248,5,199,68,36,4,0,0,128,127,217,68,36,4,195,255,248,114,255,248, + 157,252,242,15,45,193,252,242,15,42,208,102,15,46,202,15,133,244,254,15,138, + 244,255,248,158,131,252,248,1,15,142,244,252,248,1,169,1,0,0,0,15,133,244, 248,252,242,15,89,192,209,232,252,233,244,1,248,2,209,232,15,132,244,251, 15,40,200,248,3,252,242,15,89,192,209,232,15,132,244,250,15,131,244,3,255, 252,242,15,89,200,252,233,244,3,248,4,252,242,15,89,193,248,5,195,248,6,15, @@ -492,30 +492,30 @@ static const unsigned char build_actionlist[16945] = { 208,102,15,112,210,81,102,15,46,194,15,132,244,1,102,15,80,193,15,87,192, 136,196,15,146,208,48,224,15,133,244,1,248,3,184,0,0,252,240,127,102,15,110, 192,102,15,112,192,81,195,248,4,102,15,80,193,133,192,15,133,244,3,15,87, - 192,195,248,5,102,15,80,193,133,192,15,132,244,3,255,15,87,192,195,248,158, + 192,195,248,5,102,15,80,193,133,192,15,132,244,3,255,15,87,192,195,248,159, 255,139,68,36,12,252,242,15,16,68,36,4,131,252,248,1,15,132,244,247,15,135, - 244,248,232,244,87,252,233,244,253,248,1,232,244,89,252,233,244,253,248,2, - 131,252,248,3,15,132,244,247,15,135,244,248,232,244,110,255,252,233,244,253, + 244,248,232,244,88,252,233,244,253,248,1,232,244,90,252,233,244,253,248,2, + 131,252,248,3,15,132,244,247,15,135,244,248,232,244,111,255,252,233,244,253, 248,1,252,242,15,81,192,248,7,252,242,15,17,68,36,4,221,68,36,4,195,248,2, - 221,68,36,4,131,252,248,5,15,130,244,94,15,132,244,154,248,2,131,252,248, + 221,68,36,4,131,252,248,5,15,130,244,95,15,132,244,155,248,2,131,252,248, 7,15,132,244,247,15,135,244,248,217,252,237,217,201,217,252,241,195,248,1, 217,232,217,201,217,252,241,195,248,2,131,252,248,9,15,132,244,247,15,135, 244,248,255,217,252,236,217,201,217,252,241,195,248,1,217,252,254,195,248, 2,131,252,248,11,15,132,244,247,15,135,244,255,217,252,255,195,248,1,217, 252,242,221,216,195,255,139,68,36,12,221,68,36,4,131,252,248,1,15,130,244, - 87,15,132,244,89,131,252,248,3,15,130,244,110,15,135,244,248,217,252,250, - 195,248,2,131,252,248,5,15,130,244,94,15,132,244,154,131,252,248,7,15,132, + 88,15,132,244,90,131,252,248,3,15,130,244,111,15,135,244,248,217,252,250, + 195,248,2,131,252,248,5,15,130,244,95,15,132,244,155,131,252,248,7,15,132, 244,247,15,135,244,248,217,252,237,217,201,217,252,241,195,248,1,217,232, 217,201,217,252,241,195,248,2,131,252,248,9,15,132,244,247,255,15,135,244, 248,217,252,236,217,201,217,252,241,195,248,1,217,252,254,195,248,2,131,252, 248,11,15,132,244,247,15,135,244,255,217,252,255,195,248,1,217,252,242,221, - 216,195,255,248,9,204,255,248,159,255,139,68,36,20,252,242,15,16,68,36,4, + 216,195,255,248,9,204,255,248,160,255,139,68,36,20,252,242,15,16,68,36,4, 252,242,15,16,76,36,12,131,252,248,1,15,132,244,247,15,135,244,248,252,242, 15,88,193,248,7,252,242,15,17,68,36,4,221,68,36,4,195,248,1,252,242,15,92, 193,252,233,244,7,248,2,131,252,248,3,15,132,244,247,15,135,244,248,252,242, 15,89,193,252,233,244,7,248,1,252,242,15,94,193,252,233,244,7,248,2,131,252, - 248,5,15,132,244,247,255,15,135,244,248,232,244,153,252,233,244,7,248,1,90, - 232,244,113,82,252,233,244,7,248,2,131,252,248,7,15,132,244,247,15,135,244, + 248,5,15,132,244,247,255,15,135,244,248,232,244,154,252,233,244,7,248,1,90, + 232,244,114,82,252,233,244,7,248,2,131,252,248,7,15,132,244,247,15,135,244, 248,184,0,0,0,128,102,15,110,200,102,15,112,201,81,15,87,193,252,233,244, 7,248,1,102,15,252,239,201,102,15,118,201,102,15,115,209,1,15,84,193,252, 233,244,7,248,2,255,131,252,248,9,15,135,244,248,221,68,36,4,221,68,36,12, @@ -524,32 +524,32 @@ static const unsigned char build_actionlist[16945] = { 244,7,248,1,252,242,15,95,193,252,233,244,7,248,9,204,255,139,68,36,20,221, 68,36,4,221,68,36,12,131,252,248,1,15,132,244,247,15,135,244,248,222,193, 195,248,1,222,252,233,195,248,2,131,252,248,3,15,132,244,247,15,135,244,248, - 222,201,195,248,1,222,252,249,195,248,2,131,252,248,5,15,130,244,153,15,132, - 244,113,131,252,248,7,15,132,244,247,15,135,244,248,255,221,216,217,224,195, + 222,201,195,248,1,222,252,249,195,248,2,131,252,248,5,15,130,244,154,15,132, + 244,114,131,252,248,7,15,132,244,247,15,135,244,248,255,221,216,217,224,195, 248,1,221,216,217,225,195,248,2,131,252,248,9,15,132,244,247,15,135,244,248, 217,252,243,195,248,1,217,201,217,252,253,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,160,156,90,137,209,129,252,242, + 244,248,217,201,248,2,221,216,195,255,248,161,156,90,137,209,129,252,242, 0,0,32,0,82,157,156,90,49,192,57,209,15,132,244,247,139,68,36,4,87,83,15, - 162,139,124,36,16,137,7,137,95,4,137,79,8,137,87,12,91,95,248,1,195,248,161, + 162,139,124,36,16,137,7,137,95,4,137,79,8,137,87,12,91,95,248,1,195,248,162, 255,85,137,229,83,137,203,43,163,233,255,137,163,233,255,15,182,139,233,131, 252,233,1,15,136,244,248,248,1,139,132,253,139,233,137,4,140,131,252,233, 1,15,137,244,1,248,2,139,139,233,139,147,233,252,255,147,233,137,131,233, 137,147,233,128,187,233,1,15,130,244,253,15,132,244,252,221,155,233,252,233, 244,253,248,6,255,217,155,233,248,7,255,41,163,233,255,139,93,252,252,201, - 195,255,248,162,255,249,255,129,124,253,202,4,239,15,133,244,253,129,124, + 195,255,248,163,255,249,255,129,124,253,202,4,239,15,133,244,253,129,124, 253,194,4,239,15,133,244,254,139,44,202,131,198,4,59,44,194,255,15,141,244, 255,255,15,140,244,255,255,15,143,244,255,255,15,142,244,255,255,248,6,15, 183,70,252,254,141,180,253,134,233,248,9,139,6,15,182,204,15,182,232,131, - 198,4,193,232,16,252,255,36,171,248,7,15,135,244,41,129,124,253,194,4,239, - 15,130,244,247,15,133,244,41,255,252,242,15,42,4,194,252,233,244,248,255, - 221,4,202,219,4,194,252,233,244,249,255,248,8,15,135,244,41,255,252,242,15, + 198,4,193,232,16,252,255,36,171,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,4,194,131,198,4,102,15,46,193,255,15,134,244,9,255, 15,135,244,9,255,15,130,244,9,255,15,131,244,9,255,252,233,244,6,255,219, - 4,202,252,233,244,248,255,129,124,253,202,4,239,15,131,244,41,129,124,253, - 194,4,239,15,131,244,41,255,248,1,252,242,15,16,4,194,248,2,131,198,4,102, + 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,248,1,252,242,15,16,4,194,248,2,131,198,4,102, 15,46,4,202,248,3,255,248,1,221,4,202,248,2,221,4,194,248,3,131,198,4,255, 15,134,244,247,255,15,135,244,247,255,15,130,244,247,255,15,131,244,247,255, 15,183,70,252,254,141,180,253,134,233,248,1,139,6,15,182,204,15,182,232,131, @@ -565,12 +565,12 @@ static const unsigned char build_actionlist[16945] = { 255,248,1,221,4,202,248,2,221,4,194,248,4,255,15,138,244,248,15,133,244,248, 255,15,138,244,248,15,132,244,247,255,248,1,15,183,70,252,254,141,180,253, 134,233,248,2,255,248,2,15,183,70,252,254,141,180,253,134,233,248,1,255,252, - 233,244,9,255,248,5,255,129,252,253,239,15,132,244,46,129,124,253,202,4,239, - 15,132,244,46,255,57,108,202,4,15,133,244,2,129,252,253,239,15,131,244,1, + 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,4,15,133,244,2,129,252,253,239,15,131,244,1, 139,12,202,139,4,194,57,193,15,132,244,1,129,252,253,239,15,135,244,2,139, 169,233,133,252,237,15,132,244,2,252,246,133,233,235,15,133,244,2,255,49, - 252,237,255,189,1,0,0,0,255,252,233,244,45,255,248,3,129,252,253,239,255, - 15,133,244,9,255,252,233,244,46,255,252,247,208,139,108,202,4,131,198,4,129, + 252,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,255,252,247,208,139,108,202,4,131,198,4,129, 252,253,239,15,133,244,249,139,12,202,59,12,135,255,139,108,202,4,131,198, 4,255,129,252,253,239,15,133,244,253,129,124,253,199,4,239,15,133,244,254, 139,44,199,59,44,202,255,15,183,70,252,254,141,180,253,134,233,248,9,139, @@ -582,7 +582,7 @@ static const unsigned char build_actionlist[16945] = { 4,202,248,4,255,252,247,208,139,108,202,4,131,198,4,57,197,255,15,133,244, 249,15,183,70,252,254,141,180,253,134,233,248,2,139,6,15,182,204,15,182,232, 131,198,4,193,232,16,252,255,36,171,248,3,129,252,253,239,15,133,244,2,252, - 233,244,46,255,15,132,244,248,129,252,253,239,15,132,244,46,15,183,70,252, + 233,244,47,255,15,132,244,248,129,252,253,239,15,132,244,47,15,183,70,252, 254,141,180,253,134,233,248,2,139,6,15,182,204,15,182,232,131,198,4,193,232, 16,252,255,36,171,255,139,108,194,4,131,198,4,129,252,253,239,255,137,108, 202,4,139,44,194,137,44,202,255,139,108,194,4,139,4,194,137,108,202,4,137, @@ -592,39 +592,39 @@ static const unsigned char build_actionlist[16945] = { 15,133,244,251,139,44,194,252,247,221,15,128,244,250,199,68,202,4,237,137, 44,202,248,9,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36, 171,248,4,199,68,202,4,0,0,224,65,199,4,202,0,0,0,0,252,233,244,9,248,5,15, - 135,244,51,255,129,124,253,194,4,239,15,131,244,51,255,252,242,15,16,4,194, + 135,244,52,255,129,124,253,194,4,239,15,131,244,52,255,252,242,15,16,4,194, 184,0,0,0,128,102,15,110,200,102,15,112,201,81,15,87,193,252,242,15,17,4, 202,255,221,4,194,217,224,221,28,202,255,129,124,253,194,4,239,15,133,244, 248,139,4,194,255,139,128,233,248,1,199,68,202,4,237,137,4,202,255,15,87, 192,252,242,15,42,128,233,248,1,252,242,15,17,4,202,255,219,128,233,248,1, 221,28,202,255,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36, - 171,248,2,129,124,253,194,4,239,15,133,244,54,139,12,194,137,213,232,251, + 171,248,2,129,124,253,194,4,239,15,133,244,55,139,12,194,137,213,232,251, 1,20,255,252,242,15,42,192,255,137,4,36,219,4,36,255,137,252,234,15,182,78, 252,253,252,233,244,1,255,15,182,252,236,15,182,192,255,129,124,253,252,234, - 4,239,15,133,244,48,129,124,253,199,4,239,15,133,244,48,139,44,252,234,3, - 44,199,15,128,244,47,255,129,124,253,252,234,4,239,15,133,244,50,129,124, - 253,199,4,239,15,133,244,50,139,4,199,3,4,252,234,15,128,244,49,255,129,124, - 253,252,234,4,239,15,133,244,53,129,124,253,194,4,239,15,133,244,53,139,44, - 252,234,3,44,194,15,128,244,52,255,199,68,202,4,237,255,129,124,253,252,234, - 4,239,15,131,244,48,255,129,124,253,199,4,239,15,131,244,48,255,252,242,15, + 4,239,15,133,244,49,129,124,253,199,4,239,15,133,244,49,139,44,252,234,3, + 44,199,15,128,244,48,255,129,124,253,252,234,4,239,15,133,244,51,129,124, + 253,199,4,239,15,133,244,51,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,129,124,253,199,4,239,15,131,244,49,255,252,242,15, 16,4,252,234,252,242,15,88,4,199,255,221,4,252,234,220,4,199,255,129,124, - 253,252,234,4,239,15,131,244,50,255,129,124,253,199,4,239,15,131,244,50,255, + 253,252,234,4,239,15,131,244,51,255,129,124,253,199,4,239,15,131,244,51,255, 252,242,15,16,4,199,252,242,15,88,4,252,234,255,221,4,199,220,4,252,234,255, - 129,124,253,252,234,4,239,15,131,244,53,129,124,253,194,4,239,15,131,244, - 53,255,252,242,15,16,4,252,234,252,242,15,88,4,194,255,221,4,252,234,220, - 4,194,255,129,124,253,252,234,4,239,15,133,244,48,129,124,253,199,4,239,15, - 133,244,48,139,44,252,234,43,44,199,15,128,244,47,255,129,124,253,252,234, - 4,239,15,133,244,50,129,124,253,199,4,239,15,133,244,50,139,4,199,43,4,252, - 234,15,128,244,49,255,129,124,253,252,234,4,239,15,133,244,53,129,124,253, - 194,4,239,15,133,244,53,139,44,252,234,43,44,194,15,128,244,52,255,252,242, + 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,129,124,253,199,4,239,15, + 133,244,49,139,44,252,234,43,44,199,15,128,244,48,255,129,124,253,252,234, + 4,239,15,133,244,51,129,124,253,199,4,239,15,133,244,51,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,15,92,4,199,255,221,4,252,234,220,36,199,255,252, 242,15,16,4,199,252,242,15,92,4,252,234,255,221,4,199,220,36,252,234,255, 252,242,15,16,4,252,234,252,242,15,92,4,194,255,221,4,252,234,220,36,194, - 255,129,124,253,252,234,4,239,15,133,244,48,129,124,253,199,4,239,15,133, - 244,48,139,44,252,234,15,175,44,199,15,128,244,47,255,129,124,253,252,234, - 4,239,15,133,244,50,129,124,253,199,4,239,15,133,244,50,139,4,199,15,175, - 4,252,234,15,128,244,49,255,129,124,253,252,234,4,239,15,133,244,53,129,124, - 253,194,4,239,15,133,244,53,139,44,252,234,15,175,44,194,15,128,244,52,255, + 255,129,124,253,252,234,4,239,15,133,244,49,129,124,253,199,4,239,15,133, + 244,49,139,44,252,234,15,175,44,199,15,128,244,48,255,129,124,253,252,234, + 4,239,15,133,244,51,129,124,253,199,4,239,15,133,244,51,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,252,242,15,89,4,199,255,221,4,252,234,220,12,199, 255,252,242,15,16,4,199,252,242,15,89,4,252,234,255,221,4,199,220,12,252, 234,255,252,242,15,16,4,252,234,252,242,15,89,4,194,255,221,4,252,234,220, @@ -634,10 +634,10 @@ static const unsigned char build_actionlist[16945] = { 252,234,220,52,194,255,252,242,15,16,4,252,234,252,242,15,16,12,199,255,221, 4,252,234,221,4,199,255,252,242,15,16,4,199,252,242,15,16,12,252,234,255, 221,4,199,221,4,252,234,255,252,242,15,16,4,252,234,252,242,15,16,12,194, - 255,221,4,252,234,221,4,194,255,248,163,232,244,153,255,252,233,244,163,255, - 232,244,113,255,15,182,252,236,15,182,192,141,12,194,41,232,137,76,36,4,137, - 68,36,8,248,33,139,108,36,48,137,44,36,137,149,233,137,116,36,24,232,251, - 1,27,139,149,233,133,192,15,133,244,42,15,182,110,252,255,15,182,78,252,253, + 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,141,12,194,41,232,137,76,36,4,137, + 68,36,8,248,34,139,108,36,48,137,44,36,137,149,233,137,116,36,24,232,251, + 1,27,139,149,233,133,192,15,133,244,43,15,182,110,252,255,15,182,78,252,253, 139,68,252,234,4,139,44,252,234,137,68,202,4,137,44,202,139,6,15,182,204, 15,182,232,131,198,4,193,232,16,252,255,36,171,255,252,247,208,139,4,135, 199,68,202,4,237,137,4,202,139,6,15,182,204,15,182,232,131,198,4,193,232, @@ -679,57 +679,57 @@ static const unsigned char build_actionlist[16945] = { 78,252,253,137,4,202,199,68,202,4,237,139,6,15,182,204,15,182,232,131,198, 4,193,232,16,252,255,36,171,248,3,137,252,233,232,251,1,32,15,183,70,252, 254,252,247,208,252,233,244,2,255,252,247,208,139,106,252,248,139,173,233, - 139,4,135,252,233,244,164,255,252,247,208,139,106,252,248,139,173,233,139, - 4,135,252,233,244,165,255,15,182,252,236,15,182,192,129,124,253,252,234,4, - 239,15,133,244,36,139,44,252,234,255,129,124,253,194,4,239,15,133,244,251, + 139,4,135,252,233,244,165,255,252,247,208,139,106,252,248,139,173,233,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,244,251, 139,4,194,255,129,124,253,194,4,239,15,131,244,251,255,252,242,15,16,4,194, 252,242,15,45,192,252,242,15,42,200,102,15,46,193,255,221,4,194,219,20,36, - 219,4,36,255,15,133,244,36,255,59,133,233,15,131,244,36,193,224,3,3,133,233, + 219,4,36,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,132,244,248,139,40,139,64,4,137,44,202,137,68,202,4, 248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248, 2,131,189,233,0,15,132,244,249,139,141,233,252,246,129,233,235,15,132,244, - 36,15,182,78,252,253,248,3,199,68,202,4,237,252,233,244,1,248,5,255,129,124, - 253,194,4,239,15,133,244,36,139,4,194,252,233,244,164,255,15,182,252,236, - 15,182,192,252,247,208,139,4,135,129,124,253,252,234,4,239,15,133,244,34, - 139,44,252,234,248,164,139,141,233,35,136,233,105,201,239,3,141,233,248,1, + 37,15,182,78,252,253,248,3,199,68,202,4,237,252,233,244,1,248,5,255,129,124, + 253,194,4,239,15,133,244,37,139,4,194,252,233,244,165,255,15,182,252,236, + 15,182,192,252,247,208,139,4,135,129,124,253,252,234,4,239,15,133,244,35, + 139,44,252,234,248,165,139,141,233,35,136,233,105,201,239,3,141,233,248,1, 129,185,233,239,15,133,244,250,57,129,233,15,133,244,250,129,121,253,4,239, 15,132,244,251,15,182,70,252,253,139,41,139,73,4,137,44,194,137,76,194,4, 248,2,255,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171, 248,3,15,182,70,252,253,199,68,194,4,237,252,233,244,2,248,4,139,137,233, 133,201,15,133,244,1,248,5,139,141,233,133,201,15,132,244,3,252,246,129,233, - 235,15,133,244,3,252,233,244,34,255,15,182,252,236,15,182,192,129,124,253, - 252,234,4,239,15,133,244,35,139,44,252,234,59,133,233,15,131,244,35,193,224, + 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,239,15,132,244,248,139,40,139,64,4,137,44,202,137, 68,202,4,248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36, 171,248,2,131,189,233,0,15,132,244,249,139,141,233,252,246,129,233,235,15, - 132,244,35,255,15,182,78,252,253,248,3,199,68,202,4,237,252,233,244,1,255, - 15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,39,139,44, - 252,234,255,15,133,244,39,255,59,133,233,15,131,244,39,193,224,3,3,133,233, + 132,244,36,255,15,182,78,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,1,252,246,133,233,235,15,133,244,253, 248,2,139,108,202,4,139,12,202,137,104,4,137,8,139,6,15,182,204,15,182,232, 131,198,4,193,232,16,252,255,36,171,248,3,131,189,233,0,15,132,244,1,139, - 141,233,252,246,129,233,235,255,15,132,244,39,15,182,78,252,253,252,233,244, - 1,248,5,129,124,253,194,4,239,15,133,244,39,139,4,194,252,233,244,165,248, + 141,233,252,246,129,233,235,255,15,132,244,40,15,182,78,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,139,139,233,137,171,233,137,141,233,15,182,78,252,253,252, 233,244,2,255,15,182,252,236,15,182,192,252,247,208,139,4,135,129,124,253, - 252,234,4,239,15,133,244,37,139,44,252,234,248,165,139,141,233,35,136,233, + 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,233,248,1,129,185,233,239,15,133,244,251, 57,129,233,15,133,244,251,129,121,253,4,239,15,132,244,250,248,2,255,252, 246,133,233,235,15,133,244,253,248,3,15,182,70,252,253,139,108,194,4,139, 4,194,137,105,4,137,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, 255,36,171,248,4,131,189,233,0,15,132,244,2,137,76,36,16,139,141,233,252, - 246,129,233,235,15,132,244,37,139,76,36,16,252,233,244,2,248,5,139,137,233, + 246,129,233,235,15,132,244,38,139,76,36,16,252,233,244,2,248,5,139,137,233, 133,201,15,133,244,1,255,139,141,233,133,201,15,132,244,252,252,246,129,233, - 235,15,132,244,37,248,6,137,68,36,16,199,68,36,20,237,137,108,36,12,141,68, + 235,15,132,244,38,248,6,137,68,36,16,199,68,36,20,237,137,108,36,12,141,68, 36,16,137,108,36,4,139,108,36,48,137,68,36,8,137,44,36,137,149,233,137,116, 36,24,232,251,1,34,139,149,233,139,108,36,12,137,193,252,233,244,2,248,7, 128,165,233,235,139,131,233,137,171,233,137,133,233,252,233,244,3,255,15, - 182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,38,139,44,252, - 234,59,133,233,15,131,244,38,193,224,3,3,133,233,129,120,253,4,239,15,132, + 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,15,132, 244,249,248,1,252,246,133,233,235,15,133,244,253,248,2,139,108,202,4,139, 12,202,137,104,4,137,8,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, 255,36,171,248,3,131,189,233,0,15,132,244,1,255,139,141,233,252,246,129,233, - 235,15,132,244,38,15,182,78,252,253,252,233,244,1,248,7,128,165,233,235,139, + 235,15,132,244,39,15,182,78,252,253,252,233,244,1,248,7,128,165,233,235,139, 139,233,137,171,233,137,141,233,15,182,78,252,253,252,233,244,2,255,137,124, 36,16,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,20,131,232,1,15,132,244,250,1,252,248,59,133, @@ -739,10 +739,10 @@ static const unsigned char build_actionlist[16945] = { 5,137,108,36,4,139,108,36,48,137,149,233,137,68,36,8,137,44,36,137,116,36, 24,232,251,1,35,139,149,233,15,182,78,252,253,252,233,244,1,248,7,255,128, 165,233,235,139,131,233,137,171,233,137,133,233,252,233,244,2,255,3,68,36, - 20,255,129,124,253,202,4,239,139,44,202,15,133,244,55,141,84,202,8,137,114, + 20,255,129,124,253,202,4,239,139,44,202,15,133,244,56,141,84,202,8,137,114, 252,252,139,181,233,139,14,15,182,252,233,15,182,205,131,198,4,252,255,36, 171,255,141,76,202,8,137,215,139,105,252,248,129,121,253,252,252,239,15,133, - 244,28,248,56,139,114,252,252,252,247,198,237,15,133,244,253,248,1,137,106, + 244,29,248,57,139,114,252,252,252,247,198,237,15,133,244,253,248,1,137,106, 252,248,137,68,36,20,131,232,1,15,132,244,249,248,2,139,41,137,47,139,105, 4,131,193,8,137,111,4,131,199,8,131,232,1,15,133,244,2,139,106,252,248,248, 3,139,68,36,20,128,189,233,1,15,135,244,251,248,4,139,181,233,139,14,15,182, @@ -752,7 +752,7 @@ static const unsigned char build_actionlist[16945] = { 244,254,41,252,242,137,215,139,114,252,252,252,233,244,1,248,8,129,198,239, 252,233,244,1,255,141,76,202,8,139,105,232,139,65,252,236,137,41,137,65,4, 139,105,252,240,139,65,252,244,137,105,8,137,65,12,139,105,224,139,65,228, - 137,105,252,248,137,65,252,252,129,252,248,239,184,237,15,133,244,28,137, + 137,105,252,248,137,65,252,252,129,252,248,239,184,237,15,133,244,29,137, 202,137,114,252,252,139,181,233,139,14,15,182,252,233,15,182,205,131,198, 4,252,255,36,171,255,137,124,36,16,137,92,36,20,139,108,202,252,240,139,68, 202,252,248,139,157,233,131,198,4,139,189,233,248,1,57,216,15,131,244,251, @@ -790,20 +790,20 @@ static const unsigned char build_actionlist[16945] = { 204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,6,255,199,71,252,252, 237,131,199,8,255,199,68,194,252,244,237,255,131,192,1,252,233,244,5,248, 7,141,174,233,252,247,197,237,15,133,244,14,41,252,234,255,1,252,233,255, - 137,252,245,209,252,237,129,229,239,102,131,172,253,43,233,1,15,132,244,145, + 137,252,245,209,252,237,129,229,239,102,131,172,253,43,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,57,129,121,253,20,239,15,133,244,57,139,41,131,121,16,0,15,140, - 244,251,255,129,121,253,12,239,15,133,244,162,129,121,253,20,239,15,133,244, - 162,255,139,105,16,133,252,237,15,136,244,251,3,41,15,128,244,247,137,41, + 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,15,128,244,247,137,41, 255,59,105,8,199,65,28,237,137,105,24,255,15,142,244,253,248,1,248,6,141, 180,253,134,233,255,141,180,253,134,233,15,183,70,252,254,15,142,245,248, 1,248,6,255,15,143,244,253,248,6,141,180,253,134,233,248,1,255,248,7,139, 6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,5,255,3,41, 15,128,244,1,137,41,255,15,141,244,7,255,141,180,253,134,233,15,183,70,252, 254,15,141,245,255,15,140,244,7,255,252,233,244,6,248,9,255,129,121,253,4, - 239,255,15,131,244,57,129,121,253,12,239,15,131,244,57,255,129,121,253,12, - 239,15,131,244,162,129,121,253,20,239,15,131,244,162,255,139,105,20,255,129, - 252,253,239,15,131,244,57,255,252,242,15,16,1,252,242,15,16,73,8,255,252, + 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,15,16,73,8,255,252, 242,15,88,65,16,252,242,15,17,1,133,252,237,15,136,244,249,255,15,140,244, 249,255,102,15,46,200,248,1,252,242,15,17,65,24,255,221,65,8,221,1,255,220, 65,16,221,17,221,81,24,133,252,237,15,136,244,247,255,221,81,24,15,140,244, @@ -815,19 +815,19 @@ static const unsigned char build_actionlist[16945] = { 134,233,139,1,137,105,252,252,137,65,252,248,255,139,139,233,139,4,129,139, 128,233,139,108,36,48,137,147,233,137,171,233,252,255,224,255,141,180,253, 134,233,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,255, - 137,252,245,209,252,237,129,229,239,102,131,172,253,43,233,1,15,132,244,147, - 255,139,190,233,139,108,36,48,141,12,202,59,141,233,15,135,244,23,15,182, + 137,252,245,209,252,237,129,229,239,102,131,172,253,43,233,1,15,132,244,148, + 255,139,190,233,139,108,36,48,141,12,202,59,141,233,15,135,244,24,15,182, 142,233,57,200,15,134,244,249,248,2,255,15,183,70,252,254,252,233,245,255, 248,3,199,68,194,252,252,237,131,192,1,57,200,15,134,244,3,252,233,244,2, 255,141,44,197,237,141,4,194,139,122,252,248,137,104,252,252,137,120,252, - 248,139,108,36,48,141,12,200,59,141,233,15,135,244,22,137,209,137,194,15, + 248,139,108,36,48,141,12,200,59,141,233,15,135,244,23,137,209,137,194,15, 182,174,233,133,252,237,15,132,244,248,248,1,131,193,8,57,209,15,131,244, 249,139,121,252,248,137,56,139,121,252,252,137,120,4,131,192,8,199,65,252, 252,237,131,252,237,1,15,133,244,1,248,2,255,139,190,233,139,6,15,182,204, 15,182,232,131,198,4,193,232,16,252,255,36,171,255,248,3,199,64,4,237,131, 192,8,131,252,237,1,15,133,244,3,252,233,244,2,255,139,106,252,248,139,189, 233,139,108,36,48,141,68,194,252,248,137,149,233,141,136,233,59,141,233,137, - 133,233,255,137,44,36,255,137,124,36,4,137,44,36,255,15,135,244,21,199,131, + 133,233,255,137,44,36,255,137,124,36,4,137,44,36,255,15,135,244,22,199,131, 233,237,255,252,255,215,255,252,255,147,233,255,199,131,233,237,139,149,233, 141,12,194,252,247,217,3,141,233,139,114,252,252,252,233,244,12,255,254,0 }; @@ -842,6 +842,7 @@ enum { GLOB_vm_leave_unw, GLOB_vm_unwind_c, GLOB_vm_unwind_c_eh, + GLOB_vm_unwind_rethrow, GLOB_vm_unwind_ff, GLOB_vm_unwind_ff_eh, GLOB_vm_growstack_c, @@ -1001,6 +1002,7 @@ static const char *const globnames[] = { "vm_leave_unw", "vm_unwind_c@8", "vm_unwind_c_eh", + "vm_unwind_rethrow", "vm_unwind_ff@4", "vm_unwind_ff_eh", "vm_growstack_c", @@ -1213,770 +1215,770 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse) dasm_put(Dst, 0); dasm_put(Dst, 2, FRAME_P, LJ_TTRUE, FRAME_TYPE, FRAME_C, FRAME_TYPE, DISPATCH_GL(vmstate), ~LJ_VMST_C); dasm_put(Dst, 114, Dt1(->base), Dt1(->top), Dt1(->cframe), Dt1(->maxstack), LJ_TNIL); - dasm_put(Dst, 200, Dt1(->top), Dt1(->top), Dt1(->glref), Dt2(->vmstate), ~LJ_VMST_C, CFRAME_RAWMASK, 1+1); - dasm_put(Dst, 288, Dt1(->base), Dt1(->glref), GG_G2DISP, LJ_TFALSE, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, LUA_MINSTACK, -4+PC2PROTO(framesize), Dt1(->base), Dt1(->top)); - dasm_put(Dst, 354, 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, 497, FRAME_CP, FRAME_C, Dt1(->cframe), Dt1(->cframe), Dt1(->glref), GG_G2DISP, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); - dasm_put(Dst, 588, LJ_TFUNC, Dt7(->pc), Dt1(->stack), Dt1(->top), Dt1(->cframe), Dt1(->cframe), FRAME_CP, LJ_TNIL, Dt7(->pc), PC2PROTO(k)); - dasm_put(Dst, 760, LJ_TSTR, BC_GGET, DISPATCH_GL(tmptv), LJ_TTAB); + dasm_put(Dst, 200, Dt1(->top), Dt1(->top), Dt1(->glref), Dt2(->vmstate), ~LJ_VMST_C, CFRAME_RAWMASK); + dasm_put(Dst, 275, 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, 353, 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, 495, FRAME_CP, FRAME_C, Dt1(->cframe), Dt1(->cframe), Dt1(->glref), GG_G2DISP, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base)); + dasm_put(Dst, 573, Dt1(->top), LJ_TFUNC, Dt7(->pc), Dt1(->stack), Dt1(->top), Dt1(->cframe), Dt1(->cframe), FRAME_CP, LJ_TNIL, Dt7(->pc)); + dasm_put(Dst, 754, PC2PROTO(k), LJ_TSTR, BC_GGET, DISPATCH_GL(tmptv), LJ_TTAB); if (LJ_DUALNUM) { - dasm_put(Dst, 856, LJ_TISNUM); + dasm_put(Dst, 858, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 866); + dasm_put(Dst, 868); } else { - dasm_put(Dst, 879); + dasm_put(Dst, 881); } - dasm_put(Dst, 892, Dt1(->base), Dt1(->base), Dt1(->top), FRAME_CONT, 2+1, LJ_TSTR, BC_GSET); - dasm_put(Dst, 1044, DISPATCH_GL(tmptv), LJ_TTAB); + dasm_put(Dst, 894, Dt1(->base), Dt1(->base), Dt1(->top), FRAME_CONT, 2+1, LJ_TSTR, BC_GSET); + dasm_put(Dst, 1046, DISPATCH_GL(tmptv), LJ_TTAB); if (LJ_DUALNUM) { - dasm_put(Dst, 856, LJ_TISNUM); + dasm_put(Dst, 858, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 866); + dasm_put(Dst, 868); } else { - dasm_put(Dst, 879); + dasm_put(Dst, 881); } - dasm_put(Dst, 1067, Dt1(->base), Dt1(->base), Dt1(->top), FRAME_CONT, 3+1, Dt1(->base), Dt1(->base)); - dasm_put(Dst, 1261, -BCBIAS_J*4, LJ_TISTRUECOND, LJ_TISTRUECOND, Dt1(->base)); - dasm_put(Dst, 1368); + dasm_put(Dst, 1069, Dt1(->base), Dt1(->base), Dt1(->top), FRAME_CONT, 3+1, Dt1(->base), Dt1(->base)); + dasm_put(Dst, 1263, -BCBIAS_J*4, LJ_TISTRUECOND, LJ_TISTRUECOND, Dt1(->base)); + dasm_put(Dst, 1370); #if LJ_HASFFI - dasm_put(Dst, 1383, Dt1(->base)); + dasm_put(Dst, 1385, Dt1(->base)); #endif - dasm_put(Dst, 1414); + dasm_put(Dst, 1416); #if LJ_DUALNUM - dasm_put(Dst, 1417); + dasm_put(Dst, 1419); #endif - dasm_put(Dst, 1423); + dasm_put(Dst, 1425); #if LJ_DUALNUM - dasm_put(Dst, 850); + dasm_put(Dst, 852); #endif - dasm_put(Dst, 1435); + dasm_put(Dst, 1437); #if LJ_DUALNUM - dasm_put(Dst, 1417); + dasm_put(Dst, 1419); #endif - dasm_put(Dst, 1463, Dt1(->base), Dt1(->base), FRAME_CONT, 2+1, Dt1(->base), Dt1(->base), Dt1(->base)); - dasm_put(Dst, 1618, Dt1(->base), Dt7(->pc), Dt1(->base), Dt1(->base), GG_DISP2STATIC, 1+1, LJ_TISTRUECOND); - dasm_put(Dst, 1795, 1+1, ~LJ_TNUMX); + dasm_put(Dst, 1465, Dt1(->base), Dt1(->base), FRAME_CONT, 2+1, Dt1(->base), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 1620, Dt1(->base), Dt7(->pc), Dt1(->base), Dt1(->base), GG_DISP2STATIC, 1+1, LJ_TISTRUECOND); + dasm_put(Dst, 1797, 1+1, ~LJ_TNUMX); if (cmov) { - dasm_put(Dst, 1824); + dasm_put(Dst, 1826); } else { - dasm_put(Dst, 1828); + dasm_put(Dst, 1830); } - dasm_put(Dst, 1837, ((char *)(&((GCfuncC *)0)->upvalue)), LJ_TSTR, 1+1, LJ_TTAB, Dt6(->metatable), LJ_TNIL, DISPATCH_GL(gcroot)+4*(GCROOT_MMNAME+MM_metatable), LJ_TTAB); - dasm_put(Dst, 1920, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), DtB(->next), LJ_TNIL); - dasm_put(Dst, 1978, LJ_TUDATA, LJ_TISNUM, LJ_TNUMX, DISPATCH_GL(gcroot[GCROOT_BASEMT]), 2+1); - dasm_put(Dst, 2041, LJ_TTAB, Dt6(->metatable), LJ_TTAB, Dt6(->metatable), LJ_TTAB, Dt6(->marked), LJ_GC_BLACK, Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); - dasm_put(Dst, 2113, 2+1, LJ_TTAB, 1+1, LJ_TISNUM); + dasm_put(Dst, 1839, ((char *)(&((GCfuncC *)0)->upvalue)), LJ_TSTR, 1+1, LJ_TTAB, Dt6(->metatable), LJ_TNIL, DISPATCH_GL(gcroot)+4*(GCROOT_MMNAME+MM_metatable), LJ_TTAB); + dasm_put(Dst, 1922, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), DtB(->next), LJ_TNIL); + dasm_put(Dst, 1980, LJ_TUDATA, LJ_TISNUM, LJ_TNUMX, DISPATCH_GL(gcroot[GCROOT_BASEMT]), 2+1); + dasm_put(Dst, 2043, LJ_TTAB, Dt6(->metatable), LJ_TTAB, Dt6(->metatable), LJ_TTAB, Dt6(->marked), LJ_GC_BLACK, Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 2115, 2+1, LJ_TTAB, 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 2202); + dasm_put(Dst, 2204); } else { - dasm_put(Dst, 2219); + dasm_put(Dst, 2221); } if (sse) { - dasm_put(Dst, 2224); + dasm_put(Dst, 2226); } else { - dasm_put(Dst, 2234); + dasm_put(Dst, 2236); } - dasm_put(Dst, 2241, 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, 2307, Dt1(->base)); + dasm_put(Dst, 2243, 1+1, LJ_TSTR, LJ_TSTR, LJ_TISNUM, DISPATCH_GL(gcroot[GCROOT_BASEMT_NUM]), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); + dasm_put(Dst, 2309, Dt1(->base)); if (LJ_DUALNUM) { - dasm_put(Dst, 2331); + dasm_put(Dst, 2333); } else { - dasm_put(Dst, 2336); + dasm_put(Dst, 2338); } - dasm_put(Dst, 2341, Dt1(->base), 1+1, LJ_TTAB, Dt1(->base), Dt1(->top), Dt1(->base), 1+2); - dasm_put(Dst, 2450, LJ_TNIL, LJ_TNIL, 1+1, LJ_TTAB); + dasm_put(Dst, 2343, Dt1(->base), 1+1, LJ_TTAB, Dt1(->base), Dt1(->top), Dt1(->base), 1+2); + dasm_put(Dst, 2452, LJ_TNIL, LJ_TNIL, 1+1, LJ_TTAB); #ifdef LUAJIT_ENABLE_LUA52COMPAT - dasm_put(Dst, 2497, Dt6(->metatable)); + dasm_put(Dst, 2499, Dt6(->metatable)); #endif - dasm_put(Dst, 2506, Dt8(->upvalue[0]), LJ_TFUNC, LJ_TNIL, 1+3, 1+1, LJ_TTAB, LJ_TISNUM); + dasm_put(Dst, 2508, Dt8(->upvalue[0]), LJ_TFUNC, LJ_TNIL, 1+3, 1+1, LJ_TTAB, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 2492); + dasm_put(Dst, 2494); } else { - dasm_put(Dst, 2219); + dasm_put(Dst, 2221); } - dasm_put(Dst, 2561); + dasm_put(Dst, 2563); if (LJ_DUALNUM) { - dasm_put(Dst, 2566, LJ_TISNUM); + dasm_put(Dst, 2568, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 2582); + dasm_put(Dst, 2584); } else { - dasm_put(Dst, 2621); + dasm_put(Dst, 2623); } - dasm_put(Dst, 2639, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->hmask), 1+0); - dasm_put(Dst, 2477, 1+1, LJ_TTAB); + dasm_put(Dst, 2641, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->hmask), 1+0); + dasm_put(Dst, 2479, 1+1, LJ_TTAB); #ifdef LUAJIT_ENABLE_LUA52COMPAT - dasm_put(Dst, 2497, Dt6(->metatable)); + dasm_put(Dst, 2499, Dt6(->metatable)); #endif - dasm_put(Dst, 2720, Dt8(->upvalue[0]), LJ_TFUNC); + dasm_put(Dst, 2722, Dt8(->upvalue[0]), LJ_TFUNC); if (LJ_DUALNUM) { - dasm_put(Dst, 2741, LJ_TISNUM); + dasm_put(Dst, 2743, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 2753); + dasm_put(Dst, 2755); } else { - dasm_put(Dst, 2763); + dasm_put(Dst, 2765); } - dasm_put(Dst, 2770, 1+3, 1+1, 8+FRAME_PCALL, DISPATCH_GL(hookmask), HOOK_ACTIVE_SHIFT, 2+1, LJ_TFUNC); - dasm_put(Dst, 2834, LJ_TFUNC, 16+FRAME_PCALL, 1+1, LJ_TTHREAD, Dt1(->cframe), Dt1(->status), LUA_YIELD, Dt1(->top)); - dasm_put(Dst, 2922, Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP); - dasm_put(Dst, 3023, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack), LJ_TTRUE, FRAME_TYPE); - dasm_put(Dst, 3137, LJ_TFALSE, Dt1(->top), Dt1(->top), 1+2, Dt1(->top), Dt1(->base), Dt8(->upvalue[0].gcr), Dt1(->cframe)); - dasm_put(Dst, 3235, Dt1(->status), LUA_YIELD, Dt1(->top), Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top)); - dasm_put(Dst, 3301, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack)); - dasm_put(Dst, 3402, FRAME_TYPE, Dt1(->top), Dt1(->base), Dt1(->cframe), CFRAME_RESUME); - dasm_put(Dst, 3515, Dt1(->base), Dt1(->top), Dt1(->cframe), LUA_YIELD, Dt1(->status)); + dasm_put(Dst, 2772, 1+3, 1+1, 8+FRAME_PCALL, DISPATCH_GL(hookmask), HOOK_ACTIVE_SHIFT, 2+1, LJ_TFUNC); + dasm_put(Dst, 2836, LJ_TFUNC, 16+FRAME_PCALL, 1+1, LJ_TTHREAD, Dt1(->cframe), Dt1(->status), LUA_YIELD, Dt1(->top)); + dasm_put(Dst, 2924, Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP); + dasm_put(Dst, 3025, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack), LJ_TTRUE, FRAME_TYPE); + dasm_put(Dst, 3139, LJ_TFALSE, Dt1(->top), Dt1(->top), 1+2, Dt1(->top), Dt1(->base), Dt8(->upvalue[0].gcr), Dt1(->cframe)); + dasm_put(Dst, 3237, Dt1(->status), LUA_YIELD, Dt1(->top), Dt1(->base), Dt1(->maxstack), Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 3303, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), LUA_YIELD, Dt1(->base), Dt1(->top), Dt1(->top), Dt1(->maxstack)); + dasm_put(Dst, 3404, FRAME_TYPE, Dt1(->top), Dt1(->base), Dt1(->cframe), CFRAME_RESUME); + dasm_put(Dst, 3517, Dt1(->base), Dt1(->top), Dt1(->cframe), LUA_YIELD, Dt1(->status)); if (!LJ_DUALNUM) { - dasm_put(Dst, 3541); + dasm_put(Dst, 3543); } if (sse) { - dasm_put(Dst, 3544); + dasm_put(Dst, 3546); } - dasm_put(Dst, 3559, 1+1); + dasm_put(Dst, 3561, 1+1); if (LJ_DUALNUM) { - dasm_put(Dst, 3570, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 3572, LJ_TISNUM, LJ_TISNUM); } else { - dasm_put(Dst, 3650, LJ_TISNUM); + dasm_put(Dst, 3652, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 3660); + dasm_put(Dst, 3662); } else { - dasm_put(Dst, 3696); + dasm_put(Dst, 3698); } - dasm_put(Dst, 3713, 1+1, FRAME_TYPE, LJ_TNIL); + dasm_put(Dst, 3715, 1+1, FRAME_TYPE, LJ_TNIL); if (LJ_DUALNUM) { - dasm_put(Dst, 3805, LJ_TISNUM); + dasm_put(Dst, 3807, LJ_TISNUM); } else { - dasm_put(Dst, 3650, LJ_TISNUM); + dasm_put(Dst, 3652, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 3827); + dasm_put(Dst, 3829); if (LJ_DUALNUM) { - dasm_put(Dst, 3836); + dasm_put(Dst, 3838); } - dasm_put(Dst, 2229); + dasm_put(Dst, 2231); } else { - dasm_put(Dst, 3870); + dasm_put(Dst, 3872); if (LJ_DUALNUM) { - dasm_put(Dst, 3876); + dasm_put(Dst, 3878); if (cmov) { - dasm_put(Dst, 3899); + dasm_put(Dst, 3901); } else { - dasm_put(Dst, 3905); + dasm_put(Dst, 3907); } - dasm_put(Dst, 3912); + dasm_put(Dst, 3914); } else { - dasm_put(Dst, 2236); + dasm_put(Dst, 2238); } } - dasm_put(Dst, 3929); + dasm_put(Dst, 3931); if (LJ_DUALNUM) { - dasm_put(Dst, 3805, LJ_TISNUM); + dasm_put(Dst, 3807, LJ_TISNUM); } else { - dasm_put(Dst, 3650, LJ_TISNUM); + dasm_put(Dst, 3652, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 3932); + dasm_put(Dst, 3934); if (LJ_DUALNUM) { - dasm_put(Dst, 3836); + dasm_put(Dst, 3838); } - dasm_put(Dst, 2229); + dasm_put(Dst, 2231); } else { - dasm_put(Dst, 3941); + dasm_put(Dst, 3943); if (LJ_DUALNUM) { - dasm_put(Dst, 3876); + dasm_put(Dst, 3878); if (cmov) { - dasm_put(Dst, 3899); + dasm_put(Dst, 3901); } else { - dasm_put(Dst, 3905); + dasm_put(Dst, 3907); } - dasm_put(Dst, 3912); + dasm_put(Dst, 3914); } else { - dasm_put(Dst, 2236); + dasm_put(Dst, 2238); } } if (sse) { - dasm_put(Dst, 3947, 1+1, LJ_TISNUM); + dasm_put(Dst, 3949, 1+1, LJ_TISNUM); } else { - dasm_put(Dst, 3976, 1+1, LJ_TISNUM); + dasm_put(Dst, 3978, 1+1, LJ_TISNUM); } - dasm_put(Dst, 4005, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); - dasm_put(Dst, 4074, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); - dasm_put(Dst, 4131, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); - dasm_put(Dst, 4194, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM); - dasm_put(Dst, 4284); + dasm_put(Dst, 4007, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); + dasm_put(Dst, 4076, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); + dasm_put(Dst, 4133, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1); + dasm_put(Dst, 4196, LJ_TISNUM, 1+1, LJ_TISNUM, 1+1, LJ_TISNUM); + dasm_put(Dst, 4286); if (sse) { - dasm_put(Dst, 4296, 1+1, LJ_TISNUM); + dasm_put(Dst, 4298, 1+1, LJ_TISNUM); } else { - dasm_put(Dst, 4327, 1+1, LJ_TISNUM); + dasm_put(Dst, 4329, 1+1, LJ_TISNUM); } - dasm_put(Dst, 4352); + dasm_put(Dst, 4354); if (sse) { - dasm_put(Dst, 4366, 1+1, LJ_TISNUM); + dasm_put(Dst, 4368, 1+1, LJ_TISNUM); } else { - dasm_put(Dst, 4397, 1+1, LJ_TISNUM); + dasm_put(Dst, 4399, 1+1, LJ_TISNUM); } - dasm_put(Dst, 4422); + dasm_put(Dst, 4424); if (sse) { - dasm_put(Dst, 4436, 1+1, LJ_TISNUM); + dasm_put(Dst, 4438, 1+1, LJ_TISNUM); } else { - dasm_put(Dst, 4467, 1+1, LJ_TISNUM); + dasm_put(Dst, 4469, 1+1, LJ_TISNUM); } - dasm_put(Dst, 4492); + dasm_put(Dst, 4494); if (sse) { - dasm_put(Dst, 4508, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); + dasm_put(Dst, 4510, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); } else { - dasm_put(Dst, 4547, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); + dasm_put(Dst, 4549, 1+1, LJ_TISNUM, Dt8(->upvalue[0])); } - dasm_put(Dst, 4580, 2+1, LJ_TISNUM, LJ_TISNUM, 2+1, LJ_TISNUM, LJ_TISNUM); - dasm_put(Dst, 4645, 1+1, LJ_TISNUM); + dasm_put(Dst, 4582, 2+1, LJ_TISNUM, LJ_TISNUM, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 4647, 1+1, LJ_TISNUM); if (sse) { - dasm_put(Dst, 4744); + dasm_put(Dst, 4746); } else { - dasm_put(Dst, 4750); + dasm_put(Dst, 4752); } - dasm_put(Dst, 4759); + dasm_put(Dst, 4761); if (sse) { - dasm_put(Dst, 4784); + dasm_put(Dst, 4786); } else { - dasm_put(Dst, 4790); + dasm_put(Dst, 4792); } - dasm_put(Dst, 4793, 1+2); + dasm_put(Dst, 4795, 1+2); if (sse) { - dasm_put(Dst, 4802); + dasm_put(Dst, 4804); } else { - dasm_put(Dst, 4810); + dasm_put(Dst, 4812); } - dasm_put(Dst, 4818); + dasm_put(Dst, 4820); if (sse) { - dasm_put(Dst, 4821); + dasm_put(Dst, 4823); } else { - dasm_put(Dst, 4853); + dasm_put(Dst, 4855); } - dasm_put(Dst, 4872); + dasm_put(Dst, 4874); if (sse) { - dasm_put(Dst, 4888, 1+1, LJ_TISNUM); + dasm_put(Dst, 4890, 1+1, LJ_TISNUM); } else { - dasm_put(Dst, 4913, 1+1, LJ_TISNUM); + dasm_put(Dst, 4915, 1+1, LJ_TISNUM); } - dasm_put(Dst, 4935); + dasm_put(Dst, 4937); if (sse) { - dasm_put(Dst, 4957); + dasm_put(Dst, 4959); } else { - dasm_put(Dst, 4983); + dasm_put(Dst, 4985); } - dasm_put(Dst, 5000, 1+2); + dasm_put(Dst, 5002, 1+2); if (sse) { - dasm_put(Dst, 5040); + dasm_put(Dst, 5042); } else { - dasm_put(Dst, 5048); + dasm_put(Dst, 5050); } - dasm_put(Dst, 5058, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 5060, 2+1, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 5110, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 5112, 2+1, LJ_TISNUM, LJ_TISNUM); } else { - dasm_put(Dst, 5157, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 5159, 2+1, LJ_TISNUM, LJ_TISNUM); } - dasm_put(Dst, 5198, LJ_TISNUM); + dasm_put(Dst, 5200, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5211, LJ_TISNUM); + dasm_put(Dst, 5213, LJ_TISNUM); if (sse) { - dasm_put(Dst, 4744); + dasm_put(Dst, 4746); } else { - dasm_put(Dst, 4750); + dasm_put(Dst, 4752); } - dasm_put(Dst, 5261); + dasm_put(Dst, 5263); } else { - dasm_put(Dst, 2219); + dasm_put(Dst, 2221); } if (sse) { - dasm_put(Dst, 5272, LJ_TISNUM); + dasm_put(Dst, 5274, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5293); + dasm_put(Dst, 5295); } else { - dasm_put(Dst, 2219); + dasm_put(Dst, 2221); } - dasm_put(Dst, 5314); + dasm_put(Dst, 5316); } else { - dasm_put(Dst, 5339, LJ_TISNUM); + dasm_put(Dst, 5341, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5357); + dasm_put(Dst, 5359); } else { - dasm_put(Dst, 5375); + dasm_put(Dst, 5377); } - dasm_put(Dst, 5380); + dasm_put(Dst, 5382); if (cmov) { - dasm_put(Dst, 5390); + dasm_put(Dst, 5392); } else { - dasm_put(Dst, 5398); + dasm_put(Dst, 5400); } - dasm_put(Dst, 5331); + dasm_put(Dst, 5333); } - dasm_put(Dst, 5419, LJ_TISNUM); + dasm_put(Dst, 5421, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5432, LJ_TISNUM); + dasm_put(Dst, 5434, LJ_TISNUM); if (sse) { - dasm_put(Dst, 4744); + dasm_put(Dst, 4746); } else { - dasm_put(Dst, 4750); + dasm_put(Dst, 4752); } - dasm_put(Dst, 5261); + dasm_put(Dst, 5263); } else { - dasm_put(Dst, 2219); + dasm_put(Dst, 2221); } if (sse) { - dasm_put(Dst, 5272, LJ_TISNUM); + dasm_put(Dst, 5274, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5293); + dasm_put(Dst, 5295); } else { - dasm_put(Dst, 2219); + dasm_put(Dst, 2221); } - dasm_put(Dst, 5482); + dasm_put(Dst, 5484); } else { - dasm_put(Dst, 5339, LJ_TISNUM); + dasm_put(Dst, 5341, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5357); + dasm_put(Dst, 5359); } else { - dasm_put(Dst, 5375); + dasm_put(Dst, 5377); } - dasm_put(Dst, 5380); + dasm_put(Dst, 5382); if (cmov) { - dasm_put(Dst, 5507); + dasm_put(Dst, 5509); } else { - dasm_put(Dst, 5515); + dasm_put(Dst, 5517); } - dasm_put(Dst, 5331); + dasm_put(Dst, 5333); } if (!sse) { - dasm_put(Dst, 5536); + dasm_put(Dst, 5538); } - dasm_put(Dst, 5545, 1+1, LJ_TSTR); + dasm_put(Dst, 5547, 1+1, LJ_TSTR); if (LJ_DUALNUM) { - dasm_put(Dst, 5567, Dt5(->len)); + dasm_put(Dst, 5569, Dt5(->len)); } else if (sse) { - dasm_put(Dst, 5575, Dt5(->len)); + dasm_put(Dst, 5577, Dt5(->len)); } else { - dasm_put(Dst, 5586, Dt5(->len)); + dasm_put(Dst, 5588, Dt5(->len)); } - dasm_put(Dst, 5594, 1+1, LJ_TSTR, Dt5(->len), Dt5([1])); + dasm_put(Dst, 5596, 1+1, LJ_TSTR, Dt5(->len), Dt5([1])); if (LJ_DUALNUM) { - dasm_put(Dst, 3924); + dasm_put(Dst, 3926); } else if (sse) { - dasm_put(Dst, 5632); + dasm_put(Dst, 5634); } else { - dasm_put(Dst, 5642); + dasm_put(Dst, 5644); } - dasm_put(Dst, 5655, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+1, LJ_TISNUM); + dasm_put(Dst, 5657, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+1, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5686); + dasm_put(Dst, 5688); } else if (sse) { - dasm_put(Dst, 5709); + dasm_put(Dst, 5711); } else { - dasm_put(Dst, 5735); + dasm_put(Dst, 5737); } - dasm_put(Dst, 5759, Dt1(->base), Dt1(->base), LJ_TSTR, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+2, LJ_TISNUM); + dasm_put(Dst, 5761, Dt1(->base), Dt1(->base), LJ_TSTR, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), 1+2, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 5862); + dasm_put(Dst, 5864); } else if (sse) { - dasm_put(Dst, 5874); + dasm_put(Dst, 5876); } else { - dasm_put(Dst, 5889); + dasm_put(Dst, 5891); } - dasm_put(Dst, 5901, LJ_TSTR, LJ_TISNUM); + dasm_put(Dst, 5903, LJ_TSTR, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 2492); + dasm_put(Dst, 2494); } else { - dasm_put(Dst, 2219); + dasm_put(Dst, 2221); } - dasm_put(Dst, 5918, Dt5(->len)); + dasm_put(Dst, 5920, Dt5(->len)); if (LJ_DUALNUM) { - dasm_put(Dst, 5928); + dasm_put(Dst, 5930); } else if (sse) { - dasm_put(Dst, 5932); + dasm_put(Dst, 5934); } else { - dasm_put(Dst, 5939); + dasm_put(Dst, 5941); } - dasm_put(Dst, 5951, sizeof(GCstr)-1); - dasm_put(Dst, 6026, 2+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); - dasm_put(Dst, 6085, LJ_TSTR, LJ_TISNUM); + dasm_put(Dst, 5953, sizeof(GCstr)-1); + dasm_put(Dst, 6028, 2+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold)); + dasm_put(Dst, 6087, LJ_TSTR, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6102); + dasm_put(Dst, 6104); } else if (sse) { - dasm_put(Dst, 6110); + dasm_put(Dst, 6112); } else { - dasm_put(Dst, 6121); + dasm_put(Dst, 6123); } - dasm_put(Dst, 6137, Dt5(->len), DISPATCH_GL(tmpbuf.sz), Dt5([1]), DISPATCH_GL(tmpbuf.buf), DISPATCH_GL(tmpbuf.buf), 1+1); - dasm_put(Dst, 6202, 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, 6265, 1+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz)); - dasm_put(Dst, 6336, sizeof(GCstr), DISPATCH_GL(tmpbuf.buf), 1+1); - dasm_put(Dst, 6421, 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, 6491, 1+1, LJ_TTAB); + dasm_put(Dst, 6139, Dt5(->len), DISPATCH_GL(tmpbuf.sz), Dt5([1]), DISPATCH_GL(tmpbuf.buf), DISPATCH_GL(tmpbuf.buf), 1+1); + dasm_put(Dst, 6204, 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, 6267, 1+1, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), LJ_TSTR, Dt5(->len), DISPATCH_GL(tmpbuf.sz)); + dasm_put(Dst, 6338, sizeof(GCstr), DISPATCH_GL(tmpbuf.buf), 1+1); + dasm_put(Dst, 6423, 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, 6493, 1+1, LJ_TTAB); if (LJ_DUALNUM) { - dasm_put(Dst, 6559); + dasm_put(Dst, 6561); } else if (sse) { - dasm_put(Dst, 6566); + dasm_put(Dst, 6568); } else { - dasm_put(Dst, 6576); + dasm_put(Dst, 6578); } - dasm_put(Dst, 6587, LJ_TISNUM); + dasm_put(Dst, 6589, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6595); + dasm_put(Dst, 6597); } else { - dasm_put(Dst, 2219); + dasm_put(Dst, 2221); } if (sse) { - dasm_put(Dst, 6612); + dasm_put(Dst, 6614); } else { - dasm_put(Dst, 6641); + dasm_put(Dst, 6643); } dasm_put(Dst, 111); if (LJ_DUALNUM || sse) { if (!sse) { - dasm_put(Dst, 6659); + dasm_put(Dst, 6661); } - dasm_put(Dst, 6663); + dasm_put(Dst, 6665); } else { - dasm_put(Dst, 6579); + dasm_put(Dst, 6581); } - dasm_put(Dst, 6668); + dasm_put(Dst, 6670); if (sse) { - dasm_put(Dst, 6671); + dasm_put(Dst, 6673); } else { - dasm_put(Dst, 6686); + dasm_put(Dst, 6688); } - dasm_put(Dst, 2196, LJ_TISNUM); + dasm_put(Dst, 2198, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6695); + dasm_put(Dst, 6697); } else { - dasm_put(Dst, 2219); + dasm_put(Dst, 2221); } if (sse) { - dasm_put(Dst, 6712); + dasm_put(Dst, 6714); } else { - dasm_put(Dst, 6727); + dasm_put(Dst, 6729); } - dasm_put(Dst, 6740, LJ_TISNUM); + dasm_put(Dst, 6742, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6765); + dasm_put(Dst, 6767); } else { - dasm_put(Dst, 6785); + dasm_put(Dst, 6787); } if (sse) { - dasm_put(Dst, 6790); + dasm_put(Dst, 6792); } else { - dasm_put(Dst, 6807); + dasm_put(Dst, 6809); } - dasm_put(Dst, 6820); + dasm_put(Dst, 6822); if (sse) { - dasm_put(Dst, 6671); + dasm_put(Dst, 6673); } else { - dasm_put(Dst, 6686); + dasm_put(Dst, 6688); } - dasm_put(Dst, 2196, LJ_TISNUM); + dasm_put(Dst, 2198, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6695); + dasm_put(Dst, 6697); } else { - dasm_put(Dst, 2219); + dasm_put(Dst, 2221); } if (sse) { - dasm_put(Dst, 6712); + dasm_put(Dst, 6714); } else { - dasm_put(Dst, 6727); + dasm_put(Dst, 6729); } - dasm_put(Dst, 6740, LJ_TISNUM); + dasm_put(Dst, 6742, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6830); + dasm_put(Dst, 6832); } else { - dasm_put(Dst, 6785); + dasm_put(Dst, 6787); } if (sse) { - dasm_put(Dst, 6850); + dasm_put(Dst, 6852); } else { - dasm_put(Dst, 6867); + dasm_put(Dst, 6869); } - dasm_put(Dst, 6880); + dasm_put(Dst, 6882); if (sse) { - dasm_put(Dst, 6671); + dasm_put(Dst, 6673); } else { - dasm_put(Dst, 6686); + dasm_put(Dst, 6688); } - dasm_put(Dst, 2196, LJ_TISNUM); + dasm_put(Dst, 2198, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6695); + dasm_put(Dst, 6697); } else { - dasm_put(Dst, 2219); + dasm_put(Dst, 2221); } if (sse) { - dasm_put(Dst, 6712); + dasm_put(Dst, 6714); } else { - dasm_put(Dst, 6727); + dasm_put(Dst, 6729); } - dasm_put(Dst, 6740, LJ_TISNUM); + dasm_put(Dst, 6742, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6890); + dasm_put(Dst, 6892); } else { - dasm_put(Dst, 6785); + dasm_put(Dst, 6787); } if (sse) { - dasm_put(Dst, 6910); + dasm_put(Dst, 6912); } else { - dasm_put(Dst, 6927); + dasm_put(Dst, 6929); } - dasm_put(Dst, 6940, LJ_TISNUM); + dasm_put(Dst, 6942, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6695); + dasm_put(Dst, 6697); } else { - dasm_put(Dst, 2219); + dasm_put(Dst, 2221); } if (sse) { - dasm_put(Dst, 6612); + dasm_put(Dst, 6614); } else { - dasm_put(Dst, 6955); + dasm_put(Dst, 6957); } - dasm_put(Dst, 6976, LJ_TISNUM); + dasm_put(Dst, 6978, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6695); + dasm_put(Dst, 6697); } else { - dasm_put(Dst, 2219); + dasm_put(Dst, 2221); } if (sse) { - dasm_put(Dst, 6612); + dasm_put(Dst, 6614); } else { - dasm_put(Dst, 6955); + dasm_put(Dst, 6957); } - dasm_put(Dst, 6992); + dasm_put(Dst, 6994); if (LJ_DUALNUM) { - dasm_put(Dst, 6663); + dasm_put(Dst, 6665); } else if (sse) { - dasm_put(Dst, 6998); + dasm_put(Dst, 7000); } else { - dasm_put(Dst, 7010); + dasm_put(Dst, 7012); } - dasm_put(Dst, 7023); + dasm_put(Dst, 7025); if (LJ_DUALNUM) { - dasm_put(Dst, 7034, LJ_TISNUM); + dasm_put(Dst, 7036, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6695); + dasm_put(Dst, 6697); } else { - dasm_put(Dst, 2219); + dasm_put(Dst, 2221); } if (sse) { - dasm_put(Dst, 6612); + dasm_put(Dst, 6614); } else { - dasm_put(Dst, 6955); + dasm_put(Dst, 6957); } - dasm_put(Dst, 7042, LJ_TISNUM); + dasm_put(Dst, 7044, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 7057, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 7059, 2+1, LJ_TISNUM, LJ_TISNUM); } else { - dasm_put(Dst, 7129, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 7131, 2+1, LJ_TISNUM, LJ_TISNUM); } - dasm_put(Dst, 7193); + dasm_put(Dst, 7195); if (LJ_DUALNUM) { - dasm_put(Dst, 7200, LJ_TISNUM); + dasm_put(Dst, 7202, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6695); + dasm_put(Dst, 6697); } else { - dasm_put(Dst, 2219); + dasm_put(Dst, 2221); } if (sse) { - dasm_put(Dst, 6612); + dasm_put(Dst, 6614); } else { - dasm_put(Dst, 6955); + dasm_put(Dst, 6957); } - dasm_put(Dst, 7042, LJ_TISNUM); + dasm_put(Dst, 7044, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 7208, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 7210, 2+1, LJ_TISNUM, LJ_TISNUM); } else { - dasm_put(Dst, 7280, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 7282, 2+1, LJ_TISNUM, LJ_TISNUM); } - dasm_put(Dst, 7344); + dasm_put(Dst, 7346); if (LJ_DUALNUM) { - dasm_put(Dst, 7352, LJ_TISNUM); + dasm_put(Dst, 7354, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6695); + dasm_put(Dst, 6697); } else { - dasm_put(Dst, 2219); + dasm_put(Dst, 2221); } if (sse) { - dasm_put(Dst, 6612); + dasm_put(Dst, 6614); } else { - dasm_put(Dst, 6955); + dasm_put(Dst, 6957); } - dasm_put(Dst, 7042, LJ_TISNUM); + dasm_put(Dst, 7044, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 7360, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 7362, 2+1, LJ_TISNUM, LJ_TISNUM); } else { - dasm_put(Dst, 7432, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 7434, 2+1, LJ_TISNUM, LJ_TISNUM); } - dasm_put(Dst, 7496); + dasm_put(Dst, 7498); if (LJ_DUALNUM) { - dasm_put(Dst, 7504, LJ_TISNUM); + dasm_put(Dst, 7506, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6695); + dasm_put(Dst, 6697); } else { - dasm_put(Dst, 2219); + dasm_put(Dst, 2221); } if (sse) { - dasm_put(Dst, 6612); + dasm_put(Dst, 6614); } else { - dasm_put(Dst, 6955); + dasm_put(Dst, 6957); } - dasm_put(Dst, 7042, LJ_TISNUM); + dasm_put(Dst, 7044, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 7512, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 7514, 2+1, LJ_TISNUM, LJ_TISNUM); } else { - dasm_put(Dst, 7584, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 7586, 2+1, LJ_TISNUM, LJ_TISNUM); } - dasm_put(Dst, 7648); + dasm_put(Dst, 7650); if (LJ_DUALNUM) { - dasm_put(Dst, 7655, LJ_TISNUM); + dasm_put(Dst, 7657, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 6695); + dasm_put(Dst, 6697); } else { - dasm_put(Dst, 2219); + dasm_put(Dst, 2221); } if (sse) { - dasm_put(Dst, 6612); + dasm_put(Dst, 6614); } else { - dasm_put(Dst, 6955); + dasm_put(Dst, 6957); } - dasm_put(Dst, 7042, LJ_TISNUM); + dasm_put(Dst, 7044, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 7663, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 7665, 2+1, LJ_TISNUM, LJ_TISNUM); } else { - dasm_put(Dst, 7735, 2+1, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 7737, 2+1, LJ_TISNUM, LJ_TISNUM); } - dasm_put(Dst, 7799, 1+2, 1+1, Dt1(->base), 8*LUA_MINSTACK, Dt1(->top), Dt1(->maxstack), Dt8(->f), Dt1(->base)); - dasm_put(Dst, 7875, Dt1(->top), Dt7(->pc), FRAME_TYPE, LUA_MINSTACK, Dt1(->base), Dt1(->base)); - dasm_put(Dst, 7999, Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 7801, 1+2, 1+1, Dt1(->base), 8*LUA_MINSTACK, Dt1(->top), Dt1(->maxstack), Dt8(->f), Dt1(->base)); + dasm_put(Dst, 7877, Dt1(->top), Dt7(->pc), FRAME_TYPE, LUA_MINSTACK, Dt1(->base), Dt1(->base)); + dasm_put(Dst, 8001, Dt1(->top), Dt1(->base), Dt1(->top)); #if LJ_HASJIT - dasm_put(Dst, 8037, DISPATCH_GL(hookmask), HOOK_VMEVENT, HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount)); + dasm_put(Dst, 8039, DISPATCH_GL(hookmask), HOOK_VMEVENT, HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount)); #endif - dasm_put(Dst, 8068, DISPATCH_GL(hookmask), HOOK_ACTIVE, DISPATCH_GL(hookmask), HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount), LUA_MASKLINE); - dasm_put(Dst, 8119, Dt1(->base), Dt1(->base), GG_DISP2STATIC); + dasm_put(Dst, 8070, DISPATCH_GL(hookmask), HOOK_ACTIVE, DISPATCH_GL(hookmask), HOOK_ACTIVE, LUA_MASKLINE|LUA_MASKCOUNT, DISPATCH_GL(hookcount), LUA_MASKLINE); + dasm_put(Dst, 8121, Dt1(->base), Dt1(->base), GG_DISP2STATIC); #if LJ_HASJIT - dasm_put(Dst, 8185, Dt7(->pc), PC2PROTO(framesize), Dt1(->base), Dt1(->top), GG_DISP2J, DISPATCH_J(L)); + dasm_put(Dst, 8187, Dt7(->pc), PC2PROTO(framesize), Dt1(->base), Dt1(->top), GG_DISP2J, DISPATCH_J(L)); #endif - dasm_put(Dst, 8231); + dasm_put(Dst, 8233); #if LJ_HASJIT - dasm_put(Dst, 8063); + dasm_put(Dst, 8065); #endif - dasm_put(Dst, 8238); + dasm_put(Dst, 8240); #if LJ_HASJIT - dasm_put(Dst, 8241); + dasm_put(Dst, 8243); #endif - dasm_put(Dst, 8251, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 8253, Dt1(->base), Dt1(->top)); #if LJ_HASJIT - dasm_put(Dst, 8285); + dasm_put(Dst, 8287); #endif - dasm_put(Dst, 8290, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 8292, Dt1(->base), Dt1(->top)); #if LJ_HASJIT - dasm_put(Dst, 8319, DISPATCH_GL(vmstate), DISPATCH_GL(vmstate), ~LJ_VMST_EXIT, DISPATCH_J(exitno), DISPATCH_J(parent), 8*8+16, 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, 8321, DISPATCH_GL(vmstate), DISPATCH_GL(vmstate), ~LJ_VMST_EXIT, DISPATCH_J(exitno), DISPATCH_J(parent), 8*8+16, 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, 8462); + dasm_put(Dst, 8464); #if LJ_HASJIT - dasm_put(Dst, 8465, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, BC_FUNCF); + dasm_put(Dst, 8467, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, BC_FUNCF); #endif - dasm_put(Dst, 8543); + dasm_put(Dst, 8545); if (!sse) { - dasm_put(Dst, 8546); + dasm_put(Dst, 8548); } - dasm_put(Dst, 8591); + dasm_put(Dst, 8593); if (!sse) { - dasm_put(Dst, 8693); + dasm_put(Dst, 8695); } - dasm_put(Dst, 8738); + dasm_put(Dst, 8740); if (!sse) { - dasm_put(Dst, 8840); + dasm_put(Dst, 8842); } - dasm_put(Dst, 8879); + dasm_put(Dst, 8881); if (sse) { - dasm_put(Dst, 8984); + dasm_put(Dst, 8986); } else { - dasm_put(Dst, 9114); + dasm_put(Dst, 9116); } - dasm_put(Dst, 9161); + dasm_put(Dst, 9163); if (!sse) { - dasm_put(Dst, 9235); + dasm_put(Dst, 9237); if (cmov) { - dasm_put(Dst, 9246); + dasm_put(Dst, 9248); } else { - dasm_put(Dst, 9250); + dasm_put(Dst, 9252); } - dasm_put(Dst, 9257); - dasm_put(Dst, 9331); - dasm_put(Dst, 9431); + dasm_put(Dst, 9259); + dasm_put(Dst, 9333); + dasm_put(Dst, 9433); if (cmov) { - dasm_put(Dst, 9434); + dasm_put(Dst, 9436); } else { - dasm_put(Dst, 9438); + dasm_put(Dst, 9440); } - dasm_put(Dst, 9445); + dasm_put(Dst, 9447); if (cmov) { - dasm_put(Dst, 9246); + dasm_put(Dst, 9248); } else { - dasm_put(Dst, 9250); + dasm_put(Dst, 9252); } - dasm_put(Dst, 9463); + dasm_put(Dst, 9465); } else { - dasm_put(Dst, 9542); + dasm_put(Dst, 9544); } - dasm_put(Dst, 9545); - dasm_put(Dst, 9630); - dasm_put(Dst, 9760); - dasm_put(Dst, 9966); + dasm_put(Dst, 9547); + dasm_put(Dst, 9632); + dasm_put(Dst, 9762); + dasm_put(Dst, 9968); #if LJ_HASJIT if (sse) { - dasm_put(Dst, 9973); - dasm_put(Dst, 10030); - dasm_put(Dst, 10121); + dasm_put(Dst, 9975); + dasm_put(Dst, 10032); + dasm_put(Dst, 10123); } else { - dasm_put(Dst, 10163); - dasm_put(Dst, 10255); + dasm_put(Dst, 10165); + dasm_put(Dst, 10257); } - dasm_put(Dst, 10301); + dasm_put(Dst, 10303); #endif - dasm_put(Dst, 10305); + dasm_put(Dst, 10307); if (sse) { - dasm_put(Dst, 10308); - dasm_put(Dst, 10413); - dasm_put(Dst, 10496); + dasm_put(Dst, 10310); + dasm_put(Dst, 10415); + dasm_put(Dst, 10498); } else { - dasm_put(Dst, 10568); - dasm_put(Dst, 10651); + dasm_put(Dst, 10570); + dasm_put(Dst, 10653); if (cmov) { - dasm_put(Dst, 10706); + dasm_put(Dst, 10708); } else { - dasm_put(Dst, 10725); + dasm_put(Dst, 10727); } - dasm_put(Dst, 10301); + dasm_put(Dst, 10303); } - dasm_put(Dst, 10766); + dasm_put(Dst, 10768); #if LJ_HASFFI #define DtE(_V) (int)(ptrdiff_t)&(((CCallState *)0)_V) - dasm_put(Dst, 10822, DtE(->spadj)); + dasm_put(Dst, 10824, DtE(->spadj)); #if LJ_TARGET_WINDOWS - dasm_put(Dst, 10832, DtE(->spadj)); + dasm_put(Dst, 10834, DtE(->spadj)); #endif - dasm_put(Dst, 10836, DtE(->nsp), offsetof(CCallState, stack), DtE(->gpr[0]), DtE(->gpr[1]), DtE(->func), DtE(->gpr[0]), DtE(->gpr[1]), DtE(->resx87), DtE(->fpr[0].d[0])); - dasm_put(Dst, 10906, DtE(->fpr[0].f[0])); + dasm_put(Dst, 10838, DtE(->nsp), offsetof(CCallState, stack), DtE(->gpr[0]), DtE(->gpr[1]), DtE(->func), DtE(->gpr[0]), DtE(->gpr[1]), DtE(->resx87), DtE(->fpr[0].d[0])); + dasm_put(Dst, 10908, DtE(->fpr[0].f[0])); #if LJ_TARGET_WINDOWS - dasm_put(Dst, 10912, DtE(->spadj)); + dasm_put(Dst, 10914, DtE(->spadj)); #endif - dasm_put(Dst, 10916); + dasm_put(Dst, 10918); #endif - dasm_put(Dst, 10923); + dasm_put(Dst, 10925); #ifdef LUA_USE_ASSERT - dasm_put(Dst, 10303); + dasm_put(Dst, 10305); #endif - dasm_put(Dst, 10303); + dasm_put(Dst, 10305); } /* 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, 10926, defop); + dasm_put(Dst, 10928, defop); switch (op) { @@ -1987,297 +1989,297 @@ 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, 10928, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10930, LJ_TISNUM, LJ_TISNUM); switch (op) { case BC_ISLT: - dasm_put(Dst, 10958); + dasm_put(Dst, 10960); break; case BC_ISGE: - dasm_put(Dst, 10963); + dasm_put(Dst, 10965); break; case BC_ISLE: - dasm_put(Dst, 10968); + dasm_put(Dst, 10970); break; case BC_ISGT: - dasm_put(Dst, 10973); + dasm_put(Dst, 10975); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 10978, -BCBIAS_J*4, LJ_TISNUM); + dasm_put(Dst, 10980, -BCBIAS_J*4, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11031); + dasm_put(Dst, 11033); } else { - dasm_put(Dst, 11042); + dasm_put(Dst, 11044); } - dasm_put(Dst, 11053); + dasm_put(Dst, 11055); if (sse) { - dasm_put(Dst, 11060); + dasm_put(Dst, 11062); switch (op) { case BC_ISLT: - dasm_put(Dst, 11080); + dasm_put(Dst, 11082); break; case BC_ISGE: - dasm_put(Dst, 11085); + dasm_put(Dst, 11087); break; case BC_ISLE: - dasm_put(Dst, 11090); + dasm_put(Dst, 11092); break; case BC_ISGT: - dasm_put(Dst, 11095); + dasm_put(Dst, 11097); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 11100); + dasm_put(Dst, 11102); } else { - dasm_put(Dst, 11105); + dasm_put(Dst, 11107); } } else { - dasm_put(Dst, 11113, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11115, LJ_TISNUM, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11134); + dasm_put(Dst, 11136); } else { - dasm_put(Dst, 11155); + dasm_put(Dst, 11157); if (cmov) { - dasm_put(Dst, 3899); + dasm_put(Dst, 3901); } else { - dasm_put(Dst, 3905); + dasm_put(Dst, 3907); } } if (LJ_DUALNUM) { switch (op) { case BC_ISLT: - dasm_put(Dst, 11080); + dasm_put(Dst, 11082); break; case BC_ISGE: - dasm_put(Dst, 11085); + dasm_put(Dst, 11087); break; case BC_ISLE: - dasm_put(Dst, 11090); + dasm_put(Dst, 11092); break; case BC_ISGT: - dasm_put(Dst, 11095); + dasm_put(Dst, 11097); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 11100); + dasm_put(Dst, 11102); } else { switch (op) { case BC_ISLT: - dasm_put(Dst, 11171); + dasm_put(Dst, 11173); break; case BC_ISGE: - dasm_put(Dst, 11176); + dasm_put(Dst, 11178); break; case BC_ISLE: - dasm_put(Dst, 11181); + dasm_put(Dst, 11183); break; case BC_ISGT: - dasm_put(Dst, 11186); + dasm_put(Dst, 11188); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 11191, -BCBIAS_J*4); + dasm_put(Dst, 11193, -BCBIAS_J*4); } break; case BC_ISEQV: case BC_ISNEV: vk = op == BC_ISEQV; - dasm_put(Dst, 11222); + dasm_put(Dst, 11224); if (LJ_DUALNUM) { - dasm_put(Dst, 11230, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11232, LJ_TISNUM, LJ_TISNUM); if (vk) { - dasm_put(Dst, 11255); + dasm_put(Dst, 11257); } else { - dasm_put(Dst, 11260); + dasm_put(Dst, 11262); } - dasm_put(Dst, 11265, -BCBIAS_J*4, LJ_TISNUM); + dasm_put(Dst, 11267, -BCBIAS_J*4, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11316); + dasm_put(Dst, 11318); } else { - dasm_put(Dst, 11323); + dasm_put(Dst, 11325); } - dasm_put(Dst, 11327); + dasm_put(Dst, 11329); if (sse) { - dasm_put(Dst, 11338); + dasm_put(Dst, 11340); } else { - dasm_put(Dst, 11350); + dasm_put(Dst, 11352); } - dasm_put(Dst, 11357); + dasm_put(Dst, 11359); } else { - dasm_put(Dst, 11362, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11364, LJ_TISNUM, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 11381); + dasm_put(Dst, 11383); } else { - dasm_put(Dst, 11399); + dasm_put(Dst, 11401); if (cmov) { - dasm_put(Dst, 3899); + dasm_put(Dst, 3901); } else { - dasm_put(Dst, 3905); + dasm_put(Dst, 3907); } } iseqne_fp: if (vk) { - dasm_put(Dst, 11412); + dasm_put(Dst, 11414); } else { - dasm_put(Dst, 11421); + dasm_put(Dst, 11423); } iseqne_end: if (vk) { - dasm_put(Dst, 11430, -BCBIAS_J*4); + dasm_put(Dst, 11432, -BCBIAS_J*4); if (!LJ_HASFFI) { - dasm_put(Dst, 4799); + dasm_put(Dst, 4801); } } else { if (!LJ_HASFFI) { - dasm_put(Dst, 4799); + dasm_put(Dst, 4801); } - dasm_put(Dst, 11445, -BCBIAS_J*4); + dasm_put(Dst, 11447, -BCBIAS_J*4); } if (LJ_DUALNUM && (op == BC_ISEQV || op == BC_ISNEV || op == BC_ISEQN || op == BC_ISNEN)) { - dasm_put(Dst, 11460); + dasm_put(Dst, 11462); } else { - dasm_put(Dst, 11203); + dasm_put(Dst, 11205); } if (op == BC_ISEQV || op == BC_ISNEV) { - dasm_put(Dst, 11465); + dasm_put(Dst, 11467); if (LJ_HASFFI) { - dasm_put(Dst, 11468, LJ_TCDATA, LJ_TCDATA); + dasm_put(Dst, 11470, LJ_TCDATA, LJ_TCDATA); } - dasm_put(Dst, 11487, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<metatable), Dt6(->nomm), 1<len), LJ_TISNUM); + dasm_put(Dst, 12095, Dt5(->len), LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 12107, Dt5(->len)); + dasm_put(Dst, 12109, Dt5(->len)); } else { - dasm_put(Dst, 12125, Dt5(->len)); + dasm_put(Dst, 12127, Dt5(->len)); } - dasm_put(Dst, 12134, LJ_TTAB); + dasm_put(Dst, 12136, LJ_TTAB); if (LJ_DUALNUM) { } else if (sse) { - dasm_put(Dst, 12174); + dasm_put(Dst, 12176); } else { - dasm_put(Dst, 12180); + dasm_put(Dst, 12182); } - dasm_put(Dst, 12187); + dasm_put(Dst, 12189); break; /* -- Binary ops -------------------------------------------------------- */ @@ -2285,620 +2287,620 @@ 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, 12200); + dasm_put(Dst, 12202); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 12208, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 12210, LJ_TISNUM, LJ_TISNUM); break; case 1: - dasm_put(Dst, 12241, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 12243, LJ_TISNUM, LJ_TISNUM); break; default: - dasm_put(Dst, 12274, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 12276, LJ_TISNUM, LJ_TISNUM); break; } - dasm_put(Dst, 12307, LJ_TISNUM); + dasm_put(Dst, 12309, LJ_TISNUM); if (vk == 1) { - dasm_put(Dst, 12103); + dasm_put(Dst, 12105); } else { - dasm_put(Dst, 11881); + dasm_put(Dst, 11883); } - dasm_put(Dst, 11203); + dasm_put(Dst, 11205); } else { - dasm_put(Dst, 12200); + dasm_put(Dst, 12202); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 12313, LJ_TISNUM); + dasm_put(Dst, 12315, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 12325, LJ_TISNUM); + dasm_put(Dst, 12327, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 12336); + dasm_put(Dst, 12338); } else { - dasm_put(Dst, 12350); + dasm_put(Dst, 12352); } break; case 1: - dasm_put(Dst, 12358, LJ_TISNUM); + dasm_put(Dst, 12360, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 12370, LJ_TISNUM); + dasm_put(Dst, 12372, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 12381); + dasm_put(Dst, 12383); } else { - dasm_put(Dst, 12395); + dasm_put(Dst, 12397); } break; default: - dasm_put(Dst, 12403, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 12405, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 12425); + dasm_put(Dst, 12427); } else { - dasm_put(Dst, 12439); + dasm_put(Dst, 12441); } break; } if (sse) { - dasm_put(Dst, 12063); + dasm_put(Dst, 12065); } else { - dasm_put(Dst, 12075); + dasm_put(Dst, 12077); } - dasm_put(Dst, 11203); + dasm_put(Dst, 11205); } break; case BC_SUBVN: case BC_SUBNV: case BC_SUBVV: if (LJ_DUALNUM) { - dasm_put(Dst, 12200); + dasm_put(Dst, 12202); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 12447, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 12449, LJ_TISNUM, LJ_TISNUM); break; case 1: - dasm_put(Dst, 12480, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 12482, LJ_TISNUM, LJ_TISNUM); break; default: - dasm_put(Dst, 12513, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 12515, LJ_TISNUM, LJ_TISNUM); break; } - dasm_put(Dst, 12307, LJ_TISNUM); + dasm_put(Dst, 12309, LJ_TISNUM); if (vk == 1) { - dasm_put(Dst, 12103); + dasm_put(Dst, 12105); } else { - dasm_put(Dst, 11881); + dasm_put(Dst, 11883); } - dasm_put(Dst, 11203); + dasm_put(Dst, 11205); } else { - dasm_put(Dst, 12200); + dasm_put(Dst, 12202); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 12313, LJ_TISNUM); + dasm_put(Dst, 12315, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 12325, LJ_TISNUM); + dasm_put(Dst, 12327, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 12546); + dasm_put(Dst, 12548); } else { - dasm_put(Dst, 12560); + dasm_put(Dst, 12562); } break; case 1: - dasm_put(Dst, 12358, LJ_TISNUM); + dasm_put(Dst, 12360, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 12370, LJ_TISNUM); + dasm_put(Dst, 12372, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 12568); + dasm_put(Dst, 12570); } else { - dasm_put(Dst, 12582); + dasm_put(Dst, 12584); } break; default: - dasm_put(Dst, 12403, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 12405, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 12590); + dasm_put(Dst, 12592); } else { - dasm_put(Dst, 12604); + dasm_put(Dst, 12606); } break; } if (sse) { - dasm_put(Dst, 12063); + dasm_put(Dst, 12065); } else { - dasm_put(Dst, 12075); + dasm_put(Dst, 12077); } - dasm_put(Dst, 11203); + dasm_put(Dst, 11205); } break; case BC_MULVN: case BC_MULNV: case BC_MULVV: if (LJ_DUALNUM) { - dasm_put(Dst, 12200); + dasm_put(Dst, 12202); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 12612, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 12614, LJ_TISNUM, LJ_TISNUM); break; case 1: - dasm_put(Dst, 12646, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 12648, LJ_TISNUM, LJ_TISNUM); break; default: - dasm_put(Dst, 12680, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 12682, LJ_TISNUM, LJ_TISNUM); break; } - dasm_put(Dst, 12307, LJ_TISNUM); + dasm_put(Dst, 12309, LJ_TISNUM); if (vk == 1) { - dasm_put(Dst, 12103); + dasm_put(Dst, 12105); } else { - dasm_put(Dst, 11881); + dasm_put(Dst, 11883); } - dasm_put(Dst, 11203); + dasm_put(Dst, 11205); } else { - dasm_put(Dst, 12200); + dasm_put(Dst, 12202); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 12313, LJ_TISNUM); + dasm_put(Dst, 12315, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 12325, LJ_TISNUM); + dasm_put(Dst, 12327, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 12714); + dasm_put(Dst, 12716); } else { - dasm_put(Dst, 12728); + dasm_put(Dst, 12730); } break; case 1: - dasm_put(Dst, 12358, LJ_TISNUM); + dasm_put(Dst, 12360, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 12370, LJ_TISNUM); + dasm_put(Dst, 12372, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 12736); + dasm_put(Dst, 12738); } else { - dasm_put(Dst, 12750); + dasm_put(Dst, 12752); } break; default: - dasm_put(Dst, 12403, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 12405, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 12758); + dasm_put(Dst, 12760); } else { - dasm_put(Dst, 12772); + dasm_put(Dst, 12774); } break; } if (sse) { - dasm_put(Dst, 12063); + dasm_put(Dst, 12065); } else { - dasm_put(Dst, 12075); + dasm_put(Dst, 12077); } - dasm_put(Dst, 11203); + dasm_put(Dst, 11205); } break; case BC_DIVVN: case BC_DIVNV: case BC_DIVVV: - dasm_put(Dst, 12200); + dasm_put(Dst, 12202); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 12313, LJ_TISNUM); + dasm_put(Dst, 12315, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 12325, LJ_TISNUM); + dasm_put(Dst, 12327, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 12780); + dasm_put(Dst, 12782); } else { - dasm_put(Dst, 12794); + dasm_put(Dst, 12796); } break; case 1: - dasm_put(Dst, 12358, LJ_TISNUM); + dasm_put(Dst, 12360, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 12370, LJ_TISNUM); + dasm_put(Dst, 12372, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 12802); + dasm_put(Dst, 12804); } else { - dasm_put(Dst, 12816); + dasm_put(Dst, 12818); } break; default: - dasm_put(Dst, 12403, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 12405, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 12824); + dasm_put(Dst, 12826); } else { - dasm_put(Dst, 12838); + dasm_put(Dst, 12840); } break; } if (sse) { - dasm_put(Dst, 12063); + dasm_put(Dst, 12065); } else { - dasm_put(Dst, 12075); + dasm_put(Dst, 12077); } - dasm_put(Dst, 11203); + dasm_put(Dst, 11205); break; case BC_MODVN: - dasm_put(Dst, 12200); + dasm_put(Dst, 12202); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 12313, LJ_TISNUM); + dasm_put(Dst, 12315, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 12325, LJ_TISNUM); + dasm_put(Dst, 12327, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 12846); + dasm_put(Dst, 12848); } else { - dasm_put(Dst, 12860); + dasm_put(Dst, 12862); } break; case 1: - dasm_put(Dst, 12358, LJ_TISNUM); + dasm_put(Dst, 12360, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 12370, LJ_TISNUM); + dasm_put(Dst, 12372, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 12868); + dasm_put(Dst, 12870); } else { - dasm_put(Dst, 12882); + dasm_put(Dst, 12884); } break; default: - dasm_put(Dst, 12403, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 12405, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 12890); + dasm_put(Dst, 12892); } else { - dasm_put(Dst, 12904); + dasm_put(Dst, 12906); } break; } - dasm_put(Dst, 12912); + dasm_put(Dst, 12914); if (sse) { - dasm_put(Dst, 12063); + dasm_put(Dst, 12065); } else { - dasm_put(Dst, 12075); + dasm_put(Dst, 12077); } - dasm_put(Dst, 11203); + dasm_put(Dst, 11205); break; case BC_MODNV: case BC_MODVV: - dasm_put(Dst, 12200); + dasm_put(Dst, 12202); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 12313, LJ_TISNUM); + dasm_put(Dst, 12315, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 12325, LJ_TISNUM); + dasm_put(Dst, 12327, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 12846); + dasm_put(Dst, 12848); } else { - dasm_put(Dst, 12860); + dasm_put(Dst, 12862); } break; case 1: - dasm_put(Dst, 12358, LJ_TISNUM); + dasm_put(Dst, 12360, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 12370, LJ_TISNUM); + dasm_put(Dst, 12372, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 12868); + dasm_put(Dst, 12870); } else { - dasm_put(Dst, 12882); + dasm_put(Dst, 12884); } break; default: - dasm_put(Dst, 12403, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 12405, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 12890); + dasm_put(Dst, 12892); } else { - dasm_put(Dst, 12904); + dasm_put(Dst, 12906); } break; } - dasm_put(Dst, 12918); + dasm_put(Dst, 12920); break; case BC_POW: - dasm_put(Dst, 12200); + dasm_put(Dst, 12202); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 12313, LJ_TISNUM); + dasm_put(Dst, 12315, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 12325, LJ_TISNUM); + dasm_put(Dst, 12327, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 12846); + dasm_put(Dst, 12848); } else { - dasm_put(Dst, 12860); + dasm_put(Dst, 12862); } break; case 1: - dasm_put(Dst, 12358, LJ_TISNUM); + dasm_put(Dst, 12360, LJ_TISNUM); if (LJ_DUALNUM) { - dasm_put(Dst, 12370, LJ_TISNUM); + dasm_put(Dst, 12372, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 12868); + dasm_put(Dst, 12870); } else { - dasm_put(Dst, 12882); + dasm_put(Dst, 12884); } break; default: - dasm_put(Dst, 12403, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 12405, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 12890); + dasm_put(Dst, 12892); } else { - dasm_put(Dst, 12904); + dasm_put(Dst, 12906); } break; } - dasm_put(Dst, 12923); + dasm_put(Dst, 12925); if (sse) { - dasm_put(Dst, 12063); + dasm_put(Dst, 12065); } else { - dasm_put(Dst, 12075); + dasm_put(Dst, 12077); } - dasm_put(Dst, 11203); + dasm_put(Dst, 11205); break; case BC_CAT: - dasm_put(Dst, 12927, Dt1(->base), Dt1(->base)); + dasm_put(Dst, 12929, Dt1(->base), Dt1(->base)); break; /* -- Constant ops ------------------------------------------------------ */ case BC_KSTR: - dasm_put(Dst, 13021, LJ_TSTR); + dasm_put(Dst, 13023, LJ_TSTR); break; case BC_KCDATA: #if LJ_HASFFI - dasm_put(Dst, 13021, LJ_TCDATA); + dasm_put(Dst, 13023, LJ_TCDATA); #endif break; case BC_KSHORT: if (LJ_DUALNUM) { - dasm_put(Dst, 13054, LJ_TISNUM); + dasm_put(Dst, 13056, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 13066); + dasm_put(Dst, 13068); } else { - dasm_put(Dst, 13081); + dasm_put(Dst, 13083); } - dasm_put(Dst, 11203); + dasm_put(Dst, 11205); break; case BC_KNUM: if (sse) { - dasm_put(Dst, 13089); + dasm_put(Dst, 13091); } else { - dasm_put(Dst, 13102); + dasm_put(Dst, 13104); } - dasm_put(Dst, 11203); + dasm_put(Dst, 11205); break; case BC_KPRI: - dasm_put(Dst, 13109); + dasm_put(Dst, 13111); break; case BC_KNIL: - dasm_put(Dst, 13135, LJ_TNIL); + dasm_put(Dst, 13137, LJ_TNIL); break; /* -- Upvalue and function ops ------------------------------------------ */ case BC_UGET: - dasm_put(Dst, 13181, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 13183, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_USETV: #define TV2MARKOFS \ ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv)) - dasm_put(Dst, 13225, offsetof(GCfuncL, uvptr), DtA(->closed), DtA(->v), TV2MARKOFS, LJ_GC_BLACK, LJ_TISGCV, LJ_TISNUM - LJ_TISGCV, Dt4(->gch.marked), LJ_GC_WHITES, GG_DISP2G); - dasm_put(Dst, 13315); + dasm_put(Dst, 13227, 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, 13317); break; #undef TV2MARKOFS case BC_USETS: - dasm_put(Dst, 13327, offsetof(GCfuncL, uvptr), DtA(->v), LJ_TSTR, DtA(->marked), LJ_GC_BLACK, Dt4(->gch.marked), LJ_GC_WHITES, DtA(->closed), GG_DISP2G); + dasm_put(Dst, 13329, 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, 13418); + dasm_put(Dst, 13420); if (sse) { - dasm_put(Dst, 13423); + dasm_put(Dst, 13425); } else { - dasm_put(Dst, 11713); + dasm_put(Dst, 11715); } - dasm_put(Dst, 13430, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 13432, offsetof(GCfuncL, uvptr), DtA(->v)); if (sse) { - dasm_put(Dst, 13439); + dasm_put(Dst, 13441); } else { - dasm_put(Dst, 13445); + dasm_put(Dst, 13447); } - dasm_put(Dst, 11203); + dasm_put(Dst, 11205); break; case BC_USETP: - dasm_put(Dst, 13448, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 13450, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_UCLO: - dasm_put(Dst, 13485, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 13487, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); break; case BC_FNEW: - dasm_put(Dst, 13539, Dt1(->base), Dt1(->base), LJ_TFUNC); + dasm_put(Dst, 13541, Dt1(->base), Dt1(->base), LJ_TFUNC); break; /* -- Table ops --------------------------------------------------------- */ case BC_TNEW: - dasm_put(Dst, 13610, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 13612, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); break; case BC_TDUP: - dasm_put(Dst, 13736, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 13738, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); break; case BC_GGET: - dasm_put(Dst, 13828, Dt7(->env)); + dasm_put(Dst, 13830, Dt7(->env)); break; case BC_GSET: - dasm_put(Dst, 13846, Dt7(->env)); + dasm_put(Dst, 13848, Dt7(->env)); break; case BC_TGETV: - dasm_put(Dst, 13864, LJ_TTAB); + dasm_put(Dst, 13866, LJ_TTAB); if (LJ_DUALNUM) { - dasm_put(Dst, 13887, LJ_TISNUM); + dasm_put(Dst, 13889, LJ_TISNUM); } else { - dasm_put(Dst, 13901, LJ_TISNUM); + dasm_put(Dst, 13903, LJ_TISNUM); if (sse) { - dasm_put(Dst, 13912); + dasm_put(Dst, 13914); } else { - dasm_put(Dst, 13933); + dasm_put(Dst, 13935); if (cmov) { - dasm_put(Dst, 3899); + dasm_put(Dst, 3901); } else { - dasm_put(Dst, 3905); + dasm_put(Dst, 3907); } - dasm_put(Dst, 2635); + dasm_put(Dst, 2637); } - dasm_put(Dst, 13943); + dasm_put(Dst, 13945); } - dasm_put(Dst, 13948, 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, 14149, 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, 14151, 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, 14365, 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, 14504, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->nomm), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL); - dasm_put(Dst, 14579, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); - dasm_put(Dst, 14671, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 14506, 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, 14581, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); + dasm_put(Dst, 14673, 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, 14767, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); - dasm_put(Dst, 14865, Dt6(->metatable), Dt6(->nomm), 1<marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 14769, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); + dasm_put(Dst, 14867, 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, 14911, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); - dasm_put(Dst, 15060, Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 14913, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 15062, 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, 12204); + dasm_put(Dst, 12206); if (op == BC_CALLM) { - dasm_put(Dst, 15078); + dasm_put(Dst, 15080); } - dasm_put(Dst, 15083, LJ_TFUNC, Dt7(->pc)); + dasm_put(Dst, 15085, LJ_TFUNC, Dt7(->pc)); break; case BC_CALLMT: - dasm_put(Dst, 15078); + dasm_put(Dst, 15080); break; case BC_CALLT: - dasm_put(Dst, 15124, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); - dasm_put(Dst, 15242, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG); + dasm_put(Dst, 15126, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); + dasm_put(Dst, 15244, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG); break; case BC_ITERC: - dasm_put(Dst, 15312, LJ_TFUNC, 2+1, Dt7(->pc)); + dasm_put(Dst, 15314, LJ_TFUNC, 2+1, Dt7(->pc)); break; case BC_ITERN: #if LJ_HASJIT #endif - dasm_put(Dst, 15392, Dt6(->asize), Dt6(->array), LJ_TNIL); + dasm_put(Dst, 15394, Dt6(->asize), Dt6(->array), LJ_TNIL); if (LJ_DUALNUM) { - dasm_put(Dst, 12098, LJ_TISNUM); + dasm_put(Dst, 12100, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 12174); + dasm_put(Dst, 12176); } else { - dasm_put(Dst, 15438); + dasm_put(Dst, 15440); } - dasm_put(Dst, 15444); + dasm_put(Dst, 15446); if (LJ_DUALNUM) { } else if (sse) { - dasm_put(Dst, 12063); + dasm_put(Dst, 12065); } else { - dasm_put(Dst, 12075); + dasm_put(Dst, 12077); } - dasm_put(Dst, 15463, -BCBIAS_J*4); + dasm_put(Dst, 15465, -BCBIAS_J*4); if (!LJ_DUALNUM && !sse) { - dasm_put(Dst, 15514); + dasm_put(Dst, 15516); } - dasm_put(Dst, 15520, Dt6(->hmask), sizeof(Node), Dt6(->node), DtB(->val.it), LJ_TNIL, DtB(->key.gcr), DtB(->key.it), DtB(->val.gcr), DtB(->val.it)); - dasm_put(Dst, 15595); + dasm_put(Dst, 15522, Dt6(->hmask), sizeof(Node), Dt6(->node), DtB(->val.it), LJ_TNIL, DtB(->key.gcr), DtB(->key.it), DtB(->val.gcr), DtB(->val.it)); + dasm_put(Dst, 15597); break; case BC_ISNEXT: - dasm_put(Dst, 15603, LJ_TFUNC, LJ_TTAB, LJ_TNIL, Dt8(->ffid), FF_next_N, -BCBIAS_J*4, BC_JMP, -BCBIAS_J*4, BC_ITERC); + dasm_put(Dst, 15605, 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, 15702, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); - dasm_put(Dst, 15866, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 15704, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); + dasm_put(Dst, 15868, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); break; /* -- Returns ----------------------------------------------------------- */ case BC_RETM: - dasm_put(Dst, 15078); + dasm_put(Dst, 15080); break; case BC_RET: case BC_RET0: case BC_RET1: if (op != BC_RET0) { - dasm_put(Dst, 15937); + dasm_put(Dst, 15939); } - dasm_put(Dst, 15941, FRAME_TYPE); + dasm_put(Dst, 15943, FRAME_TYPE); switch (op) { case BC_RET: - dasm_put(Dst, 15960); + dasm_put(Dst, 15962); break; case BC_RET1: - dasm_put(Dst, 16018); + dasm_put(Dst, 16020); /* fallthrough */ case BC_RET0: - dasm_put(Dst, 16034); + dasm_put(Dst, 16036); default: break; } - dasm_put(Dst, 16045, Dt7(->pc), PC2PROTO(k)); + dasm_put(Dst, 16047, Dt7(->pc), PC2PROTO(k)); if (op == BC_RET) { - dasm_put(Dst, 16087, LJ_TNIL); + dasm_put(Dst, 16089, LJ_TNIL); } else { - dasm_put(Dst, 16096, LJ_TNIL); + dasm_put(Dst, 16098, LJ_TNIL); } - dasm_put(Dst, 16103, -FRAME_VARG, FRAME_TYPEP); + dasm_put(Dst, 16105, -FRAME_VARG, FRAME_TYPEP); if (op != BC_RET0) { - dasm_put(Dst, 16127); + dasm_put(Dst, 16129); } - dasm_put(Dst, 4883); + dasm_put(Dst, 4885); break; /* -- Loops and branches ------------------------------------------------ */ @@ -2906,7 +2908,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORL: #if LJ_HASJIT - dasm_put(Dst, 16131, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 16133, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2918,111 +2920,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, 16152); + dasm_put(Dst, 16154); if (LJ_DUALNUM) { - dasm_put(Dst, 16156, LJ_TISNUM); + dasm_put(Dst, 16158, LJ_TISNUM); if (!vk) { - dasm_put(Dst, 16166, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 16168, LJ_TISNUM, LJ_TISNUM); } else { #ifdef LUA_USE_ASSERT - dasm_put(Dst, 16195, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 16197, LJ_TISNUM, LJ_TISNUM); #endif - dasm_put(Dst, 16214); + dasm_put(Dst, 16216); } - dasm_put(Dst, 16233, LJ_TISNUM); + dasm_put(Dst, 16235, LJ_TISNUM); if (op == BC_FORI) { - dasm_put(Dst, 16244, -BCBIAS_J*4); + dasm_put(Dst, 16246, -BCBIAS_J*4); } else if (op == BC_JFORI) { - dasm_put(Dst, 16258, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 16260, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 16276, -BCBIAS_J*4); + dasm_put(Dst, 16278, -BCBIAS_J*4); } else { - dasm_put(Dst, 16268, BC_JLOOP); + dasm_put(Dst, 16270, BC_JLOOP); } - dasm_put(Dst, 16290); + dasm_put(Dst, 16292); if (vk) { - dasm_put(Dst, 16313); + dasm_put(Dst, 16315); } - dasm_put(Dst, 16233, LJ_TISNUM); + dasm_put(Dst, 16235, LJ_TISNUM); if (op == BC_FORI) { - dasm_put(Dst, 16322); + dasm_put(Dst, 16324); } else if (op == BC_JFORI) { - dasm_put(Dst, 16327, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 16329, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 16341); + dasm_put(Dst, 16343); } else { - dasm_put(Dst, 16337, BC_JLOOP); + dasm_put(Dst, 16339, BC_JLOOP); } - dasm_put(Dst, 16346); + dasm_put(Dst, 16348); } else if (!vk) { - dasm_put(Dst, 16353, LJ_TISNUM); + dasm_put(Dst, 16355, LJ_TISNUM); } if (!vk) { - dasm_put(Dst, 16359, LJ_TISNUM); + dasm_put(Dst, 16361, LJ_TISNUM); } else { #ifdef LUA_USE_ASSERT - dasm_put(Dst, 16373, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 16375, LJ_TISNUM, LJ_TISNUM); #endif } - dasm_put(Dst, 16392); + dasm_put(Dst, 16394); if (!vk) { - dasm_put(Dst, 16396, LJ_TISNUM); + dasm_put(Dst, 16398, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 16405); + dasm_put(Dst, 16407); if (vk) { - dasm_put(Dst, 16417); + dasm_put(Dst, 16419); } else { - dasm_put(Dst, 16436); + dasm_put(Dst, 16438); } - dasm_put(Dst, 16441); + dasm_put(Dst, 16443); } else { - dasm_put(Dst, 16454); + dasm_put(Dst, 16456); if (vk) { - dasm_put(Dst, 16460); + dasm_put(Dst, 16462); } else { - dasm_put(Dst, 16476); + dasm_put(Dst, 16478); } - dasm_put(Dst, 16484); + dasm_put(Dst, 16486); if (cmov) { - dasm_put(Dst, 3899); + dasm_put(Dst, 3901); } else { - dasm_put(Dst, 3905); + dasm_put(Dst, 3907); } if (!cmov) { - dasm_put(Dst, 16489); + dasm_put(Dst, 16491); } } if (op == BC_FORI) { if (LJ_DUALNUM) { - dasm_put(Dst, 16495); + dasm_put(Dst, 16497); } else { - dasm_put(Dst, 16500, -BCBIAS_J*4); + dasm_put(Dst, 16502, -BCBIAS_J*4); } } else if (op == BC_JFORI) { - dasm_put(Dst, 16510, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 16512, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { if (LJ_DUALNUM) { - dasm_put(Dst, 16524); + dasm_put(Dst, 16526); } else { - dasm_put(Dst, 16529, -BCBIAS_J*4); + dasm_put(Dst, 16531, -BCBIAS_J*4); } } else { - dasm_put(Dst, 16520, BC_JLOOP); + dasm_put(Dst, 16522, BC_JLOOP); } if (LJ_DUALNUM) { - dasm_put(Dst, 11100); + dasm_put(Dst, 11102); } else { - dasm_put(Dst, 11841); + dasm_put(Dst, 11843); } if (sse) { - dasm_put(Dst, 16539); + dasm_put(Dst, 16541); } break; case BC_ITERL: #if LJ_HASJIT - dasm_put(Dst, 16131, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 16133, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -3031,33 +3033,33 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IITERL: - dasm_put(Dst, 16550, LJ_TNIL); + dasm_put(Dst, 16552, LJ_TNIL); if (op == BC_JITERL) { - dasm_put(Dst, 16565, BC_JLOOP); + dasm_put(Dst, 16567, BC_JLOOP); } else { - dasm_put(Dst, 16579, -BCBIAS_J*4); + dasm_put(Dst, 16581, -BCBIAS_J*4); } - dasm_put(Dst, 11201); + dasm_put(Dst, 11203); break; case BC_LOOP: #if LJ_HASJIT - dasm_put(Dst, 16131, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 16133, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; case BC_ILOOP: - dasm_put(Dst, 11203); + dasm_put(Dst, 11205); break; case BC_JLOOP: #if LJ_HASJIT - dasm_put(Dst, 16595, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); + dasm_put(Dst, 16597, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); #endif break; case BC_JMP: - dasm_put(Dst, 16618, -BCBIAS_J*4); + dasm_put(Dst, 16620, -BCBIAS_J*4); break; /* -- Function headers -------------------------------------------------- */ @@ -3071,7 +3073,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FUNCF: #if LJ_HASJIT - dasm_put(Dst, 16642, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 16644, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif case BC_FUNCV: /* NYI: compiled vararg functions. */ break; @@ -3081,47 +3083,47 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IFUNCF: - dasm_put(Dst, 16663, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); + dasm_put(Dst, 16665, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); if (op == BC_JFUNCF) { - dasm_put(Dst, 16693, BC_JLOOP); + dasm_put(Dst, 16695, BC_JLOOP); } else { - dasm_put(Dst, 11203); + dasm_put(Dst, 11205); } - dasm_put(Dst, 16702, LJ_TNIL); + dasm_put(Dst, 16704, LJ_TNIL); break; case BC_JFUNCV: #if !LJ_HASJIT break; #endif - dasm_put(Dst, 10303); + dasm_put(Dst, 10305); break; /* NYI: compiled vararg functions. */ case BC_IFUNCV: - dasm_put(Dst, 16724, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); + dasm_put(Dst, 16726, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); if (op == BC_JFUNCV) { - dasm_put(Dst, 16693, BC_JLOOP); + dasm_put(Dst, 16695, BC_JLOOP); } else { - dasm_put(Dst, 16815, -4+PC2PROTO(k)); + dasm_put(Dst, 16817, -4+PC2PROTO(k)); } - dasm_put(Dst, 16837, LJ_TNIL); + dasm_put(Dst, 16839, LJ_TNIL); break; case BC_FUNCC: case BC_FUNCCW: - dasm_put(Dst, 16859, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); + dasm_put(Dst, 16861, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); if (op == BC_FUNCC) { - dasm_put(Dst, 16888); + dasm_put(Dst, 16890); } else { - dasm_put(Dst, 16892); + dasm_put(Dst, 16894); } - dasm_put(Dst, 16900, DISPATCH_GL(vmstate), ~LJ_VMST_C); + dasm_put(Dst, 16902, DISPATCH_GL(vmstate), ~LJ_VMST_C); if (op == BC_FUNCC) { - dasm_put(Dst, 16909); + dasm_put(Dst, 16911); } else { - dasm_put(Dst, 16913, DISPATCH_GL(wrapf)); + dasm_put(Dst, 16915, DISPATCH_GL(wrapf)); } - dasm_put(Dst, 16918, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 16920, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); break; /* ---------------------------------------------------------------------- */ @@ -3149,7 +3151,7 @@ static int build_backend(BuildCtx *ctx) build_subroutines(ctx, cmov, sse); - dasm_put(Dst, 16943); + dasm_put(Dst, 16945); for (op = 0; op < BC__MAX; op++) build_ins(ctx, (BCOp)op, op, cmov, sse); diff --git a/src/lj_err.c b/src/lj_err.c index 7f9db600..f5d7b10d 100644 --- a/src/lj_err.c +++ b/src/lj_err.c @@ -577,6 +577,16 @@ LJ_FUNCA int lj_err_unwind_dwarf(int version, _Unwind_Action actions, lj_vm_unwind_c_eh)); return _URC_INSTALL_CONTEXT; } +#if LJ_TARGET_X86ORX64 + else if ((actions & _UA_HANDLER_FRAME)) { + /* Workaround for ancient libgcc bug. Still present in RHEL 5.5. :-/ + ** Real fix: http://gcc.gnu.org/viewcvs/trunk/gcc/unwind-dw2.c?r1=121165&r2=124837&pathrev=153877&diff_format=h + */ + _Unwind_SetGR(ctx, LJ_TARGET_EHRETREG, errcode); + _Unwind_SetIP(ctx, (_Unwind_Ptr)lj_vm_unwind_rethrow); + return _URC_INSTALL_CONTEXT; + } +#endif #else /* This is not the proper way to escape from the unwinder. We get away with ** it on x86/PPC because the interpreter restores all callee-saved regs. diff --git a/src/lj_vm.h b/src/lj_vm.h index 1f9cf9b1..036ada7d 100644 --- a/src/lj_vm.h +++ b/src/lj_vm.h @@ -19,6 +19,9 @@ LJ_ASMF_NORET void LJ_FASTCALL lj_vm_unwind_c(void *cframe, int errcode); LJ_ASMF_NORET void LJ_FASTCALL lj_vm_unwind_ff(void *cframe); LJ_ASMF void lj_vm_unwind_c_eh(void); LJ_ASMF void lj_vm_unwind_ff_eh(void); +#if LJ_TARGET_X86ORX64 +LJ_ASMF void lj_vm_unwind_rethrow(void); +#endif /* Miscellaneous functions. */ #if LJ_TARGET_X86ORX64