From c52da1f2da4963762e7743419d58e372e1c9ac06 Mon Sep 17 00:00:00 2001 From: Mike Pall Date: Fri, 19 Feb 2010 03:13:48 +0100 Subject: [PATCH] Rethrow errors from trace exit handling from the right C frame. --- src/buildvm_x64.h | 1275 +++++++++++++++++++++--------------------- src/buildvm_x64win.h | 1258 ++++++++++++++++++++--------------------- src/buildvm_x86.dasc | 14 +- src/buildvm_x86.h | 983 ++++++++++++++++---------------- src/lj_err.c | 2 +- src/lj_err.h | 2 +- src/lj_snap.c | 6 +- src/lj_trace.c | 36 +- src/lj_trace.h | 2 +- 9 files changed, 1809 insertions(+), 1769 deletions(-) diff --git a/src/buildvm_x64.h b/src/buildvm_x64.h index 7632f70b..bdf85282 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[13678] = { +static const unsigned char build_actionlist[13689] = { 254,1,248,10,252,247,195,237,15,132,244,11,131,227,252,248,41,218,72,141, 76,25,252,248,139,90,252,252,199,68,10,4,237,248,12,131,192,1,137,68,36,4, 252,247,195,237,15,132,244,13,248,14,252,247,195,237,15,132,244,10,65,199, @@ -366,315 +366,315 @@ static const unsigned char build_actionlist[13678] = { 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,143,255,248,144,255,68,139,122,252,248,69,139,191,233, 69,139,191,233,65,199,134,233,0,0,0,0,65,199,134,233,237,139,3,15,182,204, - 15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,248,82,255,217, - 124,36,4,137,68,36,8,102,184,0,4,102,11,68,36,4,102,37,252,255,252,247,102, - 137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,139,68,36,8,195,255,248, - 145,72,184,237,237,102,72,15,110,208,72,184,237,237,102,72,15,110,216,15, - 40,200,102,15,84,202,102,15,46,217,15,134,244,247,102,15,85,208,252,242,15, - 88,203,252,242,15,92,203,102,15,86,202,72,184,237,237,102,72,15,110,208,252, - 242,15,194,193,1,102,15,84,194,252,242,15,92,200,15,40,193,248,1,195,248, - 84,255,217,124,36,4,137,68,36,8,102,184,0,8,102,11,68,36,4,102,37,252,255, - 252,251,102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,139,68,36,8, - 195,255,248,146,72,184,237,237,102,72,15,110,208,72,184,237,237,102,72,15, - 110,216,15,40,200,102,15,84,202,102,15,46,217,15,134,244,247,102,15,85,208, - 252,242,15,88,203,252,242,15,92,203,102,15,86,202,72,184,237,237,102,72,15, - 110,208,252,242,15,194,193,6,102,15,84,194,252,242,15,92,200,15,40,193,248, - 1,195,248,104,255,217,124,36,4,137,68,36,8,102,184,0,12,102,11,68,36,4,102, - 137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,139,68,36,8,195,255,248, - 147,72,184,237,237,102,72,15,110,208,72,184,237,237,102,72,15,110,216,15, - 40,200,102,15,84,202,102,15,46,217,15,134,244,247,102,15,85,208,15,40,193, - 252,242,15,88,203,252,242,15,92,203,72,184,237,237,102,72,15,110,216,252, - 242,15,194,193,1,102,15,84,195,252,242,15,92,200,102,15,86,202,15,40,193, - 248,1,195,248,148,255,15,40,232,252,242,15,94,193,72,184,237,237,102,72,15, - 110,208,72,184,237,237,102,72,15,110,216,15,40,224,102,15,84,226,102,15,46, - 220,15,134,244,247,102,15,85,208,252,242,15,88,227,252,242,15,92,227,102, - 15,86,226,72,184,237,237,102,72,15,110,208,252,242,15,194,196,1,102,15,84, - 194,252,242,15,92,224,15,40,197,252,242,15,89,204,252,242,15,92,193,195,248, - 1,252,242,15,89,200,15,40,197,252,242,15,92,193,195,255,217,193,216,252,241, - 217,124,36,4,102,184,0,4,102,11,68,36,4,102,37,252,255,252,247,102,137,68, - 36,6,217,108,36,6,217,252,252,217,108,36,4,222,201,222,252,233,195,255,248, - 88,217,252,234,222,201,248,149,217,84,36,252,248,129,124,36,252,248,0,0,128, - 127,15,132,244,247,129,124,36,252,248,0,0,128,252,255,15,132,244,248,248, - 150,217,192,217,252,252,220,252,233,217,201,217,252,240,217,232,222,193,217, - 252,253,221,217,248,1,195,248,2,221,216,217,252,238,195,255,248,107,255,248, - 151,252,242,15,45,193,252,242,15,42,208,102,15,46,202,15,133,244,254,15,138, - 244,255,248,152,131,252,248,1,15,142,244,252,248,1,169,1,0,0,0,15,133,244, - 248,252,242,15,89,192,209,232,252,233,244,1,248,2,209,232,15,132,244,251, - 15,40,200,248,3,252,242,15,89,192,209,232,15,132,244,250,15,131,244,3,255, - 252,242,15,89,200,252,233,244,3,248,4,252,242,15,89,193,248,5,195,248,6,15, - 132,244,5,15,130,244,253,80,72,184,237,237,102,72,15,110,200,252,242,15,94, - 200,88,15,40,193,252,247,216,131,252,248,1,15,132,244,5,252,233,244,1,248, - 7,72,184,237,237,102,72,15,110,192,195,248,8,102,72,15,126,200,72,209,224, - 72,193,192,12,72,61,252,254,15,0,0,15,132,244,248,255,102,72,15,126,192,72, - 209,224,15,132,244,250,72,193,192,12,72,61,252,254,15,0,0,15,132,244,251, - 252,242,15,17,76,36,252,240,252,242,15,17,68,36,252,248,221,68,36,252,240, - 221,68,36,252,248,217,252,241,217,192,217,252,252,220,252,233,217,201,217, - 252,240,217,232,222,193,217,252,253,221,217,221,92,36,252,248,252,242,15, - 16,68,36,252,248,195,248,9,72,184,237,237,102,72,15,110,208,102,15,46,194, - 15,132,244,247,15,40,193,248,1,195,248,2,72,184,237,237,102,72,15,110,208, - 102,15,84,194,72,184,237,237,102,72,15,110,208,102,15,46,194,15,132,244,1, - 102,15,80,193,15,87,192,136,196,15,146,208,48,224,15,133,244,1,248,3,72,184, - 237,237,255,102,72,15,110,192,195,248,4,102,15,80,193,133,192,15,133,244, - 3,15,87,192,195,248,5,102,15,80,193,133,192,15,132,244,3,15,87,192,195,248, - 153,255,131,252,255,1,15,130,244,82,15,132,244,84,131,252,255,3,15,130,244, - 104,15,135,244,248,252,242,15,81,192,195,248,2,252,242,15,17,68,36,252,248, - 221,68,36,252,248,131,252,255,5,15,135,244,248,15,132,244,247,232,244,88, - 252,233,244,253,248,1,232,244,149,255,252,233,244,253,248,2,131,252,255,7, - 15,132,244,247,15,135,244,248,217,252,237,217,201,217,252,241,252,233,244, - 253,248,1,217,232,217,201,217,252,241,252,233,244,253,248,2,131,252,255,9, - 15,132,244,247,15,135,244,248,217,252,236,217,201,217,252,241,252,233,244, - 253,248,1,255,217,252,254,252,233,244,253,248,2,131,252,255,11,15,132,244, - 247,15,135,244,255,217,252,255,252,233,244,253,248,1,217,252,242,221,216, - 248,7,221,92,36,252,248,252,242,15,16,68,36,252,248,195,255,139,124,36,12, - 221,68,36,4,131,252,255,1,15,130,244,82,15,132,244,84,131,252,255,3,15,130, - 244,104,15,135,244,248,217,252,250,195,248,2,131,252,255,5,15,130,244,88, - 15,132,244,149,131,252,255,7,15,132,244,247,15,135,244,248,217,252,237,217, - 201,217,252,241,195,248,1,217,232,217,201,217,252,241,195,248,2,131,252,255, - 9,15,132,244,247,255,15,135,244,248,217,252,236,217,201,217,252,241,195,248, - 1,217,252,254,195,248,2,131,252,255,11,15,132,244,247,15,135,244,255,217, - 252,255,195,248,1,217,252,242,221,216,195,255,248,9,204,248,154,255,131,252, - 255,1,15,132,244,247,15,135,244,248,252,242,15,88,193,195,248,1,252,242,15, - 92,193,195,248,2,131,252,255,3,15,132,244,247,15,135,244,248,252,242,15,89, - 193,195,248,1,252,242,15,94,193,195,248,2,131,252,255,5,15,130,244,148,15, - 132,244,107,131,252,255,7,15,132,244,247,15,135,244,248,72,184,237,237,255, - 102,72,15,110,200,15,87,193,195,248,1,72,184,237,237,102,72,15,110,200,15, - 84,193,195,248,2,131,252,255,9,15,135,244,248,252,242,15,17,68,36,252,248, - 252,242,15,17,76,36,252,240,221,68,36,252,248,221,68,36,252,240,15,132,244, - 247,217,252,243,248,7,221,92,36,252,248,252,242,15,16,68,36,252,248,195,248, - 1,217,201,217,252,253,221,217,252,233,244,7,248,2,131,252,255,11,15,132,244, - 247,15,135,244,255,252,242,15,93,193,195,248,1,252,242,15,95,193,195,248, - 9,204,255,139,68,36,20,221,68,36,4,221,68,36,12,131,252,248,1,15,132,244, - 247,15,135,244,248,222,193,195,248,1,222,252,233,195,248,2,131,252,248,3, - 15,132,244,247,15,135,244,248,222,201,195,248,1,222,252,249,195,248,2,131, - 252,248,5,15,130,244,148,15,132,244,107,131,252,248,7,15,132,244,247,15,135, - 244,248,255,221,216,217,224,195,248,1,221,216,217,225,195,248,2,131,252,248, - 9,15,132,244,247,15,135,244,248,217,252,243,195,248,1,217,201,217,252,253, - 221,217,195,248,2,131,252,248,11,15,132,244,247,15,135,244,255,255,219,252, - 233,219,209,221,217,195,248,1,219,252,233,218,209,221,217,195,255,221,225, - 223,224,252,246,196,1,15,132,244,248,217,201,248,2,221,216,195,248,1,221, - 225,223,224,252,246,196,1,15,133,244,248,217,201,248,2,221,216,195,255,248, - 155,137,252,248,83,15,162,137,6,137,94,4,137,78,8,137,86,12,91,195,255,249, - 255,129,124,253,202,4,239,15,135,244,41,129,124,253,194,4,239,15,135,244, - 41,255,252,242,15,16,4,194,131,195,4,102,15,46,4,202,255,221,4,202,221,4, - 194,131,195,4,255,223,252,233,221,216,255,218,252,233,223,224,158,255,15, - 134,244,248,255,15,131,244,248,255,248,1,15,183,67,252,254,141,156,253,131, - 233,248,2,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36, - 252,238,255,139,108,194,4,131,195,4,129,252,253,239,15,135,244,251,129,124, - 253,202,4,239,15,135,244,251,255,252,242,15,16,4,194,102,15,46,4,202,255, - 221,4,202,221,4,194,255,15,138,244,248,15,133,244,248,255,15,138,244,248, - 15,132,244,247,255,248,1,15,183,67,252,254,141,156,253,131,233,248,2,255, - 248,2,15,183,67,252,254,141,156,253,131,233,248,1,255,248,5,57,108,202,4, - 15,133,244,2,129,252,253,239,15,131,244,1,139,12,202,139,4,194,57,193,15, - 132,244,1,129,252,253,239,15,135,244,2,139,169,233,133,252,237,15,132,244, - 2,252,246,133,233,235,15,133,244,2,255,49,252,237,255,189,1,0,0,0,255,252, - 233,244,45,255,72,252,247,208,131,195,4,129,124,253,202,4,239,15,133,244, - 248,139,12,202,65,59,12,135,255,131,195,4,129,124,253,202,4,239,15,135,244, - 248,255,252,242,65,15,16,4,199,102,15,46,4,202,255,221,4,202,65,221,4,199, - 255,72,252,247,208,131,195,4,57,68,202,4,255,139,108,194,4,131,195,4,129, - 252,253,239,255,15,131,244,247,255,15,130,244,247,255,137,108,202,4,139,44, - 194,137,44,202,255,15,183,67,252,254,141,156,253,131,233,248,1,139,3,15,182, - 204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,139,108,194, - 4,139,4,194,137,108,202,4,137,4,202,139,3,15,182,204,15,182,232,131,195,4, - 193,232,16,65,252,255,36,252,238,255,49,252,237,129,124,253,194,4,239,129, - 213,239,137,108,202,4,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65, - 252,255,36,252,238,255,129,124,253,194,4,239,15,135,244,48,255,252,242,15, - 16,4,194,72,184,237,237,102,72,15,110,200,15,87,193,252,242,15,17,4,202,255, - 221,4,194,217,224,221,28,202,255,129,124,253,194,4,239,15,133,244,248,139, - 4,194,255,15,87,192,252,242,15,42,128,233,248,1,252,242,15,17,4,202,255,219, - 128,233,248,1,221,28,202,255,139,3,15,182,204,15,182,232,131,195,4,193,232, - 16,65,252,255,36,252,238,248,2,129,124,253,194,4,239,15,133,244,50,139,60, - 194,137,213,232,251,1,18,255,252,242,15,42,192,137,252,234,255,15,182,75, - 252,253,252,233,244,1,255,15,182,252,236,15,182,192,255,129,124,253,252,234, - 4,239,15,135,244,46,255,252,242,15,16,4,252,234,252,242,65,15,88,4,199,255, - 221,4,252,234,65,220,4,199,255,129,124,253,252,234,4,239,15,135,244,47,255, - 252,242,65,15,16,4,199,252,242,15,88,4,252,234,255,65,221,4,199,220,4,252, - 234,255,129,124,253,252,234,4,239,15,135,244,49,129,124,253,194,4,239,15, - 135,244,49,255,252,242,15,16,4,252,234,252,242,15,88,4,194,255,221,4,252, - 234,220,4,194,255,252,242,15,16,4,252,234,252,242,65,15,92,4,199,255,221, - 4,252,234,65,220,36,199,255,252,242,65,15,16,4,199,252,242,15,92,4,252,234, - 255,65,221,4,199,220,36,252,234,255,252,242,15,16,4,252,234,252,242,15,92, - 4,194,255,221,4,252,234,220,36,194,255,252,242,15,16,4,252,234,252,242,65, - 15,89,4,199,255,221,4,252,234,65,220,12,199,255,252,242,65,15,16,4,199,252, - 242,15,89,4,252,234,255,65,221,4,199,220,12,252,234,255,252,242,15,16,4,252, - 234,252,242,15,89,4,194,255,221,4,252,234,220,12,194,255,252,242,15,16,4, - 252,234,252,242,65,15,94,4,199,255,221,4,252,234,65,220,52,199,255,252,242, - 65,15,16,4,199,252,242,15,94,4,252,234,255,65,221,4,199,220,52,252,234,255, - 252,242,15,16,4,252,234,252,242,15,94,4,194,255,221,4,252,234,220,52,194, - 255,252,242,15,16,4,252,234,252,242,65,15,16,12,199,255,221,4,252,234,65, - 221,4,199,255,252,242,65,15,16,4,199,252,242,15,16,12,252,234,255,65,221, - 4,199,221,4,252,234,255,252,242,15,16,4,252,234,252,242,15,16,12,194,255, - 221,4,252,234,221,4,194,255,248,156,232,244,148,255,252,233,244,156,255,232, - 244,107,255,15,182,252,236,15,182,192,139,124,36,16,137,151,233,141,52,194, - 137,194,41,252,234,248,33,137,252,253,137,92,36,20,232,251,1,22,139,149,233, - 133,192,15,133,244,42,15,182,107,252,255,15,182,75,252,253,139,68,252,234, - 4,139,44,252,234,137,68,202,4,137,44,202,139,3,15,182,204,15,182,232,131, - 195,4,193,232,16,65,252,255,36,252,238,255,72,252,247,208,65,139,4,135,199, - 68,202,4,237,137,4,202,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65, - 252,255,36,252,238,255,15,191,192,252,242,15,42,192,252,242,15,17,4,202,255, - 223,67,252,254,221,28,202,255,252,242,65,15,16,4,199,252,242,15,17,4,202, - 255,65,221,4,199,221,28,202,255,72,252,247,208,137,68,202,4,139,3,15,182, - 204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,141,76,202, - 12,141,68,194,4,189,237,137,105,252,248,248,1,137,41,131,193,8,57,193,15, - 134,244,1,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36, - 252,238,255,139,106,252,248,139,172,253,133,233,139,173,233,139,69,4,139, - 109,0,137,68,202,4,137,44,202,139,3,15,182,204,15,182,232,131,195,4,193,232, - 16,65,252,255,36,252,238,255,139,106,252,248,139,172,253,141,233,128,189, - 233,0,139,173,233,139,12,194,139,68,194,4,137,77,0,137,69,4,15,132,244,247, - 252,246,133,233,235,15,133,244,248,248,1,139,3,15,182,204,15,182,232,131, - 195,4,193,232,16,65,252,255,36,252,238,248,2,129,232,239,129,252,248,239, - 15,134,244,1,252,246,129,233,235,15,132,244,1,137,252,238,137,213,65,141, - 190,233,255,232,251,1,23,137,252,234,252,233,244,1,255,72,252,247,208,139, - 106,252,248,139,172,253,141,233,65,139,12,135,139,133,233,137,8,199,64,4, - 237,252,246,133,233,235,15,133,244,248,248,1,139,3,15,182,204,15,182,232, - 131,195,4,193,232,16,65,252,255,36,252,238,248,2,252,246,129,233,235,15,132, - 244,1,128,189,233,0,15,132,244,1,137,213,137,198,65,141,190,233,232,251,1, - 23,137,252,234,252,233,244,1,255,139,106,252,248,255,252,242,65,15,16,4,199, - 255,139,172,253,141,233,139,141,233,255,252,242,15,17,1,255,221,25,255,72, - 252,247,208,139,106,252,248,139,172,253,141,233,139,141,233,137,65,4,139, - 3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,141, - 156,253,131,233,139,108,36,16,131,189,233,0,15,132,244,247,137,149,233,141, - 52,202,137,252,239,232,251,1,24,139,149,233,248,1,139,3,15,182,204,15,182, - 232,131,195,4,193,232,16,65,252,255,36,252,238,255,72,252,247,208,139,108, - 36,16,137,149,233,139,82,252,248,65,139,52,135,137,252,239,137,92,36,20,232, - 251,1,25,139,149,233,15,182,75,252,253,137,4,202,199,68,202,4,237,139,3,15, - 182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,139,124, - 36,16,137,151,233,248,1,137,194,37,252,255,7,0,0,193,252,234,11,61,252,255, - 7,0,0,15,132,244,249,248,2,137,198,65,139,134,233,137,252,253,65,59,134,233, - 137,92,36,20,15,131,244,251,232,251,1,26,139,149,233,15,182,75,252,253,137, - 4,202,199,68,202,4,237,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65, - 252,255,36,252,238,248,3,184,1,8,0,0,252,233,244,2,248,5,232,251,1,27,15, - 183,67,252,254,137,252,239,252,233,244,1,255,72,252,247,208,139,108,36,16, - 65,139,142,233,137,92,36,20,65,59,142,233,137,149,233,15,131,244,249,248, - 2,65,139,52,135,137,252,239,232,251,1,28,139,149,233,15,182,75,252,253,137, - 4,202,199,68,202,4,237,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65, - 252,255,36,252,238,248,3,137,252,239,232,251,1,27,15,183,67,252,254,72,252, - 247,208,252,233,244,2,255,72,252,247,208,139,106,252,248,139,173,233,65,139, - 4,135,252,233,244,157,255,72,252,247,208,139,106,252,248,139,173,233,65,139, - 4,135,252,233,244,158,255,15,182,252,236,15,182,192,129,124,253,252,234,4, - 239,15,133,244,36,139,44,252,234,129,124,253,194,4,239,15,135,244,251,255, - 252,242,15,16,4,194,252,242,15,45,192,252,242,15,42,200,102,15,46,193,255, - 15,133,244,36,59,133,233,15,131,244,36,193,224,3,3,133,233,129,120,253,4, - 239,15,132,244,248,248,1,139,40,139,64,4,137,44,202,137,68,202,4,139,3,15, - 182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,131,189, - 233,0,15,132,244,1,139,141,233,252,246,129,233,235,15,132,244,36,15,182,75, - 252,253,252,233,244,1,248,5,255,129,124,253,194,4,239,15,133,244,36,139,4, - 194,252,233,244,157,255,15,182,252,236,15,182,192,72,252,247,208,65,139,4, - 135,129,124,253,252,234,4,239,15,133,244,34,139,44,252,234,248,157,139,141, - 233,35,136,233,105,201,239,3,141,233,248,1,129,185,233,239,15,133,244,250, - 57,129,233,15,133,244,250,129,121,253,4,239,15,132,244,251,15,182,67,252, - 253,139,41,139,73,4,137,44,194,248,2,255,137,76,194,4,139,3,15,182,204,15, - 182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,15,182,67,252,253, - 185,237,252,233,244,2,248,4,139,137,233,133,201,15,133,244,1,248,5,139,141, - 233,133,201,15,132,244,3,252,246,129,233,235,15,133,244,3,252,233,244,34, - 255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,35,139, - 44,252,234,59,133,233,15,131,244,35,193,224,3,3,133,233,129,120,253,4,239, - 15,132,244,248,248,1,139,40,139,64,4,137,44,202,137,68,202,4,139,3,15,182, - 204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,131,189,233, - 0,15,132,244,1,139,141,233,252,246,129,233,235,15,132,244,35,255,15,182,252, - 236,15,182,192,129,124,253,252,234,4,239,15,133,244,39,139,44,252,234,129, - 124,253,194,4,239,15,135,244,251,255,15,133,244,39,59,133,233,15,131,244, - 39,193,224,3,3,133,233,129,120,253,4,239,15,132,244,249,248,1,252,246,133, + 15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,1,137,252,239,137, + 198,232,251,1,22,255,248,82,255,217,124,36,4,137,68,36,8,102,184,0,4,102, + 11,68,36,4,102,37,252,255,252,247,102,137,68,36,6,217,108,36,6,217,252,252, + 217,108,36,4,139,68,36,8,195,255,248,145,72,184,237,237,102,72,15,110,208, + 72,184,237,237,102,72,15,110,216,15,40,200,102,15,84,202,102,15,46,217,15, + 134,244,247,102,15,85,208,252,242,15,88,203,252,242,15,92,203,102,15,86,202, + 72,184,237,237,102,72,15,110,208,252,242,15,194,193,1,102,15,84,194,252,242, + 15,92,200,15,40,193,248,1,195,248,84,255,217,124,36,4,137,68,36,8,102,184, + 0,8,102,11,68,36,4,102,37,252,255,252,251,102,137,68,36,6,217,108,36,6,217, + 252,252,217,108,36,4,139,68,36,8,195,255,248,146,72,184,237,237,102,72,15, + 110,208,72,184,237,237,102,72,15,110,216,15,40,200,102,15,84,202,102,15,46, + 217,15,134,244,247,102,15,85,208,252,242,15,88,203,252,242,15,92,203,102, + 15,86,202,72,184,237,237,102,72,15,110,208,252,242,15,194,193,6,102,15,84, + 194,252,242,15,92,200,15,40,193,248,1,195,248,104,255,217,124,36,4,137,68, + 36,8,102,184,0,12,102,11,68,36,4,102,137,68,36,6,217,108,36,6,217,252,252, + 217,108,36,4,139,68,36,8,195,255,248,147,72,184,237,237,102,72,15,110,208, + 72,184,237,237,102,72,15,110,216,15,40,200,102,15,84,202,102,15,46,217,15, + 134,244,247,102,15,85,208,15,40,193,252,242,15,88,203,252,242,15,92,203,72, + 184,237,237,102,72,15,110,216,252,242,15,194,193,1,102,15,84,195,252,242, + 15,92,200,102,15,86,202,15,40,193,248,1,195,248,148,255,15,40,232,252,242, + 15,94,193,72,184,237,237,102,72,15,110,208,72,184,237,237,102,72,15,110,216, + 15,40,224,102,15,84,226,102,15,46,220,15,134,244,247,102,15,85,208,252,242, + 15,88,227,252,242,15,92,227,102,15,86,226,72,184,237,237,102,72,15,110,208, + 252,242,15,194,196,1,102,15,84,194,252,242,15,92,224,15,40,197,252,242,15, + 89,204,252,242,15,92,193,195,248,1,252,242,15,89,200,15,40,197,252,242,15, + 92,193,195,255,217,193,216,252,241,217,124,36,4,102,184,0,4,102,11,68,36, + 4,102,37,252,255,252,247,102,137,68,36,6,217,108,36,6,217,252,252,217,108, + 36,4,222,201,222,252,233,195,255,248,88,217,252,234,222,201,248,149,217,84, + 36,252,248,129,124,36,252,248,0,0,128,127,15,132,244,247,129,124,36,252,248, + 0,0,128,252,255,15,132,244,248,248,150,217,192,217,252,252,220,252,233,217, + 201,217,252,240,217,232,222,193,217,252,253,221,217,248,1,195,248,2,221,216, + 217,252,238,195,255,248,107,255,248,151,252,242,15,45,193,252,242,15,42,208, + 102,15,46,202,15,133,244,254,15,138,244,255,248,152,131,252,248,1,15,142, + 244,252,248,1,169,1,0,0,0,15,133,244,248,252,242,15,89,192,209,232,252,233, + 244,1,248,2,209,232,15,132,244,251,15,40,200,248,3,252,242,15,89,192,209, + 232,15,132,244,250,15,131,244,3,255,252,242,15,89,200,252,233,244,3,248,4, + 252,242,15,89,193,248,5,195,248,6,15,132,244,5,15,130,244,253,80,72,184,237, + 237,102,72,15,110,200,252,242,15,94,200,88,15,40,193,252,247,216,131,252, + 248,1,15,132,244,5,252,233,244,1,248,7,72,184,237,237,102,72,15,110,192,195, + 248,8,102,72,15,126,200,72,209,224,72,193,192,12,72,61,252,254,15,0,0,15, + 132,244,248,255,102,72,15,126,192,72,209,224,15,132,244,250,72,193,192,12, + 72,61,252,254,15,0,0,15,132,244,251,252,242,15,17,76,36,252,240,252,242,15, + 17,68,36,252,248,221,68,36,252,240,221,68,36,252,248,217,252,241,217,192, + 217,252,252,220,252,233,217,201,217,252,240,217,232,222,193,217,252,253,221, + 217,221,92,36,252,248,252,242,15,16,68,36,252,248,195,248,9,72,184,237,237, + 102,72,15,110,208,102,15,46,194,15,132,244,247,15,40,193,248,1,195,248,2, + 72,184,237,237,102,72,15,110,208,102,15,84,194,72,184,237,237,102,72,15,110, + 208,102,15,46,194,15,132,244,1,102,15,80,193,15,87,192,136,196,15,146,208, + 48,224,15,133,244,1,248,3,72,184,237,237,255,102,72,15,110,192,195,248,4, + 102,15,80,193,133,192,15,133,244,3,15,87,192,195,248,5,102,15,80,193,133, + 192,15,132,244,3,15,87,192,195,248,153,255,131,252,255,1,15,130,244,82,15, + 132,244,84,131,252,255,3,15,130,244,104,15,135,244,248,252,242,15,81,192, + 195,248,2,252,242,15,17,68,36,252,248,221,68,36,252,248,131,252,255,5,15, + 135,244,248,15,132,244,247,232,244,88,252,233,244,253,248,1,232,244,149,255, + 252,233,244,253,248,2,131,252,255,7,15,132,244,247,15,135,244,248,217,252, + 237,217,201,217,252,241,252,233,244,253,248,1,217,232,217,201,217,252,241, + 252,233,244,253,248,2,131,252,255,9,15,132,244,247,15,135,244,248,217,252, + 236,217,201,217,252,241,252,233,244,253,248,1,255,217,252,254,252,233,244, + 253,248,2,131,252,255,11,15,132,244,247,15,135,244,255,217,252,255,252,233, + 244,253,248,1,217,252,242,221,216,248,7,221,92,36,252,248,252,242,15,16,68, + 36,252,248,195,255,139,124,36,12,221,68,36,4,131,252,255,1,15,130,244,82, + 15,132,244,84,131,252,255,3,15,130,244,104,15,135,244,248,217,252,250,195, + 248,2,131,252,255,5,15,130,244,88,15,132,244,149,131,252,255,7,15,132,244, + 247,15,135,244,248,217,252,237,217,201,217,252,241,195,248,1,217,232,217, + 201,217,252,241,195,248,2,131,252,255,9,15,132,244,247,255,15,135,244,248, + 217,252,236,217,201,217,252,241,195,248,1,217,252,254,195,248,2,131,252,255, + 11,15,132,244,247,15,135,244,255,217,252,255,195,248,1,217,252,242,221,216, + 195,255,248,9,204,248,154,255,131,252,255,1,15,132,244,247,15,135,244,248, + 252,242,15,88,193,195,248,1,252,242,15,92,193,195,248,2,131,252,255,3,15, + 132,244,247,15,135,244,248,252,242,15,89,193,195,248,1,252,242,15,94,193, + 195,248,2,131,252,255,5,15,130,244,148,15,132,244,107,131,252,255,7,15,132, + 244,247,15,135,244,248,72,184,237,237,255,102,72,15,110,200,15,87,193,195, + 248,1,72,184,237,237,102,72,15,110,200,15,84,193,195,248,2,131,252,255,9, + 15,135,244,248,252,242,15,17,68,36,252,248,252,242,15,17,76,36,252,240,221, + 68,36,252,248,221,68,36,252,240,15,132,244,247,217,252,243,248,7,221,92,36, + 252,248,252,242,15,16,68,36,252,248,195,248,1,217,201,217,252,253,221,217, + 252,233,244,7,248,2,131,252,255,11,15,132,244,247,15,135,244,255,252,242, + 15,93,193,195,248,1,252,242,15,95,193,195,248,9,204,255,139,68,36,20,221, + 68,36,4,221,68,36,12,131,252,248,1,15,132,244,247,15,135,244,248,222,193, + 195,248,1,222,252,233,195,248,2,131,252,248,3,15,132,244,247,15,135,244,248, + 222,201,195,248,1,222,252,249,195,248,2,131,252,248,5,15,130,244,148,15,132, + 244,107,131,252,248,7,15,132,244,247,15,135,244,248,255,221,216,217,224,195, + 248,1,221,216,217,225,195,248,2,131,252,248,9,15,132,244,247,15,135,244,248, + 217,252,243,195,248,1,217,201,217,252,253,221,217,195,248,2,131,252,248,11, + 15,132,244,247,15,135,244,255,255,219,252,233,219,209,221,217,195,248,1,219, + 252,233,218,209,221,217,195,255,221,225,223,224,252,246,196,1,15,132,244, + 248,217,201,248,2,221,216,195,248,1,221,225,223,224,252,246,196,1,15,133, + 244,248,217,201,248,2,221,216,195,255,248,155,137,252,248,83,15,162,137,6, + 137,94,4,137,78,8,137,86,12,91,195,255,249,255,129,124,253,202,4,239,15,135, + 244,41,129,124,253,194,4,239,15,135,244,41,255,252,242,15,16,4,194,131,195, + 4,102,15,46,4,202,255,221,4,202,221,4,194,131,195,4,255,223,252,233,221,216, + 255,218,252,233,223,224,158,255,15,134,244,248,255,15,131,244,248,255,248, + 1,15,183,67,252,254,141,156,253,131,233,248,2,139,3,15,182,204,15,182,232, + 131,195,4,193,232,16,65,252,255,36,252,238,255,139,108,194,4,131,195,4,129, + 252,253,239,15,135,244,251,129,124,253,202,4,239,15,135,244,251,255,252,242, + 15,16,4,194,102,15,46,4,202,255,221,4,202,221,4,194,255,15,138,244,248,15, + 133,244,248,255,15,138,244,248,15,132,244,247,255,248,1,15,183,67,252,254, + 141,156,253,131,233,248,2,255,248,2,15,183,67,252,254,141,156,253,131,233, + 248,1,255,248,5,57,108,202,4,15,133,244,2,129,252,253,239,15,131,244,1,139, + 12,202,139,4,194,57,193,15,132,244,1,129,252,253,239,15,135,244,2,139,169, + 233,133,252,237,15,132,244,2,252,246,133,233,235,15,133,244,2,255,49,252, + 237,255,189,1,0,0,0,255,252,233,244,45,255,72,252,247,208,131,195,4,129,124, + 253,202,4,239,15,133,244,248,139,12,202,65,59,12,135,255,131,195,4,129,124, + 253,202,4,239,15,135,244,248,255,252,242,65,15,16,4,199,102,15,46,4,202,255, + 221,4,202,65,221,4,199,255,72,252,247,208,131,195,4,57,68,202,4,255,139,108, + 194,4,131,195,4,129,252,253,239,255,15,131,244,247,255,15,130,244,247,255, + 137,108,202,4,139,44,194,137,44,202,255,15,183,67,252,254,141,156,253,131, + 233,248,1,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36, + 252,238,255,139,108,194,4,139,4,194,137,108,202,4,137,4,202,139,3,15,182, + 204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,49,252,237, + 129,124,253,194,4,239,129,213,239,137,108,202,4,139,3,15,182,204,15,182,232, + 131,195,4,193,232,16,65,252,255,36,252,238,255,129,124,253,194,4,239,15,135, + 244,48,255,252,242,15,16,4,194,72,184,237,237,102,72,15,110,200,15,87,193, + 252,242,15,17,4,202,255,221,4,194,217,224,221,28,202,255,129,124,253,194, + 4,239,15,133,244,248,139,4,194,255,15,87,192,252,242,15,42,128,233,248,1, + 252,242,15,17,4,202,255,219,128,233,248,1,221,28,202,255,139,3,15,182,204, + 15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,129,124,253,194, + 4,239,15,133,244,50,139,60,194,137,213,232,251,1,18,255,252,242,15,42,192, + 137,252,234,255,15,182,75,252,253,252,233,244,1,255,15,182,252,236,15,182, + 192,255,129,124,253,252,234,4,239,15,135,244,46,255,252,242,15,16,4,252,234, + 252,242,65,15,88,4,199,255,221,4,252,234,65,220,4,199,255,129,124,253,252, + 234,4,239,15,135,244,47,255,252,242,65,15,16,4,199,252,242,15,88,4,252,234, + 255,65,221,4,199,220,4,252,234,255,129,124,253,252,234,4,239,15,135,244,49, + 129,124,253,194,4,239,15,135,244,49,255,252,242,15,16,4,252,234,252,242,15, + 88,4,194,255,221,4,252,234,220,4,194,255,252,242,15,16,4,252,234,252,242, + 65,15,92,4,199,255,221,4,252,234,65,220,36,199,255,252,242,65,15,16,4,199, + 252,242,15,92,4,252,234,255,65,221,4,199,220,36,252,234,255,252,242,15,16, + 4,252,234,252,242,15,92,4,194,255,221,4,252,234,220,36,194,255,252,242,15, + 16,4,252,234,252,242,65,15,89,4,199,255,221,4,252,234,65,220,12,199,255,252, + 242,65,15,16,4,199,252,242,15,89,4,252,234,255,65,221,4,199,220,12,252,234, + 255,252,242,15,16,4,252,234,252,242,15,89,4,194,255,221,4,252,234,220,12, + 194,255,252,242,15,16,4,252,234,252,242,65,15,94,4,199,255,221,4,252,234, + 65,220,52,199,255,252,242,65,15,16,4,199,252,242,15,94,4,252,234,255,65,221, + 4,199,220,52,252,234,255,252,242,15,16,4,252,234,252,242,15,94,4,194,255, + 221,4,252,234,220,52,194,255,252,242,15,16,4,252,234,252,242,65,15,16,12, + 199,255,221,4,252,234,65,221,4,199,255,252,242,65,15,16,4,199,252,242,15, + 16,12,252,234,255,65,221,4,199,221,4,252,234,255,252,242,15,16,4,252,234, + 252,242,15,16,12,194,255,221,4,252,234,221,4,194,255,248,156,232,244,148, + 255,252,233,244,156,255,232,244,107,255,15,182,252,236,15,182,192,139,124, + 36,16,137,151,233,141,52,194,137,194,41,252,234,248,33,137,252,253,137,92, + 36,20,232,251,1,23,139,149,233,133,192,15,133,244,42,15,182,107,252,255,15, + 182,75,252,253,139,68,252,234,4,139,44,252,234,137,68,202,4,137,44,202,139, + 3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,72, + 252,247,208,65,139,4,135,199,68,202,4,237,137,4,202,139,3,15,182,204,15,182, + 232,131,195,4,193,232,16,65,252,255,36,252,238,255,15,191,192,252,242,15, + 42,192,252,242,15,17,4,202,255,223,67,252,254,221,28,202,255,252,242,65,15, + 16,4,199,252,242,15,17,4,202,255,65,221,4,199,221,28,202,255,72,252,247,208, + 137,68,202,4,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255, + 36,252,238,255,141,76,202,12,141,68,194,4,189,237,137,105,252,248,248,1,137, + 41,131,193,8,57,193,15,134,244,1,139,3,15,182,204,15,182,232,131,195,4,193, + 232,16,65,252,255,36,252,238,255,139,106,252,248,139,172,253,133,233,139, + 173,233,139,69,4,139,109,0,137,68,202,4,137,44,202,139,3,15,182,204,15,182, + 232,131,195,4,193,232,16,65,252,255,36,252,238,255,139,106,252,248,139,172, + 253,141,233,128,189,233,0,139,173,233,139,12,194,139,68,194,4,137,77,0,137, + 69,4,15,132,244,247,252,246,133,233,235,15,133,244,248,248,1,139,3,15,182, + 204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,129,232,239, + 129,252,248,239,15,134,244,1,252,246,129,233,235,15,132,244,1,137,252,238, + 137,213,65,141,190,233,255,232,251,1,24,137,252,234,252,233,244,1,255,72, + 252,247,208,139,106,252,248,139,172,253,141,233,65,139,12,135,139,133,233, + 137,8,199,64,4,237,252,246,133,233,235,15,133,244,248,248,1,139,3,15,182, + 204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,252,246,129, + 233,235,15,132,244,1,128,189,233,0,15,132,244,1,137,213,137,198,65,141,190, + 233,232,251,1,24,137,252,234,252,233,244,1,255,139,106,252,248,255,252,242, + 65,15,16,4,199,255,139,172,253,141,233,139,141,233,255,252,242,15,17,1,255, + 221,25,255,72,252,247,208,139,106,252,248,139,172,253,141,233,139,141,233, + 137,65,4,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252, + 238,255,141,156,253,131,233,139,108,36,16,131,189,233,0,15,132,244,247,137, + 149,233,141,52,202,137,252,239,232,251,1,25,139,149,233,248,1,139,3,15,182, + 204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,72,252,247, + 208,139,108,36,16,137,149,233,139,82,252,248,65,139,52,135,137,252,239,137, + 92,36,20,232,251,1,26,139,149,233,15,182,75,252,253,137,4,202,199,68,202, + 4,237,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252, + 238,255,139,124,36,16,137,151,233,248,1,137,194,37,252,255,7,0,0,193,252, + 234,11,61,252,255,7,0,0,15,132,244,249,248,2,137,198,65,139,134,233,137,252, + 253,65,59,134,233,137,92,36,20,15,131,244,251,232,251,1,27,139,149,233,15, + 182,75,252,253,137,4,202,199,68,202,4,237,139,3,15,182,204,15,182,232,131, + 195,4,193,232,16,65,252,255,36,252,238,248,3,184,1,8,0,0,252,233,244,2,248, + 5,232,251,1,28,15,183,67,252,254,137,252,239,252,233,244,1,255,72,252,247, + 208,139,108,36,16,65,139,142,233,137,92,36,20,65,59,142,233,137,149,233,15, + 131,244,249,248,2,65,139,52,135,137,252,239,232,251,1,29,139,149,233,15,182, + 75,252,253,137,4,202,199,68,202,4,237,139,3,15,182,204,15,182,232,131,195, + 4,193,232,16,65,252,255,36,252,238,248,3,137,252,239,232,251,1,28,15,183, + 67,252,254,72,252,247,208,252,233,244,2,255,72,252,247,208,139,106,252,248, + 139,173,233,65,139,4,135,252,233,244,157,255,72,252,247,208,139,106,252,248, + 139,173,233,65,139,4,135,252,233,244,158,255,15,182,252,236,15,182,192,129, + 124,253,252,234,4,239,15,133,244,36,139,44,252,234,129,124,253,194,4,239, + 15,135,244,251,255,252,242,15,16,4,194,252,242,15,45,192,252,242,15,42,200, + 102,15,46,193,255,15,133,244,36,59,133,233,15,131,244,36,193,224,3,3,133, + 233,129,120,253,4,239,15,132,244,248,248,1,139,40,139,64,4,137,44,202,137, + 68,202,4,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252, + 238,248,2,131,189,233,0,15,132,244,1,139,141,233,252,246,129,233,235,15,132, + 244,36,15,182,75,252,253,252,233,244,1,248,5,255,129,124,253,194,4,239,15, + 133,244,36,139,4,194,252,233,244,157,255,15,182,252,236,15,182,192,72,252, + 247,208,65,139,4,135,129,124,253,252,234,4,239,15,133,244,34,139,44,252,234, + 248,157,139,141,233,35,136,233,105,201,239,3,141,233,248,1,129,185,233,239, + 15,133,244,250,57,129,233,15,133,244,250,129,121,253,4,239,15,132,244,251, + 15,182,67,252,253,139,41,139,73,4,137,44,194,248,2,255,137,76,194,4,139,3, + 15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,15, + 182,67,252,253,185,237,252,233,244,2,248,4,139,137,233,133,201,15,133,244, + 1,248,5,139,141,233,133,201,15,132,244,3,252,246,129,233,235,15,133,244,3, + 252,233,244,34,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15, + 133,244,35,139,44,252,234,59,133,233,15,131,244,35,193,224,3,3,133,233,129, + 120,253,4,239,15,132,244,248,248,1,139,40,139,64,4,137,44,202,137,68,202, + 4,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238, + 248,2,131,189,233,0,15,132,244,1,139,141,233,252,246,129,233,235,15,132,244, + 35,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,39, + 139,44,252,234,129,124,253,194,4,239,15,135,244,251,255,15,133,244,39,59, + 133,233,15,131,244,39,193,224,3,3,133,233,129,120,253,4,239,15,132,244,249, + 248,1,252,246,133,233,235,15,133,244,253,248,2,139,108,202,4,139,12,202,137, + 104,4,137,8,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36, + 252,238,248,3,131,189,233,0,15,132,244,1,139,141,233,255,252,246,129,233, + 235,15,132,244,39,15,182,75,252,253,252,233,244,1,248,5,129,124,253,194,4, + 239,15,133,244,39,139,4,194,252,233,244,158,248,7,128,165,233,235,65,139, + 142,233,65,137,174,233,137,141,233,15,182,75,252,253,252,233,244,2,255,15, + 182,252,236,15,182,192,72,252,247,208,65,139,4,135,129,124,253,252,234,4, + 239,15,133,244,37,139,44,252,234,248,158,139,141,233,35,136,233,105,201,239, + 198,133,233,0,3,141,233,248,1,129,185,233,239,15,133,244,251,57,129,233,15, + 133,244,251,129,121,253,4,239,15,132,244,250,248,2,255,252,246,133,233,235, + 15,133,244,253,248,3,15,182,67,252,253,139,108,194,4,139,4,194,137,105,4, + 137,1,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252, + 238,248,4,131,189,233,0,15,132,244,2,137,12,36,139,141,233,252,246,129,233, + 235,15,132,244,37,139,12,36,252,233,244,2,248,5,139,137,233,133,201,15,133, + 244,1,255,139,141,233,133,201,15,132,244,252,252,246,129,233,235,15,132,244, + 37,248,6,137,4,36,199,68,36,4,237,137,108,36,24,139,124,36,16,137,151,233, + 72,141,20,36,137,252,238,137,252,253,137,92,36,20,232,251,1,30,139,149,233, + 139,108,36,24,137,193,252,233,244,2,248,7,128,165,233,235,65,139,134,233, + 65,137,174,233,137,133,233,252,233,244,3,255,15,182,252,236,15,182,192,129, + 124,253,252,234,4,239,15,133,244,38,139,44,252,234,59,133,233,15,131,244, + 38,193,224,3,3,133,233,129,120,253,4,239,15,132,244,249,248,1,252,246,133, 233,235,15,133,244,253,248,2,139,108,202,4,139,12,202,137,104,4,137,8,139, 3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,3, - 131,189,233,0,15,132,244,1,139,141,233,255,252,246,129,233,235,15,132,244, - 39,15,182,75,252,253,252,233,244,1,248,5,129,124,253,194,4,239,15,133,244, - 39,139,4,194,252,233,244,158,248,7,128,165,233,235,65,139,142,233,65,137, - 174,233,137,141,233,15,182,75,252,253,252,233,244,2,255,15,182,252,236,15, - 182,192,72,252,247,208,65,139,4,135,129,124,253,252,234,4,239,15,133,244, - 37,139,44,252,234,248,158,139,141,233,35,136,233,105,201,239,198,133,233, - 0,3,141,233,248,1,129,185,233,239,15,133,244,251,57,129,233,15,133,244,251, - 129,121,253,4,239,15,132,244,250,248,2,255,252,246,133,233,235,15,133,244, - 253,248,3,15,182,67,252,253,139,108,194,4,139,4,194,137,105,4,137,1,139,3, - 15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,4,131, - 189,233,0,15,132,244,2,137,12,36,139,141,233,252,246,129,233,235,15,132,244, - 37,139,12,36,252,233,244,2,248,5,139,137,233,133,201,15,133,244,1,255,139, - 141,233,133,201,15,132,244,252,252,246,129,233,235,15,132,244,37,248,6,137, - 4,36,199,68,36,4,237,137,108,36,24,139,124,36,16,137,151,233,72,141,20,36, - 137,252,238,137,252,253,137,92,36,20,232,251,1,29,139,149,233,139,108,36, - 24,137,193,252,233,244,2,248,7,128,165,233,235,65,139,134,233,65,137,174, - 233,137,133,233,252,233,244,3,255,15,182,252,236,15,182,192,129,124,253,252, - 234,4,239,15,133,244,38,139,44,252,234,59,133,233,15,131,244,38,193,224,3, - 3,133,233,129,120,253,4,239,15,132,244,249,248,1,252,246,133,233,235,15,133, - 244,253,248,2,139,108,202,4,139,12,202,137,104,4,137,8,139,3,15,182,204,15, - 182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,131,189,233,0,15, - 132,244,1,255,139,141,233,252,246,129,233,235,15,132,244,38,15,182,75,252, - 253,252,233,244,1,248,7,128,165,233,235,65,139,142,233,65,137,174,233,137, - 141,233,15,182,75,252,253,252,233,244,2,255,68,137,60,36,255,248,1,141,12, - 202,139,105,252,248,252,246,133,233,235,15,133,244,253,248,2,139,68,36,4, - 255,252,242,68,15,45,252,248,255,131,232,1,15,132,244,250,68,1,252,248,59, - 133,233,15,131,244,251,68,41,252,248,65,193,231,3,68,3,189,233,248,3,139, - 41,65,137,47,139,105,4,131,193,8,65,137,111,4,65,131,199,8,131,232,1,15,133, - 244,3,248,4,68,139,60,36,139,3,15,182,204,15,182,232,131,195,4,193,232,16, - 65,252,255,36,252,238,248,5,139,124,36,16,137,151,233,137,252,238,137,194, - 137,252,253,137,92,36,20,232,251,1,30,139,149,233,15,182,75,252,253,252,233, - 244,1,248,7,128,165,233,235,65,139,134,233,65,137,174,233,255,137,133,233, - 252,233,244,2,255,3,68,36,4,255,129,124,253,202,4,239,139,44,202,15,133,244, - 51,141,84,202,8,137,90,252,252,139,157,233,139,11,15,182,252,233,15,182,205, - 131,195,4,65,252,255,36,252,238,255,141,76,202,8,65,137,215,139,105,252,248, - 129,121,253,252,252,239,15,133,244,28,248,52,139,90,252,252,252,247,195,237, - 15,133,244,253,248,1,137,106,252,248,137,68,36,4,131,232,1,15,132,244,249, - 248,2,139,41,65,137,47,139,105,4,65,137,111,4,65,131,199,8,131,193,8,131, - 232,1,15,133,244,2,139,106,252,248,248,3,139,68,36,4,128,189,233,1,15,135, - 244,251,248,4,139,157,233,139,11,15,182,252,233,15,182,205,131,195,4,65,252, - 255,36,252,238,248,5,255,252,247,195,237,15,133,244,4,15,182,75,252,253,72, - 252,247,209,141,12,202,68,139,121,252,248,69,139,191,233,69,139,191,233,252, - 233,244,4,248,7,15,139,244,1,131,227,252,248,41,218,65,137,215,139,90,252, - 252,252,233,244,1,255,141,76,202,8,139,105,232,139,65,252,236,137,41,137, - 65,4,139,105,252,240,139,65,252,244,137,105,8,137,65,12,139,105,224,139,65, - 228,137,105,252,248,137,65,252,252,129,252,248,239,184,237,15,133,244,28, - 137,202,137,90,252,252,139,157,233,139,11,15,182,252,233,15,182,205,131,195, - 4,65,252,255,36,252,238,255,15,182,252,236,139,66,252,248,141,12,202,139, - 128,233,15,182,128,233,68,137,60,36,68,141,188,253,194,233,68,43,122,252, - 252,133,252,237,15,132,244,251,141,108,252,233,252,248,65,57,215,15,131,244, - 248,248,1,65,139,71,252,248,137,1,65,139,71,252,252,65,131,199,8,137,65,4, - 131,193,8,57,252,233,15,131,244,249,65,57,215,15,130,244,1,248,2,199,65,4, - 237,131,193,8,57,252,233,15,130,244,2,248,3,68,139,60,36,139,3,15,182,204, - 15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,5,199,68,36,4,1, - 0,0,0,137,208,68,41,252,248,15,134,244,3,255,137,197,193,252,237,3,131,197, - 1,137,108,36,4,139,108,36,16,1,200,59,133,233,15,135,244,253,248,6,65,139, - 71,252,248,137,1,65,139,71,252,252,65,131,199,8,137,65,4,131,193,8,65,57, - 215,15,130,244,6,252,233,244,3,248,7,137,149,233,137,141,233,137,92,36,20, - 65,41,215,139,116,36,4,131,252,238,1,137,252,239,232,251,1,0,139,149,233, - 139,141,233,65,1,215,252,233,244,6,255,193,225,3,255,248,1,139,90,252,252, - 137,68,36,4,252,247,195,237,15,133,244,253,255,248,13,65,137,215,131,232, - 1,15,132,244,249,248,2,65,139,44,15,65,137,111,252,248,65,139,108,15,4,65, - 137,111,252,252,65,131,199,8,131,232,1,15,133,244,2,248,3,139,68,36,4,15, - 182,107,252,255,248,5,57,197,15,135,244,252,255,139,108,10,4,137,106,252, - 252,139,44,10,137,106,252,248,255,248,5,56,67,252,255,15,135,244,252,255, - 15,182,75,252,253,72,252,247,209,141,20,202,68,139,122,252,248,69,139,191, - 233,69,139,191,233,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252, - 255,36,252,238,248,6,255,65,199,71,252,252,237,65,131,199,8,255,199,68,194, - 252,244,237,255,131,192,1,252,233,244,5,248,7,15,139,244,14,131,227,252,248, - 41,218,255,1,217,255,137,221,209,252,237,129,229,239,102,65,131,172,253,46, - 233,1,15,132,244,140,255,141,12,202,255,129,121,253,4,239,15,135,244,53,129, - 121,253,12,239,15,135,244,53,255,139,105,20,255,129,252,253,239,15,135,244, - 53,255,252,242,15,16,1,252,242,15,16,73,8,255,252,242,15,88,65,16,252,242, - 15,17,1,133,252,237,15,136,244,249,255,15,140,244,249,255,102,15,46,200,248, - 1,252,242,15,17,65,24,255,221,65,8,221,1,255,220,65,16,221,17,221,81,24,133, - 252,237,15,136,244,247,255,221,81,24,15,140,244,247,255,217,201,248,1,255, - 15,183,67,252,254,255,15,131,244,248,141,156,253,131,233,255,141,156,253, - 131,233,15,183,67,252,254,15,131,245,255,15,130,244,248,141,156,253,131,233, - 255,248,3,102,15,46,193,252,233,244,1,255,141,12,202,139,105,4,129,252,253, - 239,15,132,244,247,255,137,105,252,252,139,41,137,105,252,248,252,233,245, - 255,141,156,253,131,233,139,1,137,105,252,252,137,65,252,248,255,65,139,142, - 233,139,4,129,72,139,128,233,139,108,36,16,65,137,150,233,65,137,174,233, - 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,68,139,187,233,139,108,36,16,141,12, - 202,59,141,233,15,135,244,23,15,182,139,233,57,200,15,134,244,249,248,2,255, - 15,183,67,252,254,252,233,245,255,248,3,199,68,194,252,252,237,131,192,1, - 57,200,15,134,244,3,252,233,244,2,255,141,44,197,237,141,4,194,68,139,122, - 252,248,137,104,252,252,68,137,120,252,248,139,108,36,16,141,12,200,59,141, - 233,15,135,244,22,137,209,137,194,15,182,171,233,133,252,237,15,132,244,248, - 248,1,131,193,8,57,209,15,131,244,249,68,139,121,252,248,68,137,56,68,139, - 121,252,252,68,137,120,4,131,192,8,199,65,252,252,237,131,252,237,1,15,133, - 244,1,248,2,255,68,139,187,233,139,3,15,182,204,15,182,232,131,195,4,193, - 232,16,65,252,255,36,252,238,255,248,3,199,64,4,237,131,192,8,131,252,237, - 1,15,133,244,3,252,233,244,2,255,139,106,252,248,76,139,189,233,139,108,36, - 16,141,68,194,252,248,137,149,233,141,136,233,59,141,233,137,133,233,255, - 137,252,239,255,76,137,252,254,137,252,239,255,15,135,244,21,65,199,134,233, - 237,255,65,252,255,215,255,65,252,255,150,233,255,65,199,134,233,237,139, - 149,233,141,12,194,252,247,217,3,141,233,139,90,252,252,252,233,244,12,255, - 254,0 + 131,189,233,0,15,132,244,1,255,139,141,233,252,246,129,233,235,15,132,244, + 38,15,182,75,252,253,252,233,244,1,248,7,128,165,233,235,65,139,142,233,65, + 137,174,233,137,141,233,15,182,75,252,253,252,233,244,2,255,68,137,60,36, + 255,248,1,141,12,202,139,105,252,248,252,246,133,233,235,15,133,244,253,248, + 2,139,68,36,4,255,252,242,68,15,45,252,248,255,131,232,1,15,132,244,250,68, + 1,252,248,59,133,233,15,131,244,251,68,41,252,248,65,193,231,3,68,3,189,233, + 248,3,139,41,65,137,47,139,105,4,131,193,8,65,137,111,4,65,131,199,8,131, + 232,1,15,133,244,3,248,4,68,139,60,36,139,3,15,182,204,15,182,232,131,195, + 4,193,232,16,65,252,255,36,252,238,248,5,139,124,36,16,137,151,233,137,252, + 238,137,194,137,252,253,137,92,36,20,232,251,1,31,139,149,233,15,182,75,252, + 253,252,233,244,1,248,7,128,165,233,235,65,139,134,233,65,137,174,233,255, + 137,133,233,252,233,244,2,255,3,68,36,4,255,129,124,253,202,4,239,139,44, + 202,15,133,244,51,141,84,202,8,137,90,252,252,139,157,233,139,11,15,182,252, + 233,15,182,205,131,195,4,65,252,255,36,252,238,255,141,76,202,8,65,137,215, + 139,105,252,248,129,121,253,252,252,239,15,133,244,28,248,52,139,90,252,252, + 252,247,195,237,15,133,244,253,248,1,137,106,252,248,137,68,36,4,131,232, + 1,15,132,244,249,248,2,139,41,65,137,47,139,105,4,65,137,111,4,65,131,199, + 8,131,193,8,131,232,1,15,133,244,2,139,106,252,248,248,3,139,68,36,4,128, + 189,233,1,15,135,244,251,248,4,139,157,233,139,11,15,182,252,233,15,182,205, + 131,195,4,65,252,255,36,252,238,248,5,255,252,247,195,237,15,133,244,4,15, + 182,75,252,253,72,252,247,209,141,12,202,68,139,121,252,248,69,139,191,233, + 69,139,191,233,252,233,244,4,248,7,15,139,244,1,131,227,252,248,41,218,65, + 137,215,139,90,252,252,252,233,244,1,255,141,76,202,8,139,105,232,139,65, + 252,236,137,41,137,65,4,139,105,252,240,139,65,252,244,137,105,8,137,65,12, + 139,105,224,139,65,228,137,105,252,248,137,65,252,252,129,252,248,239,184, + 237,15,133,244,28,137,202,137,90,252,252,139,157,233,139,11,15,182,252,233, + 15,182,205,131,195,4,65,252,255,36,252,238,255,15,182,252,236,139,66,252, + 248,141,12,202,139,128,233,15,182,128,233,68,137,60,36,68,141,188,253,194, + 233,68,43,122,252,252,133,252,237,15,132,244,251,141,108,252,233,252,248, + 65,57,215,15,131,244,248,248,1,65,139,71,252,248,137,1,65,139,71,252,252, + 65,131,199,8,137,65,4,131,193,8,57,252,233,15,131,244,249,65,57,215,15,130, + 244,1,248,2,199,65,4,237,131,193,8,57,252,233,15,130,244,2,248,3,68,139,60, + 36,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238, + 248,5,199,68,36,4,1,0,0,0,137,208,68,41,252,248,15,134,244,3,255,137,197, + 193,252,237,3,131,197,1,137,108,36,4,139,108,36,16,1,200,59,133,233,15,135, + 244,253,248,6,65,139,71,252,248,137,1,65,139,71,252,252,65,131,199,8,137, + 65,4,131,193,8,65,57,215,15,130,244,6,252,233,244,3,248,7,137,149,233,137, + 141,233,137,92,36,20,65,41,215,139,116,36,4,131,252,238,1,137,252,239,232, + 251,1,0,139,149,233,139,141,233,65,1,215,252,233,244,6,255,193,225,3,255, + 248,1,139,90,252,252,137,68,36,4,252,247,195,237,15,133,244,253,255,248,13, + 65,137,215,131,232,1,15,132,244,249,248,2,65,139,44,15,65,137,111,252,248, + 65,139,108,15,4,65,137,111,252,252,65,131,199,8,131,232,1,15,133,244,2,248, + 3,139,68,36,4,15,182,107,252,255,248,5,57,197,15,135,244,252,255,139,108, + 10,4,137,106,252,252,139,44,10,137,106,252,248,255,248,5,56,67,252,255,15, + 135,244,252,255,15,182,75,252,253,72,252,247,209,141,20,202,68,139,122,252, + 248,69,139,191,233,69,139,191,233,139,3,15,182,204,15,182,232,131,195,4,193, + 232,16,65,252,255,36,252,238,248,6,255,65,199,71,252,252,237,65,131,199,8, + 255,199,68,194,252,244,237,255,131,192,1,252,233,244,5,248,7,15,139,244,14, + 131,227,252,248,41,218,255,1,217,255,137,221,209,252,237,129,229,239,102, + 65,131,172,253,46,233,1,15,132,244,140,255,141,12,202,255,129,121,253,4,239, + 15,135,244,53,129,121,253,12,239,15,135,244,53,255,139,105,20,255,129,252, + 253,239,15,135,244,53,255,252,242,15,16,1,252,242,15,16,73,8,255,252,242, + 15,88,65,16,252,242,15,17,1,133,252,237,15,136,244,249,255,15,140,244,249, + 255,102,15,46,200,248,1,252,242,15,17,65,24,255,221,65,8,221,1,255,220,65, + 16,221,17,221,81,24,133,252,237,15,136,244,247,255,221,81,24,15,140,244,247, + 255,217,201,248,1,255,15,183,67,252,254,255,15,131,244,248,141,156,253,131, + 233,255,141,156,253,131,233,15,183,67,252,254,15,131,245,255,15,130,244,248, + 141,156,253,131,233,255,248,3,102,15,46,193,252,233,244,1,255,141,12,202, + 139,105,4,129,252,253,239,15,132,244,247,255,137,105,252,252,139,41,137,105, + 252,248,252,233,245,255,141,156,253,131,233,139,1,137,105,252,252,137,65, + 252,248,255,65,139,142,233,139,4,129,72,139,128,233,139,108,36,16,65,137, + 150,233,65,137,174,233,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,68,139,187,233, + 139,108,36,16,141,12,202,59,141,233,15,135,244,23,15,182,139,233,57,200,15, + 134,244,249,248,2,255,15,183,67,252,254,252,233,245,255,248,3,199,68,194, + 252,252,237,131,192,1,57,200,15,134,244,3,252,233,244,2,255,141,44,197,237, + 141,4,194,68,139,122,252,248,137,104,252,252,68,137,120,252,248,139,108,36, + 16,141,12,200,59,141,233,15,135,244,22,137,209,137,194,15,182,171,233,133, + 252,237,15,132,244,248,248,1,131,193,8,57,209,15,131,244,249,68,139,121,252, + 248,68,137,56,68,139,121,252,252,68,137,120,4,131,192,8,199,65,252,252,237, + 131,252,237,1,15,133,244,1,248,2,255,68,139,187,233,139,3,15,182,204,15,182, + 232,131,195,4,193,232,16,65,252,255,36,252,238,255,248,3,199,64,4,237,131, + 192,8,131,252,237,1,15,133,244,3,252,233,244,2,255,139,106,252,248,76,139, + 189,233,139,108,36,16,141,68,194,252,248,137,149,233,141,136,233,59,141,233, + 137,133,233,255,137,252,239,255,76,137,252,254,137,252,239,255,15,135,244, + 21,65,199,134,233,237,255,65,252,255,215,255,65,252,255,150,233,255,65,199, + 134,233,237,139,149,233,141,12,194,252,247,217,3,141,233,139,90,252,252,252, + 233,244,12,255,254,0 }; enum { @@ -1004,6 +1004,7 @@ static const char *const extnames[] = { "lj_gc_step@4", "lj_dispatch_ins@8", "lj_dispatch_call@8", + "lj_err_throw@8", "lj_meta_cat", "lj_gc_barrieruv@8", "lj_func_closeuv@8", @@ -1350,63 +1351,63 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse) #if LJ_HASJIT dasm_put(Dst, 7257, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP); #endif - dasm_put(Dst, 7304); + dasm_put(Dst, 7315); if (!sse) { - dasm_put(Dst, 7307); + dasm_put(Dst, 7318); } - dasm_put(Dst, 7352, (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, 7363, (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, 7438); + dasm_put(Dst, 7449); } - dasm_put(Dst, 7483, (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, 7494, (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, 7569); + dasm_put(Dst, 7580); } - dasm_put(Dst, 7608, (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, 7619, (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, 7697, (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, 7708, (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, 7811); + dasm_put(Dst, 7822); } - dasm_put(Dst, 7858); + dasm_put(Dst, 7869); if (!sse) { } else { - dasm_put(Dst, 7935); + dasm_put(Dst, 7946); } - dasm_put(Dst, 7938); - dasm_put(Dst, 8023, (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, 8124, (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, 8298); + dasm_put(Dst, 7949); + dasm_put(Dst, 8034, (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, 8135, (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, 8309); if (sse) { - dasm_put(Dst, 8339); - dasm_put(Dst, 8409); - dasm_put(Dst, 8481); + dasm_put(Dst, 8350); + dasm_put(Dst, 8420); + dasm_put(Dst, 8492); } else { - dasm_put(Dst, 8533); - dasm_put(Dst, 8625); + dasm_put(Dst, 8544); + dasm_put(Dst, 8636); } - dasm_put(Dst, 8671); + dasm_put(Dst, 8682); if (sse) { - dasm_put(Dst, 8677, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); - dasm_put(Dst, 8762, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); + dasm_put(Dst, 8688, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); + dasm_put(Dst, 8773, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); } else { - dasm_put(Dst, 8890); - dasm_put(Dst, 8973); + dasm_put(Dst, 8901); + dasm_put(Dst, 8984); if (cmov) { - dasm_put(Dst, 9028); + dasm_put(Dst, 9039); } else { - dasm_put(Dst, 9047); + dasm_put(Dst, 9058); } - dasm_put(Dst, 8886); + dasm_put(Dst, 8897); } - dasm_put(Dst, 9088); + dasm_put(Dst, 9099); } /* 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, 9110, defop); + dasm_put(Dst, 9121, defop); switch (op) { @@ -1415,600 +1416,600 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) /* Remember: all ops branch for a true comparison, fall through otherwise. */ case BC_ISLT: case BC_ISGE: case BC_ISLE: case BC_ISGT: - dasm_put(Dst, 9112, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 9123, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9133); + dasm_put(Dst, 9144); } else { - dasm_put(Dst, 9148); + dasm_put(Dst, 9159); if (cmov) { - dasm_put(Dst, 9158); + dasm_put(Dst, 9169); } else { - dasm_put(Dst, 9164); + dasm_put(Dst, 9175); } } switch (op) { case BC_ISLT: - dasm_put(Dst, 9171); + dasm_put(Dst, 9182); break; case BC_ISGE: - dasm_put(Dst, 8968); + dasm_put(Dst, 8979); break; case BC_ISLE: dasm_put(Dst, 5914); break; case BC_ISGT: - dasm_put(Dst, 9176); + dasm_put(Dst, 9187); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 9181, -BCBIAS_J*4); + dasm_put(Dst, 9192, -BCBIAS_J*4); break; case BC_ISEQV: case BC_ISNEV: vk = op == BC_ISEQV; - dasm_put(Dst, 9216, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 9227, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9242); + dasm_put(Dst, 9253); } else { - dasm_put(Dst, 9254); + dasm_put(Dst, 9265); if (cmov) { - dasm_put(Dst, 9158); + dasm_put(Dst, 9169); } else { - dasm_put(Dst, 9164); + dasm_put(Dst, 9175); } } iseqne_fp: if (vk) { - dasm_put(Dst, 9261); + dasm_put(Dst, 9272); } else { - dasm_put(Dst, 9270); + dasm_put(Dst, 9281); } iseqne_end: if (vk) { - dasm_put(Dst, 9279, -BCBIAS_J*4); + dasm_put(Dst, 9290, -BCBIAS_J*4); } else { - dasm_put(Dst, 9294, -BCBIAS_J*4); + dasm_put(Dst, 9305, -BCBIAS_J*4); } - dasm_put(Dst, 7283); + dasm_put(Dst, 9206); if (op == BC_ISEQV || op == BC_ISNEV) { - dasm_put(Dst, 9309, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<metatable), Dt6(->nomm), 1<>32)); + dasm_put(Dst, 9614, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); } else { - dasm_put(Dst, 9628); + dasm_put(Dst, 9639); } - dasm_put(Dst, 7283); + dasm_put(Dst, 9206); break; case BC_LEN: - dasm_put(Dst, 9637, LJ_TSTR); + dasm_put(Dst, 9648, LJ_TSTR); if (sse) { - dasm_put(Dst, 9651, Dt5(->len)); + dasm_put(Dst, 9662, Dt5(->len)); } else { - dasm_put(Dst, 9669, Dt5(->len)); + dasm_put(Dst, 9680, Dt5(->len)); } - dasm_put(Dst, 9678, LJ_TTAB); + dasm_put(Dst, 9689, LJ_TTAB); if (sse) { - dasm_put(Dst, 9720); + dasm_put(Dst, 9731); } else { } - dasm_put(Dst, 9729); + dasm_put(Dst, 9740); break; /* -- Binary ops -------------------------------------------------------- */ case BC_ADDVN: case BC_ADDNV: case BC_ADDVV: - dasm_put(Dst, 9739); + dasm_put(Dst, 9750); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 9747, LJ_TISNUM); + dasm_put(Dst, 9758, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9759); + dasm_put(Dst, 9770); } else { - dasm_put(Dst, 9774); + dasm_put(Dst, 9785); } break; case 1: - dasm_put(Dst, 9783, LJ_TISNUM); + dasm_put(Dst, 9794, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9795); + dasm_put(Dst, 9806); } else { - dasm_put(Dst, 9810); + dasm_put(Dst, 9821); } break; default: - dasm_put(Dst, 9819, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 9830, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9841); + dasm_put(Dst, 9852); } else { - dasm_put(Dst, 9855); + dasm_put(Dst, 9866); } break; } if (sse) { - dasm_put(Dst, 9621); + dasm_put(Dst, 9632); } else { - dasm_put(Dst, 9633); + dasm_put(Dst, 9644); } - dasm_put(Dst, 7283); + dasm_put(Dst, 9206); break; case BC_SUBVN: case BC_SUBNV: case BC_SUBVV: - dasm_put(Dst, 9739); + dasm_put(Dst, 9750); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 9747, LJ_TISNUM); + dasm_put(Dst, 9758, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9863); + dasm_put(Dst, 9874); } else { - dasm_put(Dst, 9878); + dasm_put(Dst, 9889); } break; case 1: - dasm_put(Dst, 9783, LJ_TISNUM); + dasm_put(Dst, 9794, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9887); + dasm_put(Dst, 9898); } else { - dasm_put(Dst, 9902); + dasm_put(Dst, 9913); } break; default: - dasm_put(Dst, 9819, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 9830, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9911); + dasm_put(Dst, 9922); } else { - dasm_put(Dst, 9925); + dasm_put(Dst, 9936); } break; } if (sse) { - dasm_put(Dst, 9621); + dasm_put(Dst, 9632); } else { - dasm_put(Dst, 9633); + dasm_put(Dst, 9644); } - dasm_put(Dst, 7283); + dasm_put(Dst, 9206); break; case BC_MULVN: case BC_MULNV: case BC_MULVV: - dasm_put(Dst, 9739); + dasm_put(Dst, 9750); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 9747, LJ_TISNUM); + dasm_put(Dst, 9758, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9933); + dasm_put(Dst, 9944); } else { - dasm_put(Dst, 9948); + dasm_put(Dst, 9959); } break; case 1: - dasm_put(Dst, 9783, LJ_TISNUM); + dasm_put(Dst, 9794, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9957); + dasm_put(Dst, 9968); } else { - dasm_put(Dst, 9972); + dasm_put(Dst, 9983); } break; default: - dasm_put(Dst, 9819, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 9830, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9981); + dasm_put(Dst, 9992); } else { - dasm_put(Dst, 9995); + dasm_put(Dst, 10006); } break; } if (sse) { - dasm_put(Dst, 9621); + dasm_put(Dst, 9632); } else { - dasm_put(Dst, 9633); + dasm_put(Dst, 9644); } - dasm_put(Dst, 7283); + dasm_put(Dst, 9206); break; case BC_DIVVN: case BC_DIVNV: case BC_DIVVV: - dasm_put(Dst, 9739); + dasm_put(Dst, 9750); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 9747, LJ_TISNUM); + dasm_put(Dst, 9758, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10003); + dasm_put(Dst, 10014); } else { - dasm_put(Dst, 10018); + dasm_put(Dst, 10029); } break; case 1: - dasm_put(Dst, 9783, LJ_TISNUM); + dasm_put(Dst, 9794, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10027); + dasm_put(Dst, 10038); } else { - dasm_put(Dst, 10042); + dasm_put(Dst, 10053); } break; default: - dasm_put(Dst, 9819, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 9830, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10051); + dasm_put(Dst, 10062); } else { - dasm_put(Dst, 10065); + dasm_put(Dst, 10076); } break; } if (sse) { - dasm_put(Dst, 9621); + dasm_put(Dst, 9632); } else { - dasm_put(Dst, 9633); + dasm_put(Dst, 9644); } - dasm_put(Dst, 7283); + dasm_put(Dst, 9206); break; case BC_MODVN: - dasm_put(Dst, 9739); + dasm_put(Dst, 9750); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 9747, LJ_TISNUM); + dasm_put(Dst, 9758, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10073); + dasm_put(Dst, 10084); } else { - dasm_put(Dst, 10088); + dasm_put(Dst, 10099); } break; case 1: - dasm_put(Dst, 9783, LJ_TISNUM); + dasm_put(Dst, 9794, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10097); + dasm_put(Dst, 10108); } else { - dasm_put(Dst, 10112); + dasm_put(Dst, 10123); } break; default: - dasm_put(Dst, 9819, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 9830, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10121); + dasm_put(Dst, 10132); } else { - dasm_put(Dst, 10135); - } - break; - } - dasm_put(Dst, 10143); - if (sse) { - dasm_put(Dst, 9621); - } else { - dasm_put(Dst, 9633); - } - dasm_put(Dst, 7283); - break; - case BC_MODNV: case BC_MODVV: - dasm_put(Dst, 9739); - vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); - switch (vk) { - case 0: - dasm_put(Dst, 9747, LJ_TISNUM); - if (sse) { - dasm_put(Dst, 10073); - } else { - dasm_put(Dst, 10088); - } - break; - case 1: - dasm_put(Dst, 9783, LJ_TISNUM); - if (sse) { - dasm_put(Dst, 10097); - } else { - dasm_put(Dst, 10112); - } - break; - default: - dasm_put(Dst, 9819, LJ_TISNUM, LJ_TISNUM); - if (sse) { - dasm_put(Dst, 10121); - } else { - dasm_put(Dst, 10135); - } - break; - } - dasm_put(Dst, 10149); - break; - case BC_POW: - dasm_put(Dst, 9739); - vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); - switch (vk) { - case 0: - dasm_put(Dst, 9747, LJ_TISNUM); - if (sse) { - dasm_put(Dst, 10073); - } else { - dasm_put(Dst, 10088); - } - break; - case 1: - dasm_put(Dst, 9783, LJ_TISNUM); - if (sse) { - dasm_put(Dst, 10097); - } else { - dasm_put(Dst, 10112); - } - break; - default: - dasm_put(Dst, 9819, LJ_TISNUM, LJ_TISNUM); - if (sse) { - dasm_put(Dst, 10121); - } else { - dasm_put(Dst, 10135); + dasm_put(Dst, 10146); } break; } dasm_put(Dst, 10154); if (sse) { - dasm_put(Dst, 9621); + dasm_put(Dst, 9632); } else { - dasm_put(Dst, 9633); + dasm_put(Dst, 9644); } - dasm_put(Dst, 7283); + dasm_put(Dst, 9206); + break; + case BC_MODNV: case BC_MODVV: + dasm_put(Dst, 9750); + vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); + switch (vk) { + case 0: + dasm_put(Dst, 9758, LJ_TISNUM); + if (sse) { + dasm_put(Dst, 10084); + } else { + dasm_put(Dst, 10099); + } + break; + case 1: + dasm_put(Dst, 9794, LJ_TISNUM); + if (sse) { + dasm_put(Dst, 10108); + } else { + dasm_put(Dst, 10123); + } + break; + default: + dasm_put(Dst, 9830, LJ_TISNUM, LJ_TISNUM); + if (sse) { + dasm_put(Dst, 10132); + } else { + dasm_put(Dst, 10146); + } + break; + } + dasm_put(Dst, 10160); + break; + case BC_POW: + dasm_put(Dst, 9750); + vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); + switch (vk) { + case 0: + dasm_put(Dst, 9758, LJ_TISNUM); + if (sse) { + dasm_put(Dst, 10084); + } else { + dasm_put(Dst, 10099); + } + break; + case 1: + dasm_put(Dst, 9794, LJ_TISNUM); + if (sse) { + dasm_put(Dst, 10108); + } else { + dasm_put(Dst, 10123); + } + break; + default: + dasm_put(Dst, 9830, LJ_TISNUM, LJ_TISNUM); + if (sse) { + dasm_put(Dst, 10132); + } else { + dasm_put(Dst, 10146); + } + break; + } + dasm_put(Dst, 10165); + if (sse) { + dasm_put(Dst, 9632); + } else { + dasm_put(Dst, 9644); + } + dasm_put(Dst, 9206); break; case BC_CAT: - dasm_put(Dst, 10158, Dt1(->base), Dt1(->base)); + dasm_put(Dst, 10169, Dt1(->base), Dt1(->base)); break; /* -- Constant ops ------------------------------------------------------ */ case BC_KSTR: - dasm_put(Dst, 10249, LJ_TSTR); + dasm_put(Dst, 10260, LJ_TSTR); break; case BC_KSHORT: if (sse) { - dasm_put(Dst, 10286); + dasm_put(Dst, 10297); } else { - dasm_put(Dst, 10301); + dasm_put(Dst, 10312); } - dasm_put(Dst, 7283); + dasm_put(Dst, 9206); break; case BC_KNUM: if (sse) { - dasm_put(Dst, 10309); + dasm_put(Dst, 10320); } else { - dasm_put(Dst, 10323); + dasm_put(Dst, 10334); } - dasm_put(Dst, 7283); + dasm_put(Dst, 9206); break; case BC_KPRI: - dasm_put(Dst, 10331); + dasm_put(Dst, 10342); break; case BC_KNIL: - dasm_put(Dst, 10360, LJ_TNIL); + dasm_put(Dst, 10371, LJ_TNIL); break; /* -- Upvalue and function ops ------------------------------------------ */ case BC_UGET: - dasm_put(Dst, 10408, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 10419, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_USETV: #define TV2MARKOFS \ ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv)) - dasm_put(Dst, 10454, 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, 10550); + dasm_put(Dst, 10465, 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, 10561); break; #undef TV2MARKOFS case BC_USETS: - dasm_put(Dst, 10562, 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, 10573, 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, 10658); + dasm_put(Dst, 10669); if (sse) { - dasm_put(Dst, 10663); + dasm_put(Dst, 10674); } else { - dasm_put(Dst, 9437); + dasm_put(Dst, 9448); } - dasm_put(Dst, 10671, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 10682, offsetof(GCfuncL, uvptr), DtA(->v)); if (sse) { - dasm_put(Dst, 10680); + dasm_put(Dst, 10691); } else { - dasm_put(Dst, 10686); + dasm_put(Dst, 10697); } - dasm_put(Dst, 7283); + dasm_put(Dst, 9206); break; case BC_USETP: - dasm_put(Dst, 10689, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 10700, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_UCLO: - dasm_put(Dst, 10729, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 10740, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); break; case BC_FNEW: - dasm_put(Dst, 10785, Dt1(->base), Dt1(->base), LJ_TFUNC); + dasm_put(Dst, 10796, Dt1(->base), Dt1(->base), LJ_TFUNC); break; /* -- Table ops --------------------------------------------------------- */ case BC_TNEW: - dasm_put(Dst, 10852, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 10863, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); break; case BC_TDUP: - dasm_put(Dst, 10976, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 10987, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); break; case BC_GGET: - dasm_put(Dst, 11075, Dt7(->env)); + dasm_put(Dst, 11086, Dt7(->env)); break; case BC_GSET: - dasm_put(Dst, 11095, Dt7(->env)); + dasm_put(Dst, 11106, Dt7(->env)); break; case BC_TGETV: - dasm_put(Dst, 11115, LJ_TTAB, LJ_TISNUM); + dasm_put(Dst, 11126, LJ_TTAB, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11148); + dasm_put(Dst, 11159); } else { } - dasm_put(Dst, 11169, 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, 11367, 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, 11378, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable)); - dasm_put(Dst, 11659, Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 11585, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable)); + dasm_put(Dst, 11670, Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETS: - dasm_put(Dst, 11723, 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, 11800, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); - dasm_put(Dst, 11892, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 11734, 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, 11811, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); + dasm_put(Dst, 11903, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETB: - dasm_put(Dst, 11984, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); - dasm_put(Dst, 12084, Dt6(->metatable), Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 11995, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); + dasm_put(Dst, 12095, Dt6(->metatable), Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETM: - dasm_put(Dst, 12132); + dasm_put(Dst, 12143); if (sse) { - dasm_put(Dst, 10663); + dasm_put(Dst, 10674); } else { } - dasm_put(Dst, 12137, Dt6(->marked), LJ_GC_BLACK); + dasm_put(Dst, 12148, Dt6(->marked), LJ_GC_BLACK); if (sse) { - dasm_put(Dst, 12162); + dasm_put(Dst, 12173); } else { } - dasm_put(Dst, 12170, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain)); - dasm_put(Dst, 12306, Dt6(->gclist)); + dasm_put(Dst, 12181, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain)); + dasm_put(Dst, 12317, Dt6(->gclist)); break; /* -- Calls and vararg handling ----------------------------------------- */ case BC_CALL: case BC_CALLM: - dasm_put(Dst, 9743); + dasm_put(Dst, 9754); if (op == BC_CALLM) { - dasm_put(Dst, 12314); + dasm_put(Dst, 12325); } - dasm_put(Dst, 12319, LJ_TFUNC, Dt7(->pc)); + dasm_put(Dst, 12330, LJ_TFUNC, Dt7(->pc)); break; case BC_CALLMT: - dasm_put(Dst, 12314); + dasm_put(Dst, 12325); break; case BC_CALLT: - dasm_put(Dst, 12362, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); - dasm_put(Dst, 12486, FRAME_TYPE, Dt7(->pc), PC2PROTO(k)); + dasm_put(Dst, 12373, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); + dasm_put(Dst, 12497, FRAME_TYPE, Dt7(->pc), PC2PROTO(k)); break; case BC_ITERC: - dasm_put(Dst, 12547, LJ_TFUNC, 2+1, Dt7(->pc)); + dasm_put(Dst, 12558, LJ_TFUNC, 2+1, Dt7(->pc)); break; case BC_VARG: - dasm_put(Dst, 12629, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL); - dasm_put(Dst, 12783, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 12640, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL); + dasm_put(Dst, 12794, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); break; /* -- Returns ----------------------------------------------------------- */ case BC_RETM: - dasm_put(Dst, 12314); + dasm_put(Dst, 12325); break; case BC_RET: case BC_RET0: case BC_RET1: if (op != BC_RET0) { - dasm_put(Dst, 12888); + dasm_put(Dst, 12899); } - dasm_put(Dst, 12892, FRAME_TYPE); + dasm_put(Dst, 12903, FRAME_TYPE); switch (op) { case BC_RET: - dasm_put(Dst, 12911); + dasm_put(Dst, 12922); break; case BC_RET1: - dasm_put(Dst, 12975); + dasm_put(Dst, 12986); /* fallthrough */ case BC_RET0: - dasm_put(Dst, 12991); + dasm_put(Dst, 13002); default: break; } - dasm_put(Dst, 13002, Dt7(->pc), PC2PROTO(k)); + dasm_put(Dst, 13013, Dt7(->pc), PC2PROTO(k)); if (op == BC_RET) { - dasm_put(Dst, 13050, LJ_TNIL); - } else { dasm_put(Dst, 13061, LJ_TNIL); + } else { + dasm_put(Dst, 13072, LJ_TNIL); } - dasm_put(Dst, 13068); + dasm_put(Dst, 13079); if (op != BC_RET0) { - dasm_put(Dst, 13088); + dasm_put(Dst, 13099); } dasm_put(Dst, 4568); break; @@ -2018,7 +2019,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORL: #if LJ_HASJIT - dasm_put(Dst, 13091, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 13102, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2030,57 +2031,57 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORI: case BC_IFORL: vk = (op == BC_IFORL || op == BC_JFORL); - dasm_put(Dst, 13112); + dasm_put(Dst, 13123); if (!vk) { - dasm_put(Dst, 13116, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 13127, LJ_TISNUM, LJ_TISNUM); } - dasm_put(Dst, 13135); + dasm_put(Dst, 13146); if (!vk) { - dasm_put(Dst, 13139, LJ_TISNUM); + dasm_put(Dst, 13150, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 13148); + dasm_put(Dst, 13159); if (vk) { - dasm_put(Dst, 13160); + dasm_put(Dst, 13171); } else { - dasm_put(Dst, 13179); + dasm_put(Dst, 13190); } - dasm_put(Dst, 13184); + dasm_put(Dst, 13195); } else { - dasm_put(Dst, 13197); + dasm_put(Dst, 13208); if (vk) { - dasm_put(Dst, 13203); + dasm_put(Dst, 13214); } else { - dasm_put(Dst, 13219); + dasm_put(Dst, 13230); } - dasm_put(Dst, 13227); + dasm_put(Dst, 13238); if (cmov) { - dasm_put(Dst, 9158); + dasm_put(Dst, 9169); } else { - dasm_put(Dst, 9164); + dasm_put(Dst, 9175); } if (!cmov) { - dasm_put(Dst, 13232); + dasm_put(Dst, 13243); } } if (op == BC_FORI) { - dasm_put(Dst, 13238, -BCBIAS_J*4); + dasm_put(Dst, 13249, -BCBIAS_J*4); } else if (op == BC_JFORI) { - dasm_put(Dst, 13248, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 13259, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 13262, -BCBIAS_J*4); + dasm_put(Dst, 13273, -BCBIAS_J*4); } else { - dasm_put(Dst, 13258, BC_JLOOP); + dasm_put(Dst, 13269, BC_JLOOP); } - dasm_put(Dst, 9193); + dasm_put(Dst, 9204); if (sse) { - dasm_put(Dst, 13272); + dasm_put(Dst, 13283); } break; case BC_ITERL: #if LJ_HASJIT - dasm_put(Dst, 13091, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 13102, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2089,33 +2090,33 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IITERL: - dasm_put(Dst, 13283, LJ_TNIL); + dasm_put(Dst, 13294, LJ_TNIL); if (op == BC_JITERL) { - dasm_put(Dst, 13298, BC_JLOOP); + dasm_put(Dst, 13309, BC_JLOOP); } else { - dasm_put(Dst, 13312, -BCBIAS_J*4); + dasm_put(Dst, 13323, -BCBIAS_J*4); } - dasm_put(Dst, 9497); + dasm_put(Dst, 9508); break; case BC_LOOP: #if LJ_HASJIT - dasm_put(Dst, 13091, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 13102, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; case BC_ILOOP: - dasm_put(Dst, 7283); + dasm_put(Dst, 9206); break; case BC_JLOOP: #if LJ_HASJIT - dasm_put(Dst, 13328, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); + dasm_put(Dst, 13339, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); #endif break; case BC_JMP: - dasm_put(Dst, 13355, -BCBIAS_J*4); + dasm_put(Dst, 13366, -BCBIAS_J*4); break; /* -- Function headers -------------------------------------------------- */ @@ -2138,13 +2139,13 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IFUNCF: - dasm_put(Dst, 13381, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); + dasm_put(Dst, 13392, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); if (op == BC_JFUNCF) { - dasm_put(Dst, 13412, BC_JLOOP); + dasm_put(Dst, 13423, BC_JLOOP); } else { - dasm_put(Dst, 7283); + dasm_put(Dst, 9206); } - dasm_put(Dst, 13421, LJ_TNIL); + dasm_put(Dst, 13432, LJ_TNIL); break; case BC_JFUNCV: @@ -2155,30 +2156,30 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; /* NYI: compiled vararg functions. */ case BC_IFUNCV: - dasm_put(Dst, 13443, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); + dasm_put(Dst, 13454, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); if (op == BC_JFUNCV) { - dasm_put(Dst, 13412, BC_JLOOP); + dasm_put(Dst, 13423, BC_JLOOP); } else { - dasm_put(Dst, 13540, -4+PC2PROTO(k)); + dasm_put(Dst, 13551, -4+PC2PROTO(k)); } - dasm_put(Dst, 13565, LJ_TNIL); + dasm_put(Dst, 13576, LJ_TNIL); break; case BC_FUNCC: case BC_FUNCCW: - dasm_put(Dst, 13587, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); + dasm_put(Dst, 13598, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); if (op == BC_FUNCC) { - dasm_put(Dst, 13617); + dasm_put(Dst, 13628); } else { - dasm_put(Dst, 13621); + dasm_put(Dst, 13632); } - dasm_put(Dst, 13629, DISPATCH_GL(vmstate), ~LJ_VMST_C); + dasm_put(Dst, 13640, DISPATCH_GL(vmstate), ~LJ_VMST_C); if (op == BC_FUNCC) { - dasm_put(Dst, 13639); + dasm_put(Dst, 13650); } else { - dasm_put(Dst, 13644, DISPATCH_GL(wrapf)); + dasm_put(Dst, 13655, DISPATCH_GL(wrapf)); } - dasm_put(Dst, 13650, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 13661, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); break; /* ---------------------------------------------------------------------- */ @@ -2206,7 +2207,7 @@ static int build_backend(BuildCtx *ctx) build_subroutines(ctx, cmov, sse); - dasm_put(Dst, 13676); + dasm_put(Dst, 13687); 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 742cf19b..362d993f 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[13490] = { +static const unsigned char build_actionlist[13501] = { 254,1,248,10,252,247,198,237,15,132,244,11,131,230,252,248,41,252,242,72, 141,76,49,252,248,139,114,252,252,199,68,10,4,237,248,12,131,192,1,137,68, 36,84,252,247,198,237,15,132,244,13,248,14,252,247,198,237,15,132,244,10, @@ -366,308 +366,309 @@ static const unsigned char build_actionlist[13490] = { 133,233,41,208,72,137,205,15,182,78,252,253,193,232,3,131,192,1,252,255,229, 248,143,255,248,144,255,139,122,252,248,139,191,233,139,191,233,199,131,233, 0,0,0,0,199,131,233,237,139,6,15,182,204,15,182,232,131,198,4,193,232,16, - 252,255,36,252,235,255,248,82,255,217,124,36,4,137,68,36,8,102,184,0,4,102, - 11,68,36,4,102,37,252,255,252,247,102,137,68,36,6,217,108,36,6,217,252,252, - 217,108,36,4,139,68,36,8,195,255,248,145,72,184,237,237,102,72,15,110,208, - 72,184,237,237,102,72,15,110,216,15,40,200,102,15,84,202,102,15,46,217,15, - 134,244,247,102,15,85,208,252,242,15,88,203,252,242,15,92,203,102,15,86,202, - 72,184,237,237,102,72,15,110,208,252,242,15,194,193,1,102,15,84,194,252,242, - 15,92,200,15,40,193,248,1,195,248,84,255,217,124,36,4,137,68,36,8,102,184, - 0,8,102,11,68,36,4,102,37,252,255,252,251,102,137,68,36,6,217,108,36,6,217, - 252,252,217,108,36,4,139,68,36,8,195,255,248,146,72,184,237,237,102,72,15, - 110,208,72,184,237,237,102,72,15,110,216,15,40,200,102,15,84,202,102,15,46, - 217,15,134,244,247,102,15,85,208,252,242,15,88,203,252,242,15,92,203,102, - 15,86,202,72,184,237,237,102,72,15,110,208,252,242,15,194,193,6,102,15,84, - 194,252,242,15,92,200,15,40,193,248,1,195,248,104,255,217,124,36,4,137,68, - 36,8,102,184,0,12,102,11,68,36,4,102,137,68,36,6,217,108,36,6,217,252,252, - 217,108,36,4,139,68,36,8,195,255,248,147,72,184,237,237,102,72,15,110,208, - 72,184,237,237,102,72,15,110,216,15,40,200,102,15,84,202,102,15,46,217,15, - 134,244,247,102,15,85,208,15,40,193,252,242,15,88,203,252,242,15,92,203,72, - 184,237,237,102,72,15,110,216,252,242,15,194,193,1,102,15,84,195,252,242, - 15,92,200,102,15,86,202,15,40,193,248,1,195,248,148,255,15,40,232,252,242, - 15,94,193,72,184,237,237,102,72,15,110,208,72,184,237,237,102,72,15,110,216, - 15,40,224,102,15,84,226,102,15,46,220,15,134,244,247,102,15,85,208,252,242, - 15,88,227,252,242,15,92,227,102,15,86,226,72,184,237,237,102,72,15,110,208, - 252,242,15,194,196,1,102,15,84,194,252,242,15,92,224,15,40,197,252,242,15, - 89,204,252,242,15,92,193,195,248,1,252,242,15,89,200,15,40,197,252,242,15, - 92,193,195,255,217,193,216,252,241,217,124,36,4,102,184,0,4,102,11,68,36, - 4,102,37,252,255,252,247,102,137,68,36,6,217,108,36,6,217,252,252,217,108, - 36,4,222,201,222,252,233,195,255,248,88,217,252,234,222,201,248,149,217,84, - 36,8,129,124,36,8,0,0,128,127,15,132,244,247,129,124,36,8,0,0,128,252,255, - 15,132,244,248,248,150,217,192,217,252,252,220,252,233,217,201,217,252,240, - 217,232,222,193,217,252,253,221,217,248,1,195,248,2,221,216,217,252,238,195, - 255,248,107,255,248,151,252,242,15,45,193,252,242,15,42,208,102,15,46,202, - 15,133,244,254,15,138,244,255,248,152,131,252,248,1,15,142,244,252,248,1, - 169,1,0,0,0,15,133,244,248,252,242,15,89,192,209,232,252,233,244,1,248,2, - 209,232,15,132,244,251,15,40,200,248,3,252,242,15,89,192,209,232,15,132,244, - 250,15,131,244,3,255,252,242,15,89,200,252,233,244,3,248,4,252,242,15,89, - 193,248,5,195,248,6,15,132,244,5,15,130,244,253,80,72,184,237,237,102,72, - 15,110,200,252,242,15,94,200,88,15,40,193,252,247,216,131,252,248,1,15,132, - 244,5,252,233,244,1,248,7,72,184,237,237,102,72,15,110,192,195,248,8,102, - 72,15,126,200,72,209,224,72,193,192,12,72,61,252,254,15,0,0,15,132,244,248, - 255,102,72,15,126,192,72,209,224,15,132,244,250,72,193,192,12,72,61,252,254, - 15,0,0,15,132,244,251,252,242,15,17,76,36,16,252,242,15,17,68,36,8,221,68, - 36,16,221,68,36,8,217,252,241,217,192,217,252,252,220,252,233,217,201,217, - 252,240,217,232,222,193,217,252,253,221,217,221,92,36,8,252,242,15,16,68, - 36,8,195,248,9,72,184,237,237,102,72,15,110,208,102,15,46,194,15,132,244, - 247,15,40,193,248,1,195,248,2,72,184,237,237,102,72,15,110,208,102,15,84, - 194,72,184,237,237,102,72,15,110,208,102,15,46,194,15,132,244,1,102,15,80, - 193,15,87,192,136,196,15,146,208,48,224,15,133,244,1,248,3,72,184,237,237, - 255,102,72,15,110,192,195,248,4,102,15,80,193,133,192,15,133,244,3,15,87, - 192,195,248,5,102,15,80,193,133,192,15,132,244,3,15,87,192,195,248,153,255, - 131,252,250,1,15,130,244,82,15,132,244,84,131,252,250,3,15,130,244,104,15, - 135,244,248,252,242,15,81,192,195,248,2,252,242,15,17,68,36,8,221,68,36,8, - 131,252,250,5,15,135,244,248,88,15,132,244,247,232,244,88,80,252,233,244, - 253,248,1,232,244,149,255,80,252,233,244,253,248,2,131,252,250,7,15,132,244, - 247,15,135,244,248,217,252,237,217,201,217,252,241,252,233,244,253,248,1, - 217,232,217,201,217,252,241,252,233,244,253,248,2,131,252,250,9,15,132,244, - 247,15,135,244,248,217,252,236,217,201,217,252,241,252,233,244,253,248,1, - 255,217,252,254,252,233,244,253,248,2,131,252,250,11,15,132,244,247,15,135, - 244,255,217,252,255,252,233,244,253,248,1,217,252,242,221,216,248,7,221,92, - 36,8,252,242,15,16,68,36,8,195,255,139,84,36,12,221,68,36,4,131,252,250,1, - 15,130,244,82,15,132,244,84,131,252,250,3,15,130,244,104,15,135,244,248,217, - 252,250,195,248,2,131,252,250,5,15,130,244,88,15,132,244,149,131,252,250, - 7,15,132,244,247,15,135,244,248,217,252,237,217,201,217,252,241,195,248,1, - 217,232,217,201,217,252,241,195,248,2,131,252,250,9,15,132,244,247,255,15, - 135,244,248,217,252,236,217,201,217,252,241,195,248,1,217,252,254,195,248, - 2,131,252,250,11,15,132,244,247,15,135,244,255,217,252,255,195,248,1,217, - 252,242,221,216,195,255,248,9,204,248,154,255,65,131,252,248,1,15,132,244, - 247,15,135,244,248,252,242,15,88,193,195,248,1,252,242,15,92,193,195,248, - 2,65,131,252,248,3,15,132,244,247,15,135,244,248,252,242,15,89,193,195,248, - 1,252,242,15,94,193,195,248,2,65,131,252,248,5,15,130,244,148,15,132,244, - 107,65,131,252,248,7,15,132,244,247,15,135,244,248,72,184,237,237,255,102, - 72,15,110,200,15,87,193,195,248,1,72,184,237,237,102,72,15,110,200,15,84, - 193,195,248,2,65,131,252,248,9,15,135,244,248,252,242,15,17,68,36,8,252,242, - 15,17,76,36,16,221,68,36,8,221,68,36,16,15,132,244,247,217,252,243,248,7, - 221,92,36,8,252,242,15,16,68,36,8,195,248,1,217,201,217,252,253,221,217,252, - 233,244,7,248,2,65,131,252,248,11,15,132,244,247,15,135,244,255,252,242,15, - 93,193,195,248,1,252,242,15,95,193,195,248,9,204,255,139,68,36,20,221,68, - 36,4,221,68,36,12,131,252,248,1,15,132,244,247,15,135,244,248,222,193,195, - 248,1,222,252,233,195,248,2,131,252,248,3,15,132,244,247,15,135,244,248,222, - 201,195,248,1,222,252,249,195,248,2,131,252,248,5,15,130,244,148,15,132,244, - 107,131,252,248,7,15,132,244,247,15,135,244,248,255,221,216,217,224,195,248, - 1,221,216,217,225,195,248,2,131,252,248,9,15,132,244,247,15,135,244,248,217, - 252,243,195,248,1,217,201,217,252,253,221,217,195,248,2,131,252,248,11,15, - 132,244,247,15,135,244,255,255,219,252,233,219,209,221,217,195,248,1,219, - 252,233,218,209,221,217,195,255,221,225,223,224,252,246,196,1,15,132,244, - 248,217,201,248,2,221,216,195,248,1,221,225,223,224,252,246,196,1,15,133, - 244,248,217,201,248,2,221,216,195,255,248,155,137,200,86,72,137,214,83,15, - 162,137,6,137,94,4,137,78,8,137,86,12,91,94,195,255,249,255,129,124,253,202, - 4,239,15,135,244,41,129,124,253,194,4,239,15,135,244,41,255,252,242,15,16, - 4,194,131,198,4,102,15,46,4,202,255,221,4,202,221,4,194,131,198,4,255,223, - 252,233,221,216,255,218,252,233,223,224,158,255,15,134,244,248,255,15,131, - 244,248,255,248,1,15,183,70,252,254,141,180,253,134,233,248,2,139,6,15,182, - 204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,139,108,194,4, - 131,198,4,129,252,253,239,15,135,244,251,129,124,253,202,4,239,15,135,244, - 251,255,252,242,15,16,4,194,102,15,46,4,202,255,221,4,202,221,4,194,255,15, - 138,244,248,15,133,244,248,255,15,138,244,248,15,132,244,247,255,248,1,15, - 183,70,252,254,141,180,253,134,233,248,2,255,248,2,15,183,70,252,254,141, - 180,253,134,233,248,1,255,248,5,57,108,202,4,15,133,244,2,129,252,253,239, - 15,131,244,1,139,12,202,139,4,194,57,193,15,132,244,1,129,252,253,239,15, - 135,244,2,139,169,233,133,252,237,15,132,244,2,252,246,133,233,235,15,133, - 244,2,255,49,252,237,255,189,1,0,0,0,255,252,233,244,45,255,72,252,247,208, - 131,198,4,129,124,253,202,4,239,15,133,244,248,139,12,202,59,12,135,255,131, - 198,4,129,124,253,202,4,239,15,135,244,248,255,252,242,15,16,4,199,102,15, - 46,4,202,255,221,4,202,221,4,199,255,72,252,247,208,131,198,4,57,68,202,4, - 255,139,108,194,4,131,198,4,129,252,253,239,255,15,131,244,247,255,15,130, - 244,247,255,137,108,202,4,139,44,194,137,44,202,255,15,183,70,252,254,141, - 180,253,134,233,248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, - 255,36,252,235,255,139,108,194,4,139,4,194,137,108,202,4,137,4,202,139,6, - 15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,49,252, - 237,129,124,253,194,4,239,129,213,239,137,108,202,4,139,6,15,182,204,15,182, - 232,131,198,4,193,232,16,252,255,36,252,235,255,129,124,253,194,4,239,15, - 135,244,48,255,252,242,15,16,4,194,72,184,237,237,102,72,15,110,200,15,87, - 193,252,242,15,17,4,202,255,221,4,194,217,224,221,28,202,255,129,124,253, - 194,4,239,15,133,244,248,139,4,194,255,15,87,192,252,242,15,42,128,233,248, - 1,252,242,15,17,4,202,255,219,128,233,248,1,221,28,202,255,139,6,15,182,204, - 15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,2,129,124,253,194, - 4,239,15,133,244,50,139,12,194,137,213,232,251,1,18,255,252,242,15,42,192, - 137,252,234,255,15,182,78,252,253,252,233,244,1,255,15,182,252,236,15,182, - 192,255,129,124,253,252,234,4,239,15,135,244,46,255,252,242,15,16,4,252,234, - 252,242,15,88,4,199,255,221,4,252,234,220,4,199,255,129,124,253,252,234,4, - 239,15,135,244,47,255,252,242,15,16,4,199,252,242,15,88,4,252,234,255,221, - 4,199,220,4,252,234,255,129,124,253,252,234,4,239,15,135,244,49,129,124,253, - 194,4,239,15,135,244,49,255,252,242,15,16,4,252,234,252,242,15,88,4,194,255, - 221,4,252,234,220,4,194,255,252,242,15,16,4,252,234,252,242,15,92,4,199,255, - 221,4,252,234,220,36,199,255,252,242,15,16,4,199,252,242,15,92,4,252,234, - 255,221,4,199,220,36,252,234,255,252,242,15,16,4,252,234,252,242,15,92,4, - 194,255,221,4,252,234,220,36,194,255,252,242,15,16,4,252,234,252,242,15,89, - 4,199,255,221,4,252,234,220,12,199,255,252,242,15,16,4,199,252,242,15,89, - 4,252,234,255,221,4,199,220,12,252,234,255,252,242,15,16,4,252,234,252,242, - 15,89,4,194,255,221,4,252,234,220,12,194,255,252,242,15,16,4,252,234,252, - 242,15,94,4,199,255,221,4,252,234,220,52,199,255,252,242,15,16,4,199,252, - 242,15,94,4,252,234,255,221,4,199,220,52,252,234,255,252,242,15,16,4,252, - 234,252,242,15,94,4,194,255,221,4,252,234,220,52,194,255,252,242,15,16,4, - 252,234,252,242,15,16,12,199,255,221,4,252,234,221,4,199,255,252,242,15,16, - 4,199,252,242,15,16,12,252,234,255,221,4,199,221,4,252,234,255,252,242,15, - 16,4,252,234,252,242,15,16,12,194,255,221,4,252,234,221,4,194,255,248,156, - 232,244,148,255,252,233,244,156,255,232,244,107,255,15,182,252,236,15,182, - 192,139,76,36,96,137,145,233,141,20,194,65,137,192,65,41,232,248,33,137,205, - 137,116,36,100,232,251,1,22,139,149,233,133,192,15,133,244,42,15,182,110, - 252,255,15,182,78,252,253,139,68,252,234,4,139,44,252,234,137,68,202,4,137, + 252,255,36,252,235,248,1,137,252,233,137,194,232,251,1,22,255,248,82,255, + 217,124,36,4,137,68,36,8,102,184,0,4,102,11,68,36,4,102,37,252,255,252,247, + 102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,139,68,36,8,195,255, + 248,145,72,184,237,237,102,72,15,110,208,72,184,237,237,102,72,15,110,216, + 15,40,200,102,15,84,202,102,15,46,217,15,134,244,247,102,15,85,208,252,242, + 15,88,203,252,242,15,92,203,102,15,86,202,72,184,237,237,102,72,15,110,208, + 252,242,15,194,193,1,102,15,84,194,252,242,15,92,200,15,40,193,248,1,195, + 248,84,255,217,124,36,4,137,68,36,8,102,184,0,8,102,11,68,36,4,102,37,252, + 255,252,251,102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,139,68, + 36,8,195,255,248,146,72,184,237,237,102,72,15,110,208,72,184,237,237,102, + 72,15,110,216,15,40,200,102,15,84,202,102,15,46,217,15,134,244,247,102,15, + 85,208,252,242,15,88,203,252,242,15,92,203,102,15,86,202,72,184,237,237,102, + 72,15,110,208,252,242,15,194,193,6,102,15,84,194,252,242,15,92,200,15,40, + 193,248,1,195,248,104,255,217,124,36,4,137,68,36,8,102,184,0,12,102,11,68, + 36,4,102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,139,68,36,8,195, + 255,248,147,72,184,237,237,102,72,15,110,208,72,184,237,237,102,72,15,110, + 216,15,40,200,102,15,84,202,102,15,46,217,15,134,244,247,102,15,85,208,15, + 40,193,252,242,15,88,203,252,242,15,92,203,72,184,237,237,102,72,15,110,216, + 252,242,15,194,193,1,102,15,84,195,252,242,15,92,200,102,15,86,202,15,40, + 193,248,1,195,248,148,255,15,40,232,252,242,15,94,193,72,184,237,237,102, + 72,15,110,208,72,184,237,237,102,72,15,110,216,15,40,224,102,15,84,226,102, + 15,46,220,15,134,244,247,102,15,85,208,252,242,15,88,227,252,242,15,92,227, + 102,15,86,226,72,184,237,237,102,72,15,110,208,252,242,15,194,196,1,102,15, + 84,194,252,242,15,92,224,15,40,197,252,242,15,89,204,252,242,15,92,193,195, + 248,1,252,242,15,89,200,15,40,197,252,242,15,92,193,195,255,217,193,216,252, + 241,217,124,36,4,102,184,0,4,102,11,68,36,4,102,37,252,255,252,247,102,137, + 68,36,6,217,108,36,6,217,252,252,217,108,36,4,222,201,222,252,233,195,255, + 248,88,217,252,234,222,201,248,149,217,84,36,8,129,124,36,8,0,0,128,127,15, + 132,244,247,129,124,36,8,0,0,128,252,255,15,132,244,248,248,150,217,192,217, + 252,252,220,252,233,217,201,217,252,240,217,232,222,193,217,252,253,221,217, + 248,1,195,248,2,221,216,217,252,238,195,255,248,107,255,248,151,252,242,15, + 45,193,252,242,15,42,208,102,15,46,202,15,133,244,254,15,138,244,255,248, + 152,131,252,248,1,15,142,244,252,248,1,169,1,0,0,0,15,133,244,248,252,242, + 15,89,192,209,232,252,233,244,1,248,2,209,232,15,132,244,251,15,40,200,248, + 3,252,242,15,89,192,209,232,15,132,244,250,15,131,244,3,255,252,242,15,89, + 200,252,233,244,3,248,4,252,242,15,89,193,248,5,195,248,6,15,132,244,5,15, + 130,244,253,80,72,184,237,237,102,72,15,110,200,252,242,15,94,200,88,15,40, + 193,252,247,216,131,252,248,1,15,132,244,5,252,233,244,1,248,7,72,184,237, + 237,102,72,15,110,192,195,248,8,102,72,15,126,200,72,209,224,72,193,192,12, + 72,61,252,254,15,0,0,15,132,244,248,255,102,72,15,126,192,72,209,224,15,132, + 244,250,72,193,192,12,72,61,252,254,15,0,0,15,132,244,251,252,242,15,17,76, + 36,16,252,242,15,17,68,36,8,221,68,36,16,221,68,36,8,217,252,241,217,192, + 217,252,252,220,252,233,217,201,217,252,240,217,232,222,193,217,252,253,221, + 217,221,92,36,8,252,242,15,16,68,36,8,195,248,9,72,184,237,237,102,72,15, + 110,208,102,15,46,194,15,132,244,247,15,40,193,248,1,195,248,2,72,184,237, + 237,102,72,15,110,208,102,15,84,194,72,184,237,237,102,72,15,110,208,102, + 15,46,194,15,132,244,1,102,15,80,193,15,87,192,136,196,15,146,208,48,224, + 15,133,244,1,248,3,72,184,237,237,255,102,72,15,110,192,195,248,4,102,15, + 80,193,133,192,15,133,244,3,15,87,192,195,248,5,102,15,80,193,133,192,15, + 132,244,3,15,87,192,195,248,153,255,131,252,250,1,15,130,244,82,15,132,244, + 84,131,252,250,3,15,130,244,104,15,135,244,248,252,242,15,81,192,195,248, + 2,252,242,15,17,68,36,8,221,68,36,8,131,252,250,5,15,135,244,248,88,15,132, + 244,247,232,244,88,80,252,233,244,253,248,1,232,244,149,255,80,252,233,244, + 253,248,2,131,252,250,7,15,132,244,247,15,135,244,248,217,252,237,217,201, + 217,252,241,252,233,244,253,248,1,217,232,217,201,217,252,241,252,233,244, + 253,248,2,131,252,250,9,15,132,244,247,15,135,244,248,217,252,236,217,201, + 217,252,241,252,233,244,253,248,1,255,217,252,254,252,233,244,253,248,2,131, + 252,250,11,15,132,244,247,15,135,244,255,217,252,255,252,233,244,253,248, + 1,217,252,242,221,216,248,7,221,92,36,8,252,242,15,16,68,36,8,195,255,139, + 84,36,12,221,68,36,4,131,252,250,1,15,130,244,82,15,132,244,84,131,252,250, + 3,15,130,244,104,15,135,244,248,217,252,250,195,248,2,131,252,250,5,15,130, + 244,88,15,132,244,149,131,252,250,7,15,132,244,247,15,135,244,248,217,252, + 237,217,201,217,252,241,195,248,1,217,232,217,201,217,252,241,195,248,2,131, + 252,250,9,15,132,244,247,255,15,135,244,248,217,252,236,217,201,217,252,241, + 195,248,1,217,252,254,195,248,2,131,252,250,11,15,132,244,247,15,135,244, + 255,217,252,255,195,248,1,217,252,242,221,216,195,255,248,9,204,248,154,255, + 65,131,252,248,1,15,132,244,247,15,135,244,248,252,242,15,88,193,195,248, + 1,252,242,15,92,193,195,248,2,65,131,252,248,3,15,132,244,247,15,135,244, + 248,252,242,15,89,193,195,248,1,252,242,15,94,193,195,248,2,65,131,252,248, + 5,15,130,244,148,15,132,244,107,65,131,252,248,7,15,132,244,247,15,135,244, + 248,72,184,237,237,255,102,72,15,110,200,15,87,193,195,248,1,72,184,237,237, + 102,72,15,110,200,15,84,193,195,248,2,65,131,252,248,9,15,135,244,248,252, + 242,15,17,68,36,8,252,242,15,17,76,36,16,221,68,36,8,221,68,36,16,15,132, + 244,247,217,252,243,248,7,221,92,36,8,252,242,15,16,68,36,8,195,248,1,217, + 201,217,252,253,221,217,252,233,244,7,248,2,65,131,252,248,11,15,132,244, + 247,15,135,244,255,252,242,15,93,193,195,248,1,252,242,15,95,193,195,248, + 9,204,255,139,68,36,20,221,68,36,4,221,68,36,12,131,252,248,1,15,132,244, + 247,15,135,244,248,222,193,195,248,1,222,252,233,195,248,2,131,252,248,3, + 15,132,244,247,15,135,244,248,222,201,195,248,1,222,252,249,195,248,2,131, + 252,248,5,15,130,244,148,15,132,244,107,131,252,248,7,15,132,244,247,15,135, + 244,248,255,221,216,217,224,195,248,1,221,216,217,225,195,248,2,131,252,248, + 9,15,132,244,247,15,135,244,248,217,252,243,195,248,1,217,201,217,252,253, + 221,217,195,248,2,131,252,248,11,15,132,244,247,15,135,244,255,255,219,252, + 233,219,209,221,217,195,248,1,219,252,233,218,209,221,217,195,255,221,225, + 223,224,252,246,196,1,15,132,244,248,217,201,248,2,221,216,195,248,1,221, + 225,223,224,252,246,196,1,15,133,244,248,217,201,248,2,221,216,195,255,248, + 155,137,200,86,72,137,214,83,15,162,137,6,137,94,4,137,78,8,137,86,12,91, + 94,195,255,249,255,129,124,253,202,4,239,15,135,244,41,129,124,253,194,4, + 239,15,135,244,41,255,252,242,15,16,4,194,131,198,4,102,15,46,4,202,255,221, + 4,202,221,4,194,131,198,4,255,223,252,233,221,216,255,218,252,233,223,224, + 158,255,15,134,244,248,255,15,131,244,248,255,248,1,15,183,70,252,254,141, + 180,253,134,233,248,2,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, + 255,36,252,235,255,139,108,194,4,131,198,4,129,252,253,239,15,135,244,251, + 129,124,253,202,4,239,15,135,244,251,255,252,242,15,16,4,194,102,15,46,4, + 202,255,221,4,202,221,4,194,255,15,138,244,248,15,133,244,248,255,15,138, + 244,248,15,132,244,247,255,248,1,15,183,70,252,254,141,180,253,134,233,248, + 2,255,248,2,15,183,70,252,254,141,180,253,134,233,248,1,255,248,5,57,108, + 202,4,15,133,244,2,129,252,253,239,15,131,244,1,139,12,202,139,4,194,57,193, + 15,132,244,1,129,252,253,239,15,135,244,2,139,169,233,133,252,237,15,132, + 244,2,252,246,133,233,235,15,133,244,2,255,49,252,237,255,189,1,0,0,0,255, + 252,233,244,45,255,72,252,247,208,131,198,4,129,124,253,202,4,239,15,133, + 244,248,139,12,202,59,12,135,255,131,198,4,129,124,253,202,4,239,15,135,244, + 248,255,252,242,15,16,4,199,102,15,46,4,202,255,221,4,202,221,4,199,255,72, + 252,247,208,131,198,4,57,68,202,4,255,139,108,194,4,131,198,4,129,252,253, + 239,255,15,131,244,247,255,15,130,244,247,255,137,108,202,4,139,44,194,137, + 44,202,255,15,183,70,252,254,141,180,253,134,233,248,1,139,6,15,182,204,15, + 182,232,131,198,4,193,232,16,252,255,36,252,235,255,139,108,194,4,139,4,194, + 137,108,202,4,137,4,202,139,6,15,182,204,15,182,232,131,198,4,193,232,16, + 252,255,36,252,235,255,49,252,237,129,124,253,194,4,239,129,213,239,137,108, + 202,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235, + 255,129,124,253,194,4,239,15,135,244,48,255,252,242,15,16,4,194,72,184,237, + 237,102,72,15,110,200,15,87,193,252,242,15,17,4,202,255,221,4,194,217,224, + 221,28,202,255,129,124,253,194,4,239,15,133,244,248,139,4,194,255,15,87,192, + 252,242,15,42,128,233,248,1,252,242,15,17,4,202,255,219,128,233,248,1,221, + 28,202,255,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252, + 235,248,2,129,124,253,194,4,239,15,133,244,50,139,12,194,137,213,232,251, + 1,18,255,252,242,15,42,192,137,252,234,255,15,182,78,252,253,252,233,244, + 1,255,15,182,252,236,15,182,192,255,129,124,253,252,234,4,239,15,135,244, + 46,255,252,242,15,16,4,252,234,252,242,15,88,4,199,255,221,4,252,234,220, + 4,199,255,129,124,253,252,234,4,239,15,135,244,47,255,252,242,15,16,4,199, + 252,242,15,88,4,252,234,255,221,4,199,220,4,252,234,255,129,124,253,252,234, + 4,239,15,135,244,49,129,124,253,194,4,239,15,135,244,49,255,252,242,15,16, + 4,252,234,252,242,15,88,4,194,255,221,4,252,234,220,4,194,255,252,242,15, + 16,4,252,234,252,242,15,92,4,199,255,221,4,252,234,220,36,199,255,252,242, + 15,16,4,199,252,242,15,92,4,252,234,255,221,4,199,220,36,252,234,255,252, + 242,15,16,4,252,234,252,242,15,92,4,194,255,221,4,252,234,220,36,194,255, + 252,242,15,16,4,252,234,252,242,15,89,4,199,255,221,4,252,234,220,12,199, + 255,252,242,15,16,4,199,252,242,15,89,4,252,234,255,221,4,199,220,12,252, + 234,255,252,242,15,16,4,252,234,252,242,15,89,4,194,255,221,4,252,234,220, + 12,194,255,252,242,15,16,4,252,234,252,242,15,94,4,199,255,221,4,252,234, + 220,52,199,255,252,242,15,16,4,199,252,242,15,94,4,252,234,255,221,4,199, + 220,52,252,234,255,252,242,15,16,4,252,234,252,242,15,94,4,194,255,221,4, + 252,234,220,52,194,255,252,242,15,16,4,252,234,252,242,15,16,12,199,255,221, + 4,252,234,221,4,199,255,252,242,15,16,4,199,252,242,15,16,12,252,234,255, + 221,4,199,221,4,252,234,255,252,242,15,16,4,252,234,252,242,15,16,12,194, + 255,221,4,252,234,221,4,194,255,248,156,232,244,148,255,252,233,244,156,255, + 232,244,107,255,15,182,252,236,15,182,192,139,76,36,96,137,145,233,141,20, + 194,65,137,192,65,41,232,248,33,137,205,137,116,36,100,232,251,1,23,139,149, + 233,133,192,15,133,244,42,15,182,110,252,255,15,182,78,252,253,139,68,252, + 234,4,139,44,252,234,137,68,202,4,137,44,202,139,6,15,182,204,15,182,232, + 131,198,4,193,232,16,252,255,36,252,235,255,72,252,247,208,139,4,135,199, + 68,202,4,237,137,4,202,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, + 255,36,252,235,255,15,191,192,252,242,15,42,192,252,242,15,17,4,202,255,223, + 70,252,254,221,28,202,255,252,242,15,16,4,199,252,242,15,17,4,202,255,221, + 4,199,221,28,202,255,72,252,247,208,137,68,202,4,139,6,15,182,204,15,182, + 232,131,198,4,193,232,16,252,255,36,252,235,255,141,76,202,12,141,68,194, + 4,189,237,137,105,252,248,248,1,137,41,131,193,8,57,193,15,134,244,1,139, + 6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,139,106, + 252,248,139,172,253,133,233,139,173,233,139,69,4,139,109,0,137,68,202,4,137, 44,202,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235, - 255,72,252,247,208,139,4,135,199,68,202,4,237,137,4,202,139,6,15,182,204, - 15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,15,191,192,252,242, - 15,42,192,252,242,15,17,4,202,255,223,70,252,254,221,28,202,255,252,242,15, - 16,4,199,252,242,15,17,4,202,255,221,4,199,221,28,202,255,72,252,247,208, - 137,68,202,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36, - 252,235,255,141,76,202,12,141,68,194,4,189,237,137,105,252,248,248,1,137, - 41,131,193,8,57,193,15,134,244,1,139,6,15,182,204,15,182,232,131,198,4,193, - 232,16,252,255,36,252,235,255,139,106,252,248,139,172,253,133,233,139,173, - 233,139,69,4,139,109,0,137,68,202,4,137,44,202,139,6,15,182,204,15,182,232, - 131,198,4,193,232,16,252,255,36,252,235,255,139,106,252,248,139,172,253,141, - 233,128,189,233,0,139,173,233,139,12,194,139,68,194,4,137,77,0,137,69,4,15, - 132,244,247,252,246,133,233,235,15,133,244,248,248,1,139,6,15,182,204,15, - 182,232,131,198,4,193,232,16,252,255,36,252,235,248,2,129,232,239,129,252, - 248,239,15,134,244,1,252,246,129,233,235,15,132,244,1,135,213,141,139,233, - 255,232,251,1,23,137,252,234,252,233,244,1,255,72,252,247,208,139,106,252, - 248,139,172,253,141,233,139,12,135,139,133,233,137,8,199,64,4,237,252,246, - 133,233,235,15,133,244,248,248,1,139,6,15,182,204,15,182,232,131,198,4,193, - 232,16,252,255,36,252,235,248,2,252,246,129,233,235,15,132,244,1,128,189, - 233,0,15,132,244,1,137,213,137,194,141,139,233,232,251,1,23,137,252,234,252, - 233,244,1,255,139,106,252,248,255,252,242,15,16,4,199,255,139,172,253,141, - 233,139,141,233,255,252,242,15,17,1,255,221,25,255,72,252,247,208,139,106, - 252,248,139,172,253,141,233,139,141,233,137,65,4,139,6,15,182,204,15,182, - 232,131,198,4,193,232,16,252,255,36,252,235,255,141,180,253,134,233,139,108, - 36,96,131,189,233,0,15,132,244,247,137,149,233,141,20,202,137,252,233,232, - 251,1,24,139,149,233,248,1,139,6,15,182,204,15,182,232,131,198,4,193,232, - 16,252,255,36,252,235,255,72,252,247,208,139,108,36,96,137,149,233,68,139, - 66,252,248,139,20,135,137,252,233,137,116,36,100,232,251,1,25,139,149,233, - 15,182,78,252,253,137,4,202,199,68,202,4,237,139,6,15,182,204,15,182,232, - 131,198,4,193,232,16,252,255,36,252,235,255,139,76,36,96,137,145,233,248, - 1,65,137,192,37,252,255,7,0,0,65,193,232,11,61,252,255,7,0,0,15,132,244,249, - 248,2,137,194,139,131,233,137,205,59,131,233,137,116,36,100,15,131,244,251, - 232,251,1,26,139,149,233,15,182,78,252,253,137,4,202,199,68,202,4,237,139, - 6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,3,184, - 1,8,0,0,252,233,244,2,248,5,232,251,1,27,15,183,70,252,254,137,252,233,252, - 233,244,1,255,72,252,247,208,139,108,36,96,139,139,233,137,116,36,100,59, - 139,233,137,149,233,15,131,244,249,248,2,139,20,135,137,252,233,232,251,1, - 28,139,149,233,15,182,78,252,253,137,4,202,199,68,202,4,237,139,6,15,182, - 204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,3,137,252,233, - 232,251,1,27,15,183,70,252,254,72,252,247,208,252,233,244,2,255,72,252,247, - 208,139,106,252,248,139,173,233,139,4,135,252,233,244,157,255,72,252,247, - 208,139,106,252,248,139,173,233,139,4,135,252,233,244,158,255,15,182,252, - 236,15,182,192,129,124,253,252,234,4,239,15,133,244,36,139,44,252,234,129, - 124,253,194,4,239,15,135,244,251,255,252,242,15,16,4,194,252,242,15,45,192, - 252,242,15,42,200,102,15,46,193,255,15,133,244,36,59,133,233,15,131,244,36, - 193,224,3,3,133,233,129,120,253,4,239,15,132,244,248,248,1,139,40,139,64, - 4,137,44,202,137,68,202,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16, - 252,255,36,252,235,248,2,131,189,233,0,15,132,244,1,139,141,233,252,246,129, - 233,235,15,132,244,36,15,182,78,252,253,252,233,244,1,248,5,255,129,124,253, - 194,4,239,15,133,244,36,139,4,194,252,233,244,157,255,15,182,252,236,15,182, - 192,72,252,247,208,139,4,135,129,124,253,252,234,4,239,15,133,244,34,139, - 44,252,234,248,157,139,141,233,35,136,233,105,201,239,3,141,233,248,1,129, - 185,233,239,15,133,244,250,57,129,233,15,133,244,250,129,121,253,4,239,15, - 132,244,251,15,182,70,252,253,139,41,139,73,4,137,44,194,248,2,255,137,76, - 194,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235, - 248,3,15,182,70,252,253,185,237,252,233,244,2,248,4,139,137,233,133,201,15, - 133,244,1,248,5,139,141,233,133,201,15,132,244,3,252,246,129,233,235,15,133, - 244,3,252,233,244,34,255,15,182,252,236,15,182,192,129,124,253,252,234,4, - 239,15,133,244,35,139,44,252,234,59,133,233,15,131,244,35,193,224,3,3,133, - 233,129,120,253,4,239,15,132,244,248,248,1,139,40,139,64,4,137,44,202,137, - 68,202,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252, - 235,248,2,131,189,233,0,15,132,244,1,139,141,233,252,246,129,233,235,15,132, - 244,35,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244, - 39,139,44,252,234,129,124,253,194,4,239,15,135,244,251,255,15,133,244,39, - 59,133,233,15,131,244,39,193,224,3,3,133,233,129,120,253,4,239,15,132,244, + 255,139,106,252,248,139,172,253,141,233,128,189,233,0,139,173,233,139,12, + 194,139,68,194,4,137,77,0,137,69,4,15,132,244,247,252,246,133,233,235,15, + 133,244,248,248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255, + 36,252,235,248,2,129,232,239,129,252,248,239,15,134,244,1,252,246,129,233, + 235,15,132,244,1,135,213,141,139,233,255,232,251,1,24,137,252,234,252,233, + 244,1,255,72,252,247,208,139,106,252,248,139,172,253,141,233,139,12,135,139, + 133,233,137,8,199,64,4,237,252,246,133,233,235,15,133,244,248,248,1,139,6, + 15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,2,252,246, + 129,233,235,15,132,244,1,128,189,233,0,15,132,244,1,137,213,137,194,141,139, + 233,232,251,1,24,137,252,234,252,233,244,1,255,139,106,252,248,255,252,242, + 15,16,4,199,255,139,172,253,141,233,139,141,233,255,252,242,15,17,1,255,221, + 25,255,72,252,247,208,139,106,252,248,139,172,253,141,233,139,141,233,137, + 65,4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235, + 255,141,180,253,134,233,139,108,36,96,131,189,233,0,15,132,244,247,137,149, + 233,141,20,202,137,252,233,232,251,1,25,139,149,233,248,1,139,6,15,182,204, + 15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,72,252,247,208,139, + 108,36,96,137,149,233,68,139,66,252,248,139,20,135,137,252,233,137,116,36, + 100,232,251,1,26,139,149,233,15,182,78,252,253,137,4,202,199,68,202,4,237, + 139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,139, + 76,36,96,137,145,233,248,1,65,137,192,37,252,255,7,0,0,65,193,232,11,61,252, + 255,7,0,0,15,132,244,249,248,2,137,194,139,131,233,137,205,59,131,233,137, + 116,36,100,15,131,244,251,232,251,1,27,139,149,233,15,182,78,252,253,137, + 4,202,199,68,202,4,237,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, + 255,36,252,235,248,3,184,1,8,0,0,252,233,244,2,248,5,232,251,1,28,15,183, + 70,252,254,137,252,233,252,233,244,1,255,72,252,247,208,139,108,36,96,139, + 139,233,137,116,36,100,59,139,233,137,149,233,15,131,244,249,248,2,139,20, + 135,137,252,233,232,251,1,29,139,149,233,15,182,78,252,253,137,4,202,199, + 68,202,4,237,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36, + 252,235,248,3,137,252,233,232,251,1,28,15,183,70,252,254,72,252,247,208,252, + 233,244,2,255,72,252,247,208,139,106,252,248,139,173,233,139,4,135,252,233, + 244,157,255,72,252,247,208,139,106,252,248,139,173,233,139,4,135,252,233, + 244,158,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244, + 36,139,44,252,234,129,124,253,194,4,239,15,135,244,251,255,252,242,15,16, + 4,194,252,242,15,45,192,252,242,15,42,200,102,15,46,193,255,15,133,244,36, + 59,133,233,15,131,244,36,193,224,3,3,133,233,129,120,253,4,239,15,132,244, + 248,248,1,139,40,139,64,4,137,44,202,137,68,202,4,139,6,15,182,204,15,182, + 232,131,198,4,193,232,16,252,255,36,252,235,248,2,131,189,233,0,15,132,244, + 1,139,141,233,252,246,129,233,235,15,132,244,36,15,182,78,252,253,252,233, + 244,1,248,5,255,129,124,253,194,4,239,15,133,244,36,139,4,194,252,233,244, + 157,255,15,182,252,236,15,182,192,72,252,247,208,139,4,135,129,124,253,252, + 234,4,239,15,133,244,34,139,44,252,234,248,157,139,141,233,35,136,233,105, + 201,239,3,141,233,248,1,129,185,233,239,15,133,244,250,57,129,233,15,133, + 244,250,129,121,253,4,239,15,132,244,251,15,182,70,252,253,139,41,139,73, + 4,137,44,194,248,2,255,137,76,194,4,139,6,15,182,204,15,182,232,131,198,4, + 193,232,16,252,255,36,252,235,248,3,15,182,70,252,253,185,237,252,233,244, + 2,248,4,139,137,233,133,201,15,133,244,1,248,5,139,141,233,133,201,15,132, + 244,3,252,246,129,233,235,15,133,244,3,252,233,244,34,255,15,182,252,236, + 15,182,192,129,124,253,252,234,4,239,15,133,244,35,139,44,252,234,59,133, + 233,15,131,244,35,193,224,3,3,133,233,129,120,253,4,239,15,132,244,248,248, + 1,139,40,139,64,4,137,44,202,137,68,202,4,139,6,15,182,204,15,182,232,131, + 198,4,193,232,16,252,255,36,252,235,248,2,131,189,233,0,15,132,244,1,139, + 141,233,252,246,129,233,235,15,132,244,35,255,15,182,252,236,15,182,192,129, + 124,253,252,234,4,239,15,133,244,39,139,44,252,234,129,124,253,194,4,239, + 15,135,244,251,255,15,133,244,39,59,133,233,15,131,244,39,193,224,3,3,133, + 233,129,120,253,4,239,15,132,244,249,248,1,252,246,133,233,235,15,133,244, + 253,248,2,139,108,202,4,139,12,202,137,104,4,137,8,139,6,15,182,204,15,182, + 232,131,198,4,193,232,16,252,255,36,252,235,248,3,131,189,233,0,15,132,244, + 1,139,141,233,255,252,246,129,233,235,15,132,244,39,15,182,78,252,253,252, + 233,244,1,248,5,129,124,253,194,4,239,15,133,244,39,139,4,194,252,233,244, + 158,248,7,128,165,233,235,139,139,233,137,171,233,137,141,233,15,182,78,252, + 253,252,233,244,2,255,15,182,252,236,15,182,192,72,252,247,208,139,4,135, + 129,124,253,252,234,4,239,15,133,244,37,139,44,252,234,248,158,139,141,233, + 35,136,233,105,201,239,198,133,233,0,3,141,233,248,1,129,185,233,239,15,133, + 244,251,57,129,233,15,133,244,251,129,121,253,4,239,15,132,244,250,248,2, + 255,252,246,133,233,235,15,133,244,253,248,3,15,182,70,252,253,139,108,194, + 4,139,4,194,137,105,4,137,1,139,6,15,182,204,15,182,232,131,198,4,193,232, + 16,252,255,36,252,235,248,4,131,189,233,0,15,132,244,2,137,76,36,80,139,141, + 233,252,246,129,233,235,15,132,244,37,139,76,36,80,252,233,244,2,248,5,139, + 137,233,133,201,15,133,244,1,255,139,141,233,133,201,15,132,244,252,252,246, + 129,233,235,15,132,244,37,248,6,137,68,36,80,199,68,36,84,237,137,108,36, + 32,139,76,36,96,137,145,233,76,141,68,36,80,137,252,234,137,205,137,116,36, + 100,232,251,1,30,139,149,233,139,108,36,32,137,193,252,233,244,2,248,7,128, + 165,233,235,139,131,233,137,171,233,137,133,233,252,233,244,3,255,15,182, + 252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,38,139,44,252,234, + 59,133,233,15,131,244,38,193,224,3,3,133,233,129,120,253,4,239,15,132,244, 249,248,1,252,246,133,233,235,15,133,244,253,248,2,139,108,202,4,139,12,202, 137,104,4,137,8,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255, - 36,252,235,248,3,131,189,233,0,15,132,244,1,139,141,233,255,252,246,129,233, - 235,15,132,244,39,15,182,78,252,253,252,233,244,1,248,5,129,124,253,194,4, - 239,15,133,244,39,139,4,194,252,233,244,158,248,7,128,165,233,235,139,139, - 233,137,171,233,137,141,233,15,182,78,252,253,252,233,244,2,255,15,182,252, - 236,15,182,192,72,252,247,208,139,4,135,129,124,253,252,234,4,239,15,133, - 244,37,139,44,252,234,248,158,139,141,233,35,136,233,105,201,239,198,133, - 233,0,3,141,233,248,1,129,185,233,239,15,133,244,251,57,129,233,15,133,244, - 251,129,121,253,4,239,15,132,244,250,248,2,255,252,246,133,233,235,15,133, - 244,253,248,3,15,182,70,252,253,139,108,194,4,139,4,194,137,105,4,137,1,139, - 6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,4,131, - 189,233,0,15,132,244,2,137,76,36,80,139,141,233,252,246,129,233,235,15,132, - 244,37,139,76,36,80,252,233,244,2,248,5,139,137,233,133,201,15,133,244,1, - 255,139,141,233,133,201,15,132,244,252,252,246,129,233,235,15,132,244,37, - 248,6,137,68,36,80,199,68,36,84,237,137,108,36,32,139,76,36,96,137,145,233, - 76,141,68,36,80,137,252,234,137,205,137,116,36,100,232,251,1,29,139,149,233, - 139,108,36,32,137,193,252,233,244,2,248,7,128,165,233,235,139,131,233,137, - 171,233,137,133,233,252,233,244,3,255,15,182,252,236,15,182,192,129,124,253, - 252,234,4,239,15,133,244,38,139,44,252,234,59,133,233,15,131,244,38,193,224, - 3,3,133,233,129,120,253,4,239,15,132,244,249,248,1,252,246,133,233,235,15, - 133,244,253,248,2,139,108,202,4,139,12,202,137,104,4,137,8,139,6,15,182,204, - 15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,3,131,189,233,0,15, - 132,244,1,255,139,141,233,252,246,129,233,235,15,132,244,38,15,182,78,252, - 253,252,233,244,1,248,7,128,165,233,235,139,139,233,137,171,233,137,141,233, - 15,182,78,252,253,252,233,244,2,255,137,124,36,80,255,248,1,141,12,202,139, - 105,252,248,252,246,133,233,235,15,133,244,253,248,2,139,68,36,84,255,252, - 242,15,45,252,248,255,131,232,1,15,132,244,250,1,252,248,59,133,233,15,131, - 244,251,41,252,248,193,231,3,3,189,233,248,3,139,41,137,47,139,105,4,131, - 193,8,137,111,4,131,199,8,131,232,1,15,133,244,3,248,4,139,124,36,80,139, - 6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,5,139, - 76,36,96,137,145,233,137,252,234,65,137,192,137,205,137,116,36,100,232,251, - 1,30,139,149,233,15,182,78,252,253,252,233,244,1,248,7,128,165,233,235,139, - 131,233,137,171,233,255,137,133,233,252,233,244,2,255,3,68,36,84,255,129, - 124,253,202,4,239,139,44,202,15,133,244,51,141,84,202,8,137,114,252,252,139, + 36,252,235,248,3,131,189,233,0,15,132,244,1,255,139,141,233,252,246,129,233, + 235,15,132,244,38,15,182,78,252,253,252,233,244,1,248,7,128,165,233,235,139, + 139,233,137,171,233,137,141,233,15,182,78,252,253,252,233,244,2,255,137,124, + 36,80,255,248,1,141,12,202,139,105,252,248,252,246,133,233,235,15,133,244, + 253,248,2,139,68,36,84,255,252,242,15,45,252,248,255,131,232,1,15,132,244, + 250,1,252,248,59,133,233,15,131,244,251,41,252,248,193,231,3,3,189,233,248, + 3,139,41,137,47,139,105,4,131,193,8,137,111,4,131,199,8,131,232,1,15,133, + 244,3,248,4,139,124,36,80,139,6,15,182,204,15,182,232,131,198,4,193,232,16, + 252,255,36,252,235,248,5,139,76,36,96,137,145,233,137,252,234,65,137,192, + 137,205,137,116,36,100,232,251,1,31,139,149,233,15,182,78,252,253,252,233, + 244,1,248,7,128,165,233,235,139,131,233,137,171,233,255,137,133,233,252,233, + 244,2,255,3,68,36,84,255,129,124,253,202,4,239,139,44,202,15,133,244,51,141, + 84,202,8,137,114,252,252,139,181,233,139,14,15,182,252,233,15,182,205,131, + 198,4,252,255,36,252,235,255,141,76,202,8,137,215,139,105,252,248,129,121, + 253,252,252,239,15,133,244,28,248,52,139,114,252,252,252,247,198,237,15,133, + 244,253,248,1,137,106,252,248,137,68,36,84,131,232,1,15,132,244,249,248,2, + 139,41,137,47,139,105,4,137,111,4,131,199,8,131,193,8,131,232,1,15,133,244, + 2,139,106,252,248,248,3,139,68,36,84,128,189,233,1,15,135,244,251,248,4,139, + 181,233,139,14,15,182,252,233,15,182,205,131,198,4,252,255,36,252,235,248, + 5,255,252,247,198,237,15,133,244,4,15,182,78,252,253,72,252,247,209,141,12, + 202,139,121,252,248,139,191,233,139,191,233,252,233,244,4,248,7,15,139,244, + 1,131,230,252,248,41,252,242,137,215,139,114,252,252,252,233,244,1,255,141, + 76,202,8,139,105,232,139,65,252,236,137,41,137,65,4,139,105,252,240,139,65, + 252,244,137,105,8,137,65,12,139,105,224,139,65,228,137,105,252,248,137,65, + 252,252,129,252,248,239,184,237,15,133,244,28,137,202,137,114,252,252,139, 181,233,139,14,15,182,252,233,15,182,205,131,198,4,252,255,36,252,235,255, - 141,76,202,8,137,215,139,105,252,248,129,121,253,252,252,239,15,133,244,28, - 248,52,139,114,252,252,252,247,198,237,15,133,244,253,248,1,137,106,252,248, - 137,68,36,84,131,232,1,15,132,244,249,248,2,139,41,137,47,139,105,4,137,111, - 4,131,199,8,131,193,8,131,232,1,15,133,244,2,139,106,252,248,248,3,139,68, - 36,84,128,189,233,1,15,135,244,251,248,4,139,181,233,139,14,15,182,252,233, - 15,182,205,131,198,4,252,255,36,252,235,248,5,255,252,247,198,237,15,133, - 244,4,15,182,78,252,253,72,252,247,209,141,12,202,139,121,252,248,139,191, - 233,139,191,233,252,233,244,4,248,7,15,139,244,1,131,230,252,248,41,252,242, - 137,215,139,114,252,252,252,233,244,1,255,141,76,202,8,139,105,232,139,65, - 252,236,137,41,137,65,4,139,105,252,240,139,65,252,244,137,105,8,137,65,12, - 139,105,224,139,65,228,137,105,252,248,137,65,252,252,129,252,248,239,184, - 237,15,133,244,28,137,202,137,114,252,252,139,181,233,139,14,15,182,252,233, - 15,182,205,131,198,4,252,255,36,252,235,255,15,182,252,236,139,66,252,248, - 141,12,202,139,128,233,15,182,128,233,137,124,36,80,141,188,253,194,233,43, - 122,252,252,133,252,237,15,132,244,251,141,108,252,233,252,248,57,215,15, - 131,244,248,248,1,139,71,252,248,137,1,139,71,252,252,131,199,8,137,65,4, - 131,193,8,57,252,233,15,131,244,249,57,215,15,130,244,1,248,2,199,65,4,237, - 131,193,8,57,252,233,15,130,244,2,248,3,139,124,36,80,139,6,15,182,204,15, - 182,232,131,198,4,193,232,16,252,255,36,252,235,248,5,199,68,36,84,1,0,0, - 0,137,208,41,252,248,15,134,244,3,255,137,197,193,252,237,3,131,197,1,137, - 108,36,84,139,108,36,96,1,200,59,133,233,15,135,244,253,248,6,139,71,252, - 248,137,1,139,71,252,252,131,199,8,137,65,4,131,193,8,57,215,15,130,244,6, - 252,233,244,3,248,7,137,149,233,137,141,233,137,116,36,100,41,215,139,84, - 36,84,131,252,234,1,137,252,233,232,251,1,0,139,149,233,139,141,233,1,215, - 252,233,244,6,255,193,225,3,255,248,1,139,114,252,252,137,68,36,84,252,247, - 198,237,15,133,244,253,255,248,13,137,215,131,232,1,15,132,244,249,248,2, - 139,44,15,137,111,252,248,139,108,15,4,137,111,252,252,131,199,8,131,232, - 1,15,133,244,2,248,3,139,68,36,84,15,182,110,252,255,248,5,57,197,15,135, - 244,252,255,139,108,10,4,137,106,252,252,139,44,10,137,106,252,248,255,248, - 5,56,70,252,255,15,135,244,252,255,15,182,78,252,253,72,252,247,209,141,20, - 202,139,122,252,248,139,191,233,139,191,233,139,6,15,182,204,15,182,232,131, - 198,4,193,232,16,252,255,36,252,235,248,6,255,199,71,252,252,237,131,199, - 8,255,199,68,194,252,244,237,255,131,192,1,252,233,244,5,248,7,15,139,244, - 14,131,230,252,248,41,252,242,255,1,252,241,255,137,252,245,209,252,237,129, - 229,239,102,131,172,253,43,233,1,15,132,244,140,255,141,12,202,255,129,121, - 253,4,239,15,135,244,53,129,121,253,12,239,15,135,244,53,255,139,105,20,255, - 129,252,253,239,15,135,244,53,255,252,242,15,16,1,252,242,15,16,73,8,255, - 252,242,15,88,65,16,252,242,15,17,1,133,252,237,15,136,244,249,255,15,140, - 244,249,255,102,15,46,200,248,1,252,242,15,17,65,24,255,221,65,8,221,1,255, - 220,65,16,221,17,221,81,24,133,252,237,15,136,244,247,255,221,81,24,15,140, - 244,247,255,217,201,248,1,255,15,183,70,252,254,255,15,131,244,248,141,180, - 253,134,233,255,141,180,253,134,233,15,183,70,252,254,15,131,245,255,15,130, - 244,248,141,180,253,134,233,255,248,3,102,15,46,193,252,233,244,1,255,141, - 12,202,139,105,4,129,252,253,239,15,132,244,247,255,137,105,252,252,139,41, - 137,105,252,248,252,233,245,255,141,180,253,134,233,139,1,137,105,252,252, - 137,65,252,248,255,139,139,233,139,4,129,72,139,128,233,139,108,36,96,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,252,235,255,139,190,233,139,108, - 36,96,141,12,202,59,141,233,15,135,244,23,15,182,142,233,57,200,15,134,244, - 249,248,2,255,15,183,70,252,254,252,233,245,255,248,3,199,68,194,252,252, - 237,131,192,1,57,200,15,134,244,3,252,233,244,2,255,141,44,197,237,141,4, - 194,139,122,252,248,137,104,252,252,137,120,252,248,139,108,36,96,141,12, - 200,59,141,233,15,135,244,22,137,209,137,194,15,182,174,233,133,252,237,15, - 132,244,248,248,1,131,193,8,57,209,15,131,244,249,139,121,252,248,137,56, - 139,121,252,252,137,120,4,131,192,8,199,65,252,252,237,131,252,237,1,15,133, - 244,1,248,2,255,139,190,233,139,6,15,182,204,15,182,232,131,198,4,193,232, - 16,252,255,36,252,235,255,248,3,199,64,4,237,131,192,8,131,252,237,1,15,133, - 244,3,252,233,244,2,255,139,106,252,248,72,139,189,233,139,108,36,96,141, - 68,194,252,248,137,149,233,141,136,233,59,141,233,137,133,233,255,137,252, - 233,255,72,137,252,250,137,252,233,255,15,135,244,21,199,131,233,237,255, - 252,255,215,255,252,255,147,233,255,199,131,233,237,139,149,233,141,12,194, - 252,247,217,3,141,233,139,114,252,252,252,233,244,12,255,254,0 + 15,182,252,236,139,66,252,248,141,12,202,139,128,233,15,182,128,233,137,124, + 36,80,141,188,253,194,233,43,122,252,252,133,252,237,15,132,244,251,141,108, + 252,233,252,248,57,215,15,131,244,248,248,1,139,71,252,248,137,1,139,71,252, + 252,131,199,8,137,65,4,131,193,8,57,252,233,15,131,244,249,57,215,15,130, + 244,1,248,2,199,65,4,237,131,193,8,57,252,233,15,130,244,2,248,3,139,124, + 36,80,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235, + 248,5,199,68,36,84,1,0,0,0,137,208,41,252,248,15,134,244,3,255,137,197,193, + 252,237,3,131,197,1,137,108,36,84,139,108,36,96,1,200,59,133,233,15,135,244, + 253,248,6,139,71,252,248,137,1,139,71,252,252,131,199,8,137,65,4,131,193, + 8,57,215,15,130,244,6,252,233,244,3,248,7,137,149,233,137,141,233,137,116, + 36,100,41,215,139,84,36,84,131,252,234,1,137,252,233,232,251,1,0,139,149, + 233,139,141,233,1,215,252,233,244,6,255,193,225,3,255,248,1,139,114,252,252, + 137,68,36,84,252,247,198,237,15,133,244,253,255,248,13,137,215,131,232,1, + 15,132,244,249,248,2,139,44,15,137,111,252,248,139,108,15,4,137,111,252,252, + 131,199,8,131,232,1,15,133,244,2,248,3,139,68,36,84,15,182,110,252,255,248, + 5,57,197,15,135,244,252,255,139,108,10,4,137,106,252,252,139,44,10,137,106, + 252,248,255,248,5,56,70,252,255,15,135,244,252,255,15,182,78,252,253,72,252, + 247,209,141,20,202,139,122,252,248,139,191,233,139,191,233,139,6,15,182,204, + 15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,6,255,199,71,252,252, + 237,131,199,8,255,199,68,194,252,244,237,255,131,192,1,252,233,244,5,248, + 7,15,139,244,14,131,230,252,248,41,252,242,255,1,252,241,255,137,252,245, + 209,252,237,129,229,239,102,131,172,253,43,233,1,15,132,244,140,255,141,12, + 202,255,129,121,253,4,239,15,135,244,53,129,121,253,12,239,15,135,244,53, + 255,139,105,20,255,129,252,253,239,15,135,244,53,255,252,242,15,16,1,252, + 242,15,16,73,8,255,252,242,15,88,65,16,252,242,15,17,1,133,252,237,15,136, + 244,249,255,15,140,244,249,255,102,15,46,200,248,1,252,242,15,17,65,24,255, + 221,65,8,221,1,255,220,65,16,221,17,221,81,24,133,252,237,15,136,244,247, + 255,221,81,24,15,140,244,247,255,217,201,248,1,255,15,183,70,252,254,255, + 15,131,244,248,141,180,253,134,233,255,141,180,253,134,233,15,183,70,252, + 254,15,131,245,255,15,130,244,248,141,180,253,134,233,255,248,3,102,15,46, + 193,252,233,244,1,255,141,12,202,139,105,4,129,252,253,239,15,132,244,247, + 255,137,105,252,252,139,41,137,105,252,248,252,233,245,255,141,180,253,134, + 233,139,1,137,105,252,252,137,65,252,248,255,139,139,233,139,4,129,72,139, + 128,233,139,108,36,96,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,252,235, + 255,139,190,233,139,108,36,96,141,12,202,59,141,233,15,135,244,23,15,182, + 142,233,57,200,15,134,244,249,248,2,255,15,183,70,252,254,252,233,245,255, + 248,3,199,68,194,252,252,237,131,192,1,57,200,15,134,244,3,252,233,244,2, + 255,141,44,197,237,141,4,194,139,122,252,248,137,104,252,252,137,120,252, + 248,139,108,36,96,141,12,200,59,141,233,15,135,244,22,137,209,137,194,15, + 182,174,233,133,252,237,15,132,244,248,248,1,131,193,8,57,209,15,131,244, + 249,139,121,252,248,137,56,139,121,252,252,137,120,4,131,192,8,199,65,252, + 252,237,131,252,237,1,15,133,244,1,248,2,255,139,190,233,139,6,15,182,204, + 15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,248,3,199,64,4,237, + 131,192,8,131,252,237,1,15,133,244,3,252,233,244,2,255,139,106,252,248,72, + 139,189,233,139,108,36,96,141,68,194,252,248,137,149,233,141,136,233,59,141, + 233,137,133,233,255,137,252,233,255,72,137,252,250,137,252,233,255,15,135, + 244,21,199,131,233,237,255,252,255,215,255,252,255,147,233,255,199,131,233, + 237,139,149,233,141,12,194,252,247,217,3,141,233,139,114,252,252,252,233, + 244,12,255,254,0 }; enum { @@ -997,6 +998,7 @@ static const char *const extnames[] = { "lj_gc_step@4", "lj_dispatch_ins@8", "lj_dispatch_call@8", + "lj_err_throw@8", "lj_meta_cat", "lj_gc_barrieruv@8", "lj_func_closeuv@8", @@ -1343,63 +1345,63 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse) #if LJ_HASJIT dasm_put(Dst, 7212, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP); #endif - dasm_put(Dst, 7253); + dasm_put(Dst, 7264); if (!sse) { - dasm_put(Dst, 7256); + dasm_put(Dst, 7267); } - dasm_put(Dst, 7301, (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, 7312, (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, 7387); + dasm_put(Dst, 7398); } - dasm_put(Dst, 7432, (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, 7443, (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, 7518); + dasm_put(Dst, 7529); } - dasm_put(Dst, 7557, (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, 7568, (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, 7646, (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, 7657, (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, 7760); + dasm_put(Dst, 7771); } - dasm_put(Dst, 7807); + dasm_put(Dst, 7818); if (!sse) { } else { - dasm_put(Dst, 7881); + dasm_put(Dst, 7892); } - dasm_put(Dst, 7884); - dasm_put(Dst, 7969, (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, 8070, (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, 8238); + dasm_put(Dst, 7895); + dasm_put(Dst, 7980, (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, 8081, (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, 8249); if (sse) { - dasm_put(Dst, 8279); - dasm_put(Dst, 8349); - dasm_put(Dst, 8422); + dasm_put(Dst, 8290); + dasm_put(Dst, 8360); + dasm_put(Dst, 8433); } else { - dasm_put(Dst, 8472); - dasm_put(Dst, 8564); + dasm_put(Dst, 8483); + dasm_put(Dst, 8575); } - dasm_put(Dst, 8610); + dasm_put(Dst, 8621); if (sse) { - dasm_put(Dst, 8616, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); - dasm_put(Dst, 8705, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); + dasm_put(Dst, 8627, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); + dasm_put(Dst, 8716, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32)); } else { - dasm_put(Dst, 8829); - dasm_put(Dst, 8912); + dasm_put(Dst, 8840); + dasm_put(Dst, 8923); if (cmov) { - dasm_put(Dst, 8967); + dasm_put(Dst, 8978); } else { - dasm_put(Dst, 8986); + dasm_put(Dst, 8997); } - dasm_put(Dst, 8825); + dasm_put(Dst, 8836); } - dasm_put(Dst, 9027); + dasm_put(Dst, 9038); } /* 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, 9053, defop); + dasm_put(Dst, 9064, defop); switch (op) { @@ -1408,600 +1410,600 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) /* Remember: all ops branch for a true comparison, fall through otherwise. */ case BC_ISLT: case BC_ISGE: case BC_ISLE: case BC_ISGT: - dasm_put(Dst, 9055, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 9066, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9076); + dasm_put(Dst, 9087); } else { - dasm_put(Dst, 9091); + dasm_put(Dst, 9102); if (cmov) { - dasm_put(Dst, 9101); + dasm_put(Dst, 9112); } else { - dasm_put(Dst, 9107); + dasm_put(Dst, 9118); } } switch (op) { case BC_ISLT: - dasm_put(Dst, 9114); + dasm_put(Dst, 9125); break; case BC_ISGE: - dasm_put(Dst, 8907); + dasm_put(Dst, 8918); break; case BC_ISLE: dasm_put(Dst, 5872); break; case BC_ISGT: - dasm_put(Dst, 9119); + dasm_put(Dst, 9130); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 9124, -BCBIAS_J*4); + dasm_put(Dst, 9135, -BCBIAS_J*4); break; case BC_ISEQV: case BC_ISNEV: vk = op == BC_ISEQV; - dasm_put(Dst, 9158, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 9169, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9184); + dasm_put(Dst, 9195); } else { - dasm_put(Dst, 9196); + dasm_put(Dst, 9207); if (cmov) { - dasm_put(Dst, 9101); + dasm_put(Dst, 9112); } else { - dasm_put(Dst, 9107); + dasm_put(Dst, 9118); } } iseqne_fp: if (vk) { - dasm_put(Dst, 9203); + dasm_put(Dst, 9214); } else { - dasm_put(Dst, 9212); + dasm_put(Dst, 9223); } iseqne_end: if (vk) { - dasm_put(Dst, 9221, -BCBIAS_J*4); + dasm_put(Dst, 9232, -BCBIAS_J*4); } else { - dasm_put(Dst, 9236, -BCBIAS_J*4); + dasm_put(Dst, 9247, -BCBIAS_J*4); } - dasm_put(Dst, 7233); + dasm_put(Dst, 9149); if (op == BC_ISEQV || op == BC_ISNEV) { - dasm_put(Dst, 9251, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<metatable), Dt6(->nomm), 1<>32)); + dasm_put(Dst, 9550, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); } else { - dasm_put(Dst, 9564); + dasm_put(Dst, 9575); } - dasm_put(Dst, 7233); + dasm_put(Dst, 9149); break; case BC_LEN: - dasm_put(Dst, 9573, LJ_TSTR); + dasm_put(Dst, 9584, LJ_TSTR); if (sse) { - dasm_put(Dst, 9587, Dt5(->len)); + dasm_put(Dst, 9598, Dt5(->len)); } else { - dasm_put(Dst, 9605, Dt5(->len)); + dasm_put(Dst, 9616, Dt5(->len)); } - dasm_put(Dst, 9614, LJ_TTAB); + dasm_put(Dst, 9625, LJ_TTAB); if (sse) { - dasm_put(Dst, 9655); + dasm_put(Dst, 9666); } else { } - dasm_put(Dst, 9664); + dasm_put(Dst, 9675); break; /* -- Binary ops -------------------------------------------------------- */ case BC_ADDVN: case BC_ADDNV: case BC_ADDVV: - dasm_put(Dst, 9674); + dasm_put(Dst, 9685); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 9682, LJ_TISNUM); + dasm_put(Dst, 9693, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9694); + dasm_put(Dst, 9705); } else { - dasm_put(Dst, 9708); + dasm_put(Dst, 9719); } break; case 1: - dasm_put(Dst, 9716, LJ_TISNUM); + dasm_put(Dst, 9727, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9728); + dasm_put(Dst, 9739); } else { - dasm_put(Dst, 9742); + dasm_put(Dst, 9753); } break; default: - dasm_put(Dst, 9750, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 9761, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9772); + dasm_put(Dst, 9783); } else { - dasm_put(Dst, 9786); + dasm_put(Dst, 9797); } break; } if (sse) { - dasm_put(Dst, 9557); + dasm_put(Dst, 9568); } else { - dasm_put(Dst, 9569); + dasm_put(Dst, 9580); } - dasm_put(Dst, 7233); + dasm_put(Dst, 9149); break; case BC_SUBVN: case BC_SUBNV: case BC_SUBVV: - dasm_put(Dst, 9674); + dasm_put(Dst, 9685); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 9682, LJ_TISNUM); + dasm_put(Dst, 9693, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9794); + dasm_put(Dst, 9805); } else { - dasm_put(Dst, 9808); + dasm_put(Dst, 9819); } break; case 1: - dasm_put(Dst, 9716, LJ_TISNUM); + dasm_put(Dst, 9727, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9816); + dasm_put(Dst, 9827); } else { - dasm_put(Dst, 9830); + dasm_put(Dst, 9841); } break; default: - dasm_put(Dst, 9750, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 9761, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9838); + dasm_put(Dst, 9849); } else { - dasm_put(Dst, 9852); + dasm_put(Dst, 9863); } break; } if (sse) { - dasm_put(Dst, 9557); + dasm_put(Dst, 9568); } else { - dasm_put(Dst, 9569); + dasm_put(Dst, 9580); } - dasm_put(Dst, 7233); + dasm_put(Dst, 9149); break; case BC_MULVN: case BC_MULNV: case BC_MULVV: - dasm_put(Dst, 9674); + dasm_put(Dst, 9685); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 9682, LJ_TISNUM); + dasm_put(Dst, 9693, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9860); + dasm_put(Dst, 9871); } else { - dasm_put(Dst, 9874); + dasm_put(Dst, 9885); } break; case 1: - dasm_put(Dst, 9716, LJ_TISNUM); + dasm_put(Dst, 9727, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9882); + dasm_put(Dst, 9893); } else { - dasm_put(Dst, 9896); + dasm_put(Dst, 9907); } break; default: - dasm_put(Dst, 9750, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 9761, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9904); + dasm_put(Dst, 9915); } else { - dasm_put(Dst, 9918); + dasm_put(Dst, 9929); } break; } if (sse) { - dasm_put(Dst, 9557); + dasm_put(Dst, 9568); } else { - dasm_put(Dst, 9569); + dasm_put(Dst, 9580); } - dasm_put(Dst, 7233); + dasm_put(Dst, 9149); break; case BC_DIVVN: case BC_DIVNV: case BC_DIVVV: - dasm_put(Dst, 9674); + dasm_put(Dst, 9685); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 9682, LJ_TISNUM); + dasm_put(Dst, 9693, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9926); + dasm_put(Dst, 9937); } else { - dasm_put(Dst, 9940); + dasm_put(Dst, 9951); } break; case 1: - dasm_put(Dst, 9716, LJ_TISNUM); + dasm_put(Dst, 9727, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9948); + dasm_put(Dst, 9959); } else { - dasm_put(Dst, 9962); + dasm_put(Dst, 9973); } break; default: - dasm_put(Dst, 9750, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 9761, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9970); + dasm_put(Dst, 9981); } else { - dasm_put(Dst, 9984); + dasm_put(Dst, 9995); } break; } if (sse) { - dasm_put(Dst, 9557); + dasm_put(Dst, 9568); } else { - dasm_put(Dst, 9569); + dasm_put(Dst, 9580); } - dasm_put(Dst, 7233); + dasm_put(Dst, 9149); break; case BC_MODVN: - dasm_put(Dst, 9674); + dasm_put(Dst, 9685); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 9682, LJ_TISNUM); + dasm_put(Dst, 9693, LJ_TISNUM); if (sse) { - dasm_put(Dst, 9992); + dasm_put(Dst, 10003); } else { - dasm_put(Dst, 10006); + dasm_put(Dst, 10017); } break; case 1: - dasm_put(Dst, 9716, LJ_TISNUM); + dasm_put(Dst, 9727, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10014); + dasm_put(Dst, 10025); } else { - dasm_put(Dst, 10028); + dasm_put(Dst, 10039); } break; default: - dasm_put(Dst, 9750, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 9761, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10036); + dasm_put(Dst, 10047); } else { - dasm_put(Dst, 10050); - } - break; - } - dasm_put(Dst, 10058); - if (sse) { - dasm_put(Dst, 9557); - } else { - dasm_put(Dst, 9569); - } - dasm_put(Dst, 7233); - break; - case BC_MODNV: case BC_MODVV: - dasm_put(Dst, 9674); - vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); - switch (vk) { - case 0: - dasm_put(Dst, 9682, LJ_TISNUM); - if (sse) { - dasm_put(Dst, 9992); - } else { - dasm_put(Dst, 10006); - } - break; - case 1: - dasm_put(Dst, 9716, LJ_TISNUM); - if (sse) { - dasm_put(Dst, 10014); - } else { - dasm_put(Dst, 10028); - } - break; - default: - dasm_put(Dst, 9750, LJ_TISNUM, LJ_TISNUM); - if (sse) { - dasm_put(Dst, 10036); - } else { - dasm_put(Dst, 10050); - } - break; - } - dasm_put(Dst, 10064); - break; - case BC_POW: - dasm_put(Dst, 9674); - vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); - switch (vk) { - case 0: - dasm_put(Dst, 9682, LJ_TISNUM); - if (sse) { - dasm_put(Dst, 9992); - } else { - dasm_put(Dst, 10006); - } - break; - case 1: - dasm_put(Dst, 9716, LJ_TISNUM); - if (sse) { - dasm_put(Dst, 10014); - } else { - dasm_put(Dst, 10028); - } - break; - default: - dasm_put(Dst, 9750, LJ_TISNUM, LJ_TISNUM); - if (sse) { - dasm_put(Dst, 10036); - } else { - dasm_put(Dst, 10050); + dasm_put(Dst, 10061); } break; } dasm_put(Dst, 10069); if (sse) { - dasm_put(Dst, 9557); + dasm_put(Dst, 9568); } else { - dasm_put(Dst, 9569); + dasm_put(Dst, 9580); } - dasm_put(Dst, 7233); + dasm_put(Dst, 9149); + break; + case BC_MODNV: case BC_MODVV: + dasm_put(Dst, 9685); + vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); + switch (vk) { + case 0: + dasm_put(Dst, 9693, LJ_TISNUM); + if (sse) { + dasm_put(Dst, 10003); + } else { + dasm_put(Dst, 10017); + } + break; + case 1: + dasm_put(Dst, 9727, LJ_TISNUM); + if (sse) { + dasm_put(Dst, 10025); + } else { + dasm_put(Dst, 10039); + } + break; + default: + dasm_put(Dst, 9761, LJ_TISNUM, LJ_TISNUM); + if (sse) { + dasm_put(Dst, 10047); + } else { + dasm_put(Dst, 10061); + } + break; + } + dasm_put(Dst, 10075); + break; + case BC_POW: + dasm_put(Dst, 9685); + vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); + switch (vk) { + case 0: + dasm_put(Dst, 9693, LJ_TISNUM); + if (sse) { + dasm_put(Dst, 10003); + } else { + dasm_put(Dst, 10017); + } + break; + case 1: + dasm_put(Dst, 9727, LJ_TISNUM); + if (sse) { + dasm_put(Dst, 10025); + } else { + dasm_put(Dst, 10039); + } + break; + default: + dasm_put(Dst, 9761, LJ_TISNUM, LJ_TISNUM); + if (sse) { + dasm_put(Dst, 10047); + } else { + dasm_put(Dst, 10061); + } + break; + } + dasm_put(Dst, 10080); + if (sse) { + dasm_put(Dst, 9568); + } else { + dasm_put(Dst, 9580); + } + dasm_put(Dst, 9149); break; case BC_CAT: - dasm_put(Dst, 10073, Dt1(->base), Dt1(->base)); + dasm_put(Dst, 10084, Dt1(->base), Dt1(->base)); break; /* -- Constant ops ------------------------------------------------------ */ case BC_KSTR: - dasm_put(Dst, 10163, LJ_TSTR); + dasm_put(Dst, 10174, LJ_TSTR); break; case BC_KSHORT: if (sse) { - dasm_put(Dst, 10198); + dasm_put(Dst, 10209); } else { - dasm_put(Dst, 10213); + dasm_put(Dst, 10224); } - dasm_put(Dst, 7233); + dasm_put(Dst, 9149); break; case BC_KNUM: if (sse) { - dasm_put(Dst, 10221); + dasm_put(Dst, 10232); } else { - dasm_put(Dst, 10234); + dasm_put(Dst, 10245); } - dasm_put(Dst, 7233); + dasm_put(Dst, 9149); break; case BC_KPRI: - dasm_put(Dst, 10241); + dasm_put(Dst, 10252); break; case BC_KNIL: - dasm_put(Dst, 10269, LJ_TNIL); + dasm_put(Dst, 10280, LJ_TNIL); break; /* -- Upvalue and function ops ------------------------------------------ */ case BC_UGET: - dasm_put(Dst, 10316, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 10327, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_USETV: #define TV2MARKOFS \ ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv)) - dasm_put(Dst, 10361, 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, 10452); + dasm_put(Dst, 10372, 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, 10463); break; #undef TV2MARKOFS case BC_USETS: - dasm_put(Dst, 10464, 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, 10475, 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, 10557); + dasm_put(Dst, 10568); if (sse) { - dasm_put(Dst, 10562); + dasm_put(Dst, 10573); } else { - dasm_put(Dst, 9377); + dasm_put(Dst, 9388); } - dasm_put(Dst, 10569, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 10580, offsetof(GCfuncL, uvptr), DtA(->v)); if (sse) { - dasm_put(Dst, 10578); + dasm_put(Dst, 10589); } else { - dasm_put(Dst, 10584); + dasm_put(Dst, 10595); } - dasm_put(Dst, 7233); + dasm_put(Dst, 9149); break; case BC_USETP: - dasm_put(Dst, 10587, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 10598, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_UCLO: - dasm_put(Dst, 10626, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 10637, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); break; case BC_FNEW: - dasm_put(Dst, 10681, Dt1(->base), Dt1(->base), LJ_TFUNC); + dasm_put(Dst, 10692, Dt1(->base), Dt1(->base), LJ_TFUNC); break; /* -- Table ops --------------------------------------------------------- */ case BC_TNEW: - dasm_put(Dst, 10747, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 10758, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); break; case BC_TDUP: - dasm_put(Dst, 10868, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 10879, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); break; case BC_GGET: - dasm_put(Dst, 10963, Dt7(->env)); + dasm_put(Dst, 10974, Dt7(->env)); break; case BC_GSET: - dasm_put(Dst, 10982, Dt7(->env)); + dasm_put(Dst, 10993, Dt7(->env)); break; case BC_TGETV: - dasm_put(Dst, 11001, LJ_TTAB, LJ_TISNUM); + dasm_put(Dst, 11012, LJ_TTAB, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11034); + dasm_put(Dst, 11045); } else { } - dasm_put(Dst, 11055, 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, 11251, 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, 11262, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable)); - dasm_put(Dst, 11540, Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 11467, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable)); + dasm_put(Dst, 11551, Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETS: - dasm_put(Dst, 11602, 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, 11678, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); - dasm_put(Dst, 11771, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 11613, 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, 11689, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); + dasm_put(Dst, 11782, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETB: - dasm_put(Dst, 11862, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); - dasm_put(Dst, 11961, Dt6(->metatable), Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 11873, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); + dasm_put(Dst, 11972, Dt6(->metatable), Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETM: - dasm_put(Dst, 12007); + dasm_put(Dst, 12018); if (sse) { - dasm_put(Dst, 10562); + dasm_put(Dst, 10573); } else { } - dasm_put(Dst, 12012, Dt6(->marked), LJ_GC_BLACK); + dasm_put(Dst, 12023, Dt6(->marked), LJ_GC_BLACK); if (sse) { - dasm_put(Dst, 12037); + dasm_put(Dst, 12048); } else { } - dasm_put(Dst, 12044, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain)); - dasm_put(Dst, 12170, Dt6(->gclist)); + dasm_put(Dst, 12055, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain)); + dasm_put(Dst, 12181, Dt6(->gclist)); break; /* -- Calls and vararg handling ----------------------------------------- */ case BC_CALL: case BC_CALLM: - dasm_put(Dst, 9678); + dasm_put(Dst, 9689); if (op == BC_CALLM) { - dasm_put(Dst, 12178); + dasm_put(Dst, 12189); } - dasm_put(Dst, 12183, LJ_TFUNC, Dt7(->pc)); + dasm_put(Dst, 12194, LJ_TFUNC, Dt7(->pc)); break; case BC_CALLMT: - dasm_put(Dst, 12178); + dasm_put(Dst, 12189); break; case BC_CALLT: - dasm_put(Dst, 12225, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); - dasm_put(Dst, 12344, FRAME_TYPE, Dt7(->pc), PC2PROTO(k)); + dasm_put(Dst, 12236, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); + dasm_put(Dst, 12355, FRAME_TYPE, Dt7(->pc), PC2PROTO(k)); break; case BC_ITERC: - dasm_put(Dst, 12402, LJ_TFUNC, 2+1, Dt7(->pc)); + dasm_put(Dst, 12413, LJ_TFUNC, 2+1, Dt7(->pc)); break; case BC_VARG: - dasm_put(Dst, 12483, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL); - dasm_put(Dst, 12628, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 12494, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL); + dasm_put(Dst, 12639, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); break; /* -- Returns ----------------------------------------------------------- */ case BC_RETM: - dasm_put(Dst, 12178); + dasm_put(Dst, 12189); break; case BC_RET: case BC_RET0: case BC_RET1: if (op != BC_RET0) { - dasm_put(Dst, 12727); + dasm_put(Dst, 12738); } - dasm_put(Dst, 12731, FRAME_TYPE); + dasm_put(Dst, 12742, FRAME_TYPE); switch (op) { case BC_RET: - dasm_put(Dst, 12750); + dasm_put(Dst, 12761); break; case BC_RET1: - dasm_put(Dst, 12808); + dasm_put(Dst, 12819); /* fallthrough */ case BC_RET0: - dasm_put(Dst, 12824); + dasm_put(Dst, 12835); default: break; } - dasm_put(Dst, 12835, Dt7(->pc), PC2PROTO(k)); + dasm_put(Dst, 12846, Dt7(->pc), PC2PROTO(k)); if (op == BC_RET) { - dasm_put(Dst, 12879, LJ_TNIL); + dasm_put(Dst, 12890, LJ_TNIL); } else { - dasm_put(Dst, 12888, LJ_TNIL); + dasm_put(Dst, 12899, LJ_TNIL); } - dasm_put(Dst, 12895); + dasm_put(Dst, 12906); if (op != BC_RET0) { - dasm_put(Dst, 12916); + dasm_put(Dst, 12927); } dasm_put(Dst, 4542); break; @@ -2011,7 +2013,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORL: #if LJ_HASJIT - dasm_put(Dst, 12920, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 12931, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2023,57 +2025,57 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORI: case BC_IFORL: vk = (op == BC_IFORL || op == BC_JFORL); - dasm_put(Dst, 12941); + dasm_put(Dst, 12952); if (!vk) { - dasm_put(Dst, 12945, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 12956, LJ_TISNUM, LJ_TISNUM); } - dasm_put(Dst, 12964); + dasm_put(Dst, 12975); if (!vk) { - dasm_put(Dst, 12968, LJ_TISNUM); + dasm_put(Dst, 12979, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 12977); + dasm_put(Dst, 12988); if (vk) { - dasm_put(Dst, 12989); + dasm_put(Dst, 13000); } else { - dasm_put(Dst, 13008); + dasm_put(Dst, 13019); } - dasm_put(Dst, 13013); + dasm_put(Dst, 13024); } else { - dasm_put(Dst, 13026); + dasm_put(Dst, 13037); if (vk) { - dasm_put(Dst, 13032); + dasm_put(Dst, 13043); } else { - dasm_put(Dst, 13048); + dasm_put(Dst, 13059); } - dasm_put(Dst, 13056); + dasm_put(Dst, 13067); if (cmov) { - dasm_put(Dst, 9101); + dasm_put(Dst, 9112); } else { - dasm_put(Dst, 9107); + dasm_put(Dst, 9118); } if (!cmov) { - dasm_put(Dst, 13061); + dasm_put(Dst, 13072); } } if (op == BC_FORI) { - dasm_put(Dst, 13067, -BCBIAS_J*4); + dasm_put(Dst, 13078, -BCBIAS_J*4); } else if (op == BC_JFORI) { - dasm_put(Dst, 13077, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 13088, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 13091, -BCBIAS_J*4); + dasm_put(Dst, 13102, -BCBIAS_J*4); } else { - dasm_put(Dst, 13087, BC_JLOOP); + dasm_put(Dst, 13098, BC_JLOOP); } - dasm_put(Dst, 9136); + dasm_put(Dst, 9147); if (sse) { - dasm_put(Dst, 13101); + dasm_put(Dst, 13112); } break; case BC_ITERL: #if LJ_HASJIT - dasm_put(Dst, 12920, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 12931, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2082,33 +2084,33 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IITERL: - dasm_put(Dst, 13112, LJ_TNIL); + dasm_put(Dst, 13123, LJ_TNIL); if (op == BC_JITERL) { - dasm_put(Dst, 13127, BC_JLOOP); + dasm_put(Dst, 13138, BC_JLOOP); } else { - dasm_put(Dst, 13141, -BCBIAS_J*4); + dasm_put(Dst, 13152, -BCBIAS_J*4); } - dasm_put(Dst, 9436); + dasm_put(Dst, 9447); break; case BC_LOOP: #if LJ_HASJIT - dasm_put(Dst, 12920, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 12931, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; case BC_ILOOP: - dasm_put(Dst, 7233); + dasm_put(Dst, 9149); break; case BC_JLOOP: #if LJ_HASJIT - dasm_put(Dst, 13157, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); + dasm_put(Dst, 13168, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); #endif break; case BC_JMP: - dasm_put(Dst, 13181, -BCBIAS_J*4); + dasm_put(Dst, 13192, -BCBIAS_J*4); break; /* -- Function headers -------------------------------------------------- */ @@ -2131,13 +2133,13 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IFUNCF: - dasm_put(Dst, 13206, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); + dasm_put(Dst, 13217, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); if (op == BC_JFUNCF) { - dasm_put(Dst, 13236, BC_JLOOP); + dasm_put(Dst, 13247, BC_JLOOP); } else { - dasm_put(Dst, 7233); + dasm_put(Dst, 9149); } - dasm_put(Dst, 13245, LJ_TNIL); + dasm_put(Dst, 13256, LJ_TNIL); break; case BC_JFUNCV: @@ -2148,30 +2150,30 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; /* NYI: compiled vararg functions. */ case BC_IFUNCV: - dasm_put(Dst, 13267, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); + dasm_put(Dst, 13278, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); if (op == BC_JFUNCV) { - dasm_put(Dst, 13236, BC_JLOOP); + dasm_put(Dst, 13247, BC_JLOOP); } else { - dasm_put(Dst, 13358, -4+PC2PROTO(k)); + dasm_put(Dst, 13369, -4+PC2PROTO(k)); } - dasm_put(Dst, 13381, LJ_TNIL); + dasm_put(Dst, 13392, LJ_TNIL); break; case BC_FUNCC: case BC_FUNCCW: - dasm_put(Dst, 13403, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); + dasm_put(Dst, 13414, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); if (op == BC_FUNCC) { - dasm_put(Dst, 13433); + dasm_put(Dst, 13444); } else { - dasm_put(Dst, 13437); + dasm_put(Dst, 13448); } - dasm_put(Dst, 13445, DISPATCH_GL(vmstate), ~LJ_VMST_C); + dasm_put(Dst, 13456, DISPATCH_GL(vmstate), ~LJ_VMST_C); if (op == BC_FUNCC) { - dasm_put(Dst, 13454); + dasm_put(Dst, 13465); } else { - dasm_put(Dst, 13458, DISPATCH_GL(wrapf)); + dasm_put(Dst, 13469, DISPATCH_GL(wrapf)); } - dasm_put(Dst, 13463, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 13474, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); break; /* ---------------------------------------------------------------------- */ @@ -2199,7 +2201,7 @@ static int build_backend(BuildCtx *ctx) build_subroutines(ctx, cmov, sse); - dasm_put(Dst, 13488); + dasm_put(Dst, 13499); 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 5ec87aa8..0d97d01c 100644 --- a/src/buildvm_x86.dasc +++ b/src/buildvm_x86.dasc @@ -2591,11 +2591,14 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse) | lea FCARG2, [esp+16] | lea FCARG1, [DISPATCH+GG_DISP2J] | call extern lj_trace_exit@8 // (jit_State *J, ExitState *ex) - | // Interpreter C frame returned in eax. - | mov esp, eax // Reposition stack to C frame. + | // Error code returned in eax (RD). + | mov RAa, L:RB->cframe + | and RAa, CFRAME_RAWMASK + | mov esp, RAa // Reposition stack to C frame. + | mov SAVE_L, L:RB // Needed for on-trace resume/yield. + | test RD, RD; jnz >1 // Check for error from exit. | mov BASE, L:RB->base | mov PC, SAVE_PC - | mov SAVE_L, L:RB // Needed for on-trace resume/yield. |.endif #endif |->vm_exit_interp: @@ -2606,6 +2609,11 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse) | mov dword [DISPATCH+DISPATCH_GL(jit_L)], 0 | set_vmstate INTERP | ins_next + | + |1: // Rethrow error from the right C frame. + | mov FCARG1, L:RB + | mov FCARG2, RD + | call extern lj_err_throw@8 // (lua_State *L, int errcode) #endif | |//----------------------------------------------------------------------- diff --git a/src/buildvm_x86.h b/src/buildvm_x86.h index ef160e61..9253bc21 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[15165] = { +static const unsigned char build_actionlist[15189] = { 254,1,248,10,252,247,198,237,15,132,244,11,131,230,252,248,41,252,242,141, 76,49,252,248,139,114,252,252,199,68,10,4,237,248,12,131,192,1,137,68,36, 20,252,247,198,237,15,132,244,13,248,14,252,247,198,237,15,132,244,10,199, @@ -417,170 +417,171 @@ static const unsigned char build_actionlist[15165] = { 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,248,1,139,171,233,139,147,233,137,171,233,137,149,233,141,84, - 36,16,141,139,233,232,251,1,23,137,196,139,149,233,139,116,36,24,137,108, - 36,48,255,248,144,255,139,122,252,248,139,191,233,139,191,233,199,131,233, - 0,0,0,0,199,131,233,237,139,6,15,182,204,15,182,232,131,198,4,193,232,16, - 252,255,36,171,255,248,82,255,217,124,36,4,137,68,36,8,102,184,0,4,102,11, - 68,36,4,102,37,252,255,252,247,102,137,68,36,6,217,108,36,6,217,252,252,217, - 108,36,4,139,68,36,8,195,255,248,145,102,15,252,239,210,102,15,118,210,102, + 36,16,141,139,233,232,251,1,23,139,141,233,129,225,239,137,204,137,108,36, + 48,133,192,15,133,244,247,255,139,149,233,139,116,36,24,255,248,144,255,139, + 122,252,248,139,191,233,139,191,233,199,131,233,0,0,0,0,199,131,233,237,139, + 6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,1,137,252, + 233,137,194,232,251,1,24,255,248,82,255,217,124,36,4,137,68,36,8,102,184, + 0,4,102,11,68,36,4,102,37,252,255,252,247,102,137,68,36,6,217,108,36,6,217, + 252,252,217,108,36,4,139,68,36,8,195,255,248,145,102,15,252,239,210,102,15, + 118,210,102,15,115,210,1,184,0,0,48,67,102,15,110,216,102,15,112,219,81,15, + 40,200,102,15,84,202,102,15,46,217,15,134,244,247,102,15,85,208,252,242,15, + 88,203,252,242,15,92,203,102,15,86,202,184,0,0,252,240,63,102,15,110,208, + 102,15,112,210,81,252,242,15,194,193,1,102,15,84,194,252,242,15,92,200,15, + 40,193,248,1,195,248,84,255,217,124,36,4,137,68,36,8,102,184,0,8,102,11,68, + 36,4,102,37,252,255,252,251,102,137,68,36,6,217,108,36,6,217,252,252,217, + 108,36,4,139,68,36,8,195,255,248,146,102,15,252,239,210,102,15,118,210,102, 15,115,210,1,184,0,0,48,67,102,15,110,216,102,15,112,219,81,15,40,200,102, 15,84,202,102,15,46,217,15,134,244,247,102,15,85,208,252,242,15,88,203,252, - 242,15,92,203,102,15,86,202,184,0,0,252,240,63,102,15,110,208,102,15,112, - 210,81,252,242,15,194,193,1,102,15,84,194,252,242,15,92,200,15,40,193,248, - 1,195,248,84,255,217,124,36,4,137,68,36,8,102,184,0,8,102,11,68,36,4,102, - 37,252,255,252,251,102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,4, - 139,68,36,8,195,255,248,146,102,15,252,239,210,102,15,118,210,102,15,115, - 210,1,184,0,0,48,67,102,15,110,216,102,15,112,219,81,15,40,200,102,15,84, - 202,102,15,46,217,15,134,244,247,102,15,85,208,252,242,15,88,203,252,242, - 15,92,203,102,15,86,202,184,0,0,252,240,191,102,15,110,208,102,15,112,210, - 81,252,242,15,194,193,6,102,15,84,194,252,242,15,92,200,15,40,193,248,1,195, - 248,104,255,217,124,36,4,137,68,36,8,102,184,0,12,102,11,68,36,4,102,137, - 68,36,6,217,108,36,6,217,252,252,217,108,36,4,139,68,36,8,195,255,248,147, - 102,15,252,239,210,102,15,118,210,102,15,115,210,1,184,0,0,48,67,102,15,110, - 216,102,15,112,219,81,15,40,200,102,15,84,202,102,15,46,217,15,134,244,247, - 102,15,85,208,15,40,193,252,242,15,88,203,252,242,15,92,203,184,0,0,252,240, - 63,102,15,110,216,102,15,112,219,81,252,242,15,194,193,1,102,15,84,195,252, - 242,15,92,200,102,15,86,202,15,40,193,248,1,195,248,148,255,15,40,232,252, - 242,15,94,193,102,15,252,239,210,102,15,118,210,102,15,115,210,1,184,0,0, - 48,67,102,15,110,216,102,15,112,219,81,15,40,224,102,15,84,226,102,15,46, - 220,15,134,244,247,102,15,85,208,252,242,15,88,227,252,242,15,92,227,102, - 15,86,226,184,0,0,252,240,63,102,15,110,208,102,15,112,210,81,252,242,15, - 194,196,1,102,15,84,194,252,242,15,92,224,15,40,197,252,242,15,89,204,252, - 242,15,92,193,195,248,1,252,242,15,89,200,15,40,197,252,242,15,92,193,195, - 255,217,193,216,252,241,217,124,36,4,102,184,0,4,102,11,68,36,4,102,37,252, - 255,252,247,102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,222,201, - 222,252,233,195,255,248,88,217,252,234,222,201,248,149,217,84,36,4,129,124, - 36,4,0,0,128,127,15,132,244,247,129,124,36,4,0,0,128,252,255,15,132,244,248, - 248,150,217,192,217,252,252,220,252,233,217,201,217,252,240,217,232,222,193, - 217,252,253,221,217,248,1,195,248,2,221,216,217,252,238,195,255,248,107,219, - 84,36,4,219,68,36,4,255,223,252,233,255,221,252,233,223,224,158,255,15,133, - 244,254,15,138,244,255,221,216,139,68,36,4,131,252,248,1,15,142,244,252,248, - 1,169,1,0,0,0,15,133,244,248,216,200,209,232,252,233,244,1,248,2,209,232, - 15,132,244,251,217,192,248,3,216,200,209,232,15,132,244,250,15,131,244,3, - 220,201,252,233,244,3,248,4,255,222,201,248,5,195,248,6,15,132,244,5,15,130, - 244,253,217,232,222,252,241,252,247,216,131,252,248,1,15,132,244,5,252,233, - 244,1,248,7,221,216,217,232,195,248,8,217,84,36,4,217,201,217,84,36,8,139, - 68,36,4,209,224,61,0,0,0,252,255,15,132,244,248,139,68,36,8,209,224,15,132, - 244,250,61,0,0,0,252,255,15,132,244,250,217,252,241,252,233,244,150,248,9, - 255,217,232,255,223,252,234,255,221,252,234,223,224,158,255,15,132,244,247, - 217,201,248,1,221,216,195,248,2,217,225,217,232,255,15,132,244,249,221,216, - 217,225,217,252,238,184,0,0,0,0,15,146,208,209,200,51,68,36,4,15,137,244, - 249,217,201,248,3,221,217,217,225,195,248,4,131,124,36,4,0,15,141,244,3,221, - 216,221,216,133,192,15,132,244,251,217,252,238,195,248,5,199,68,36,4,0,0, - 128,127,217,68,36,4,195,255,248,107,255,248,151,252,242,15,45,193,252,242, - 15,42,208,102,15,46,202,15,133,244,254,15,138,244,255,248,152,131,252,248, - 1,15,142,244,252,248,1,169,1,0,0,0,15,133,244,248,252,242,15,89,192,209,232, - 252,233,244,1,248,2,209,232,15,132,244,251,15,40,200,248,3,252,242,15,89, - 192,209,232,15,132,244,250,15,131,244,3,255,252,242,15,89,200,252,233,244, - 3,248,4,252,242,15,89,193,248,5,195,248,6,15,132,244,5,15,130,244,253,80, - 184,0,0,252,240,63,102,15,110,200,102,15,112,201,81,252,242,15,94,200,88, - 15,40,193,252,247,216,131,252,248,1,15,132,244,5,252,233,244,1,248,7,184, - 0,0,252,240,63,102,15,110,192,102,15,112,192,81,195,248,8,252,242,15,17,76, - 36,12,252,242,15,17,68,36,4,131,124,36,12,0,15,133,244,247,139,68,36,16,209, - 224,61,0,0,224,252,255,15,132,244,248,248,1,255,131,124,36,4,0,15,133,244, - 247,139,68,36,8,209,224,15,132,244,250,61,0,0,224,252,255,15,132,244,251, - 248,1,221,68,36,12,221,68,36,4,217,252,241,217,192,217,252,252,220,252,233, - 217,201,217,252,240,217,232,222,193,217,252,253,221,217,221,92,36,4,252,242, - 15,16,68,36,4,195,248,9,184,0,0,252,240,63,102,15,110,208,102,15,112,210, - 81,102,15,46,194,15,132,244,247,15,40,193,248,1,195,248,2,102,15,252,239, - 210,102,15,118,210,102,15,115,210,1,102,15,84,194,184,0,0,252,240,63,102, - 15,110,208,102,15,112,210,81,102,15,46,194,15,132,244,1,102,15,80,193,15, - 87,192,136,196,15,146,208,48,224,15,133,244,1,248,3,184,0,0,252,240,127,102, - 15,110,192,102,15,112,192,81,195,248,4,102,15,80,193,133,192,15,133,244,3, - 255,15,87,192,195,248,5,102,15,80,193,133,192,15,132,244,3,15,87,192,195, - 248,153,255,139,68,36,12,252,242,15,16,68,36,4,131,252,248,1,15,132,244,247, - 15,135,244,248,232,244,82,252,233,244,253,248,1,232,244,84,252,233,244,253, - 248,2,131,252,248,3,15,132,244,247,15,135,244,248,232,244,104,255,252,233, - 244,253,248,1,252,242,15,81,192,248,7,252,242,15,17,68,36,4,221,68,36,4,195, - 248,2,221,68,36,4,131,252,248,5,15,130,244,88,15,132,244,149,248,2,131,252, - 248,7,15,132,244,247,15,135,244,248,217,252,237,217,201,217,252,241,195,248, - 1,217,232,217,201,217,252,241,195,248,2,131,252,248,9,15,132,244,247,15,135, - 244,248,255,217,252,236,217,201,217,252,241,195,248,1,217,252,254,195,248, + 242,15,92,203,102,15,86,202,184,0,0,252,240,191,102,15,110,208,102,15,112, + 210,81,252,242,15,194,193,6,102,15,84,194,252,242,15,92,200,15,40,193,248, + 1,195,248,104,255,217,124,36,4,137,68,36,8,102,184,0,12,102,11,68,36,4,102, + 137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,139,68,36,8,195,255,248, + 147,102,15,252,239,210,102,15,118,210,102,15,115,210,1,184,0,0,48,67,102, + 15,110,216,102,15,112,219,81,15,40,200,102,15,84,202,102,15,46,217,15,134, + 244,247,102,15,85,208,15,40,193,252,242,15,88,203,252,242,15,92,203,184,0, + 0,252,240,63,102,15,110,216,102,15,112,219,81,252,242,15,194,193,1,102,15, + 84,195,252,242,15,92,200,102,15,86,202,15,40,193,248,1,195,248,148,255,15, + 40,232,252,242,15,94,193,102,15,252,239,210,102,15,118,210,102,15,115,210, + 1,184,0,0,48,67,102,15,110,216,102,15,112,219,81,15,40,224,102,15,84,226, + 102,15,46,220,15,134,244,247,102,15,85,208,252,242,15,88,227,252,242,15,92, + 227,102,15,86,226,184,0,0,252,240,63,102,15,110,208,102,15,112,210,81,252, + 242,15,194,196,1,102,15,84,194,252,242,15,92,224,15,40,197,252,242,15,89, + 204,252,242,15,92,193,195,248,1,252,242,15,89,200,15,40,197,252,242,15,92, + 193,195,255,217,193,216,252,241,217,124,36,4,102,184,0,4,102,11,68,36,4,102, + 37,252,255,252,247,102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,4, + 222,201,222,252,233,195,255,248,88,217,252,234,222,201,248,149,217,84,36, + 4,129,124,36,4,0,0,128,127,15,132,244,247,129,124,36,4,0,0,128,252,255,15, + 132,244,248,248,150,217,192,217,252,252,220,252,233,217,201,217,252,240,217, + 232,222,193,217,252,253,221,217,248,1,195,248,2,221,216,217,252,238,195,255, + 248,107,219,84,36,4,219,68,36,4,255,223,252,233,255,221,252,233,223,224,158, + 255,15,133,244,254,15,138,244,255,221,216,139,68,36,4,131,252,248,1,15,142, + 244,252,248,1,169,1,0,0,0,15,133,244,248,216,200,209,232,252,233,244,1,248, + 2,209,232,15,132,244,251,217,192,248,3,216,200,209,232,15,132,244,250,15, + 131,244,3,220,201,252,233,244,3,248,4,255,222,201,248,5,195,248,6,15,132, + 244,5,15,130,244,253,217,232,222,252,241,252,247,216,131,252,248,1,15,132, + 244,5,252,233,244,1,248,7,221,216,217,232,195,248,8,217,84,36,4,217,201,217, + 84,36,8,139,68,36,4,209,224,61,0,0,0,252,255,15,132,244,248,139,68,36,8,209, + 224,15,132,244,250,61,0,0,0,252,255,15,132,244,250,217,252,241,252,233,244, + 150,248,9,255,217,232,255,223,252,234,255,221,252,234,223,224,158,255,15, + 132,244,247,217,201,248,1,221,216,195,248,2,217,225,217,232,255,15,132,244, + 249,221,216,217,225,217,252,238,184,0,0,0,0,15,146,208,209,200,51,68,36,4, + 15,137,244,249,217,201,248,3,221,217,217,225,195,248,4,131,124,36,4,0,15, + 141,244,3,221,216,221,216,133,192,15,132,244,251,217,252,238,195,248,5,199, + 68,36,4,0,0,128,127,217,68,36,4,195,255,248,107,255,248,151,252,242,15,45, + 193,252,242,15,42,208,102,15,46,202,15,133,244,254,15,138,244,255,248,152, + 131,252,248,1,15,142,244,252,248,1,169,1,0,0,0,15,133,244,248,252,242,15, + 89,192,209,232,252,233,244,1,248,2,209,232,15,132,244,251,15,40,200,248,3, + 252,242,15,89,192,209,232,15,132,244,250,15,131,244,3,255,252,242,15,89,200, + 252,233,244,3,248,4,252,242,15,89,193,248,5,195,248,6,15,132,244,5,15,130, + 244,253,80,184,0,0,252,240,63,102,15,110,200,102,15,112,201,81,252,242,15, + 94,200,88,15,40,193,252,247,216,131,252,248,1,15,132,244,5,252,233,244,1, + 248,7,184,0,0,252,240,63,102,15,110,192,102,15,112,192,81,195,248,8,252,242, + 15,17,76,36,12,252,242,15,17,68,36,4,131,124,36,12,0,15,133,244,247,139,68, + 36,16,209,224,61,0,0,224,252,255,15,132,244,248,248,1,255,131,124,36,4,0, + 15,133,244,247,139,68,36,8,209,224,15,132,244,250,61,0,0,224,252,255,15,132, + 244,251,248,1,221,68,36,12,221,68,36,4,217,252,241,217,192,217,252,252,220, + 252,233,217,201,217,252,240,217,232,222,193,217,252,253,221,217,221,92,36, + 4,252,242,15,16,68,36,4,195,248,9,184,0,0,252,240,63,102,15,110,208,102,15, + 112,210,81,102,15,46,194,15,132,244,247,15,40,193,248,1,195,248,2,102,15, + 252,239,210,102,15,118,210,102,15,115,210,1,102,15,84,194,184,0,0,252,240, + 63,102,15,110,208,102,15,112,210,81,102,15,46,194,15,132,244,1,102,15,80, + 193,15,87,192,136,196,15,146,208,48,224,15,133,244,1,248,3,184,0,0,252,240, + 127,102,15,110,192,102,15,112,192,81,195,248,4,102,15,80,193,133,192,15,133, + 244,3,255,15,87,192,195,248,5,102,15,80,193,133,192,15,132,244,3,15,87,192, + 195,248,153,255,139,68,36,12,252,242,15,16,68,36,4,131,252,248,1,15,132,244, + 247,15,135,244,248,232,244,82,252,233,244,253,248,1,232,244,84,252,233,244, + 253,248,2,131,252,248,3,15,132,244,247,15,135,244,248,232,244,104,255,252, + 233,244,253,248,1,252,242,15,81,192,248,7,252,242,15,17,68,36,4,221,68,36, + 4,195,248,2,221,68,36,4,131,252,248,5,15,130,244,88,15,132,244,149,248,2, + 131,252,248,7,15,132,244,247,15,135,244,248,217,252,237,217,201,217,252,241, + 195,248,1,217,232,217,201,217,252,241,195,248,2,131,252,248,9,15,132,244, + 247,15,135,244,248,255,217,252,236,217,201,217,252,241,195,248,1,217,252, + 254,195,248,2,131,252,248,11,15,132,244,247,15,135,244,255,217,252,255,195, + 248,1,217,252,242,221,216,195,255,139,68,36,12,221,68,36,4,131,252,248,1, + 15,130,244,82,15,132,244,84,131,252,248,3,15,130,244,104,15,135,244,248,217, + 252,250,195,248,2,131,252,248,5,15,130,244,88,15,132,244,149,131,252,248, + 7,15,132,244,247,15,135,244,248,217,252,237,217,201,217,252,241,195,248,1, + 217,232,217,201,217,252,241,195,248,2,131,252,248,9,15,132,244,247,255,15, + 135,244,248,217,252,236,217,201,217,252,241,195,248,1,217,252,254,195,248, 2,131,252,248,11,15,132,244,247,15,135,244,255,217,252,255,195,248,1,217, - 252,242,221,216,195,255,139,68,36,12,221,68,36,4,131,252,248,1,15,130,244, - 82,15,132,244,84,131,252,248,3,15,130,244,104,15,135,244,248,217,252,250, - 195,248,2,131,252,248,5,15,130,244,88,15,132,244,149,131,252,248,7,15,132, - 244,247,15,135,244,248,217,252,237,217,201,217,252,241,195,248,1,217,232, - 217,201,217,252,241,195,248,2,131,252,248,9,15,132,244,247,255,15,135,244, - 248,217,252,236,217,201,217,252,241,195,248,1,217,252,254,195,248,2,131,252, - 248,11,15,132,244,247,15,135,244,255,217,252,255,195,248,1,217,252,242,221, - 216,195,255,248,9,204,248,154,255,139,68,36,20,252,242,15,16,68,36,4,252, - 242,15,16,76,36,12,131,252,248,1,15,132,244,247,15,135,244,248,252,242,15, - 88,193,248,7,252,242,15,17,68,36,4,221,68,36,4,195,248,1,252,242,15,92,193, - 252,233,244,7,248,2,131,252,248,3,15,132,244,247,15,135,244,248,252,242,15, - 89,193,252,233,244,7,248,1,252,242,15,94,193,252,233,244,7,248,2,131,252, - 248,5,15,132,244,247,255,15,135,244,248,232,244,148,252,233,244,7,248,1,90, - 232,244,107,82,252,233,244,7,248,2,131,252,248,7,15,132,244,247,15,135,244, - 248,184,0,0,0,128,102,15,110,200,102,15,112,201,81,15,87,193,252,233,244, - 7,248,1,102,15,252,239,201,102,15,118,201,102,15,115,209,1,15,84,193,252, - 233,244,7,248,2,255,131,252,248,9,15,135,244,248,221,68,36,4,221,68,36,12, - 15,132,244,247,217,252,243,195,248,1,217,201,217,252,253,221,217,195,248, - 2,131,252,248,11,15,132,244,247,15,135,244,255,252,242,15,93,193,252,233, - 244,7,248,1,252,242,15,95,193,252,233,244,7,248,9,204,255,139,68,36,20,221, - 68,36,4,221,68,36,12,131,252,248,1,15,132,244,247,15,135,244,248,222,193, - 195,248,1,222,252,233,195,248,2,131,252,248,3,15,132,244,247,15,135,244,248, - 222,201,195,248,1,222,252,249,195,248,2,131,252,248,5,15,130,244,148,15,132, - 244,107,131,252,248,7,15,132,244,247,15,135,244,248,255,221,216,217,224,195, - 248,1,221,216,217,225,195,248,2,131,252,248,9,15,132,244,247,15,135,244,248, - 217,252,243,195,248,1,217,201,217,252,253,221,217,195,248,2,131,252,248,11, - 15,132,244,247,15,135,244,255,255,219,252,233,219,209,221,217,195,248,1,219, - 252,233,218,209,221,217,195,255,221,225,223,224,252,246,196,1,15,132,244, - 248,217,201,248,2,221,216,195,248,1,221,225,223,224,252,246,196,1,15,133, - 244,248,217,201,248,2,221,216,195,255,248,155,156,90,137,209,129,252,242, - 0,0,32,0,82,157,156,90,49,192,57,209,15,132,244,247,139,68,36,4,87,83,15, - 162,139,124,36,16,137,7,137,95,4,137,79,8,137,87,12,91,95,248,1,195,255,249, - 255,129,124,253,202,4,239,15,135,244,41,129,124,253,194,4,239,15,135,244, - 41,255,252,242,15,16,4,194,131,198,4,102,15,46,4,202,255,221,4,202,221,4, - 194,131,198,4,255,223,252,233,221,216,255,218,252,233,223,224,158,255,15, - 134,244,248,255,15,131,244,248,255,248,1,15,183,70,252,254,141,180,253,134, - 233,248,2,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171, - 255,139,108,194,4,131,198,4,129,252,253,239,15,135,244,251,129,124,253,202, - 4,239,15,135,244,251,255,252,242,15,16,4,194,102,15,46,4,202,255,221,4,202, - 221,4,194,255,15,138,244,248,15,133,244,248,255,15,138,244,248,15,132,244, - 247,255,248,1,15,183,70,252,254,141,180,253,134,233,248,2,255,248,2,15,183, - 70,252,254,141,180,253,134,233,248,1,255,248,5,57,108,202,4,15,133,244,2, - 129,252,253,239,15,131,244,1,139,12,202,139,4,194,57,193,15,132,244,1,129, - 252,253,239,15,135,244,2,139,169,233,133,252,237,15,132,244,2,252,246,133, - 233,235,15,133,244,2,255,49,252,237,255,189,1,0,0,0,255,252,233,244,45,255, - 252,247,208,131,198,4,129,124,253,202,4,239,15,133,244,248,139,12,202,59, - 12,135,255,131,198,4,129,124,253,202,4,239,15,135,244,248,255,252,242,15, - 16,4,199,102,15,46,4,202,255,221,4,202,221,4,199,255,252,247,208,131,198, - 4,57,68,202,4,255,139,108,194,4,131,198,4,129,252,253,239,255,15,131,244, - 247,255,15,130,244,247,255,137,108,202,4,139,44,194,137,44,202,255,15,183, - 70,252,254,141,180,253,134,233,248,1,139,6,15,182,204,15,182,232,131,198, - 4,193,232,16,252,255,36,171,255,139,108,194,4,139,4,194,137,108,202,4,137, - 4,202,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,255, - 49,252,237,129,124,253,194,4,239,129,213,239,137,108,202,4,139,6,15,182,204, - 15,182,232,131,198,4,193,232,16,252,255,36,171,255,129,124,253,194,4,239, - 15,135,244,48,255,252,242,15,16,4,194,184,0,0,0,128,102,15,110,200,102,15, - 112,201,81,15,87,193,252,242,15,17,4,202,255,221,4,194,217,224,221,28,202, - 255,129,124,253,194,4,239,15,133,244,248,139,4,194,255,15,87,192,252,242, - 15,42,128,233,248,1,252,242,15,17,4,202,255,219,128,233,248,1,221,28,202, - 255,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,2, - 129,124,253,194,4,239,15,133,244,50,139,12,194,137,213,232,251,1,18,255,252, - 242,15,42,192,137,252,234,255,137,4,36,137,252,234,219,4,36,255,15,182,78, - 252,253,252,233,244,1,255,15,182,252,236,15,182,192,255,129,124,253,252,234, - 4,239,15,135,244,46,255,252,242,15,16,4,252,234,252,242,15,88,4,199,255,221, - 4,252,234,220,4,199,255,129,124,253,252,234,4,239,15,135,244,47,255,252,242, - 15,16,4,199,252,242,15,88,4,252,234,255,221,4,199,220,4,252,234,255,129,124, - 253,252,234,4,239,15,135,244,49,129,124,253,194,4,239,15,135,244,49,255,252, - 242,15,16,4,252,234,252,242,15,88,4,194,255,221,4,252,234,220,4,194,255,252, - 242,15,16,4,252,234,252,242,15,92,4,199,255,221,4,252,234,220,36,199,255, - 252,242,15,16,4,199,252,242,15,92,4,252,234,255,221,4,199,220,36,252,234, - 255,252,242,15,16,4,252,234,252,242,15,92,4,194,255,221,4,252,234,220,36, - 194,255,252,242,15,16,4,252,234,252,242,15,89,4,199,255,221,4,252,234,220, - 12,199,255,252,242,15,16,4,199,252,242,15,89,4,252,234,255,221,4,199,220, - 12,252,234,255,252,242,15,16,4,252,234,252,242,15,89,4,194,255,221,4,252, - 234,220,12,194,255,252,242,15,16,4,252,234,252,242,15,94,4,199,255,221,4, - 252,234,220,52,199,255,252,242,15,16,4,199,252,242,15,94,4,252,234,255,221, - 4,199,220,52,252,234,255,252,242,15,16,4,252,234,252,242,15,94,4,194,255, - 221,4,252,234,220,52,194,255,252,242,15,16,4,252,234,252,242,15,16,12,199, - 255,221,4,252,234,221,4,199,255,252,242,15,16,4,199,252,242,15,16,12,252, - 234,255,221,4,199,221,4,252,234,255,252,242,15,16,4,252,234,252,242,15,16, - 12,194,255,221,4,252,234,221,4,194,255,248,156,232,244,148,255,252,233,244, - 156,255,232,244,107,255,15,182,252,236,15,182,192,141,12,194,41,232,137,76, - 36,4,137,68,36,8,248,33,139,108,36,48,137,44,36,137,149,233,137,116,36,24, - 232,251,1,24,139,149,233,133,192,15,133,244,42,15,182,110,252,255,15,182, + 252,242,221,216,195,255,248,9,204,248,154,255,139,68,36,20,252,242,15,16, + 68,36,4,252,242,15,16,76,36,12,131,252,248,1,15,132,244,247,15,135,244,248, + 252,242,15,88,193,248,7,252,242,15,17,68,36,4,221,68,36,4,195,248,1,252,242, + 15,92,193,252,233,244,7,248,2,131,252,248,3,15,132,244,247,15,135,244,248, + 252,242,15,89,193,252,233,244,7,248,1,252,242,15,94,193,252,233,244,7,248, + 2,131,252,248,5,15,132,244,247,255,15,135,244,248,232,244,148,252,233,244, + 7,248,1,90,232,244,107,82,252,233,244,7,248,2,131,252,248,7,15,132,244,247, + 15,135,244,248,184,0,0,0,128,102,15,110,200,102,15,112,201,81,15,87,193,252, + 233,244,7,248,1,102,15,252,239,201,102,15,118,201,102,15,115,209,1,15,84, + 193,252,233,244,7,248,2,255,131,252,248,9,15,135,244,248,221,68,36,4,221, + 68,36,12,15,132,244,247,217,252,243,195,248,1,217,201,217,252,253,221,217, + 195,248,2,131,252,248,11,15,132,244,247,15,135,244,255,252,242,15,93,193, + 252,233,244,7,248,1,252,242,15,95,193,252,233,244,7,248,9,204,255,139,68, + 36,20,221,68,36,4,221,68,36,12,131,252,248,1,15,132,244,247,15,135,244,248, + 222,193,195,248,1,222,252,233,195,248,2,131,252,248,3,15,132,244,247,15,135, + 244,248,222,201,195,248,1,222,252,249,195,248,2,131,252,248,5,15,130,244, + 148,15,132,244,107,131,252,248,7,15,132,244,247,15,135,244,248,255,221,216, + 217,224,195,248,1,221,216,217,225,195,248,2,131,252,248,9,15,132,244,247, + 15,135,244,248,217,252,243,195,248,1,217,201,217,252,253,221,217,195,248, + 2,131,252,248,11,15,132,244,247,15,135,244,255,255,219,252,233,219,209,221, + 217,195,248,1,219,252,233,218,209,221,217,195,255,221,225,223,224,252,246, + 196,1,15,132,244,248,217,201,248,2,221,216,195,248,1,221,225,223,224,252, + 246,196,1,15,133,244,248,217,201,248,2,221,216,195,255,248,155,156,90,137, + 209,129,252,242,0,0,32,0,82,157,156,90,49,192,57,209,15,132,244,247,139,68, + 36,4,87,83,15,162,139,124,36,16,137,7,137,95,4,137,79,8,137,87,12,91,95,248, + 1,195,255,249,255,129,124,253,202,4,239,15,135,244,41,129,124,253,194,4,239, + 15,135,244,41,255,252,242,15,16,4,194,131,198,4,102,15,46,4,202,255,221,4, + 202,221,4,194,131,198,4,255,223,252,233,221,216,255,218,252,233,223,224,158, + 255,15,134,244,248,255,15,131,244,248,255,248,1,15,183,70,252,254,141,180, + 253,134,233,248,2,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255, + 36,171,255,139,108,194,4,131,198,4,129,252,253,239,15,135,244,251,129,124, + 253,202,4,239,15,135,244,251,255,252,242,15,16,4,194,102,15,46,4,202,255, + 221,4,202,221,4,194,255,15,138,244,248,15,133,244,248,255,15,138,244,248, + 15,132,244,247,255,248,1,15,183,70,252,254,141,180,253,134,233,248,2,255, + 248,2,15,183,70,252,254,141,180,253,134,233,248,1,255,248,5,57,108,202,4, + 15,133,244,2,129,252,253,239,15,131,244,1,139,12,202,139,4,194,57,193,15, + 132,244,1,129,252,253,239,15,135,244,2,139,169,233,133,252,237,15,132,244, + 2,252,246,133,233,235,15,133,244,2,255,49,252,237,255,189,1,0,0,0,255,252, + 233,244,45,255,252,247,208,131,198,4,129,124,253,202,4,239,15,133,244,248, + 139,12,202,59,12,135,255,131,198,4,129,124,253,202,4,239,15,135,244,248,255, + 252,242,15,16,4,199,102,15,46,4,202,255,221,4,202,221,4,199,255,252,247,208, + 131,198,4,57,68,202,4,255,139,108,194,4,131,198,4,129,252,253,239,255,15, + 131,244,247,255,15,130,244,247,255,137,108,202,4,139,44,194,137,44,202,255, + 15,183,70,252,254,141,180,253,134,233,248,1,139,6,15,182,204,15,182,232,131, + 198,4,193,232,16,252,255,36,171,255,139,108,194,4,139,4,194,137,108,202,4, + 137,4,202,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171, + 255,49,252,237,129,124,253,194,4,239,129,213,239,137,108,202,4,139,6,15,182, + 204,15,182,232,131,198,4,193,232,16,252,255,36,171,255,129,124,253,194,4, + 239,15,135,244,48,255,252,242,15,16,4,194,184,0,0,0,128,102,15,110,200,102, + 15,112,201,81,15,87,193,252,242,15,17,4,202,255,221,4,194,217,224,221,28, + 202,255,129,124,253,194,4,239,15,133,244,248,139,4,194,255,15,87,192,252, + 242,15,42,128,233,248,1,252,242,15,17,4,202,255,219,128,233,248,1,221,28, + 202,255,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248, + 2,129,124,253,194,4,239,15,133,244,50,139,12,194,137,213,232,251,1,18,255, + 252,242,15,42,192,137,252,234,255,137,4,36,137,252,234,219,4,36,255,15,182, + 78,252,253,252,233,244,1,255,15,182,252,236,15,182,192,255,129,124,253,252, + 234,4,239,15,135,244,46,255,252,242,15,16,4,252,234,252,242,15,88,4,199,255, + 221,4,252,234,220,4,199,255,129,124,253,252,234,4,239,15,135,244,47,255,252, + 242,15,16,4,199,252,242,15,88,4,252,234,255,221,4,199,220,4,252,234,255,129, + 124,253,252,234,4,239,15,135,244,49,129,124,253,194,4,239,15,135,244,49,255, + 252,242,15,16,4,252,234,252,242,15,88,4,194,255,221,4,252,234,220,4,194,255, + 252,242,15,16,4,252,234,252,242,15,92,4,199,255,221,4,252,234,220,36,199, + 255,252,242,15,16,4,199,252,242,15,92,4,252,234,255,221,4,199,220,36,252, + 234,255,252,242,15,16,4,252,234,252,242,15,92,4,194,255,221,4,252,234,220, + 36,194,255,252,242,15,16,4,252,234,252,242,15,89,4,199,255,221,4,252,234, + 220,12,199,255,252,242,15,16,4,199,252,242,15,89,4,252,234,255,221,4,199, + 220,12,252,234,255,252,242,15,16,4,252,234,252,242,15,89,4,194,255,221,4, + 252,234,220,12,194,255,252,242,15,16,4,252,234,252,242,15,94,4,199,255,221, + 4,252,234,220,52,199,255,252,242,15,16,4,199,252,242,15,94,4,252,234,255, + 221,4,199,220,52,252,234,255,252,242,15,16,4,252,234,252,242,15,94,4,194, + 255,221,4,252,234,220,52,194,255,252,242,15,16,4,252,234,252,242,15,16,12, + 199,255,221,4,252,234,221,4,199,255,252,242,15,16,4,199,252,242,15,16,12, + 252,234,255,221,4,199,221,4,252,234,255,252,242,15,16,4,252,234,252,242,15, + 16,12,194,255,221,4,252,234,221,4,194,255,248,156,232,244,148,255,252,233, + 244,156,255,232,244,107,255,15,182,252,236,15,182,192,141,12,194,41,232,137, + 76,36,4,137,68,36,8,248,33,139,108,36,48,137,44,36,137,149,233,137,116,36, + 24,232,251,1,25,139,149,233,133,192,15,133,244,42,15,182,110,252,255,15,182, 78,252,253,139,68,252,234,4,139,44,252,234,137,68,202,4,137,44,202,139,6, 15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,255,252,247,208, 139,4,135,199,68,202,4,237,137,4,202,139,6,15,182,204,15,182,232,131,198, @@ -596,31 +597,31 @@ static const unsigned char build_actionlist[15165] = { 12,194,139,68,194,4,137,77,0,137,69,4,15,132,244,247,252,246,133,233,235, 15,133,244,248,248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, 255,36,171,248,2,129,232,239,129,252,248,239,15,134,244,1,252,246,129,233, - 235,15,132,244,1,135,213,141,139,233,255,232,251,1,25,137,252,234,252,233, + 235,15,132,244,1,135,213,141,139,233,255,232,251,1,26,137,252,234,252,233, 244,1,255,252,247,208,139,106,252,248,139,172,253,141,233,139,12,135,139, 133,233,137,8,199,64,4,237,252,246,133,233,235,15,133,244,248,248,1,139,6, 15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,2,252,246,129, 233,235,15,132,244,1,128,189,233,0,15,132,244,1,137,213,137,194,141,139,233, - 232,251,1,25,137,252,234,252,233,244,1,255,139,106,252,248,255,252,242,15, + 232,251,1,26,137,252,234,252,233,244,1,255,139,106,252,248,255,252,242,15, 16,4,199,255,139,172,253,141,233,139,141,233,255,252,242,15,17,1,255,221, 25,255,252,247,208,139,106,252,248,139,172,253,141,233,139,141,233,137,65, 4,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,255,141, 180,253,134,233,139,108,36,48,131,189,233,0,15,132,244,247,137,149,233,141, - 20,202,137,252,233,232,251,1,26,139,149,233,248,1,139,6,15,182,204,15,182, + 20,202,137,252,233,232,251,1,27,139,149,233,248,1,139,6,15,182,204,15,182, 232,131,198,4,193,232,16,252,255,36,171,255,252,247,208,139,74,252,248,139, 4,135,139,108,36,48,137,76,36,8,137,68,36,4,137,44,36,137,149,233,137,116, - 36,24,232,251,1,27,139,149,233,15,182,78,252,253,137,4,202,199,68,202,4,237, + 36,24,232,251,1,28,139,149,233,15,182,78,252,253,137,4,202,199,68,202,4,237, 139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,255,137,197, 37,252,255,7,0,0,193,252,237,11,61,252,255,7,0,0,15,132,244,249,248,2,137, 108,36,8,139,108,36,48,137,68,36,4,137,116,36,24,139,131,233,137,44,36,59, - 131,233,137,149,233,15,131,244,251,248,1,232,251,1,28,139,149,233,15,182, + 131,233,137,149,233,15,131,244,251,248,1,232,251,1,29,139,149,233,15,182, 78,252,253,137,4,202,199,68,202,4,237,139,6,15,182,204,15,182,232,131,198, 4,193,232,16,252,255,36,171,248,3,184,1,8,0,0,252,233,244,2,248,5,137,252, - 233,232,251,1,29,252,233,244,1,255,252,247,208,139,108,36,48,139,139,233, + 233,232,251,1,30,252,233,244,1,255,252,247,208,139,108,36,48,139,139,233, 137,116,36,24,59,139,233,137,149,233,15,131,244,249,248,2,139,20,135,137, - 252,233,232,251,1,30,139,149,233,15,182,78,252,253,137,4,202,199,68,202,4, + 252,233,232,251,1,31,139,149,233,15,182,78,252,253,137,4,202,199,68,202,4, 237,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,3, - 137,252,233,232,251,1,29,15,183,70,252,254,252,247,208,252,233,244,2,255, + 137,252,233,232,251,1,30,15,183,70,252,254,252,247,208,252,233,244,2,255, 252,247,208,139,106,252,248,139,173,233,139,4,135,252,233,244,157,255,252, 247,208,139,106,252,248,139,173,233,139,4,135,252,233,244,158,255,15,182, 252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,36,139,44,252,234, @@ -663,7 +664,7 @@ static const unsigned char build_actionlist[15165] = { 133,201,15,133,244,1,255,139,141,233,133,201,15,132,244,252,252,246,129,233, 235,15,132,244,37,248,6,137,68,36,16,199,68,36,20,237,137,108,36,12,141,68, 36,16,137,108,36,4,139,108,36,48,137,68,36,8,137,44,36,137,149,233,137,116, - 36,24,232,251,1,31,139,149,233,139,108,36,12,137,193,252,233,244,2,248,7, + 36,24,232,251,1,32,139,149,233,139,108,36,12,137,193,252,233,244,2,248,7, 128,165,233,235,139,131,233,137,171,233,137,133,233,252,233,244,3,255,15, 182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,38,139,44,252, 234,59,133,233,15,131,244,38,193,224,3,3,133,233,129,120,253,4,239,15,132, @@ -679,7 +680,7 @@ static const unsigned char build_actionlist[15165] = { 193,8,137,111,4,131,199,8,131,232,1,15,133,244,3,248,4,139,124,36,16,139, 6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,171,248,5,137,108, 36,4,139,108,36,48,137,149,233,137,68,36,8,137,44,36,137,116,36,24,232,251, - 1,32,139,149,233,15,182,78,252,253,252,233,244,1,248,7,128,165,233,235,139, + 1,33,139,149,233,15,182,78,252,253,252,233,244,1,248,7,128,165,233,235,139, 131,233,137,171,233,255,137,133,233,252,233,244,2,255,3,68,36,20,255,129, 124,253,202,4,239,139,44,202,15,133,244,51,141,84,202,8,137,114,252,252,139, 181,233,139,14,15,182,252,233,15,182,205,131,198,4,252,255,36,171,255,141, @@ -1076,6 +1077,7 @@ 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", @@ -1453,91 +1455,92 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse) #endif dasm_put(Dst, 8216, Dt1(->base), Dt1(->top)); #if LJ_HASJIT - dasm_put(Dst, 8245, DISPATCH_GL(vmstate), DISPATCH_GL(vmstate), ~LJ_VMST_EXIT, DISPATCH_J(exitno), DISPATCH_J(parent), 8*8+16, DISPATCH_J(flags), JIT_F_SSE2, DISPATCH_GL(jit_L), DISPATCH_GL(jit_base), DISPATCH_J(L), Dt1(->base), GG_DISP2J, Dt1(->base)); + dasm_put(Dst, 8245, DISPATCH_GL(vmstate), DISPATCH_GL(vmstate), ~LJ_VMST_EXIT, DISPATCH_J(exitno), DISPATCH_J(parent), 8*8+16, DISPATCH_J(flags), JIT_F_SSE2, DISPATCH_GL(jit_L), DISPATCH_GL(jit_base), DISPATCH_J(L), Dt1(->base), GG_DISP2J, Dt1(->cframe), CFRAME_RAWMASK); + dasm_put(Dst, 8393, Dt1(->base)); #endif - dasm_put(Dst, 8388); + dasm_put(Dst, 8401); #if LJ_HASJIT - dasm_put(Dst, 8391, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP); + dasm_put(Dst, 8404, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP); #endif - dasm_put(Dst, 8431); + dasm_put(Dst, 8455); if (!sse) { - dasm_put(Dst, 8434); + dasm_put(Dst, 8458); } - dasm_put(Dst, 8479); + dasm_put(Dst, 8503); if (!sse) { - dasm_put(Dst, 8581); + dasm_put(Dst, 8605); } - dasm_put(Dst, 8626); + dasm_put(Dst, 8650); if (!sse) { - dasm_put(Dst, 8728); + dasm_put(Dst, 8752); } - dasm_put(Dst, 8767); + dasm_put(Dst, 8791); if (sse) { - dasm_put(Dst, 8872); + dasm_put(Dst, 8896); } else { - dasm_put(Dst, 9002); + dasm_put(Dst, 9026); } - dasm_put(Dst, 9049); + dasm_put(Dst, 9073); if (!sse) { - dasm_put(Dst, 9123); + dasm_put(Dst, 9147); if (cmov) { - dasm_put(Dst, 9134); + dasm_put(Dst, 9158); } else { - dasm_put(Dst, 9138); + dasm_put(Dst, 9162); } - dasm_put(Dst, 9145); - dasm_put(Dst, 9219); - dasm_put(Dst, 9319); + dasm_put(Dst, 9169); + dasm_put(Dst, 9243); + dasm_put(Dst, 9343); if (cmov) { - dasm_put(Dst, 9322); + dasm_put(Dst, 9346); } else { - dasm_put(Dst, 9326); + dasm_put(Dst, 9350); } - dasm_put(Dst, 9333); + dasm_put(Dst, 9357); if (cmov) { - dasm_put(Dst, 9134); + dasm_put(Dst, 9158); } else { - dasm_put(Dst, 9138); + dasm_put(Dst, 9162); } - dasm_put(Dst, 9351); + dasm_put(Dst, 9375); } else { - dasm_put(Dst, 9430); + dasm_put(Dst, 9454); } - dasm_put(Dst, 9433); - dasm_put(Dst, 9518); - dasm_put(Dst, 9649); - dasm_put(Dst, 9848); + dasm_put(Dst, 9457); + dasm_put(Dst, 9542); + dasm_put(Dst, 9673); + dasm_put(Dst, 9872); if (sse) { - dasm_put(Dst, 9871); - dasm_put(Dst, 9928); - dasm_put(Dst, 10019); + dasm_put(Dst, 9895); + dasm_put(Dst, 9952); + dasm_put(Dst, 10043); } else { - dasm_put(Dst, 10061); - dasm_put(Dst, 10153); + dasm_put(Dst, 10085); + dasm_put(Dst, 10177); } - dasm_put(Dst, 10199); + dasm_put(Dst, 10223); if (sse) { - dasm_put(Dst, 10205); - dasm_put(Dst, 10310); - dasm_put(Dst, 10393); + dasm_put(Dst, 10229); + dasm_put(Dst, 10334); + dasm_put(Dst, 10417); } else { - dasm_put(Dst, 10465); - dasm_put(Dst, 10548); + dasm_put(Dst, 10489); + dasm_put(Dst, 10572); if (cmov) { - dasm_put(Dst, 10603); + dasm_put(Dst, 10627); } else { - dasm_put(Dst, 10622); + dasm_put(Dst, 10646); } - dasm_put(Dst, 10461); + dasm_put(Dst, 10485); } - dasm_put(Dst, 10663); + dasm_put(Dst, 10687); } /* 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, 10717, defop); + dasm_put(Dst, 10741, defop); switch (op) { @@ -1546,617 +1549,617 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) /* Remember: all ops branch for a true comparison, fall through otherwise. */ case BC_ISLT: case BC_ISGE: case BC_ISLE: case BC_ISGT: - dasm_put(Dst, 10719, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10743, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10740); + dasm_put(Dst, 10764); } else { - dasm_put(Dst, 10755); + dasm_put(Dst, 10779); if (cmov) { - dasm_put(Dst, 10765); + dasm_put(Dst, 10789); } else { - dasm_put(Dst, 10771); + dasm_put(Dst, 10795); } } switch (op) { case BC_ISLT: - dasm_put(Dst, 10778); + dasm_put(Dst, 10802); break; case BC_ISGE: - dasm_put(Dst, 10014); + dasm_put(Dst, 10038); break; case BC_ISLE: dasm_put(Dst, 6179); break; case BC_ISGT: - dasm_put(Dst, 10783); + dasm_put(Dst, 10807); break; default: break; /* Shut up GCC. */ } - dasm_put(Dst, 10788, -BCBIAS_J*4); + dasm_put(Dst, 10812, -BCBIAS_J*4); break; case BC_ISEQV: case BC_ISNEV: vk = op == BC_ISEQV; - dasm_put(Dst, 10821, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 10845, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 10847); + dasm_put(Dst, 10871); } else { - dasm_put(Dst, 10859); + dasm_put(Dst, 10883); if (cmov) { - dasm_put(Dst, 10765); + dasm_put(Dst, 10789); } else { - dasm_put(Dst, 10771); + dasm_put(Dst, 10795); } } iseqne_fp: if (vk) { - dasm_put(Dst, 10866); + dasm_put(Dst, 10890); } else { - dasm_put(Dst, 10875); + dasm_put(Dst, 10899); } iseqne_end: if (vk) { - dasm_put(Dst, 10884, -BCBIAS_J*4); + dasm_put(Dst, 10908, -BCBIAS_J*4); } else { - dasm_put(Dst, 10899, -BCBIAS_J*4); + dasm_put(Dst, 10923, -BCBIAS_J*4); } - dasm_put(Dst, 8412); + dasm_put(Dst, 10826); if (op == BC_ISEQV || op == BC_ISNEV) { - dasm_put(Dst, 10914, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<metatable), Dt6(->nomm), 1<len)); + dasm_put(Dst, 11274, Dt5(->len)); } else { - dasm_put(Dst, 11268, Dt5(->len)); + dasm_put(Dst, 11292, Dt5(->len)); } - dasm_put(Dst, 11277, LJ_TTAB); + dasm_put(Dst, 11301, LJ_TTAB); if (sse) { - dasm_put(Dst, 11317); + dasm_put(Dst, 11341); } else { - dasm_put(Dst, 11326); + dasm_put(Dst, 11350); } - dasm_put(Dst, 11336); + dasm_put(Dst, 11360); break; /* -- Binary ops -------------------------------------------------------- */ case BC_ADDVN: case BC_ADDNV: case BC_ADDVV: - dasm_put(Dst, 11346); + dasm_put(Dst, 11370); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11354, LJ_TISNUM); + dasm_put(Dst, 11378, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11366); + dasm_put(Dst, 11390); } else { - dasm_put(Dst, 11380); + dasm_put(Dst, 11404); } break; case 1: - dasm_put(Dst, 11388, LJ_TISNUM); + dasm_put(Dst, 11412, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11400); + dasm_put(Dst, 11424); } else { - dasm_put(Dst, 11414); + dasm_put(Dst, 11438); } break; default: - dasm_put(Dst, 11422, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11446, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11444); + dasm_put(Dst, 11468); } else { - dasm_put(Dst, 11458); + dasm_put(Dst, 11482); } break; } if (sse) { - dasm_put(Dst, 11220); + dasm_put(Dst, 11244); } else { - dasm_put(Dst, 11232); + dasm_put(Dst, 11256); } - dasm_put(Dst, 8412); + dasm_put(Dst, 10826); break; case BC_SUBVN: case BC_SUBNV: case BC_SUBVV: - dasm_put(Dst, 11346); + dasm_put(Dst, 11370); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11354, LJ_TISNUM); + dasm_put(Dst, 11378, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11466); + dasm_put(Dst, 11490); } else { - dasm_put(Dst, 11480); + dasm_put(Dst, 11504); } break; case 1: - dasm_put(Dst, 11388, LJ_TISNUM); + dasm_put(Dst, 11412, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11488); + dasm_put(Dst, 11512); } else { - dasm_put(Dst, 11502); + dasm_put(Dst, 11526); } break; default: - dasm_put(Dst, 11422, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11446, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11510); + dasm_put(Dst, 11534); } else { - dasm_put(Dst, 11524); + dasm_put(Dst, 11548); } break; } if (sse) { - dasm_put(Dst, 11220); + dasm_put(Dst, 11244); } else { - dasm_put(Dst, 11232); + dasm_put(Dst, 11256); } - dasm_put(Dst, 8412); + dasm_put(Dst, 10826); break; case BC_MULVN: case BC_MULNV: case BC_MULVV: - dasm_put(Dst, 11346); + dasm_put(Dst, 11370); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11354, LJ_TISNUM); + dasm_put(Dst, 11378, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11532); + dasm_put(Dst, 11556); } else { - dasm_put(Dst, 11546); + dasm_put(Dst, 11570); } break; case 1: - dasm_put(Dst, 11388, LJ_TISNUM); + dasm_put(Dst, 11412, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11554); + dasm_put(Dst, 11578); } else { - dasm_put(Dst, 11568); + dasm_put(Dst, 11592); } break; default: - dasm_put(Dst, 11422, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11446, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11576); + dasm_put(Dst, 11600); } else { - dasm_put(Dst, 11590); + dasm_put(Dst, 11614); } break; } if (sse) { - dasm_put(Dst, 11220); + dasm_put(Dst, 11244); } else { - dasm_put(Dst, 11232); + dasm_put(Dst, 11256); } - dasm_put(Dst, 8412); + dasm_put(Dst, 10826); break; case BC_DIVVN: case BC_DIVNV: case BC_DIVVV: - dasm_put(Dst, 11346); + dasm_put(Dst, 11370); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11354, LJ_TISNUM); + dasm_put(Dst, 11378, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11598); + dasm_put(Dst, 11622); } else { - dasm_put(Dst, 11612); + dasm_put(Dst, 11636); } break; case 1: - dasm_put(Dst, 11388, LJ_TISNUM); + dasm_put(Dst, 11412, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11620); + dasm_put(Dst, 11644); } else { - dasm_put(Dst, 11634); + dasm_put(Dst, 11658); } break; default: - dasm_put(Dst, 11422, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11446, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11642); + dasm_put(Dst, 11666); } else { - dasm_put(Dst, 11656); + dasm_put(Dst, 11680); } break; } if (sse) { - dasm_put(Dst, 11220); + dasm_put(Dst, 11244); } else { - dasm_put(Dst, 11232); + dasm_put(Dst, 11256); } - dasm_put(Dst, 8412); + dasm_put(Dst, 10826); break; case BC_MODVN: - dasm_put(Dst, 11346); + dasm_put(Dst, 11370); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11354, LJ_TISNUM); + dasm_put(Dst, 11378, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11664); + dasm_put(Dst, 11688); } else { - dasm_put(Dst, 11678); + dasm_put(Dst, 11702); } break; case 1: - dasm_put(Dst, 11388, LJ_TISNUM); + dasm_put(Dst, 11412, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11686); + dasm_put(Dst, 11710); } else { - dasm_put(Dst, 11700); + dasm_put(Dst, 11724); } break; default: - dasm_put(Dst, 11422, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11446, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11708); + dasm_put(Dst, 11732); } else { - dasm_put(Dst, 11722); + dasm_put(Dst, 11746); } break; } - dasm_put(Dst, 11730); + dasm_put(Dst, 11754); if (sse) { - dasm_put(Dst, 11220); + dasm_put(Dst, 11244); } else { - dasm_put(Dst, 11232); + dasm_put(Dst, 11256); } - dasm_put(Dst, 8412); + dasm_put(Dst, 10826); break; case BC_MODNV: case BC_MODVV: - dasm_put(Dst, 11346); + dasm_put(Dst, 11370); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11354, LJ_TISNUM); + dasm_put(Dst, 11378, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11664); + dasm_put(Dst, 11688); } else { - dasm_put(Dst, 11678); + dasm_put(Dst, 11702); } break; case 1: - dasm_put(Dst, 11388, LJ_TISNUM); + dasm_put(Dst, 11412, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11686); + dasm_put(Dst, 11710); } else { - dasm_put(Dst, 11700); + dasm_put(Dst, 11724); } break; default: - dasm_put(Dst, 11422, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11446, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11708); + dasm_put(Dst, 11732); } else { - dasm_put(Dst, 11722); + dasm_put(Dst, 11746); } break; } - dasm_put(Dst, 11736); + dasm_put(Dst, 11760); break; case BC_POW: - dasm_put(Dst, 11346); + dasm_put(Dst, 11370); vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN); switch (vk) { case 0: - dasm_put(Dst, 11354, LJ_TISNUM); + dasm_put(Dst, 11378, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11664); + dasm_put(Dst, 11688); } else { - dasm_put(Dst, 11678); + dasm_put(Dst, 11702); } break; case 1: - dasm_put(Dst, 11388, LJ_TISNUM); + dasm_put(Dst, 11412, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11686); + dasm_put(Dst, 11710); } else { - dasm_put(Dst, 11700); + dasm_put(Dst, 11724); } break; default: - dasm_put(Dst, 11422, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 11446, LJ_TISNUM, LJ_TISNUM); if (sse) { - dasm_put(Dst, 11708); + dasm_put(Dst, 11732); } else { - dasm_put(Dst, 11722); + dasm_put(Dst, 11746); } break; } - dasm_put(Dst, 11741); + dasm_put(Dst, 11765); if (sse) { - dasm_put(Dst, 11220); + dasm_put(Dst, 11244); } else { - dasm_put(Dst, 11232); + dasm_put(Dst, 11256); } - dasm_put(Dst, 8412); + dasm_put(Dst, 10826); break; case BC_CAT: - dasm_put(Dst, 11745, Dt1(->base), Dt1(->base)); + dasm_put(Dst, 11769, Dt1(->base), Dt1(->base)); break; /* -- Constant ops ------------------------------------------------------ */ case BC_KSTR: - dasm_put(Dst, 11839, LJ_TSTR); + dasm_put(Dst, 11863, LJ_TSTR); break; case BC_KSHORT: if (sse) { - dasm_put(Dst, 11872); + dasm_put(Dst, 11896); } else { - dasm_put(Dst, 11887); + dasm_put(Dst, 11911); } - dasm_put(Dst, 8412); + dasm_put(Dst, 10826); break; case BC_KNUM: if (sse) { - dasm_put(Dst, 11895); + dasm_put(Dst, 11919); } else { - dasm_put(Dst, 11908); + dasm_put(Dst, 11932); } - dasm_put(Dst, 8412); + dasm_put(Dst, 10826); break; case BC_KPRI: - dasm_put(Dst, 11915); + dasm_put(Dst, 11939); break; case BC_KNIL: - dasm_put(Dst, 11941, LJ_TNIL); + dasm_put(Dst, 11965, LJ_TNIL); break; /* -- Upvalue and function ops ------------------------------------------ */ case BC_UGET: - dasm_put(Dst, 11987, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12011, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_USETV: #define TV2MARKOFS \ ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv)) - dasm_put(Dst, 12031, 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, 12121); + dasm_put(Dst, 12055, 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, 12145); break; #undef TV2MARKOFS case BC_USETS: - dasm_put(Dst, 12133, 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, 12157, 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, 12224); + dasm_put(Dst, 12248); if (sse) { - dasm_put(Dst, 12229); + dasm_put(Dst, 12253); } else { - dasm_put(Dst, 11039); + dasm_put(Dst, 11063); } - dasm_put(Dst, 12236, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12260, offsetof(GCfuncL, uvptr), DtA(->v)); if (sse) { - dasm_put(Dst, 12245); + dasm_put(Dst, 12269); } else { - dasm_put(Dst, 12251); + dasm_put(Dst, 12275); } - dasm_put(Dst, 8412); + dasm_put(Dst, 10826); break; case BC_USETP: - dasm_put(Dst, 12254, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12278, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_UCLO: - dasm_put(Dst, 12291, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 12315, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); break; case BC_FNEW: - dasm_put(Dst, 12345, Dt1(->base), Dt1(->base), LJ_TFUNC); + dasm_put(Dst, 12369, Dt1(->base), Dt1(->base), LJ_TFUNC); break; /* -- Table ops --------------------------------------------------------- */ case BC_TNEW: - dasm_put(Dst, 12416, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 12440, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); break; case BC_TDUP: - dasm_put(Dst, 12537, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 12561, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); break; case BC_GGET: - dasm_put(Dst, 12629, Dt7(->env)); + dasm_put(Dst, 12653, Dt7(->env)); break; case BC_GSET: - dasm_put(Dst, 12647, Dt7(->env)); + dasm_put(Dst, 12671, Dt7(->env)); break; case BC_TGETV: - dasm_put(Dst, 12665, LJ_TTAB, LJ_TISNUM); + dasm_put(Dst, 12689, LJ_TTAB, LJ_TISNUM); if (sse) { - dasm_put(Dst, 12698); + dasm_put(Dst, 12722); } else { - dasm_put(Dst, 12719); + dasm_put(Dst, 12743); if (cmov) { - dasm_put(Dst, 10765); + dasm_put(Dst, 10789); } else { - dasm_put(Dst, 10771); + dasm_put(Dst, 10795); } dasm_put(Dst, 2522); } - dasm_put(Dst, 12729, 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, 12923, 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, 12947, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable)); - dasm_put(Dst, 13209, Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13150, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable)); + dasm_put(Dst, 13233, Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETS: - dasm_put(Dst, 13271, 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, 13346, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); - dasm_put(Dst, 13438, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13295, 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, 13370, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); + dasm_put(Dst, 13462, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETB: - dasm_put(Dst, 13534, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); - dasm_put(Dst, 13632, Dt6(->metatable), Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13558, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); + dasm_put(Dst, 13656, Dt6(->metatable), Dt6(->nomm), 1<marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETM: - dasm_put(Dst, 13678); + dasm_put(Dst, 13702); if (sse) { - dasm_put(Dst, 12229); + dasm_put(Dst, 12253); } else { - dasm_put(Dst, 13683); + dasm_put(Dst, 13707); } - dasm_put(Dst, 13691, Dt6(->marked), LJ_GC_BLACK); + dasm_put(Dst, 13715, Dt6(->marked), LJ_GC_BLACK); if (sse) { - dasm_put(Dst, 13716); + dasm_put(Dst, 13740); } else { - dasm_put(Dst, 13723); + dasm_put(Dst, 13747); } - dasm_put(Dst, 13728, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain)); - dasm_put(Dst, 13856, Dt6(->gclist)); + dasm_put(Dst, 13752, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain)); + dasm_put(Dst, 13880, Dt6(->gclist)); break; /* -- Calls and vararg handling ----------------------------------------- */ case BC_CALL: case BC_CALLM: - dasm_put(Dst, 11350); + dasm_put(Dst, 11374); if (op == BC_CALLM) { - dasm_put(Dst, 13864); + dasm_put(Dst, 13888); } - dasm_put(Dst, 13869, LJ_TFUNC, Dt7(->pc)); + dasm_put(Dst, 13893, LJ_TFUNC, Dt7(->pc)); break; case BC_CALLMT: - dasm_put(Dst, 13864); + dasm_put(Dst, 13888); break; case BC_CALLT: - dasm_put(Dst, 13910, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); - dasm_put(Dst, 14028, FRAME_TYPE, Dt7(->pc), PC2PROTO(k)); + dasm_put(Dst, 13934, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); + dasm_put(Dst, 14052, FRAME_TYPE, Dt7(->pc), PC2PROTO(k)); break; case BC_ITERC: - dasm_put(Dst, 14085, LJ_TFUNC, 2+1, Dt7(->pc)); + dasm_put(Dst, 14109, LJ_TFUNC, 2+1, Dt7(->pc)); break; case BC_VARG: - dasm_put(Dst, 14165, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL); - dasm_put(Dst, 14309, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 14189, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL); + dasm_put(Dst, 14333, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); break; /* -- Returns ----------------------------------------------------------- */ case BC_RETM: - dasm_put(Dst, 13864); + dasm_put(Dst, 13888); break; case BC_RET: case BC_RET0: case BC_RET1: if (op != BC_RET0) { - dasm_put(Dst, 14408); + dasm_put(Dst, 14432); } - dasm_put(Dst, 14412, FRAME_TYPE); + dasm_put(Dst, 14436, FRAME_TYPE); switch (op) { case BC_RET: - dasm_put(Dst, 14431); + dasm_put(Dst, 14455); break; case BC_RET1: - dasm_put(Dst, 14489); + dasm_put(Dst, 14513); /* fallthrough */ case BC_RET0: - dasm_put(Dst, 14505); + dasm_put(Dst, 14529); default: break; } - dasm_put(Dst, 14516, Dt7(->pc), PC2PROTO(k)); + dasm_put(Dst, 14540, Dt7(->pc), PC2PROTO(k)); if (op == BC_RET) { - dasm_put(Dst, 14558, LJ_TNIL); + dasm_put(Dst, 14582, LJ_TNIL); } else { - dasm_put(Dst, 14567, LJ_TNIL); + dasm_put(Dst, 14591, LJ_TNIL); } - dasm_put(Dst, 14574); + dasm_put(Dst, 14598); if (op != BC_RET0) { - dasm_put(Dst, 14595); + dasm_put(Dst, 14619); } dasm_put(Dst, 4678); break; @@ -2166,7 +2169,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORL: #if LJ_HASJIT - dasm_put(Dst, 14599, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 14623, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2178,57 +2181,57 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORI: case BC_IFORL: vk = (op == BC_IFORL || op == BC_JFORL); - dasm_put(Dst, 14620); + dasm_put(Dst, 14644); if (!vk) { - dasm_put(Dst, 14624, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 14648, LJ_TISNUM, LJ_TISNUM); } - dasm_put(Dst, 14643); + dasm_put(Dst, 14667); if (!vk) { - dasm_put(Dst, 14647, LJ_TISNUM); + dasm_put(Dst, 14671, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 14656); + dasm_put(Dst, 14680); if (vk) { - dasm_put(Dst, 14668); + dasm_put(Dst, 14692); } else { - dasm_put(Dst, 14687); - } - dasm_put(Dst, 14692); - } else { - dasm_put(Dst, 14705); - if (vk) { dasm_put(Dst, 14711); - } else { - dasm_put(Dst, 14727); } - dasm_put(Dst, 14735); - if (cmov) { - dasm_put(Dst, 10765); + dasm_put(Dst, 14716); + } else { + dasm_put(Dst, 14729); + if (vk) { + dasm_put(Dst, 14735); } else { - dasm_put(Dst, 10771); + dasm_put(Dst, 14751); + } + dasm_put(Dst, 14759); + if (cmov) { + dasm_put(Dst, 10789); + } else { + dasm_put(Dst, 10795); } if (!cmov) { - dasm_put(Dst, 14740); + dasm_put(Dst, 14764); } } if (op == BC_FORI) { - dasm_put(Dst, 14746, -BCBIAS_J*4); - } else if (op == BC_JFORI) { - dasm_put(Dst, 14756, -BCBIAS_J*4, BC_JLOOP); - } else if (op == BC_IFORL) { dasm_put(Dst, 14770, -BCBIAS_J*4); + } else if (op == BC_JFORI) { + dasm_put(Dst, 14780, -BCBIAS_J*4, BC_JLOOP); + } else if (op == BC_IFORL) { + dasm_put(Dst, 14794, -BCBIAS_J*4); } else { - dasm_put(Dst, 14766, BC_JLOOP); + dasm_put(Dst, 14790, BC_JLOOP); } - dasm_put(Dst, 10800); + dasm_put(Dst, 10824); if (sse) { - dasm_put(Dst, 14780); + dasm_put(Dst, 14804); } break; case BC_ITERL: #if LJ_HASJIT - dasm_put(Dst, 14599, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 14623, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; @@ -2237,33 +2240,33 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IITERL: - dasm_put(Dst, 14791, LJ_TNIL); + dasm_put(Dst, 14815, LJ_TNIL); if (op == BC_JITERL) { - dasm_put(Dst, 14806, BC_JLOOP); + dasm_put(Dst, 14830, BC_JLOOP); } else { - dasm_put(Dst, 14820, -BCBIAS_J*4); + dasm_put(Dst, 14844, -BCBIAS_J*4); } - dasm_put(Dst, 11097); + dasm_put(Dst, 11121); break; case BC_LOOP: #if LJ_HASJIT - dasm_put(Dst, 14599, HOTCOUNT_PCMASK, GG_DISP2HOT); + dasm_put(Dst, 14623, HOTCOUNT_PCMASK, GG_DISP2HOT); #endif break; case BC_ILOOP: - dasm_put(Dst, 8412); + dasm_put(Dst, 10826); break; case BC_JLOOP: #if LJ_HASJIT - dasm_put(Dst, 14836, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); + dasm_put(Dst, 14860, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); #endif break; case BC_JMP: - dasm_put(Dst, 14859, -BCBIAS_J*4); + dasm_put(Dst, 14883, -BCBIAS_J*4); break; /* -- Function headers -------------------------------------------------- */ @@ -2286,47 +2289,47 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IFUNCF: - dasm_put(Dst, 14883, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); + dasm_put(Dst, 14907, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); if (op == BC_JFUNCF) { - dasm_put(Dst, 14913, BC_JLOOP); + dasm_put(Dst, 14937, BC_JLOOP); } else { - dasm_put(Dst, 8412); + dasm_put(Dst, 10826); } - dasm_put(Dst, 14922, LJ_TNIL); + dasm_put(Dst, 14946, LJ_TNIL); break; case BC_JFUNCV: #if !LJ_HASJIT break; #endif - dasm_put(Dst, 10463); + dasm_put(Dst, 10487); break; /* NYI: compiled vararg functions. */ case BC_IFUNCV: - dasm_put(Dst, 14944, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); + dasm_put(Dst, 14968, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); if (op == BC_JFUNCV) { - dasm_put(Dst, 14913, BC_JLOOP); + dasm_put(Dst, 14937, BC_JLOOP); } else { - dasm_put(Dst, 15035, -4+PC2PROTO(k)); + dasm_put(Dst, 15059, -4+PC2PROTO(k)); } - dasm_put(Dst, 15057, LJ_TNIL); + dasm_put(Dst, 15081, LJ_TNIL); break; case BC_FUNCC: case BC_FUNCCW: - dasm_put(Dst, 15079, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); + dasm_put(Dst, 15103, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); if (op == BC_FUNCC) { - dasm_put(Dst, 15108); + dasm_put(Dst, 15132); } else { - dasm_put(Dst, 15112); + dasm_put(Dst, 15136); } - dasm_put(Dst, 15120, DISPATCH_GL(vmstate), ~LJ_VMST_C); + dasm_put(Dst, 15144, DISPATCH_GL(vmstate), ~LJ_VMST_C); if (op == BC_FUNCC) { - dasm_put(Dst, 15129); + dasm_put(Dst, 15153); } else { - dasm_put(Dst, 15133, DISPATCH_GL(wrapf)); + dasm_put(Dst, 15157, DISPATCH_GL(wrapf)); } - dasm_put(Dst, 15138, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 15162, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); break; /* ---------------------------------------------------------------------- */ @@ -2354,7 +2357,7 @@ static int build_backend(BuildCtx *ctx) build_subroutines(ctx, cmov, sse); - dasm_put(Dst, 15163); + dasm_put(Dst, 15187); 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 fdc06001..0aaf5497 100644 --- a/src/lj_err.c +++ b/src/lj_err.c @@ -695,7 +695,7 @@ static void err_raise_ext(int errcode) /* -- Error handling ------------------------------------------------------ */ /* Throw error. Find catch frame, unwind stack and continue. */ -LJ_NOINLINE void lj_err_throw(lua_State *L, int errcode) +LJ_NOINLINE void LJ_FASTCALL lj_err_throw(lua_State *L, int errcode) { global_State *g = G(L); lj_trace_abort(g); diff --git a/src/lj_err.h b/src/lj_err.h index aadb7c59..58a85381 100644 --- a/src/lj_err.h +++ b/src/lj_err.h @@ -18,7 +18,7 @@ typedef enum { } ErrMsg; LJ_FUNC GCstr *lj_err_str(lua_State *L, ErrMsg em); -LJ_FUNC_NORET void lj_err_throw(lua_State *L, int errcode); +LJ_FUNC_NORET void LJ_FASTCALL lj_err_throw(lua_State *L, int errcode); LJ_FUNC_NORET void lj_err_mem(lua_State *L); LJ_FUNC_NORET void lj_err_run(lua_State *L); LJ_FUNC_NORET void lj_err_msg(lua_State *L, ErrMsg em); diff --git a/src/lj_snap.c b/src/lj_snap.c index e17b7a0d..1353e90f 100644 --- a/src/lj_snap.c +++ b/src/lj_snap.c @@ -216,8 +216,12 @@ const BCIns *lj_snap_restore(jit_State *J, void *exptr) BCReg nslots = snap->nslots; TValue *frame; BloomFilter rfilt = snap_renamefilter(T, snapno); + const BCIns *pc = snap_pc(map[nent]); lua_State *L = J->L; + /* Set interpreter PC to the next PC to get correct error messages. */ + setcframe_pc(cframe_raw(L->cframe), pc+1); + /* Make sure the stack is big enough for the slots from the snapshot. */ if (LJ_UNLIKELY(L->base + nslots > L->maxstack)) { L->top = curr_topL(L); @@ -289,7 +293,7 @@ const BCIns *lj_snap_restore(jit_State *J, void *exptr) } L->top = curr_topL(L); lua_assert(map + nent == flinks); - return snap_pc(*flinks); + return pc; } #undef IR diff --git a/src/lj_trace.c b/src/lj_trace.c index 3b137164..43104be6 100644 --- a/src/lj_trace.c +++ b/src/lj_trace.c @@ -574,13 +574,34 @@ static void trace_hotside(jit_State *J, const BCIns *pc) } } -/* A trace exited. Restore interpreter state. */ -void * LJ_FASTCALL lj_trace_exit(jit_State *J, void *exptr) +/* Tiny struct to pass data to protected call. */ +typedef struct ExitDataCP { + jit_State *J; + void *exptr; /* Pointer to exit state. */ + const BCIns *pc; /* Restart interpreter at this PC. */ +} ExitDataCP; + +/* Need to protect lj_snap_restore because it may throw. */ +static TValue *trace_exit_cp(lua_State *L, lua_CFunction dummy, void *ud) +{ + ExitDataCP *exd = (ExitDataCP *)ud; + cframe_errfunc(L->cframe) = -1; /* Inherit error function. */ + exd->pc = lj_snap_restore(exd->J, exd->exptr); + UNUSED(dummy); + return NULL; +} + +/* A trace exited. Restore interpreter state. */ +int LJ_FASTCALL lj_trace_exit(jit_State *J, void *exptr) { - const BCIns *pc = lj_snap_restore(J, exptr); lua_State *L = J->L; - void *cf = cframe_raw(L->cframe); - setcframe_pc(cf, pc); /* Restart interpreter at this PC. */ + ExitDataCP exd; + int errcode; + exd.J = J; + exd.exptr = exptr; + errcode = lj_vm_cpcall(L, NULL, &exd, trace_exit_cp); + if (errcode) + return errcode; lj_vmevent_send(L, TEXIT, ExitState *ex = (ExitState *)exptr; @@ -600,8 +621,9 @@ void * LJ_FASTCALL lj_trace_exit(jit_State *J, void *exptr) } ); - trace_hotside(J, pc); - return cf; /* Return the interpreter C frame. */ + trace_hotside(J, exd.pc); + setcframe_pc(cframe_raw(L->cframe), exd.pc); + return 0; } #endif diff --git a/src/lj_trace.h b/src/lj_trace.h index a8e45974..6944bd9c 100644 --- a/src/lj_trace.h +++ b/src/lj_trace.h @@ -33,7 +33,7 @@ LJ_FUNC void lj_trace_freestate(global_State *g); /* Event handling. */ LJ_FUNC void lj_trace_ins(jit_State *J, const BCIns *pc); LJ_FUNCA void LJ_FASTCALL lj_trace_hot(jit_State *J, const BCIns *pc); -LJ_FUNCA void * LJ_FASTCALL lj_trace_exit(jit_State *J, void *exptr); +LJ_FUNCA int LJ_FASTCALL lj_trace_exit(jit_State *J, void *exptr); /* Signal asynchronous abort of trace or end of trace. */ #define lj_trace_abort(g) (G2J(g)->state &= ~LJ_TRACE_ACTIVE)