From f1849fa928f7d8d870488f04a4d356eabaa5d057 Mon Sep 17 00:00:00 2001 From: Mike Pall Date: Fri, 4 Nov 2011 14:48:44 +0100 Subject: [PATCH] x64: Fix lightuserdata comparisons. --- src/buildvm_x64.h | 1148 +++++++++++++++++++++++++------------------------- src/buildvm_x64win.h | 1140 ++++++++++++++++++++++++------------------------- src/buildvm_x86.dasc | 4 + 3 files changed, 1148 insertions(+), 1144 deletions(-) diff --git a/src/buildvm_x64.h b/src/buildvm_x64.h index 4e4eca54..bd4ab408 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[16156] = { +static const unsigned char build_actionlist[16164] = { 254,1,248,10,252,247,195,237,15,132,244,11,131,227,252,248,41,218,72,141, 76,25,252,248,139,90,252,252,199,68,10,4,237,248,12,131,192,1,137,68,36,4, 252,247,195,237,15,132,244,13,248,14,129,252,243,239,252,247,195,237,15,133, @@ -526,273 +526,273 @@ static const unsigned char build_actionlist[16156] = { 252,254,141,156,253,131,233,248,1,255,252,233,244,9,255,248,5,255,129,252, 253,239,15,132,244,48,129,124,253,202,4,239,15,132,244,48,255,57,108,202, 4,15,133,244,2,129,252,253,239,15,131,244,1,139,12,202,139,4,194,57,193,15, - 132,244,1,129,252,253,239,15,135,244,2,139,169,233,133,252,237,15,132,244, - 2,252,246,133,233,235,15,133,244,2,255,49,252,237,255,189,1,0,0,0,255,252, - 233,244,47,255,248,3,129,252,253,239,255,15,133,244,9,255,252,233,244,48, - 255,72,252,247,208,139,108,202,4,131,195,4,129,252,253,239,15,133,244,249, - 139,12,202,65,59,12,135,255,139,108,202,4,131,195,4,255,129,252,253,239,15, - 133,244,253,65,129,124,253,199,4,239,15,133,244,254,65,139,44,199,59,44,202, - 255,15,183,67,252,254,141,156,253,131,233,248,9,139,3,15,182,204,15,182,232, - 131,195,4,193,232,16,65,252,255,36,252,238,248,7,15,135,244,249,65,129,124, - 253,199,4,239,15,130,244,247,255,252,242,65,15,42,4,199,255,65,219,4,199, - 255,252,233,244,248,248,8,255,252,242,15,42,4,202,102,65,15,46,4,199,255, - 219,4,202,65,221,4,199,255,129,252,253,239,15,131,244,249,255,248,1,252,242, - 65,15,16,4,199,248,2,102,15,46,4,202,248,4,255,248,1,65,221,4,199,248,2,221, - 4,202,248,4,255,72,252,247,208,139,108,202,4,131,195,4,57,197,255,15,133, - 244,249,15,183,67,252,254,141,156,253,131,233,248,2,139,3,15,182,204,15,182, - 232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,129,252,253,239,15,133, - 244,2,252,233,244,48,255,15,132,244,248,129,252,253,239,15,132,244,48,15, - 183,67,252,254,141,156,253,131,233,248,2,139,3,15,182,204,15,182,232,131, - 195,4,193,232,16,65,252,255,36,252,238,255,139,108,194,4,131,195,4,129,252, - 253,239,255,137,108,202,4,139,44,194,137,44,202,255,72,139,44,194,72,137, - 44,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,133,244,251,139,44,194,252,247,221,15,128,244,250,199, - 68,202,4,237,137,44,202,248,9,139,3,15,182,204,15,182,232,131,195,4,193,232, - 16,65,252,255,36,252,238,248,4,199,68,202,4,0,0,224,65,199,4,202,0,0,0,0, - 252,233,244,9,248,5,15,135,244,53,255,129,124,253,194,4,239,15,131,244,53, - 255,252,242,15,16,4,194,72,184,237,237,102,72,15,110,200,15,87,193,252,242, - 15,17,4,202,255,221,4,194,217,224,221,28,202,255,129,124,253,194,4,239,15, - 133,244,248,139,4,194,255,139,128,233,248,1,199,68,202,4,237,137,4,202,255, - 15,87,192,252,242,15,42,128,233,248,1,252,242,15,17,4,202,255,219,128,233, - 248,1,221,28,202,255,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65, - 252,255,36,252,238,248,2,129,124,253,194,4,239,15,133,244,56,139,60,194,255, - 139,175,233,131,252,253,0,15,133,244,255,248,3,255,248,57,137,213,232,251, - 1,21,255,252,242,15,42,192,255,137,252,234,15,182,75,252,253,252,233,244, - 1,255,248,9,252,246,133,233,235,15,133,244,3,252,233,244,56,255,15,182,252, - 236,15,182,192,255,129,124,253,252,234,4,239,15,133,244,50,65,129,124,253, - 199,4,239,15,133,244,50,139,44,252,234,65,3,44,199,15,128,244,49,255,129, - 124,253,252,234,4,239,15,133,244,52,65,129,124,253,199,4,239,15,133,244,52, - 65,139,4,199,3,4,252,234,15,128,244,51,255,129,124,253,252,234,4,239,15,133, - 244,55,129,124,253,194,4,239,15,133,244,55,139,44,252,234,3,44,194,15,128, - 244,54,255,199,68,202,4,237,255,129,124,253,252,234,4,239,15,131,244,50,255, - 65,129,124,253,199,4,239,15,131,244,50,255,252,242,15,16,4,252,234,252,242, - 65,15,88,4,199,255,221,4,252,234,65,220,4,199,255,129,124,253,252,234,4,239, - 15,131,244,52,255,65,129,124,253,199,4,239,15,131,244,52,255,252,242,65,15, - 16,4,199,252,242,15,88,4,252,234,255,65,221,4,199,220,4,252,234,255,129,124, - 253,252,234,4,239,15,131,244,55,129,124,253,194,4,239,15,131,244,55,255,252, - 242,15,16,4,252,234,252,242,15,88,4,194,255,221,4,252,234,220,4,194,255,129, - 124,253,252,234,4,239,15,133,244,50,65,129,124,253,199,4,239,15,133,244,50, - 139,44,252,234,65,43,44,199,15,128,244,49,255,129,124,253,252,234,4,239,15, - 133,244,52,65,129,124,253,199,4,239,15,133,244,52,65,139,4,199,43,4,252,234, - 15,128,244,51,255,129,124,253,252,234,4,239,15,133,244,55,129,124,253,194, - 4,239,15,133,244,55,139,44,252,234,43,44,194,15,128,244,54,255,252,242,15, - 16,4,252,234,252,242,65,15,92,4,199,255,221,4,252,234,65,220,36,199,255,252, - 242,65,15,16,4,199,252,242,15,92,4,252,234,255,65,221,4,199,220,36,252,234, - 255,252,242,15,16,4,252,234,252,242,15,92,4,194,255,221,4,252,234,220,36, - 194,255,129,124,253,252,234,4,239,15,133,244,50,65,129,124,253,199,4,239, - 15,133,244,50,139,44,252,234,65,15,175,44,199,15,128,244,49,255,129,124,253, - 252,234,4,239,15,133,244,52,65,129,124,253,199,4,239,15,133,244,52,65,139, - 4,199,15,175,4,252,234,15,128,244,51,255,129,124,253,252,234,4,239,15,133, - 244,55,129,124,253,194,4,239,15,133,244,55,139,44,252,234,15,175,44,194,15, - 128,244,54,255,252,242,15,16,4,252,234,252,242,65,15,89,4,199,255,221,4,252, - 234,65,220,12,199,255,252,242,65,15,16,4,199,252,242,15,89,4,252,234,255, - 65,221,4,199,220,12,252,234,255,252,242,15,16,4,252,234,252,242,15,89,4,194, - 255,221,4,252,234,220,12,194,255,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,166,232,244,156,255,252,233,244,166,255,232,244,116,255,15,182,252,236, - 15,182,192,139,124,36,24,137,151,233,141,52,194,137,194,41,252,234,248,35, - 137,252,253,137,92,36,28,232,251,1,27,139,149,233,133,192,15,133,244,44,15, - 182,107,252,255,15,182,75,252,253,72,139,4,252,234,72,137,4,202,139,3,15, - 182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,72,252, - 247,208,65,139,4,135,199,68,202,4,237,137,4,202,139,3,15,182,204,15,182,232, - 131,195,4,193,232,16,65,252,255,36,252,238,255,15,191,192,199,68,202,4,237, - 137,4,202,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,72,139,69,0,72,137,4, - 202,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238, - 255,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,28, - 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,28,137,252,234,252,233, - 244,1,255,139,106,252,248,255,252,242,65,15,16,4,199,255,139,172,253,141, - 233,139,141,233,255,252,242,15,17,1,255,221,25,255,72,252,247,208,139,106, - 252,248,139,172,253,141,233,139,141,233,137,65,4,139,3,15,182,204,15,182, - 232,131,195,4,193,232,16,65,252,255,36,252,238,255,141,156,253,131,233,139, - 108,36,24,131,189,233,0,15,132,244,247,137,149,233,141,52,202,137,252,239, - 232,251,1,29,139,149,233,248,1,139,3,15,182,204,15,182,232,131,195,4,193, - 232,16,65,252,255,36,252,238,255,72,252,247,208,139,108,36,24,137,149,233, - 139,82,252,248,65,139,52,135,137,252,239,137,92,36,28,232,251,1,30,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,108,36,24,137,149, - 233,65,139,142,233,65,59,142,233,137,92,36,28,15,131,244,251,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, - 252,239,137,198,232,251,1,31,139,149,233,15,182,75,252,253,137,4,202,199, - 68,202,4,237,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255, - 36,252,238,248,3,184,1,8,0,0,252,233,244,2,248,5,137,252,239,232,251,1,32, - 15,183,67,252,254,252,233,244,1,255,72,252,247,208,139,108,36,24,65,139,142, - 233,137,92,36,28,65,59,142,233,137,149,233,15,131,244,249,248,2,65,139,52, - 135,137,252,239,232,251,1,33,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,32,15,183,67,252,254,72,252,247,208, - 252,233,244,2,255,72,252,247,208,139,106,252,248,139,173,233,65,139,4,135, - 252,233,244,167,255,72,252,247,208,139,106,252,248,139,173,233,65,139,4,135, - 252,233,244,168,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15, - 133,244,38,139,44,252,234,255,129,124,253,194,4,239,15,133,244,251,139,4, - 194,255,129,124,253,194,4,239,15,131,244,251,255,252,242,15,16,4,194,252, - 242,15,45,192,252,242,15,42,200,102,15,46,193,255,15,133,244,38,255,59,133, - 233,15,131,244,38,193,224,3,3,133,233,129,120,253,4,239,15,132,244,248,72, - 139,40,72,137,44,202,248,1,139,3,15,182,204,15,182,232,131,195,4,193,232, - 16,65,252,255,36,252,238,248,2,131,189,233,0,15,132,244,249,139,141,233,252, - 246,129,233,235,15,132,244,38,15,182,75,252,253,248,3,199,68,202,4,237,252, - 233,244,1,248,5,255,129,124,253,194,4,239,15,133,244,38,139,4,194,252,233, - 244,167,255,15,182,252,236,15,182,192,72,252,247,208,65,139,4,135,129,124, - 253,252,234,4,239,15,133,244,36,139,44,252,234,248,167,139,141,233,35,136, - 233,105,201,239,3,141,233,248,1,129,185,233,239,15,133,244,250,57,129,233, - 15,133,244,250,129,121,253,4,239,15,132,244,251,15,182,67,252,253,72,139, - 41,72,137,44,194,248,2,255,139,3,15,182,204,15,182,232,131,195,4,193,232, - 16,65,252,255,36,252,238,248,3,15,182,67,252,253,199,68,194,4,237,252,233, - 244,2,248,4,139,137,233,133,201,15,133,244,1,248,5,139,141,233,133,201,15, - 132,244,3,252,246,129,233,235,15,133,244,3,252,233,244,36,255,15,182,252, - 236,15,182,192,129,124,253,252,234,4,239,15,133,244,37,139,44,252,234,59, - 133,233,15,131,244,37,193,224,3,3,133,233,129,120,253,4,239,15,132,244,248, - 72,139,40,72,137,44,202,248,1,139,3,15,182,204,15,182,232,131,195,4,193,232, - 16,65,252,255,36,252,238,248,2,131,189,233,0,15,132,244,249,139,141,233,252, - 246,129,233,235,15,132,244,37,255,15,182,75,252,253,248,3,199,68,202,4,237, - 252,233,244,1,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15, - 133,244,41,139,44,252,234,255,15,133,244,41,255,59,133,233,15,131,244,41, - 193,224,3,3,133,233,129,120,253,4,239,15,132,244,249,248,1,252,246,133,233, - 235,15,133,244,253,248,2,72,139,44,202,72,137,40,139,3,15,182,204,15,182, - 232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,131,189,233,0,15,132, - 244,1,139,141,233,252,246,129,233,235,255,15,132,244,41,15,182,75,252,253, - 252,233,244,1,248,5,129,124,253,194,4,239,15,133,244,41,139,4,194,252,233, - 244,168,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,39,139,44,252,234,248,168, - 139,141,233,35,136,233,105,201,239,198,133,233,0,3,141,233,248,1,129,185, - 233,239,15,133,244,251,57,129,233,15,133,244,251,129,121,253,4,239,15,132, - 244,250,248,2,255,252,246,133,233,235,15,133,244,253,248,3,15,182,67,252, - 253,72,139,44,194,72,137,41,139,3,15,182,204,15,182,232,131,195,4,193,232, - 16,65,252,255,36,252,238,248,4,131,189,233,0,15,132,244,2,137,12,36,139,141, - 233,252,246,129,233,235,15,132,244,39,139,12,36,252,233,244,2,248,5,139,137, - 233,133,201,15,133,244,1,255,139,141,233,133,201,15,132,244,252,252,246,129, - 233,235,15,132,244,39,248,6,137,4,36,199,68,36,4,237,137,108,36,8,139,124, - 36,24,137,151,233,72,141,20,36,137,252,238,137,252,253,137,92,36,28,232,251, - 1,34,139,149,233,139,108,36,8,137,193,252,233,244,2,248,7,128,165,233,235, - 65,139,134,233,65,137,174,233,137,133,233,252,233,244,3,255,15,182,252,236, - 15,182,192,129,124,253,252,234,4,239,15,133,244,40,139,44,252,234,59,133, - 233,15,131,244,40,193,224,3,3,133,233,129,120,253,4,239,15,132,244,249,248, - 1,252,246,133,233,235,15,133,244,253,248,2,72,139,12,202,72,137,8,139,3,15, - 182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,131,189, - 233,0,15,132,244,1,255,139,141,233,252,246,129,233,235,15,132,244,40,15,182, - 75,252,253,252,233,244,1,248,7,128,165,233,235,65,139,142,233,65,137,174, - 233,137,141,233,15,182,75,252,253,252,233,244,2,255,68,137,60,36,69,139,60, - 199,248,1,141,12,202,139,105,252,248,252,246,133,233,235,15,133,244,253,248, - 2,139,68,36,4,131,232,1,15,132,244,250,68,1,252,248,59,133,233,15,135,244, - 251,68,41,252,248,65,193,231,3,68,3,189,233,248,3,72,139,41,131,193,8,73, - 137,47,65,131,199,8,131,232,1,15,133,244,3,248,4,68,139,60,36,139,3,15,182, - 204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,5,139,124,36, - 24,137,151,233,137,252,238,137,194,137,252,253,137,92,36,28,232,251,1,35, - 139,149,233,15,182,75,252,253,252,233,244,1,248,7,255,128,165,233,235,65, - 139,134,233,65,137,174,233,137,133,233,252,233,244,2,255,3,68,36,4,255,129, - 124,253,202,4,239,139,44,202,15,133,244,58,141,84,202,8,137,90,252,252,139, + 132,244,1,129,252,253,239,15,135,244,2,129,252,253,239,15,130,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,47,255,248,3,129,252,253,239,255,15,133, + 244,9,255,252,233,244,48,255,72,252,247,208,139,108,202,4,131,195,4,129,252, + 253,239,15,133,244,249,139,12,202,65,59,12,135,255,139,108,202,4,131,195, + 4,255,129,252,253,239,15,133,244,253,65,129,124,253,199,4,239,15,133,244, + 254,65,139,44,199,59,44,202,255,15,183,67,252,254,141,156,253,131,233,248, + 9,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238, + 248,7,15,135,244,249,65,129,124,253,199,4,239,15,130,244,247,255,252,242, + 65,15,42,4,199,255,65,219,4,199,255,252,233,244,248,248,8,255,252,242,15, + 42,4,202,102,65,15,46,4,199,255,219,4,202,65,221,4,199,255,129,252,253,239, + 15,131,244,249,255,248,1,252,242,65,15,16,4,199,248,2,102,15,46,4,202,248, + 4,255,248,1,65,221,4,199,248,2,221,4,202,248,4,255,72,252,247,208,139,108, + 202,4,131,195,4,57,197,255,15,133,244,249,15,183,67,252,254,141,156,253,131, + 233,248,2,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36, + 252,238,248,3,129,252,253,239,15,133,244,2,252,233,244,48,255,15,132,244, + 248,129,252,253,239,15,132,244,48,15,183,67,252,254,141,156,253,131,233,248, + 2,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238, + 255,139,108,194,4,131,195,4,129,252,253,239,255,137,108,202,4,139,44,194, + 137,44,202,255,72,139,44,194,72,137,44,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,133,244,251,139,44,194, + 252,247,221,15,128,244,250,199,68,202,4,237,137,44,202,248,9,139,3,15,182, + 204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,4,199,68,202, + 4,0,0,224,65,199,4,202,0,0,0,0,252,233,244,9,248,5,15,135,244,53,255,129, + 124,253,194,4,239,15,131,244,53,255,252,242,15,16,4,194,72,184,237,237,102, + 72,15,110,200,15,87,193,252,242,15,17,4,202,255,221,4,194,217,224,221,28, + 202,255,129,124,253,194,4,239,15,133,244,248,139,4,194,255,139,128,233,248, + 1,199,68,202,4,237,137,4,202,255,15,87,192,252,242,15,42,128,233,248,1,252, + 242,15,17,4,202,255,219,128,233,248,1,221,28,202,255,139,3,15,182,204,15, + 182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,129,124,253,194, + 4,239,15,133,244,56,139,60,194,255,139,175,233,131,252,253,0,15,133,244,255, + 248,3,255,248,57,137,213,232,251,1,21,255,252,242,15,42,192,255,137,252,234, + 15,182,75,252,253,252,233,244,1,255,248,9,252,246,133,233,235,15,133,244, + 3,252,233,244,56,255,15,182,252,236,15,182,192,255,129,124,253,252,234,4, + 239,15,133,244,50,65,129,124,253,199,4,239,15,133,244,50,139,44,252,234,65, + 3,44,199,15,128,244,49,255,129,124,253,252,234,4,239,15,133,244,52,65,129, + 124,253,199,4,239,15,133,244,52,65,139,4,199,3,4,252,234,15,128,244,51,255, + 129,124,253,252,234,4,239,15,133,244,55,129,124,253,194,4,239,15,133,244, + 55,139,44,252,234,3,44,194,15,128,244,54,255,199,68,202,4,237,255,129,124, + 253,252,234,4,239,15,131,244,50,255,65,129,124,253,199,4,239,15,131,244,50, + 255,252,242,15,16,4,252,234,252,242,65,15,88,4,199,255,221,4,252,234,65,220, + 4,199,255,129,124,253,252,234,4,239,15,131,244,52,255,65,129,124,253,199, + 4,239,15,131,244,52,255,252,242,65,15,16,4,199,252,242,15,88,4,252,234,255, + 65,221,4,199,220,4,252,234,255,129,124,253,252,234,4,239,15,131,244,55,129, + 124,253,194,4,239,15,131,244,55,255,252,242,15,16,4,252,234,252,242,15,88, + 4,194,255,221,4,252,234,220,4,194,255,129,124,253,252,234,4,239,15,133,244, + 50,65,129,124,253,199,4,239,15,133,244,50,139,44,252,234,65,43,44,199,15, + 128,244,49,255,129,124,253,252,234,4,239,15,133,244,52,65,129,124,253,199, + 4,239,15,133,244,52,65,139,4,199,43,4,252,234,15,128,244,51,255,129,124,253, + 252,234,4,239,15,133,244,55,129,124,253,194,4,239,15,133,244,55,139,44,252, + 234,43,44,194,15,128,244,54,255,252,242,15,16,4,252,234,252,242,65,15,92, + 4,199,255,221,4,252,234,65,220,36,199,255,252,242,65,15,16,4,199,252,242, + 15,92,4,252,234,255,65,221,4,199,220,36,252,234,255,252,242,15,16,4,252,234, + 252,242,15,92,4,194,255,221,4,252,234,220,36,194,255,129,124,253,252,234, + 4,239,15,133,244,50,65,129,124,253,199,4,239,15,133,244,50,139,44,252,234, + 65,15,175,44,199,15,128,244,49,255,129,124,253,252,234,4,239,15,133,244,52, + 65,129,124,253,199,4,239,15,133,244,52,65,139,4,199,15,175,4,252,234,15,128, + 244,51,255,129,124,253,252,234,4,239,15,133,244,55,129,124,253,194,4,239, + 15,133,244,55,139,44,252,234,15,175,44,194,15,128,244,54,255,252,242,15,16, + 4,252,234,252,242,65,15,89,4,199,255,221,4,252,234,65,220,12,199,255,252, + 242,65,15,16,4,199,252,242,15,89,4,252,234,255,65,221,4,199,220,12,252,234, + 255,252,242,15,16,4,252,234,252,242,15,89,4,194,255,221,4,252,234,220,12, + 194,255,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,166,232,244,156, + 255,252,233,244,166,255,232,244,116,255,15,182,252,236,15,182,192,139,124, + 36,24,137,151,233,141,52,194,137,194,41,252,234,248,35,137,252,253,137,92, + 36,28,232,251,1,27,139,149,233,133,192,15,133,244,44,15,182,107,252,255,15, + 182,75,252,253,72,139,4,252,234,72,137,4,202,139,3,15,182,204,15,182,232, + 131,195,4,193,232,16,65,252,255,36,252,238,255,72,252,247,208,65,139,4,135, + 199,68,202,4,237,137,4,202,139,3,15,182,204,15,182,232,131,195,4,193,232, + 16,65,252,255,36,252,238,255,15,191,192,199,68,202,4,237,137,4,202,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,72,139,69,0,72,137,4,202,139,3,15,182,204,15,182, + 232,131,195,4,193,232,16,65,252,255,36,252,238,255,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,28,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,28,137,252,234,252,233,244,1,255,139,106,252,248,255,252,242, + 65,15,16,4,199,255,139,172,253,141,233,139,141,233,255,252,242,15,17,1,255, + 221,25,255,72,252,247,208,139,106,252,248,139,172,253,141,233,139,141,233, + 137,65,4,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252, + 238,255,141,156,253,131,233,139,108,36,24,131,189,233,0,15,132,244,247,137, + 149,233,141,52,202,137,252,239,232,251,1,29,139,149,233,248,1,139,3,15,182, + 204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,72,252,247, + 208,139,108,36,24,137,149,233,139,82,252,248,65,139,52,135,137,252,239,137, + 92,36,28,232,251,1,30,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,108,36,24,137,149,233,65,139,142,233,65,59,142,233,137,92,36, + 28,15,131,244,251,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,252,239,137,198,232,251,1,31,139,149,233,15, + 182,75,252,253,137,4,202,199,68,202,4,237,139,3,15,182,204,15,182,232,131, + 195,4,193,232,16,65,252,255,36,252,238,248,3,184,1,8,0,0,252,233,244,2,248, + 5,137,252,239,232,251,1,32,15,183,67,252,254,252,233,244,1,255,72,252,247, + 208,139,108,36,24,65,139,142,233,137,92,36,28,65,59,142,233,137,149,233,15, + 131,244,249,248,2,65,139,52,135,137,252,239,232,251,1,33,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,32,15,183, + 67,252,254,72,252,247,208,252,233,244,2,255,72,252,247,208,139,106,252,248, + 139,173,233,65,139,4,135,252,233,244,167,255,72,252,247,208,139,106,252,248, + 139,173,233,65,139,4,135,252,233,244,168,255,15,182,252,236,15,182,192,129, + 124,253,252,234,4,239,15,133,244,38,139,44,252,234,255,129,124,253,194,4, + 239,15,133,244,251,139,4,194,255,129,124,253,194,4,239,15,131,244,251,255, + 252,242,15,16,4,194,252,242,15,45,192,252,242,15,42,200,102,15,46,193,255, + 15,133,244,38,255,59,133,233,15,131,244,38,193,224,3,3,133,233,129,120,253, + 4,239,15,132,244,248,72,139,40,72,137,44,202,248,1,139,3,15,182,204,15,182, + 232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,131,189,233,0,15,132, + 244,249,139,141,233,252,246,129,233,235,15,132,244,38,15,182,75,252,253,248, + 3,199,68,202,4,237,252,233,244,1,248,5,255,129,124,253,194,4,239,15,133,244, + 38,139,4,194,252,233,244,167,255,15,182,252,236,15,182,192,72,252,247,208, + 65,139,4,135,129,124,253,252,234,4,239,15,133,244,36,139,44,252,234,248,167, + 139,141,233,35,136,233,105,201,239,3,141,233,248,1,129,185,233,239,15,133, + 244,250,57,129,233,15,133,244,250,129,121,253,4,239,15,132,244,251,15,182, + 67,252,253,72,139,41,72,137,44,194,248,2,255,139,3,15,182,204,15,182,232, + 131,195,4,193,232,16,65,252,255,36,252,238,248,3,15,182,67,252,253,199,68, + 194,4,237,252,233,244,2,248,4,139,137,233,133,201,15,133,244,1,248,5,139, + 141,233,133,201,15,132,244,3,252,246,129,233,235,15,133,244,3,252,233,244, + 36,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,37, + 139,44,252,234,59,133,233,15,131,244,37,193,224,3,3,133,233,129,120,253,4, + 239,15,132,244,248,72,139,40,72,137,44,202,248,1,139,3,15,182,204,15,182, + 232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,131,189,233,0,15,132, + 244,249,139,141,233,252,246,129,233,235,15,132,244,37,255,15,182,75,252,253, + 248,3,199,68,202,4,237,252,233,244,1,255,15,182,252,236,15,182,192,129,124, + 253,252,234,4,239,15,133,244,41,139,44,252,234,255,15,133,244,41,255,59,133, + 233,15,131,244,41,193,224,3,3,133,233,129,120,253,4,239,15,132,244,249,248, + 1,252,246,133,233,235,15,133,244,253,248,2,72,139,44,202,72,137,40,139,3, + 15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,131, + 189,233,0,15,132,244,1,139,141,233,252,246,129,233,235,255,15,132,244,41, + 15,182,75,252,253,252,233,244,1,248,5,129,124,253,194,4,239,15,133,244,41, + 139,4,194,252,233,244,168,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,39,139, + 44,252,234,248,168,139,141,233,35,136,233,105,201,239,198,133,233,0,3,141, + 233,248,1,129,185,233,239,15,133,244,251,57,129,233,15,133,244,251,129,121, + 253,4,239,15,132,244,250,248,2,255,252,246,133,233,235,15,133,244,253,248, + 3,15,182,67,252,253,72,139,44,194,72,137,41,139,3,15,182,204,15,182,232,131, + 195,4,193,232,16,65,252,255,36,252,238,248,4,131,189,233,0,15,132,244,2,137, + 12,36,139,141,233,252,246,129,233,235,15,132,244,39,139,12,36,252,233,244, + 2,248,5,139,137,233,133,201,15,133,244,1,255,139,141,233,133,201,15,132,244, + 252,252,246,129,233,235,15,132,244,39,248,6,137,4,36,199,68,36,4,237,137, + 108,36,8,139,124,36,24,137,151,233,72,141,20,36,137,252,238,137,252,253,137, + 92,36,28,232,251,1,34,139,149,233,139,108,36,8,137,193,252,233,244,2,248, + 7,128,165,233,235,65,139,134,233,65,137,174,233,137,133,233,252,233,244,3, + 255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,40,139, + 44,252,234,59,133,233,15,131,244,40,193,224,3,3,133,233,129,120,253,4,239, + 15,132,244,249,248,1,252,246,133,233,235,15,133,244,253,248,2,72,139,12,202, + 72,137,8,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252, + 238,248,3,131,189,233,0,15,132,244,1,255,139,141,233,252,246,129,233,235, + 15,132,244,40,15,182,75,252,253,252,233,244,1,248,7,128,165,233,235,65,139, + 142,233,65,137,174,233,137,141,233,15,182,75,252,253,252,233,244,2,255,68, + 137,60,36,69,139,60,199,248,1,141,12,202,139,105,252,248,252,246,133,233, + 235,15,133,244,253,248,2,139,68,36,4,131,232,1,15,132,244,250,68,1,252,248, + 59,133,233,15,135,244,251,68,41,252,248,65,193,231,3,68,3,189,233,248,3,72, + 139,41,131,193,8,73,137,47,65,131,199,8,131,232,1,15,133,244,3,248,4,68,139, + 60,36,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252, + 238,248,5,139,124,36,24,137,151,233,137,252,238,137,194,137,252,253,137,92, + 36,28,232,251,1,35,139,149,233,15,182,75,252,253,252,233,244,1,248,7,255, + 128,165,233,235,65,139,134,233,65,137,174,233,137,133,233,252,233,244,2,255, + 3,68,36,4,255,129,124,253,202,4,239,139,44,202,15,133,244,58,141,84,202,8, + 137,90,252,252,139,157,233,139,11,15,182,252,233,15,182,205,131,195,4,65, + 252,255,36,252,238,255,141,76,202,8,65,137,215,139,105,252,248,129,121,253, + 252,252,239,15,133,244,29,248,59,139,90,252,252,252,247,195,237,15,133,244, + 253,248,1,137,106,252,248,137,68,36,4,131,232,1,15,132,244,249,248,2,72,139, + 41,131,193,8,73,137,47,65,131,199,8,131,232,1,15,133,244,2,139,106,252,248, + 248,3,139,68,36,4,128,189,233,1,15,135,244,251,248,4,139,157,233,139,11,15, + 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,129,252,235,239, + 252,247,195,237,15,133,244,254,41,218,65,137,215,139,90,252,252,252,233,244, + 1,248,8,129,195,239,252,233,244,1,255,141,76,202,8,72,139,105,232,72,139, + 65,252,240,72,137,41,72,137,65,8,139,105,224,139,65,228,137,105,252,248,137, + 65,252,252,129,252,248,239,184,237,15,133,244,29,137,202,137,90,252,252,139, 157,233,139,11,15,182,252,233,15,182,205,131,195,4,65,252,255,36,252,238, - 255,141,76,202,8,65,137,215,139,105,252,248,129,121,253,252,252,239,15,133, - 244,29,248,59,139,90,252,252,252,247,195,237,15,133,244,253,248,1,137,106, - 252,248,137,68,36,4,131,232,1,15,132,244,249,248,2,72,139,41,131,193,8,73, - 137,47,65,131,199,8,131,232,1,15,133,244,2,139,106,252,248,248,3,139,68,36, - 4,128,189,233,1,15,135,244,251,248,4,139,157,233,139,11,15,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,129,252,235,239,252,247,195,237, - 15,133,244,254,41,218,65,137,215,139,90,252,252,252,233,244,1,248,8,129,195, - 239,252,233,244,1,255,141,76,202,8,72,139,105,232,72,139,65,252,240,72,137, - 41,72,137,65,8,139,105,224,139,65,228,137,105,252,248,137,65,252,252,129, - 252,248,239,184,237,15,133,244,29,137,202,137,90,252,252,139,157,233,139, - 11,15,182,252,233,15,182,205,131,195,4,65,252,255,36,252,238,255,68,137,60, - 36,68,137,116,36,4,139,108,202,252,240,139,68,202,252,248,68,139,181,233, - 131,195,4,68,139,189,233,248,1,68,57,252,240,15,131,244,251,65,129,124,253, - 199,4,239,15,132,244,250,255,219,68,202,252,248,255,73,139,44,199,72,137, - 108,202,8,131,192,1,255,137,68,202,252,248,248,2,15,183,67,252,254,141,156, - 253,131,233,248,3,68,139,116,36,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,4,131,192,1,255,137,68,202, - 252,248,255,252,233,244,1,248,5,68,41,252,240,248,6,59,133,233,15,135,244, - 3,68,105,252,248,239,68,3,189,233,65,129,191,233,239,15,132,244,253,70,141, - 116,48,1,73,139,175,233,73,139,135,233,72,137,44,202,72,137,68,202,8,68,137, - 116,202,252,248,252,233,244,2,248,7,131,192,1,252,233,244,6,255,129,124,253, - 202,252,236,239,15,133,244,251,139,108,202,232,129,124,253,202,252,244,239, - 15,133,244,251,129,124,253,202,252,252,239,15,133,244,251,128,189,233,235, - 15,133,244,251,141,156,253,131,233,199,68,202,252,248,0,0,0,0,248,1,139,3, - 15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,5,198, - 67,252,252,235,141,156,253,131,233,198,3,235,252,233,244,1,255,15,182,252, - 236,15,182,192,68,137,60,36,68,141,188,253,194,233,141,12,202,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,73,139,71,252,248,65,131,199,8,72,137,1,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,137,197,193,252,237,3,131,197,1,137,108,36,4,139,108,36, - 24,1,200,59,133,233,15,135,244,253,248,6,255,73,139,71,252,248,65,131,199, - 8,72,137,1,131,193,8,65,57,215,15,130,244,6,252,233,244,3,248,7,137,149,233, - 137,141,233,137,92,36,28,65,41,215,139,116,36,4,131,252,238,1,137,252,239, - 232,251,1,0,139,149,233,139,141,233,65,1,215,252,233,244,6,255,193,225,3, - 255,248,1,139,90,252,252,137,68,36,4,252,247,195,237,15,133,244,253,255,248, - 13,65,137,215,131,232,1,15,132,244,249,248,2,73,139,44,15,73,137,111,252, - 248,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,72,139,44,10,72,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,141,171,233,252,247,197,237,15,133,244,14,41,252,234,255,1,252,233, - 255,137,221,209,252,237,129,229,239,102,65,129,172,253,46,233,238,15,130, - 244,148,255,141,12,202,255,129,121,253,4,239,15,133,244,255,255,129,121,253, - 12,239,15,133,244,60,129,121,253,20,239,15,133,244,60,139,41,131,121,16,0, - 15,140,244,251,255,129,121,253,12,239,15,133,244,165,129,121,253,20,239,15, - 133,244,165,255,139,105,16,133,252,237,15,136,244,251,3,41,15,128,244,247, - 137,41,255,59,105,8,199,65,28,237,137,105,24,255,15,142,244,253,248,1,248, - 6,141,156,253,131,233,255,141,156,253,131,233,15,183,67,252,254,15,142,245, - 248,1,248,6,255,15,143,244,253,248,6,141,156,253,131,233,248,1,255,248,7, - 139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248, - 5,255,3,41,15,128,244,1,137,41,255,15,141,244,7,255,141,156,253,131,233,15, - 183,67,252,254,15,141,245,255,15,140,244,7,255,252,233,244,6,248,9,255,129, - 121,253,4,239,255,15,131,244,60,129,121,253,12,239,15,131,244,60,255,129, - 121,253,12,239,15,131,244,165,129,121,253,20,239,15,131,244,165,255,139,105, - 20,255,129,252,253,239,15,131,244,60,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,7,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,7,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,24,65,137,150,233,65,137,174,233,76,137, - 36,36,76,137,108,36,8,72,131,252,236,16,252,255,224,255,141,156,253,131,233, - 139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255, - 137,221,209,252,237,129,229,239,102,65,129,172,253,46,233,238,15,130,244, - 150,255,68,139,187,233,139,108,36,24,141,12,202,59,141,233,15,135,244,24, - 15,182,139,233,57,200,15,134,244,249,248,2,255,15,183,67,252,254,252,233, - 245,255,248,3,199,68,194,252,252,237,131,192,1,57,200,15,134,244,3,252,233, - 244,2,255,141,44,197,237,141,4,194,68,139,122,252,248,137,104,252,252,68, - 137,120,252,248,139,108,36,24,141,12,200,59,141,233,15,135,244,23,137,209, - 137,194,15,182,171,233,133,252,237,15,132,244,248,248,1,131,193,8,57,209, - 15,131,244,249,68,139,121,252,248,68,137,56,68,139,121,252,252,68,137,120, - 4,131,192,8,199,65,252,252,237,131,252,237,1,15,133,244,1,248,2,255,68,139, - 187,233,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252, - 238,255,248,3,199,64,4,237,131,192,8,131,252,237,1,15,133,244,3,252,233,244, - 2,255,139,106,252,248,76,139,189,233,139,108,36,24,141,68,194,252,248,137, - 149,233,141,136,233,59,141,233,137,133,233,255,76,137,252,254,137,252,239, - 255,15,135,244,22,65,199,134,233,237,255,65,252,255,215,255,65,252,255,150, - 233,255,65,199,134,233,237,139,149,233,141,12,194,252,247,217,3,141,233,139, - 90,252,252,252,233,244,12,255,254,0 + 255,68,137,60,36,68,137,116,36,4,139,108,202,252,240,139,68,202,252,248,68, + 139,181,233,131,195,4,68,139,189,233,248,1,68,57,252,240,15,131,244,251,65, + 129,124,253,199,4,239,15,132,244,250,255,219,68,202,252,248,255,73,139,44, + 199,72,137,108,202,8,131,192,1,255,137,68,202,252,248,248,2,15,183,67,252, + 254,141,156,253,131,233,248,3,68,139,116,36,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,4,131,192,1,255, + 137,68,202,252,248,255,252,233,244,1,248,5,68,41,252,240,248,6,59,133,233, + 15,135,244,3,68,105,252,248,239,68,3,189,233,65,129,191,233,239,15,132,244, + 253,70,141,116,48,1,73,139,175,233,73,139,135,233,72,137,44,202,72,137,68, + 202,8,68,137,116,202,252,248,252,233,244,2,248,7,131,192,1,252,233,244,6, + 255,129,124,253,202,252,236,239,15,133,244,251,139,108,202,232,129,124,253, + 202,252,244,239,15,133,244,251,129,124,253,202,252,252,239,15,133,244,251, + 128,189,233,235,15,133,244,251,141,156,253,131,233,199,68,202,252,248,0,0, + 0,0,248,1,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36, + 252,238,248,5,198,67,252,252,235,141,156,253,131,233,198,3,235,252,233,244, + 1,255,15,182,252,236,15,182,192,68,137,60,36,68,141,188,253,194,233,141,12, + 202,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,73,139,71,252,248,65,131,199,8,72,137,1,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,137,197,193,252,237,3,131,197,1,137, + 108,36,4,139,108,36,24,1,200,59,133,233,15,135,244,253,248,6,255,73,139,71, + 252,248,65,131,199,8,72,137,1,131,193,8,65,57,215,15,130,244,6,252,233,244, + 3,248,7,137,149,233,137,141,233,137,92,36,28,65,41,215,139,116,36,4,131,252, + 238,1,137,252,239,232,251,1,0,139,149,233,139,141,233,65,1,215,252,233,244, + 6,255,193,225,3,255,248,1,139,90,252,252,137,68,36,4,252,247,195,237,15,133, + 244,253,255,248,13,65,137,215,131,232,1,15,132,244,249,248,2,73,139,44,15, + 73,137,111,252,248,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,72,139,44,10,72,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,141,171,233,252,247,197,237,15,133,244,14,41,252,234, + 255,1,252,233,255,137,221,209,252,237,129,229,239,102,65,129,172,253,46,233, + 238,15,130,244,148,255,141,12,202,255,129,121,253,4,239,15,133,244,255,255, + 129,121,253,12,239,15,133,244,60,129,121,253,20,239,15,133,244,60,139,41, + 131,121,16,0,15,140,244,251,255,129,121,253,12,239,15,133,244,165,129,121, + 253,20,239,15,133,244,165,255,139,105,16,133,252,237,15,136,244,251,3,41, + 15,128,244,247,137,41,255,59,105,8,199,65,28,237,137,105,24,255,15,142,244, + 253,248,1,248,6,141,156,253,131,233,255,141,156,253,131,233,15,183,67,252, + 254,15,142,245,248,1,248,6,255,15,143,244,253,248,6,141,156,253,131,233,248, + 1,255,248,7,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36, + 252,238,248,5,255,3,41,15,128,244,1,137,41,255,15,141,244,7,255,141,156,253, + 131,233,15,183,67,252,254,15,141,245,255,15,140,244,7,255,252,233,244,6,248, + 9,255,129,121,253,4,239,255,15,131,244,60,129,121,253,12,239,15,131,244,60, + 255,129,121,253,12,239,15,131,244,165,129,121,253,20,239,15,131,244,165,255, + 139,105,20,255,129,252,253,239,15,131,244,60,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,7,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,7,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,24,65,137,150,233,65,137,174, + 233,76,137,36,36,76,137,108,36,8,72,131,252,236,16,252,255,224,255,141,156, + 253,131,233,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36, + 252,238,255,137,221,209,252,237,129,229,239,102,65,129,172,253,46,233,238, + 15,130,244,150,255,68,139,187,233,139,108,36,24,141,12,202,59,141,233,15, + 135,244,24,15,182,139,233,57,200,15,134,244,249,248,2,255,15,183,67,252,254, + 252,233,245,255,248,3,199,68,194,252,252,237,131,192,1,57,200,15,134,244, + 3,252,233,244,2,255,141,44,197,237,141,4,194,68,139,122,252,248,137,104,252, + 252,68,137,120,252,248,139,108,36,24,141,12,200,59,141,233,15,135,244,23, + 137,209,137,194,15,182,171,233,133,252,237,15,132,244,248,248,1,131,193,8, + 57,209,15,131,244,249,68,139,121,252,248,68,137,56,68,139,121,252,252,68, + 137,120,4,131,192,8,199,65,252,252,237,131,252,237,1,15,133,244,1,248,2,255, + 68,139,187,233,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255, + 36,252,238,255,248,3,199,64,4,237,131,192,8,131,252,237,1,15,133,244,3,252, + 233,244,2,255,139,106,252,248,76,139,189,233,139,108,36,24,141,68,194,252, + 248,137,149,233,141,136,233,59,141,233,137,133,233,255,76,137,252,254,137, + 252,239,255,15,135,244,22,65,199,134,233,237,255,65,252,255,215,255,65,252, + 255,150,233,255,65,199,134,233,237,139,149,233,141,12,194,252,247,217,3,141, + 233,139,90,252,252,252,233,244,12,255,254,0 }; enum { @@ -2026,26 +2026,26 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) if (LJ_HASFFI) { dasm_put(Dst, 10575, LJ_TCDATA, LJ_TCDATA); } - dasm_put(Dst, 10594, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<metatable), Dt6(->nomm), 1<>32)); + dasm_put(Dst, 11173, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); } else { - dasm_put(Dst, 11190); + dasm_put(Dst, 11198); } if (LJ_DUALNUM) { dasm_put(Dst, 10567); @@ -2142,27 +2142,27 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) } break; case BC_LEN: - dasm_put(Dst, 11199, LJ_TSTR); + dasm_put(Dst, 11207, LJ_TSTR); if (LJ_DUALNUM) { - dasm_put(Dst, 11213, Dt5(->len), LJ_TISNUM); + dasm_put(Dst, 11221, Dt5(->len), LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 11227, Dt5(->len)); + dasm_put(Dst, 11235, Dt5(->len)); } else { - dasm_put(Dst, 11245, Dt5(->len)); + dasm_put(Dst, 11253, Dt5(->len)); } - dasm_put(Dst, 11254, LJ_TTAB); + dasm_put(Dst, 11262, LJ_TTAB); #ifdef LUAJIT_ENABLE_LUA52COMPAT - dasm_put(Dst, 11290, Dt6(->metatable)); + dasm_put(Dst, 11298, Dt6(->metatable)); #endif - dasm_put(Dst, 11304); + dasm_put(Dst, 11312); if (LJ_DUALNUM) { } else if (sse) { - dasm_put(Dst, 11313); + dasm_put(Dst, 11321); } else { } - dasm_put(Dst, 11319); + dasm_put(Dst, 11327); #ifdef LUAJIT_ENABLE_LUA52COMPAT - dasm_put(Dst, 11332, Dt6(->nomm), 1<nomm), 1<base), Dt1(->base)); + dasm_put(Dst, 12117, Dt1(->base), Dt1(->base)); break; /* -- Constant ops ------------------------------------------------------ */ case BC_KSTR: - dasm_put(Dst, 12193, LJ_TSTR); + dasm_put(Dst, 12201, LJ_TSTR); break; case BC_KCDATA: #if LJ_HASFFI - dasm_put(Dst, 12193, LJ_TCDATA); + dasm_put(Dst, 12201, LJ_TCDATA); #endif break; case BC_KSHORT: if (LJ_DUALNUM) { - dasm_put(Dst, 12230, LJ_TISNUM); + dasm_put(Dst, 12238, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 12242); + dasm_put(Dst, 12250); } else { - dasm_put(Dst, 12257); + dasm_put(Dst, 12265); } dasm_put(Dst, 10306); break; case BC_KNUM: if (sse) { - dasm_put(Dst, 12265); + dasm_put(Dst, 12273); } else { - dasm_put(Dst, 12279); + dasm_put(Dst, 12287); } dasm_put(Dst, 10306); break; case BC_KPRI: - dasm_put(Dst, 12287); + dasm_put(Dst, 12295); break; case BC_KNIL: - dasm_put(Dst, 12316, LJ_TNIL); + dasm_put(Dst, 12324, LJ_TNIL); break; /* -- Upvalue and function ops ------------------------------------------ */ case BC_UGET: - dasm_put(Dst, 12364, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12372, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_USETV: #define TV2MARKOFS \ ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv)) - dasm_put(Dst, 12405, 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, 12501); + dasm_put(Dst, 12413, 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, 12509); break; #undef TV2MARKOFS case BC_USETS: - dasm_put(Dst, 12513, 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, 12521, 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, 12609); + dasm_put(Dst, 12617); if (sse) { - dasm_put(Dst, 12614); + dasm_put(Dst, 12622); } else { - dasm_put(Dst, 10830); + dasm_put(Dst, 10838); } - dasm_put(Dst, 12622, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12630, offsetof(GCfuncL, uvptr), DtA(->v)); if (sse) { - dasm_put(Dst, 12631); + dasm_put(Dst, 12639); } else { - dasm_put(Dst, 12637); + dasm_put(Dst, 12645); } dasm_put(Dst, 10306); break; case BC_USETP: - dasm_put(Dst, 12640, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12648, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_UCLO: - dasm_put(Dst, 12680, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 12688, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); break; case BC_FNEW: - dasm_put(Dst, 12736, Dt1(->base), Dt1(->base), LJ_TFUNC); + dasm_put(Dst, 12744, Dt1(->base), Dt1(->base), LJ_TFUNC); break; /* -- Table ops --------------------------------------------------------- */ case BC_TNEW: - dasm_put(Dst, 12803, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 12811, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); break; case BC_TDUP: - dasm_put(Dst, 12927, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 12935, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); break; case BC_GGET: - dasm_put(Dst, 13026, Dt7(->env)); + dasm_put(Dst, 13034, Dt7(->env)); break; case BC_GSET: - dasm_put(Dst, 13046, Dt7(->env)); + dasm_put(Dst, 13054, Dt7(->env)); break; case BC_TGETV: - dasm_put(Dst, 13066, LJ_TTAB); + dasm_put(Dst, 13074, LJ_TTAB); if (LJ_DUALNUM) { - dasm_put(Dst, 13089, LJ_TISNUM); + dasm_put(Dst, 13097, LJ_TISNUM); } else { - dasm_put(Dst, 13103, LJ_TISNUM); + dasm_put(Dst, 13111, LJ_TISNUM); if (sse) { - dasm_put(Dst, 13114); + dasm_put(Dst, 13122); } else { } - dasm_put(Dst, 13135); + dasm_put(Dst, 13143); } - dasm_put(Dst, 13140, 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, 13335, 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, 13343, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13556, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETS: - dasm_put(Dst, 13688, 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, 13765, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); - dasm_put(Dst, 13852, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13696, 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, 13773, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); + dasm_put(Dst, 13860, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETB: - dasm_put(Dst, 13944, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); - dasm_put(Dst, 14039, Dt6(->metatable), Dt6(->nomm), 1<marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13952, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); + dasm_put(Dst, 14047, Dt6(->metatable), Dt6(->nomm), 1<marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETM: - dasm_put(Dst, 14087, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); - dasm_put(Dst, 14237, Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 14095, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 14245, Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; /* -- Calls and vararg handling ----------------------------------------- */ case BC_CALL: case BC_CALLM: - dasm_put(Dst, 11352); + dasm_put(Dst, 11360); if (op == BC_CALLM) { - dasm_put(Dst, 14257); + dasm_put(Dst, 14265); } - dasm_put(Dst, 14262, LJ_TFUNC, Dt7(->pc)); + dasm_put(Dst, 14270, LJ_TFUNC, Dt7(->pc)); break; case BC_CALLMT: - dasm_put(Dst, 14257); + dasm_put(Dst, 14265); break; case BC_CALLT: - dasm_put(Dst, 14305, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); - dasm_put(Dst, 14423, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG); + dasm_put(Dst, 14313, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); + dasm_put(Dst, 14431, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG); break; case BC_ITERC: - dasm_put(Dst, 14497, LJ_TFUNC, 2+1, Dt7(->pc)); + dasm_put(Dst, 14505, LJ_TFUNC, 2+1, Dt7(->pc)); break; case BC_ITERN: #if LJ_HASJIT #endif - dasm_put(Dst, 14569, Dt6(->asize), Dt6(->array), LJ_TNIL); + dasm_put(Dst, 14577, Dt6(->asize), Dt6(->array), LJ_TNIL); if (LJ_DUALNUM) { - dasm_put(Dst, 11218, LJ_TISNUM); + dasm_put(Dst, 11226, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 11313); + dasm_put(Dst, 11321); } else { - dasm_put(Dst, 14621); + dasm_put(Dst, 14629); } - dasm_put(Dst, 14627); + dasm_put(Dst, 14635); if (LJ_DUALNUM) { } else if (sse) { - dasm_put(Dst, 11183); + dasm_put(Dst, 11191); } else { - dasm_put(Dst, 11195); + dasm_put(Dst, 11203); } - dasm_put(Dst, 14640, -BCBIAS_J*4); + dasm_put(Dst, 14648, -BCBIAS_J*4); if (!LJ_DUALNUM && !sse) { - dasm_put(Dst, 14694); + dasm_put(Dst, 14702); } - dasm_put(Dst, 14700, Dt6(->hmask), sizeof(Node), Dt6(->node), DtB(->val.it), LJ_TNIL, DtB(->key), DtB(->val)); + dasm_put(Dst, 14708, Dt6(->hmask), sizeof(Node), Dt6(->node), DtB(->val.it), LJ_TNIL, DtB(->key), DtB(->val)); break; case BC_ISNEXT: - dasm_put(Dst, 14779, LJ_TFUNC, LJ_TTAB, LJ_TNIL, Dt8(->ffid), FF_next_N, -BCBIAS_J*4, BC_JMP, -BCBIAS_J*4, BC_ITERC); + dasm_put(Dst, 14787, LJ_TFUNC, LJ_TTAB, LJ_TNIL, Dt8(->ffid), FF_next_N, -BCBIAS_J*4, BC_JMP, -BCBIAS_J*4, BC_ITERC); break; case BC_VARG: - dasm_put(Dst, 14880, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); - dasm_put(Dst, 15047, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 14888, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); + dasm_put(Dst, 15055, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); break; /* -- Returns ----------------------------------------------------------- */ case BC_RETM: - dasm_put(Dst, 14257); + dasm_put(Dst, 14265); break; case BC_RET: case BC_RET0: case BC_RET1: if (op != BC_RET0) { - dasm_put(Dst, 15117); + dasm_put(Dst, 15125); } - dasm_put(Dst, 15121, FRAME_TYPE); + dasm_put(Dst, 15129, FRAME_TYPE); switch (op) { case BC_RET: - dasm_put(Dst, 15140); + dasm_put(Dst, 15148); break; case BC_RET1: - dasm_put(Dst, 15194); + dasm_put(Dst, 15202); /* fallthrough */ case BC_RET0: - dasm_put(Dst, 15204); + dasm_put(Dst, 15212); default: break; } - dasm_put(Dst, 15215, Dt7(->pc), PC2PROTO(k)); + dasm_put(Dst, 15223, Dt7(->pc), PC2PROTO(k)); if (op == BC_RET) { - dasm_put(Dst, 15263, LJ_TNIL); + dasm_put(Dst, 15271, LJ_TNIL); } else { - dasm_put(Dst, 15274, LJ_TNIL); + dasm_put(Dst, 15282, LJ_TNIL); } - dasm_put(Dst, 15281, -FRAME_VARG, FRAME_TYPEP); + dasm_put(Dst, 15289, -FRAME_VARG, FRAME_TYPEP); if (op != BC_RET0) { - dasm_put(Dst, 15305); + dasm_put(Dst, 15313); } dasm_put(Dst, 4752); break; @@ -2777,7 +2777,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORL: #if LJ_HASJIT - dasm_put(Dst, 15309, HOTCOUNT_PCMASK, GG_DISP2HOT, HOTCOUNT_LOOP); + dasm_put(Dst, 15317, HOTCOUNT_PCMASK, GG_DISP2HOT, HOTCOUNT_LOOP); #endif break; @@ -2789,111 +2789,111 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORI: case BC_IFORL: vk = (op == BC_IFORL || op == BC_JFORL); - dasm_put(Dst, 15330); + dasm_put(Dst, 15338); if (LJ_DUALNUM) { - dasm_put(Dst, 15334, LJ_TISNUM); + dasm_put(Dst, 15342, LJ_TISNUM); if (!vk) { - dasm_put(Dst, 15344, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 15352, LJ_TISNUM, LJ_TISNUM); } else { #ifdef LUA_USE_ASSERT - dasm_put(Dst, 15373, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 15381, LJ_TISNUM, LJ_TISNUM); #endif - dasm_put(Dst, 15392); + dasm_put(Dst, 15400); } - dasm_put(Dst, 15411, LJ_TISNUM); + dasm_put(Dst, 15419, LJ_TISNUM); if (op == BC_FORI) { - dasm_put(Dst, 15422, -BCBIAS_J*4); + dasm_put(Dst, 15430, -BCBIAS_J*4); } else if (op == BC_JFORI) { - dasm_put(Dst, 15436, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 15444, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 15454, -BCBIAS_J*4); + dasm_put(Dst, 15462, -BCBIAS_J*4); } else { - dasm_put(Dst, 15446, BC_JLOOP); + dasm_put(Dst, 15454, BC_JLOOP); } - dasm_put(Dst, 15468); + dasm_put(Dst, 15476); if (vk) { - dasm_put(Dst, 15493); + dasm_put(Dst, 15501); } - dasm_put(Dst, 15411, LJ_TISNUM); + dasm_put(Dst, 15419, LJ_TISNUM); if (op == BC_FORI) { - dasm_put(Dst, 15502); + dasm_put(Dst, 15510); } else if (op == BC_JFORI) { - dasm_put(Dst, 15507, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 15515, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 15521); + dasm_put(Dst, 15529); } else { - dasm_put(Dst, 15517, BC_JLOOP); + dasm_put(Dst, 15525, BC_JLOOP); } - dasm_put(Dst, 15526); + dasm_put(Dst, 15534); } else if (!vk) { - dasm_put(Dst, 15533, LJ_TISNUM); + dasm_put(Dst, 15541, LJ_TISNUM); } if (!vk) { - dasm_put(Dst, 15539, LJ_TISNUM); + dasm_put(Dst, 15547, LJ_TISNUM); } else { #ifdef LUA_USE_ASSERT - dasm_put(Dst, 15553, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 15561, LJ_TISNUM, LJ_TISNUM); #endif } - dasm_put(Dst, 15572); + dasm_put(Dst, 15580); if (!vk) { - dasm_put(Dst, 15576, LJ_TISNUM); + dasm_put(Dst, 15584, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 15585); + dasm_put(Dst, 15593); if (vk) { - dasm_put(Dst, 15597); + dasm_put(Dst, 15605); } else { - dasm_put(Dst, 15616); + dasm_put(Dst, 15624); } - dasm_put(Dst, 15621); + dasm_put(Dst, 15629); } else { - dasm_put(Dst, 15634); + dasm_put(Dst, 15642); if (vk) { - dasm_put(Dst, 15640); + dasm_put(Dst, 15648); } else { - dasm_put(Dst, 15656); + dasm_put(Dst, 15664); } - dasm_put(Dst, 15664); + dasm_put(Dst, 15672); if (cmov) { dasm_put(Dst, 10261); } else { dasm_put(Dst, 10267); } if (!cmov) { - dasm_put(Dst, 15669); + dasm_put(Dst, 15677); } } if (op == BC_FORI) { if (LJ_DUALNUM) { - dasm_put(Dst, 15675); + dasm_put(Dst, 15683); } else { - dasm_put(Dst, 15680, -BCBIAS_J*4); + dasm_put(Dst, 15688, -BCBIAS_J*4); } } else if (op == BC_JFORI) { - dasm_put(Dst, 15690, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 15698, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { if (LJ_DUALNUM) { - dasm_put(Dst, 15704); + dasm_put(Dst, 15712); } else { - dasm_put(Dst, 15709, -BCBIAS_J*4); + dasm_put(Dst, 15717, -BCBIAS_J*4); } } else { - dasm_put(Dst, 15700, BC_JLOOP); + dasm_put(Dst, 15708, BC_JLOOP); } if (LJ_DUALNUM) { dasm_put(Dst, 10190); } else { - dasm_put(Dst, 10964); + dasm_put(Dst, 10972); } if (sse) { - dasm_put(Dst, 15719); + dasm_put(Dst, 15727); } break; case BC_ITERL: #if LJ_HASJIT - dasm_put(Dst, 15309, HOTCOUNT_PCMASK, GG_DISP2HOT, HOTCOUNT_LOOP); + dasm_put(Dst, 15317, HOTCOUNT_PCMASK, GG_DISP2HOT, HOTCOUNT_LOOP); #endif break; @@ -2902,18 +2902,18 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IITERL: - dasm_put(Dst, 15730, LJ_TNIL); + dasm_put(Dst, 15738, LJ_TNIL); if (op == BC_JITERL) { - dasm_put(Dst, 15745, BC_JLOOP); + dasm_put(Dst, 15753, BC_JLOOP); } else { - dasm_put(Dst, 15759, -BCBIAS_J*4); + dasm_put(Dst, 15767, -BCBIAS_J*4); } dasm_put(Dst, 10304); break; case BC_LOOP: #if LJ_HASJIT - dasm_put(Dst, 15309, HOTCOUNT_PCMASK, GG_DISP2HOT, HOTCOUNT_LOOP); + dasm_put(Dst, 15317, HOTCOUNT_PCMASK, GG_DISP2HOT, HOTCOUNT_LOOP); #endif break; @@ -2923,12 +2923,12 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_JLOOP: #if LJ_HASJIT - dasm_put(Dst, 15775, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); + dasm_put(Dst, 15783, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); #endif break; case BC_JMP: - dasm_put(Dst, 15816, -BCBIAS_J*4); + dasm_put(Dst, 15824, -BCBIAS_J*4); break; /* -- Function headers -------------------------------------------------- */ @@ -2942,7 +2942,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FUNCF: #if LJ_HASJIT - dasm_put(Dst, 15842, HOTCOUNT_PCMASK, GG_DISP2HOT, HOTCOUNT_CALL); + dasm_put(Dst, 15850, HOTCOUNT_PCMASK, GG_DISP2HOT, HOTCOUNT_CALL); #endif case BC_FUNCV: /* NYI: compiled vararg functions. */ break; @@ -2952,13 +2952,13 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IFUNCF: - dasm_put(Dst, 15863, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); + dasm_put(Dst, 15871, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); if (op == BC_JFUNCF) { - dasm_put(Dst, 15894, BC_JLOOP); + dasm_put(Dst, 15902, BC_JLOOP); } else { dasm_put(Dst, 10306); } - dasm_put(Dst, 15903, LJ_TNIL); + dasm_put(Dst, 15911, LJ_TNIL); break; case BC_JFUNCV: @@ -2969,30 +2969,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, 15925, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); + dasm_put(Dst, 15933, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); if (op == BC_JFUNCV) { - dasm_put(Dst, 15894, BC_JLOOP); + dasm_put(Dst, 15902, BC_JLOOP); } else { - dasm_put(Dst, 16022, -4+PC2PROTO(k)); + dasm_put(Dst, 16030, -4+PC2PROTO(k)); } - dasm_put(Dst, 16047, LJ_TNIL); + dasm_put(Dst, 16055, LJ_TNIL); break; case BC_FUNCC: case BC_FUNCCW: - dasm_put(Dst, 16069, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); + dasm_put(Dst, 16077, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); if (op == BC_FUNCC) { dasm_put(Dst, 2424); } else { - dasm_put(Dst, 16099); + dasm_put(Dst, 16107); } - dasm_put(Dst, 16107, DISPATCH_GL(vmstate), ~LJ_VMST_C); + dasm_put(Dst, 16115, DISPATCH_GL(vmstate), ~LJ_VMST_C); if (op == BC_FUNCC) { - dasm_put(Dst, 16117); + dasm_put(Dst, 16125); } else { - dasm_put(Dst, 16122, DISPATCH_GL(wrapf)); + dasm_put(Dst, 16130, DISPATCH_GL(wrapf)); } - dasm_put(Dst, 16128, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 16136, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); break; /* ---------------------------------------------------------------------- */ @@ -3020,7 +3020,7 @@ static int build_backend(BuildCtx *ctx) build_subroutines(ctx, cmov, sse); - dasm_put(Dst, 16154); + dasm_put(Dst, 16162); 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 0e1b5b46..a3c8ed74 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[16011] = { +static const unsigned char build_actionlist[16019] = { 254,1,248,10,252,247,198,237,15,132,244,11,131,230,252,248,41,252,242,72, 141,76,49,252,248,139,114,252,252,199,68,10,4,237,248,12,131,192,1,137,68, 36,84,252,247,198,237,15,132,244,13,248,14,129,252,246,239,252,247,198,237, @@ -526,270 +526,270 @@ static const unsigned char build_actionlist[16011] = { 180,253,134,233,248,1,255,252,233,244,9,255,129,252,253,239,15,132,244,48, 129,124,253,202,4,239,15,132,244,48,255,57,108,202,4,15,133,244,2,129,252, 253,239,15,131,244,1,139,12,202,139,4,194,57,193,15,132,244,1,129,252,253, - 239,15,135,244,2,139,169,233,133,252,237,15,132,244,2,252,246,133,233,235, - 15,133,244,2,255,49,252,237,255,189,1,0,0,0,255,252,233,244,47,255,248,3, - 129,252,253,239,255,15,133,244,9,255,252,233,244,48,255,72,252,247,208,139, - 108,202,4,131,198,4,129,252,253,239,15,133,244,249,139,12,202,59,12,135,255, - 139,108,202,4,131,198,4,255,129,252,253,239,15,133,244,253,129,124,253,199, - 4,239,15,133,244,254,139,44,199,59,44,202,255,15,183,70,252,254,141,180,253, - 134,233,248,9,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36, - 252,235,248,7,15,135,244,249,129,124,253,199,4,239,15,130,244,247,255,252, - 242,15,42,4,199,255,219,4,199,255,252,233,244,248,248,8,255,252,242,15,42, - 4,202,102,15,46,4,199,255,219,4,202,221,4,199,255,129,252,253,239,15,131, - 244,249,255,248,1,252,242,15,16,4,199,248,2,102,15,46,4,202,248,4,255,248, - 1,221,4,199,248,2,221,4,202,248,4,255,72,252,247,208,139,108,202,4,131,198, - 4,57,197,255,15,133,244,249,15,183,70,252,254,141,180,253,134,233,248,2,139, - 6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,3,129, - 252,253,239,15,133,244,2,252,233,244,48,255,15,132,244,248,129,252,253,239, - 15,132,244,48,15,183,70,252,254,141,180,253,134,233,248,2,139,6,15,182,204, - 15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,139,108,194,4,131, - 198,4,129,252,253,239,255,137,108,202,4,139,44,194,137,44,202,255,72,139, - 44,194,72,137,44,202,139,6,15,182,204,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,133,244,251,139,44,194,252,247,221,15,128,244,250, - 199,68,202,4,237,137,44,202,248,9,139,6,15,182,204,15,182,232,131,198,4,193, - 232,16,252,255,36,252,235,248,4,199,68,202,4,0,0,224,65,199,4,202,0,0,0,0, - 252,233,244,9,248,5,15,135,244,53,255,129,124,253,194,4,239,15,131,244,53, - 255,252,242,15,16,4,194,72,184,237,237,102,72,15,110,200,15,87,193,252,242, - 15,17,4,202,255,221,4,194,217,224,221,28,202,255,129,124,253,194,4,239,15, - 133,244,248,139,4,194,255,139,128,233,248,1,199,68,202,4,237,137,4,202,255, - 15,87,192,252,242,15,42,128,233,248,1,252,242,15,17,4,202,255,219,128,233, - 248,1,221,28,202,255,139,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,56,139,12,194,255,139, - 169,233,131,252,253,0,15,133,244,255,248,3,255,248,57,137,213,232,251,1,20, - 255,252,242,15,42,192,255,137,252,234,15,182,78,252,253,252,233,244,1,255, - 248,9,252,246,133,233,235,15,133,244,3,252,233,244,56,255,15,182,252,236, - 15,182,192,255,129,124,253,252,234,4,239,15,133,244,50,129,124,253,199,4, - 239,15,133,244,50,139,44,252,234,3,44,199,15,128,244,49,255,129,124,253,252, - 234,4,239,15,133,244,52,129,124,253,199,4,239,15,133,244,52,139,4,199,3,4, - 252,234,15,128,244,51,255,129,124,253,252,234,4,239,15,133,244,55,129,124, - 253,194,4,239,15,133,244,55,139,44,252,234,3,44,194,15,128,244,54,255,199, - 68,202,4,237,255,129,124,253,252,234,4,239,15,131,244,50,255,129,124,253, - 199,4,239,15,131,244,50,255,252,242,15,16,4,252,234,252,242,15,88,4,199,255, - 221,4,252,234,220,4,199,255,129,124,253,252,234,4,239,15,131,244,52,255,129, - 124,253,199,4,239,15,131,244,52,255,252,242,15,16,4,199,252,242,15,88,4,252, - 234,255,221,4,199,220,4,252,234,255,129,124,253,252,234,4,239,15,131,244, - 55,129,124,253,194,4,239,15,131,244,55,255,252,242,15,16,4,252,234,252,242, - 15,88,4,194,255,221,4,252,234,220,4,194,255,129,124,253,252,234,4,239,15, - 133,244,50,129,124,253,199,4,239,15,133,244,50,139,44,252,234,43,44,199,15, + 239,15,135,244,2,129,252,253,239,15,130,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,47,255,248,3,129,252,253,239,255,15,133,244,9,255,252,233, + 244,48,255,72,252,247,208,139,108,202,4,131,198,4,129,252,253,239,15,133, + 244,249,139,12,202,59,12,135,255,139,108,202,4,131,198,4,255,129,252,253, + 239,15,133,244,253,129,124,253,199,4,239,15,133,244,254,139,44,199,59,44, + 202,255,15,183,70,252,254,141,180,253,134,233,248,9,139,6,15,182,204,15,182, + 232,131,198,4,193,232,16,252,255,36,252,235,248,7,15,135,244,249,129,124, + 253,199,4,239,15,130,244,247,255,252,242,15,42,4,199,255,219,4,199,255,252, + 233,244,248,248,8,255,252,242,15,42,4,202,102,15,46,4,199,255,219,4,202,221, + 4,199,255,129,252,253,239,15,131,244,249,255,248,1,252,242,15,16,4,199,248, + 2,102,15,46,4,202,248,4,255,248,1,221,4,199,248,2,221,4,202,248,4,255,72, + 252,247,208,139,108,202,4,131,198,4,57,197,255,15,133,244,249,15,183,70,252, + 254,141,180,253,134,233,248,2,139,6,15,182,204,15,182,232,131,198,4,193,232, + 16,252,255,36,252,235,248,3,129,252,253,239,15,133,244,2,252,233,244,48,255, + 15,132,244,248,129,252,253,239,15,132,244,48,15,183,70,252,254,141,180,253, + 134,233,248,2,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36, + 252,235,255,139,108,194,4,131,198,4,129,252,253,239,255,137,108,202,4,139, + 44,194,137,44,202,255,72,139,44,194,72,137,44,202,139,6,15,182,204,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,133,244,251,139,44, + 194,252,247,221,15,128,244,250,199,68,202,4,237,137,44,202,248,9,139,6,15, + 182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,4,199,68,202, + 4,0,0,224,65,199,4,202,0,0,0,0,252,233,244,9,248,5,15,135,244,53,255,129, + 124,253,194,4,239,15,131,244,53,255,252,242,15,16,4,194,72,184,237,237,102, + 72,15,110,200,15,87,193,252,242,15,17,4,202,255,221,4,194,217,224,221,28, + 202,255,129,124,253,194,4,239,15,133,244,248,139,4,194,255,139,128,233,248, + 1,199,68,202,4,237,137,4,202,255,15,87,192,252,242,15,42,128,233,248,1,252, + 242,15,17,4,202,255,219,128,233,248,1,221,28,202,255,139,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,56,139,12,194,255,139,169,233,131,252,253,0,15,133,244,255,248, + 3,255,248,57,137,213,232,251,1,20,255,252,242,15,42,192,255,137,252,234,15, + 182,78,252,253,252,233,244,1,255,248,9,252,246,133,233,235,15,133,244,3,252, + 233,244,56,255,15,182,252,236,15,182,192,255,129,124,253,252,234,4,239,15, + 133,244,50,129,124,253,199,4,239,15,133,244,50,139,44,252,234,3,44,199,15, 128,244,49,255,129,124,253,252,234,4,239,15,133,244,52,129,124,253,199,4, - 239,15,133,244,52,139,4,199,43,4,252,234,15,128,244,51,255,129,124,253,252, - 234,4,239,15,133,244,55,129,124,253,194,4,239,15,133,244,55,139,44,252,234, - 43,44,194,15,128,244,54,255,252,242,15,16,4,252,234,252,242,15,92,4,199,255, - 221,4,252,234,220,36,199,255,252,242,15,16,4,199,252,242,15,92,4,252,234, - 255,221,4,199,220,36,252,234,255,252,242,15,16,4,252,234,252,242,15,92,4, - 194,255,221,4,252,234,220,36,194,255,129,124,253,252,234,4,239,15,133,244, - 50,129,124,253,199,4,239,15,133,244,50,139,44,252,234,15,175,44,199,15,128, - 244,49,255,129,124,253,252,234,4,239,15,133,244,52,129,124,253,199,4,239, - 15,133,244,52,139,4,199,15,175,4,252,234,15,128,244,51,255,129,124,253,252, + 239,15,133,244,52,139,4,199,3,4,252,234,15,128,244,51,255,129,124,253,252, 234,4,239,15,133,244,55,129,124,253,194,4,239,15,133,244,55,139,44,252,234, - 15,175,44,194,15,128,244,54,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,166,232, - 244,156,255,252,233,244,166,255,232,244,116,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,35,137,205,137, - 116,36,100,232,251,1,27,139,149,233,133,192,15,133,244,44,15,182,110,252, - 255,15,182,78,252,253,72,139,4,252,234,72,137,4,202,139,6,15,182,204,15,182, - 232,131,198,4,193,232,16,252,255,36,252,235,255,72,252,247,208,139,4,135, - 199,68,202,4,237,137,4,202,139,6,15,182,204,15,182,232,131,198,4,193,232, - 16,252,255,36,252,235,255,15,191,192,199,68,202,4,237,137,4,202,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,72,139,69,0,72,137,4,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,28,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,28,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,29, - 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,30,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,108,36,96,137,149,233,139,139,233,59, - 139,233,137,116,36,100,15,131,244,251,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,252,233,137,194,232, - 251,1,31,139,149,233,15,182,78,252,253,137,4,202,199,68,202,4,237,139,6,15, - 182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,3,184,1,8, - 0,0,252,233,244,2,248,5,137,252,233,232,251,1,32,15,183,70,252,254,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,33, - 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,32,15,183,70,252,254,72,252,247,208,252,233,244,2,255,72,252,247,208, - 139,106,252,248,139,173,233,139,4,135,252,233,244,167,255,72,252,247,208, - 139,106,252,248,139,173,233,139,4,135,252,233,244,168,255,15,182,252,236, - 15,182,192,129,124,253,252,234,4,239,15,133,244,38,139,44,252,234,255,129, - 124,253,194,4,239,15,133,244,251,139,4,194,255,129,124,253,194,4,239,15,131, - 244,251,255,252,242,15,16,4,194,252,242,15,45,192,252,242,15,42,200,102,15, - 46,193,255,15,133,244,38,255,59,133,233,15,131,244,38,193,224,3,3,133,233, - 129,120,253,4,239,15,132,244,248,72,139,40,72,137,44,202,248,1,139,6,15,182, - 204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,2,131,189,233, - 0,15,132,244,249,139,141,233,252,246,129,233,235,15,132,244,38,15,182,78, - 252,253,248,3,199,68,202,4,237,252,233,244,1,248,5,255,129,124,253,194,4, - 239,15,133,244,38,139,4,194,252,233,244,167,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,36,139,44,252, - 234,248,167,139,141,233,35,136,233,105,201,239,3,141,233,248,1,129,185,233, - 239,15,133,244,250,57,129,233,15,133,244,250,129,121,253,4,239,15,132,244, - 251,15,182,70,252,253,72,139,41,72,137,44,194,248,2,255,139,6,15,182,204, - 15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,3,15,182,70,252,253, - 199,68,194,4,237,252,233,244,2,248,4,139,137,233,133,201,15,133,244,1,248, - 5,139,141,233,133,201,15,132,244,3,252,246,129,233,235,15,133,244,3,252,233, - 244,36,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244, - 37,139,44,252,234,59,133,233,15,131,244,37,193,224,3,3,133,233,129,120,253, - 4,239,15,132,244,248,72,139,40,72,137,44,202,248,1,139,6,15,182,204,15,182, - 232,131,198,4,193,232,16,252,255,36,252,235,248,2,131,189,233,0,15,132,244, - 249,139,141,233,252,246,129,233,235,15,132,244,37,255,15,182,78,252,253,248, - 3,199,68,202,4,237,252,233,244,1,255,15,182,252,236,15,182,192,129,124,253, - 252,234,4,239,15,133,244,41,139,44,252,234,255,15,133,244,41,255,59,133,233, - 15,131,244,41,193,224,3,3,133,233,129,120,253,4,239,15,132,244,249,248,1, - 252,246,133,233,235,15,133,244,253,248,2,72,139,44,202,72,137,40,139,6,15, - 182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,3,131,189, - 233,0,15,132,244,1,139,141,233,252,246,129,233,235,255,15,132,244,41,15,182, - 78,252,253,252,233,244,1,248,5,129,124,253,194,4,239,15,133,244,41,139,4, - 194,252,233,244,168,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,39,139,44,252,234, - 248,168,139,141,233,35,136,233,105,201,239,198,133,233,0,3,141,233,248,1, - 129,185,233,239,15,133,244,251,57,129,233,15,133,244,251,129,121,253,4,239, - 15,132,244,250,248,2,255,252,246,133,233,235,15,133,244,253,248,3,15,182, - 70,252,253,72,139,44,194,72,137,41,139,6,15,182,204,15,182,232,131,198,4, - 193,232,16,252,255,36,252,235,248,4,131,189,233,0,15,132,244,2,137,76,36, - 80,139,141,233,252,246,129,233,235,15,132,244,39,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,39,248,6,137,68,36,80,199,68,36,84,237, - 137,108,36,32,139,76,36,96,137,145,233,76,141,68,36,80,137,252,234,137,205, - 137,116,36,100,232,251,1,34,139,149,233,139,108,36,32,137,193,252,233,244, - 2,248,7,128,165,233,235,139,131,233,137,171,233,137,133,233,252,233,244,3, - 255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,40,139, - 44,252,234,59,133,233,15,131,244,40,193,224,3,3,133,233,129,120,253,4,239, - 15,132,244,249,248,1,252,246,133,233,235,15,133,244,253,248,2,72,139,12,202, - 72,137,8,139,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,40,15,182,78,252,253,252,233,244,1,248,7,128,165,233,235,139,139, - 233,137,171,233,137,141,233,15,182,78,252,253,252,233,244,2,255,137,124,36, - 80,139,60,199,248,1,141,12,202,139,105,252,248,252,246,133,233,235,15,133, - 244,253,248,2,139,68,36,84,131,232,1,15,132,244,250,1,252,248,59,133,233, - 15,135,244,251,41,252,248,193,231,3,3,189,233,248,3,72,139,41,131,193,8,72, - 137,47,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,35,139, - 149,233,15,182,78,252,253,252,233,244,1,248,7,255,128,165,233,235,139,131, - 233,137,171,233,137,133,233,252,233,244,2,255,3,68,36,84,255,129,124,253, - 202,4,239,139,44,202,15,133,244,58,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,29,248,59, - 139,114,252,252,252,247,198,237,15,133,244,253,248,1,137,106,252,248,137, - 68,36,84,131,232,1,15,132,244,249,248,2,72,139,41,131,193,8,72,137,47,131, - 199,8,131,232,1,15,133,244,2,139,106,252,248,248,3,139,68,36,84,128,189,233, - 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,129,252,238,239,252,247,198,237,15,133,244,254,41,252,242, - 137,215,139,114,252,252,252,233,244,1,248,8,129,198,239,252,233,244,1,255, - 141,76,202,8,72,139,105,232,72,139,65,252,240,72,137,41,72,137,65,8,139,105, - 224,139,65,228,137,105,252,248,137,65,252,252,129,252,248,239,184,237,15, - 133,244,29,137,202,137,114,252,252,139,181,233,139,14,15,182,252,233,15,182, - 205,131,198,4,252,255,36,252,235,255,137,124,36,80,137,92,36,84,139,108,202, - 252,240,139,68,202,252,248,139,157,233,131,198,4,139,189,233,248,1,57,216, - 15,131,244,251,129,124,253,199,4,239,15,132,244,250,255,219,68,202,252,248, - 255,72,139,44,199,72,137,108,202,8,131,192,1,255,137,68,202,252,248,248,2, - 15,183,70,252,254,141,180,253,134,233,248,3,139,92,36,84,139,124,36,80,139, - 6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,4,131, - 192,1,255,137,68,202,252,248,255,252,233,244,1,248,5,41,216,248,6,59,133, - 233,15,135,244,3,105,252,248,239,3,189,233,129,191,233,239,15,132,244,253, - 141,92,24,1,72,139,175,233,72,139,135,233,72,137,44,202,72,137,68,202,8,137, - 92,202,252,248,252,233,244,2,248,7,131,192,1,252,233,244,6,255,129,124,253, - 202,252,236,239,15,133,244,251,139,108,202,232,129,124,253,202,252,244,239, - 15,133,244,251,129,124,253,202,252,252,239,15,133,244,251,128,189,233,235, - 15,133,244,251,141,180,253,134,233,199,68,202,252,248,0,0,0,0,248,1,139,6, - 15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,5,198,70, - 252,252,235,141,180,253,134,233,198,6,235,252,233,244,1,255,15,182,252,236, - 15,182,192,137,124,36,80,141,188,253,194,233,141,12,202,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,72,139,71,252,248,131,199,8,72,137,1,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, - 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,255,72,139,71,252,248,131,199,8,72,137,1,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,72,139,44,15,72,137,111,252,248,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,72,139,44,10,72,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,141,174,233,252,247,197,237,15,133, - 244,14,41,252,234,255,1,252,233,255,137,252,245,209,252,237,129,229,239,102, - 129,172,253,43,233,238,15,130,244,148,255,141,12,202,255,129,121,253,4,239, - 15,133,244,255,255,129,121,253,12,239,15,133,244,60,129,121,253,20,239,15, - 133,244,60,139,41,131,121,16,0,15,140,244,251,255,129,121,253,12,239,15,133, - 244,165,129,121,253,20,239,15,133,244,165,255,139,105,16,133,252,237,15,136, - 244,251,3,41,15,128,244,247,137,41,255,59,105,8,199,65,28,237,137,105,24, - 255,15,142,244,253,248,1,248,6,141,180,253,134,233,255,141,180,253,134,233, - 15,183,70,252,254,15,142,245,248,1,248,6,255,15,143,244,253,248,6,141,180, - 253,134,233,248,1,255,248,7,139,6,15,182,204,15,182,232,131,198,4,193,232, - 16,252,255,36,252,235,248,5,255,3,41,15,128,244,1,137,41,255,15,141,244,7, - 255,141,180,253,134,233,15,183,70,252,254,15,141,245,255,15,140,244,7,255, - 252,233,244,6,248,9,255,129,121,253,4,239,255,15,131,244,60,129,121,253,12, - 239,15,131,244,60,255,129,121,253,12,239,15,131,244,165,129,121,253,20,239, - 15,131,244,165,255,139,105,20,255,129,252,253,239,15,131,244,60,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,7,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,7,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,76,137,100,36,80,76,137,108,36,32,76,137,116,36,24,76,137, - 124,36,16,72,137,225,72,129,252,236,239,102,15,127,49,102,15,127,185,233, - 102,68,15,127,129,233,102,68,15,127,137,233,102,68,15,127,145,233,102,68, - 15,127,153,233,102,68,15,127,161,233,102,68,15,127,169,233,102,68,15,127, - 177,233,102,68,15,127,185,233,252,255,224,255,141,180,253,134,233,139,6,15, - 182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,137,252,245, - 209,252,237,129,229,239,102,129,172,253,43,233,238,15,130,244,150,255,139, - 190,233,139,108,36,96,141,12,202,59,141,233,15,135,244,24,15,182,142,233, - 57,200,15,134,244,249,248,2,255,15,183,70,252,254,252,233,245,255,248,3,199, - 68,194,252,252,237,131,192,1,57,200,15,134,244,3,252,233,244,2,255,141,44, - 197,237,141,4,194,139,122,252,248,137,104,252,252,137,120,252,248,139,108, - 36,96,141,12,200,59,141,233,15,135,244,23,137,209,137,194,15,182,174,233, - 133,252,237,15,132,244,248,248,1,131,193,8,57,209,15,131,244,249,139,121, - 252,248,137,56,139,121,252,252,137,120,4,131,192,8,199,65,252,252,237,131, - 252,237,1,15,133,244,1,248,2,255,139,190,233,139,6,15,182,204,15,182,232, - 131,198,4,193,232,16,252,255,36,252,235,255,248,3,199,64,4,237,131,192,8, - 131,252,237,1,15,133,244,3,252,233,244,2,255,139,106,252,248,72,139,189,233, - 139,108,36,96,141,68,194,252,248,137,149,233,141,136,233,59,141,233,137,133, - 233,255,72,137,252,250,137,252,233,255,15,135,244,22,199,131,233,237,255, - 252,255,215,255,252,255,147,233,255,199,131,233,237,139,149,233,141,12,194, - 252,247,217,3,141,233,139,114,252,252,252,233,244,12,255,254,0 + 3,44,194,15,128,244,54,255,199,68,202,4,237,255,129,124,253,252,234,4,239, + 15,131,244,50,255,129,124,253,199,4,239,15,131,244,50,255,252,242,15,16,4, + 252,234,252,242,15,88,4,199,255,221,4,252,234,220,4,199,255,129,124,253,252, + 234,4,239,15,131,244,52,255,129,124,253,199,4,239,15,131,244,52,255,252,242, + 15,16,4,199,252,242,15,88,4,252,234,255,221,4,199,220,4,252,234,255,129,124, + 253,252,234,4,239,15,131,244,55,129,124,253,194,4,239,15,131,244,55,255,252, + 242,15,16,4,252,234,252,242,15,88,4,194,255,221,4,252,234,220,4,194,255,129, + 124,253,252,234,4,239,15,133,244,50,129,124,253,199,4,239,15,133,244,50,139, + 44,252,234,43,44,199,15,128,244,49,255,129,124,253,252,234,4,239,15,133,244, + 52,129,124,253,199,4,239,15,133,244,52,139,4,199,43,4,252,234,15,128,244, + 51,255,129,124,253,252,234,4,239,15,133,244,55,129,124,253,194,4,239,15,133, + 244,55,139,44,252,234,43,44,194,15,128,244,54,255,252,242,15,16,4,252,234, + 252,242,15,92,4,199,255,221,4,252,234,220,36,199,255,252,242,15,16,4,199, + 252,242,15,92,4,252,234,255,221,4,199,220,36,252,234,255,252,242,15,16,4, + 252,234,252,242,15,92,4,194,255,221,4,252,234,220,36,194,255,129,124,253, + 252,234,4,239,15,133,244,50,129,124,253,199,4,239,15,133,244,50,139,44,252, + 234,15,175,44,199,15,128,244,49,255,129,124,253,252,234,4,239,15,133,244, + 52,129,124,253,199,4,239,15,133,244,52,139,4,199,15,175,4,252,234,15,128, + 244,51,255,129,124,253,252,234,4,239,15,133,244,55,129,124,253,194,4,239, + 15,133,244,55,139,44,252,234,15,175,44,194,15,128,244,54,255,252,242,15,16, + 4,252,234,252,242,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,166,232,244,156,255,252,233,244,166,255,232,244,116, + 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,35,137,205,137,116,36,100,232,251,1,27,139,149,233,133, + 192,15,133,244,44,15,182,110,252,255,15,182,78,252,253,72,139,4,252,234,72, + 137,4,202,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252, + 235,255,72,252,247,208,139,4,135,199,68,202,4,237,137,4,202,139,6,15,182, + 204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,15,191,192,199, + 68,202,4,237,137,4,202,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,72,139,69,0,72,137,4,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,28,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,28,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,29,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,30,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, + 108,36,96,137,149,233,139,139,233,59,139,233,137,116,36,100,15,131,244,251, + 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,252,233,137,194,232,251,1,31,139,149,233,15,182,78,252,253, + 137,4,202,199,68,202,4,237,139,6,15,182,204,15,182,232,131,198,4,193,232, + 16,252,255,36,252,235,248,3,184,1,8,0,0,252,233,244,2,248,5,137,252,233,232, + 251,1,32,15,183,70,252,254,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,33,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,32,15,183,70,252,254,72,252,247,208,252, + 233,244,2,255,72,252,247,208,139,106,252,248,139,173,233,139,4,135,252,233, + 244,167,255,72,252,247,208,139,106,252,248,139,173,233,139,4,135,252,233, + 244,168,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244, + 38,139,44,252,234,255,129,124,253,194,4,239,15,133,244,251,139,4,194,255, + 129,124,253,194,4,239,15,131,244,251,255,252,242,15,16,4,194,252,242,15,45, + 192,252,242,15,42,200,102,15,46,193,255,15,133,244,38,255,59,133,233,15,131, + 244,38,193,224,3,3,133,233,129,120,253,4,239,15,132,244,248,72,139,40,72, + 137,44,202,248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255, + 36,252,235,248,2,131,189,233,0,15,132,244,249,139,141,233,252,246,129,233, + 235,15,132,244,38,15,182,78,252,253,248,3,199,68,202,4,237,252,233,244,1, + 248,5,255,129,124,253,194,4,239,15,133,244,38,139,4,194,252,233,244,167,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,36,139,44,252,234,248,167,139,141,233,35,136,233,105,201,239, + 3,141,233,248,1,129,185,233,239,15,133,244,250,57,129,233,15,133,244,250, + 129,121,253,4,239,15,132,244,251,15,182,70,252,253,72,139,41,72,137,44,194, + 248,2,255,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252, + 235,248,3,15,182,70,252,253,199,68,194,4,237,252,233,244,2,248,4,139,137, + 233,133,201,15,133,244,1,248,5,139,141,233,133,201,15,132,244,3,252,246,129, + 233,235,15,133,244,3,252,233,244,36,255,15,182,252,236,15,182,192,129,124, + 253,252,234,4,239,15,133,244,37,139,44,252,234,59,133,233,15,131,244,37,193, + 224,3,3,133,233,129,120,253,4,239,15,132,244,248,72,139,40,72,137,44,202, + 248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235, + 248,2,131,189,233,0,15,132,244,249,139,141,233,252,246,129,233,235,15,132, + 244,37,255,15,182,78,252,253,248,3,199,68,202,4,237,252,233,244,1,255,15, + 182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,41,139,44,252, + 234,255,15,133,244,41,255,59,133,233,15,131,244,41,193,224,3,3,133,233,129, + 120,253,4,239,15,132,244,249,248,1,252,246,133,233,235,15,133,244,253,248, + 2,72,139,44,202,72,137,40,139,6,15,182,204,15,182,232,131,198,4,193,232,16, + 252,255,36,252,235,248,3,131,189,233,0,15,132,244,1,139,141,233,252,246,129, + 233,235,255,15,132,244,41,15,182,78,252,253,252,233,244,1,248,5,129,124,253, + 194,4,239,15,133,244,41,139,4,194,252,233,244,168,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,39,139,44,252,234,248,168,139,141,233,35,136,233,105,201,239,198, + 133,233,0,3,141,233,248,1,129,185,233,239,15,133,244,251,57,129,233,15,133, + 244,251,129,121,253,4,239,15,132,244,250,248,2,255,252,246,133,233,235,15, + 133,244,253,248,3,15,182,70,252,253,72,139,44,194,72,137,41,139,6,15,182, + 204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,4,131,189,233, + 0,15,132,244,2,137,76,36,80,139,141,233,252,246,129,233,235,15,132,244,39, + 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,39,248,6,137, + 68,36,80,199,68,36,84,237,137,108,36,32,139,76,36,96,137,145,233,76,141,68, + 36,80,137,252,234,137,205,137,116,36,100,232,251,1,34,139,149,233,139,108, + 36,32,137,193,252,233,244,2,248,7,128,165,233,235,139,131,233,137,171,233, + 137,133,233,252,233,244,3,255,15,182,252,236,15,182,192,129,124,253,252,234, + 4,239,15,133,244,40,139,44,252,234,59,133,233,15,131,244,40,193,224,3,3,133, + 233,129,120,253,4,239,15,132,244,249,248,1,252,246,133,233,235,15,133,244, + 253,248,2,72,139,12,202,72,137,8,139,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,40,15,182,78,252,253,252,233,244,1,248,7,128, + 165,233,235,139,139,233,137,171,233,137,141,233,15,182,78,252,253,252,233, + 244,2,255,137,124,36,80,139,60,199,248,1,141,12,202,139,105,252,248,252,246, + 133,233,235,15,133,244,253,248,2,139,68,36,84,131,232,1,15,132,244,250,1, + 252,248,59,133,233,15,135,244,251,41,252,248,193,231,3,3,189,233,248,3,72, + 139,41,131,193,8,72,137,47,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,35,139,149,233,15,182,78,252,253,252,233,244,1,248,7,255,128, + 165,233,235,139,131,233,137,171,233,137,133,233,252,233,244,2,255,3,68,36, + 84,255,129,124,253,202,4,239,139,44,202,15,133,244,58,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,29,248,59,139,114,252,252,252,247,198,237,15,133,244,253,248,1, + 137,106,252,248,137,68,36,84,131,232,1,15,132,244,249,248,2,72,139,41,131, + 193,8,72,137,47,131,199,8,131,232,1,15,133,244,2,139,106,252,248,248,3,139, + 68,36,84,128,189,233,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,129,252,238,239,252,247,198,237,15, + 133,244,254,41,252,242,137,215,139,114,252,252,252,233,244,1,248,8,129,198, + 239,252,233,244,1,255,141,76,202,8,72,139,105,232,72,139,65,252,240,72,137, + 41,72,137,65,8,139,105,224,139,65,228,137,105,252,248,137,65,252,252,129, + 252,248,239,184,237,15,133,244,29,137,202,137,114,252,252,139,181,233,139, + 14,15,182,252,233,15,182,205,131,198,4,252,255,36,252,235,255,137,124,36, + 80,137,92,36,84,139,108,202,252,240,139,68,202,252,248,139,157,233,131,198, + 4,139,189,233,248,1,57,216,15,131,244,251,129,124,253,199,4,239,15,132,244, + 250,255,219,68,202,252,248,255,72,139,44,199,72,137,108,202,8,131,192,1,255, + 137,68,202,252,248,248,2,15,183,70,252,254,141,180,253,134,233,248,3,139, + 92,36,84,139,124,36,80,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, + 255,36,252,235,248,4,131,192,1,255,137,68,202,252,248,255,252,233,244,1,248, + 5,41,216,248,6,59,133,233,15,135,244,3,105,252,248,239,3,189,233,129,191, + 233,239,15,132,244,253,141,92,24,1,72,139,175,233,72,139,135,233,72,137,44, + 202,72,137,68,202,8,137,92,202,252,248,252,233,244,2,248,7,131,192,1,252, + 233,244,6,255,129,124,253,202,252,236,239,15,133,244,251,139,108,202,232, + 129,124,253,202,252,244,239,15,133,244,251,129,124,253,202,252,252,239,15, + 133,244,251,128,189,233,235,15,133,244,251,141,180,253,134,233,199,68,202, + 252,248,0,0,0,0,248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252, + 255,36,252,235,248,5,198,70,252,252,235,141,180,253,134,233,198,6,235,252, + 233,244,1,255,15,182,252,236,15,182,192,137,124,36,80,141,188,253,194,233, + 141,12,202,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,72,139,71,252,248,131,199,8,72,137,1,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,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,255,72,139,71,252,248, + 131,199,8,72,137,1,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,72,139,44,15,72,137,111,252, + 248,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,72,139,44,10,72,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,141,174,233, + 252,247,197,237,15,133,244,14,41,252,234,255,1,252,233,255,137,252,245,209, + 252,237,129,229,239,102,129,172,253,43,233,238,15,130,244,148,255,141,12, + 202,255,129,121,253,4,239,15,133,244,255,255,129,121,253,12,239,15,133,244, + 60,129,121,253,20,239,15,133,244,60,139,41,131,121,16,0,15,140,244,251,255, + 129,121,253,12,239,15,133,244,165,129,121,253,20,239,15,133,244,165,255,139, + 105,16,133,252,237,15,136,244,251,3,41,15,128,244,247,137,41,255,59,105,8, + 199,65,28,237,137,105,24,255,15,142,244,253,248,1,248,6,141,180,253,134,233, + 255,141,180,253,134,233,15,183,70,252,254,15,142,245,248,1,248,6,255,15,143, + 244,253,248,6,141,180,253,134,233,248,1,255,248,7,139,6,15,182,204,15,182, + 232,131,198,4,193,232,16,252,255,36,252,235,248,5,255,3,41,15,128,244,1,137, + 41,255,15,141,244,7,255,141,180,253,134,233,15,183,70,252,254,15,141,245, + 255,15,140,244,7,255,252,233,244,6,248,9,255,129,121,253,4,239,255,15,131, + 244,60,129,121,253,12,239,15,131,244,60,255,129,121,253,12,239,15,131,244, + 165,129,121,253,20,239,15,131,244,165,255,139,105,20,255,129,252,253,239, + 15,131,244,60,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,7,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,7,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,76,137,100,36,80,76,137,108,36, + 32,76,137,116,36,24,76,137,124,36,16,72,137,225,72,129,252,236,239,102,15, + 127,49,102,15,127,185,233,102,68,15,127,129,233,102,68,15,127,137,233,102, + 68,15,127,145,233,102,68,15,127,153,233,102,68,15,127,161,233,102,68,15,127, + 169,233,102,68,15,127,177,233,102,68,15,127,185,233,252,255,224,255,141,180, + 253,134,233,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252, + 235,255,137,252,245,209,252,237,129,229,239,102,129,172,253,43,233,238,15, + 130,244,150,255,139,190,233,139,108,36,96,141,12,202,59,141,233,15,135,244, + 24,15,182,142,233,57,200,15,134,244,249,248,2,255,15,183,70,252,254,252,233, + 245,255,248,3,199,68,194,252,252,237,131,192,1,57,200,15,134,244,3,252,233, + 244,2,255,141,44,197,237,141,4,194,139,122,252,248,137,104,252,252,137,120, + 252,248,139,108,36,96,141,12,200,59,141,233,15,135,244,23,137,209,137,194, + 15,182,174,233,133,252,237,15,132,244,248,248,1,131,193,8,57,209,15,131,244, + 249,139,121,252,248,137,56,139,121,252,252,137,120,4,131,192,8,199,65,252, + 252,237,131,252,237,1,15,133,244,1,248,2,255,139,190,233,139,6,15,182,204, + 15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,248,3,199,64,4,237, + 131,192,8,131,252,237,1,15,133,244,3,252,233,244,2,255,139,106,252,248,72, + 139,189,233,139,108,36,96,141,68,194,252,248,137,149,233,141,136,233,59,141, + 233,137,133,233,255,72,137,252,250,137,252,233,255,15,135,244,22,199,131, + 233,237,255,252,255,215,255,252,255,147,233,255,199,131,233,237,139,149,233, + 141,12,194,252,247,217,3,141,233,139,114,252,252,252,233,244,12,255,254,0 }; enum { @@ -2024,26 +2024,26 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) if (LJ_HASFFI) { dasm_put(Dst, 10519, LJ_TCDATA, LJ_TCDATA); } - dasm_put(Dst, 10538, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<metatable), Dt6(->nomm), 1<>32)); + dasm_put(Dst, 11101, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32)); } else { - dasm_put(Dst, 11118); + dasm_put(Dst, 11126); } if (LJ_DUALNUM) { dasm_put(Dst, 10514); @@ -2140,27 +2140,27 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) } break; case BC_LEN: - dasm_put(Dst, 11127, LJ_TSTR); + dasm_put(Dst, 11135, LJ_TSTR); if (LJ_DUALNUM) { - dasm_put(Dst, 11141, Dt5(->len), LJ_TISNUM); + dasm_put(Dst, 11149, Dt5(->len), LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 11155, Dt5(->len)); + dasm_put(Dst, 11163, Dt5(->len)); } else { - dasm_put(Dst, 11173, Dt5(->len)); + dasm_put(Dst, 11181, Dt5(->len)); } - dasm_put(Dst, 11182, LJ_TTAB); + dasm_put(Dst, 11190, LJ_TTAB); #ifdef LUAJIT_ENABLE_LUA52COMPAT - dasm_put(Dst, 11217, Dt6(->metatable)); + dasm_put(Dst, 11225, Dt6(->metatable)); #endif - dasm_put(Dst, 11231); + dasm_put(Dst, 11239); if (LJ_DUALNUM) { } else if (sse) { - dasm_put(Dst, 11240); + dasm_put(Dst, 11248); } else { } - dasm_put(Dst, 11246); + dasm_put(Dst, 11254); #ifdef LUAJIT_ENABLE_LUA52COMPAT - dasm_put(Dst, 11259, Dt6(->nomm), 1<nomm), 1<base), Dt1(->base)); + dasm_put(Dst, 12010, Dt1(->base), Dt1(->base)); break; /* -- Constant ops ------------------------------------------------------ */ case BC_KSTR: - dasm_put(Dst, 12085, LJ_TSTR); + dasm_put(Dst, 12093, LJ_TSTR); break; case BC_KCDATA: #if LJ_HASFFI - dasm_put(Dst, 12085, LJ_TCDATA); + dasm_put(Dst, 12093, LJ_TCDATA); #endif break; case BC_KSHORT: if (LJ_DUALNUM) { - dasm_put(Dst, 12120, LJ_TISNUM); + dasm_put(Dst, 12128, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 12132); + dasm_put(Dst, 12140); } else { - dasm_put(Dst, 12147); + dasm_put(Dst, 12155); } dasm_put(Dst, 10255); break; case BC_KNUM: if (sse) { - dasm_put(Dst, 12155); + dasm_put(Dst, 12163); } else { - dasm_put(Dst, 12168); + dasm_put(Dst, 12176); } dasm_put(Dst, 10255); break; case BC_KPRI: - dasm_put(Dst, 12175); + dasm_put(Dst, 12183); break; case BC_KNIL: - dasm_put(Dst, 12203, LJ_TNIL); + dasm_put(Dst, 12211, LJ_TNIL); break; /* -- Upvalue and function ops ------------------------------------------ */ case BC_UGET: - dasm_put(Dst, 12250, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12258, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_USETV: #define TV2MARKOFS \ ((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv)) - dasm_put(Dst, 12290, 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, 12381); + dasm_put(Dst, 12298, 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, 12389); break; #undef TV2MARKOFS case BC_USETS: - dasm_put(Dst, 12393, 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, 12401, 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, 12486); + dasm_put(Dst, 12494); if (sse) { - dasm_put(Dst, 12491); + dasm_put(Dst, 12499); } else { - dasm_put(Dst, 10766); + dasm_put(Dst, 10774); } - dasm_put(Dst, 12498, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12506, offsetof(GCfuncL, uvptr), DtA(->v)); if (sse) { - dasm_put(Dst, 12507); + dasm_put(Dst, 12515); } else { - dasm_put(Dst, 12513); + dasm_put(Dst, 12521); } dasm_put(Dst, 10255); break; case BC_USETP: - dasm_put(Dst, 12516, offsetof(GCfuncL, uvptr), DtA(->v)); + dasm_put(Dst, 12524, offsetof(GCfuncL, uvptr), DtA(->v)); break; case BC_UCLO: - dasm_put(Dst, 12555, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 12563, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base)); break; case BC_FNEW: - dasm_put(Dst, 12610, Dt1(->base), Dt1(->base), LJ_TFUNC); + dasm_put(Dst, 12618, Dt1(->base), Dt1(->base), LJ_TFUNC); break; /* -- Table ops --------------------------------------------------------- */ case BC_TNEW: - dasm_put(Dst, 12676, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 12684, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB); break; case BC_TDUP: - dasm_put(Dst, 12798, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); + dasm_put(Dst, 12806, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB); break; case BC_GGET: - dasm_put(Dst, 12893, Dt7(->env)); + dasm_put(Dst, 12901, Dt7(->env)); break; case BC_GSET: - dasm_put(Dst, 12912, Dt7(->env)); + dasm_put(Dst, 12920, Dt7(->env)); break; case BC_TGETV: - dasm_put(Dst, 12931, LJ_TTAB); + dasm_put(Dst, 12939, LJ_TTAB); if (LJ_DUALNUM) { - dasm_put(Dst, 12954, LJ_TISNUM); + dasm_put(Dst, 12962, LJ_TISNUM); } else { - dasm_put(Dst, 12968, LJ_TISNUM); + dasm_put(Dst, 12976, LJ_TISNUM); if (sse) { - dasm_put(Dst, 12979); + dasm_put(Dst, 12987); } else { } - dasm_put(Dst, 13000); + dasm_put(Dst, 13008); } - dasm_put(Dst, 13005, 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, 13198, 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, 13206, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13417, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETS: - dasm_put(Dst, 13546, 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, 13622, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); - dasm_put(Dst, 13710, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13554, 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, 13630, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<next)); + dasm_put(Dst, 13718, Dt6(->metatable), Dt6(->nomm), 1<base), Dt1(->base), Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETB: - dasm_put(Dst, 13801, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); - dasm_put(Dst, 13895, Dt6(->metatable), Dt6(->nomm), 1<marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13809, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable)); + dasm_put(Dst, 13903, Dt6(->metatable), Dt6(->nomm), 1<marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; case BC_TSETM: - dasm_put(Dst, 13941, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); - dasm_put(Dst, 14084, Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); + dasm_put(Dst, 13949, Dt6(->marked), LJ_GC_BLACK, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base)); + dasm_put(Dst, 14092, Dt6(->marked), (uint8_t)~LJ_GC_BLACK, DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist)); break; /* -- Calls and vararg handling ----------------------------------------- */ case BC_CALL: case BC_CALLM: - dasm_put(Dst, 11279); + dasm_put(Dst, 11287); if (op == BC_CALLM) { - dasm_put(Dst, 14102); + dasm_put(Dst, 14110); } - dasm_put(Dst, 14107, LJ_TFUNC, Dt7(->pc)); + dasm_put(Dst, 14115, LJ_TFUNC, Dt7(->pc)); break; case BC_CALLMT: - dasm_put(Dst, 14102); + dasm_put(Dst, 14110); break; case BC_CALLT: - dasm_put(Dst, 14149, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); - dasm_put(Dst, 14264, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG); + dasm_put(Dst, 14157, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc)); + dasm_put(Dst, 14272, FRAME_TYPE, Dt7(->pc), PC2PROTO(k), FRAME_VARG, FRAME_TYPEP, FRAME_VARG); break; case BC_ITERC: - dasm_put(Dst, 14335, LJ_TFUNC, 2+1, Dt7(->pc)); + dasm_put(Dst, 14343, LJ_TFUNC, 2+1, Dt7(->pc)); break; case BC_ITERN: #if LJ_HASJIT #endif - dasm_put(Dst, 14406, Dt6(->asize), Dt6(->array), LJ_TNIL); + dasm_put(Dst, 14414, Dt6(->asize), Dt6(->array), LJ_TNIL); if (LJ_DUALNUM) { - dasm_put(Dst, 11146, LJ_TISNUM); + dasm_put(Dst, 11154, LJ_TISNUM); } else if (sse) { - dasm_put(Dst, 11240); + dasm_put(Dst, 11248); } else { - dasm_put(Dst, 14452); + dasm_put(Dst, 14460); } - dasm_put(Dst, 14458); + dasm_put(Dst, 14466); if (LJ_DUALNUM) { } else if (sse) { - dasm_put(Dst, 11111); + dasm_put(Dst, 11119); } else { - dasm_put(Dst, 11123); + dasm_put(Dst, 11131); } - dasm_put(Dst, 14471, -BCBIAS_J*4); + dasm_put(Dst, 14479, -BCBIAS_J*4); if (!LJ_DUALNUM && !sse) { - dasm_put(Dst, 14523); + dasm_put(Dst, 14531); } - dasm_put(Dst, 14529, Dt6(->hmask), sizeof(Node), Dt6(->node), DtB(->val.it), LJ_TNIL, DtB(->key), DtB(->val)); + dasm_put(Dst, 14537, Dt6(->hmask), sizeof(Node), Dt6(->node), DtB(->val.it), LJ_TNIL, DtB(->key), DtB(->val)); break; case BC_ISNEXT: - dasm_put(Dst, 14601, LJ_TFUNC, LJ_TTAB, LJ_TNIL, Dt8(->ffid), FF_next_N, -BCBIAS_J*4, BC_JMP, -BCBIAS_J*4, BC_ITERC); + dasm_put(Dst, 14609, LJ_TFUNC, LJ_TTAB, LJ_TNIL, Dt8(->ffid), FF_next_N, -BCBIAS_J*4, BC_JMP, -BCBIAS_J*4, BC_ITERC); break; case BC_VARG: - dasm_put(Dst, 14701, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); - dasm_put(Dst, 14861, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); + dasm_put(Dst, 14709, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); + dasm_put(Dst, 14869, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); break; /* -- Returns ----------------------------------------------------------- */ case BC_RETM: - dasm_put(Dst, 14102); + dasm_put(Dst, 14110); break; case BC_RET: case BC_RET0: case BC_RET1: if (op != BC_RET0) { - dasm_put(Dst, 14927); + dasm_put(Dst, 14935); } - dasm_put(Dst, 14931, FRAME_TYPE); + dasm_put(Dst, 14939, FRAME_TYPE); switch (op) { case BC_RET: - dasm_put(Dst, 14950); + dasm_put(Dst, 14958); break; case BC_RET1: - dasm_put(Dst, 15002); + dasm_put(Dst, 15010); /* fallthrough */ case BC_RET0: - dasm_put(Dst, 15012); + dasm_put(Dst, 15020); default: break; } - dasm_put(Dst, 15023, Dt7(->pc), PC2PROTO(k)); + dasm_put(Dst, 15031, Dt7(->pc), PC2PROTO(k)); if (op == BC_RET) { - dasm_put(Dst, 15067, LJ_TNIL); + dasm_put(Dst, 15075, LJ_TNIL); } else { - dasm_put(Dst, 15076, LJ_TNIL); + dasm_put(Dst, 15084, LJ_TNIL); } - dasm_put(Dst, 15083, -FRAME_VARG, FRAME_TYPEP); + dasm_put(Dst, 15091, -FRAME_VARG, FRAME_TYPEP); if (op != BC_RET0) { - dasm_put(Dst, 15107); + dasm_put(Dst, 15115); } dasm_put(Dst, 4708); break; @@ -2775,7 +2775,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORL: #if LJ_HASJIT - dasm_put(Dst, 15111, HOTCOUNT_PCMASK, GG_DISP2HOT, HOTCOUNT_LOOP); + dasm_put(Dst, 15119, HOTCOUNT_PCMASK, GG_DISP2HOT, HOTCOUNT_LOOP); #endif break; @@ -2787,111 +2787,111 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FORI: case BC_IFORL: vk = (op == BC_IFORL || op == BC_JFORL); - dasm_put(Dst, 15132); + dasm_put(Dst, 15140); if (LJ_DUALNUM) { - dasm_put(Dst, 15136, LJ_TISNUM); + dasm_put(Dst, 15144, LJ_TISNUM); if (!vk) { - dasm_put(Dst, 15146, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 15154, LJ_TISNUM, LJ_TISNUM); } else { #ifdef LUA_USE_ASSERT - dasm_put(Dst, 15175, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 15183, LJ_TISNUM, LJ_TISNUM); #endif - dasm_put(Dst, 15194); + dasm_put(Dst, 15202); } - dasm_put(Dst, 15213, LJ_TISNUM); + dasm_put(Dst, 15221, LJ_TISNUM); if (op == BC_FORI) { - dasm_put(Dst, 15224, -BCBIAS_J*4); + dasm_put(Dst, 15232, -BCBIAS_J*4); } else if (op == BC_JFORI) { - dasm_put(Dst, 15238, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 15246, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 15256, -BCBIAS_J*4); + dasm_put(Dst, 15264, -BCBIAS_J*4); } else { - dasm_put(Dst, 15248, BC_JLOOP); + dasm_put(Dst, 15256, BC_JLOOP); } - dasm_put(Dst, 15270); + dasm_put(Dst, 15278); if (vk) { - dasm_put(Dst, 15294); + dasm_put(Dst, 15302); } - dasm_put(Dst, 15213, LJ_TISNUM); + dasm_put(Dst, 15221, LJ_TISNUM); if (op == BC_FORI) { - dasm_put(Dst, 15303); + dasm_put(Dst, 15311); } else if (op == BC_JFORI) { - dasm_put(Dst, 15308, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 15316, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { - dasm_put(Dst, 15322); + dasm_put(Dst, 15330); } else { - dasm_put(Dst, 15318, BC_JLOOP); + dasm_put(Dst, 15326, BC_JLOOP); } - dasm_put(Dst, 15327); + dasm_put(Dst, 15335); } else if (!vk) { - dasm_put(Dst, 15334, LJ_TISNUM); + dasm_put(Dst, 15342, LJ_TISNUM); } if (!vk) { - dasm_put(Dst, 15340, LJ_TISNUM); + dasm_put(Dst, 15348, LJ_TISNUM); } else { #ifdef LUA_USE_ASSERT - dasm_put(Dst, 15354, LJ_TISNUM, LJ_TISNUM); + dasm_put(Dst, 15362, LJ_TISNUM, LJ_TISNUM); #endif } - dasm_put(Dst, 15373); + dasm_put(Dst, 15381); if (!vk) { - dasm_put(Dst, 15377, LJ_TISNUM); + dasm_put(Dst, 15385, LJ_TISNUM); } if (sse) { - dasm_put(Dst, 15386); + dasm_put(Dst, 15394); if (vk) { - dasm_put(Dst, 15398); + dasm_put(Dst, 15406); } else { - dasm_put(Dst, 15417); + dasm_put(Dst, 15425); } - dasm_put(Dst, 15422); + dasm_put(Dst, 15430); } else { - dasm_put(Dst, 15435); + dasm_put(Dst, 15443); if (vk) { - dasm_put(Dst, 15441); + dasm_put(Dst, 15449); } else { - dasm_put(Dst, 15457); + dasm_put(Dst, 15465); } - dasm_put(Dst, 15465); + dasm_put(Dst, 15473); if (cmov) { dasm_put(Dst, 10210); } else { dasm_put(Dst, 10216); } if (!cmov) { - dasm_put(Dst, 15470); + dasm_put(Dst, 15478); } } if (op == BC_FORI) { if (LJ_DUALNUM) { - dasm_put(Dst, 15476); + dasm_put(Dst, 15484); } else { - dasm_put(Dst, 15481, -BCBIAS_J*4); + dasm_put(Dst, 15489, -BCBIAS_J*4); } } else if (op == BC_JFORI) { - dasm_put(Dst, 15491, -BCBIAS_J*4, BC_JLOOP); + dasm_put(Dst, 15499, -BCBIAS_J*4, BC_JLOOP); } else if (op == BC_IFORL) { if (LJ_DUALNUM) { - dasm_put(Dst, 15505); + dasm_put(Dst, 15513); } else { - dasm_put(Dst, 15510, -BCBIAS_J*4); + dasm_put(Dst, 15518, -BCBIAS_J*4); } } else { - dasm_put(Dst, 15501, BC_JLOOP); + dasm_put(Dst, 15509, BC_JLOOP); } if (LJ_DUALNUM) { dasm_put(Dst, 10139); } else { - dasm_put(Dst, 10896); + dasm_put(Dst, 10904); } if (sse) { - dasm_put(Dst, 15520); + dasm_put(Dst, 15528); } break; case BC_ITERL: #if LJ_HASJIT - dasm_put(Dst, 15111, HOTCOUNT_PCMASK, GG_DISP2HOT, HOTCOUNT_LOOP); + dasm_put(Dst, 15119, HOTCOUNT_PCMASK, GG_DISP2HOT, HOTCOUNT_LOOP); #endif break; @@ -2900,18 +2900,18 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IITERL: - dasm_put(Dst, 15531, LJ_TNIL); + dasm_put(Dst, 15539, LJ_TNIL); if (op == BC_JITERL) { - dasm_put(Dst, 15546, BC_JLOOP); + dasm_put(Dst, 15554, BC_JLOOP); } else { - dasm_put(Dst, 15560, -BCBIAS_J*4); + dasm_put(Dst, 15568, -BCBIAS_J*4); } dasm_put(Dst, 10253); break; case BC_LOOP: #if LJ_HASJIT - dasm_put(Dst, 15111, HOTCOUNT_PCMASK, GG_DISP2HOT, HOTCOUNT_LOOP); + dasm_put(Dst, 15119, HOTCOUNT_PCMASK, GG_DISP2HOT, HOTCOUNT_LOOP); #endif break; @@ -2921,12 +2921,12 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_JLOOP: #if LJ_HASJIT - dasm_put(Dst, 15576, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L), 9*16+4*8, -1*16, -2*16, -3*16, -4*16, -5*16, -6*16, -7*16, -8*16, -9*16); + dasm_put(Dst, 15584, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L), 9*16+4*8, -1*16, -2*16, -3*16, -4*16, -5*16, -6*16, -7*16, -8*16, -9*16); #endif break; case BC_JMP: - dasm_put(Dst, 15685, -BCBIAS_J*4); + dasm_put(Dst, 15693, -BCBIAS_J*4); break; /* -- Function headers -------------------------------------------------- */ @@ -2940,7 +2940,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) case BC_FUNCF: #if LJ_HASJIT - dasm_put(Dst, 15710, HOTCOUNT_PCMASK, GG_DISP2HOT, HOTCOUNT_CALL); + dasm_put(Dst, 15718, HOTCOUNT_PCMASK, GG_DISP2HOT, HOTCOUNT_CALL); #endif case BC_FUNCV: /* NYI: compiled vararg functions. */ break; @@ -2950,13 +2950,13 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) break; #endif case BC_IFUNCF: - dasm_put(Dst, 15731, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); + dasm_put(Dst, 15739, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); if (op == BC_JFUNCF) { - dasm_put(Dst, 15761, BC_JLOOP); + dasm_put(Dst, 15769, BC_JLOOP); } else { dasm_put(Dst, 10255); } - dasm_put(Dst, 15770, LJ_TNIL); + dasm_put(Dst, 15778, LJ_TNIL); break; case BC_JFUNCV: @@ -2967,30 +2967,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, 15792, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); + dasm_put(Dst, 15800, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); if (op == BC_JFUNCV) { - dasm_put(Dst, 15761, BC_JLOOP); + dasm_put(Dst, 15769, BC_JLOOP); } else { - dasm_put(Dst, 15883, -4+PC2PROTO(k)); + dasm_put(Dst, 15891, -4+PC2PROTO(k)); } - dasm_put(Dst, 15906, LJ_TNIL); + dasm_put(Dst, 15914, LJ_TNIL); break; case BC_FUNCC: case BC_FUNCCW: - dasm_put(Dst, 15928, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); + dasm_put(Dst, 15936, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); if (op == BC_FUNCC) { dasm_put(Dst, 2372); } else { - dasm_put(Dst, 15958); + dasm_put(Dst, 15966); } - dasm_put(Dst, 15966, DISPATCH_GL(vmstate), ~LJ_VMST_C); + dasm_put(Dst, 15974, DISPATCH_GL(vmstate), ~LJ_VMST_C); if (op == BC_FUNCC) { - dasm_put(Dst, 15975); + dasm_put(Dst, 15983); } else { - dasm_put(Dst, 15979, DISPATCH_GL(wrapf)); + dasm_put(Dst, 15987, DISPATCH_GL(wrapf)); } - dasm_put(Dst, 15984, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); + dasm_put(Dst, 15992, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); break; /* ---------------------------------------------------------------------- */ @@ -3018,7 +3018,7 @@ static int build_backend(BuildCtx *ctx) build_subroutines(ctx, cmov, sse); - dasm_put(Dst, 16009); + dasm_put(Dst, 16017); 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 21e18ea8..a667bcb6 100644 --- a/src/buildvm_x86.dasc +++ b/src/buildvm_x86.dasc @@ -4022,6 +4022,10 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) | je <1 // Same GCobjs or pvalues? | cmp RB, LJ_TISTABUD | ja <2 // Different objects and not table/ud? + |.if X64 + | cmp RB, LJ_TUDATA // And not 64 bit lightuserdata. + | jb <2 + |.endif | | // Different tables or userdatas. Need to check __eq metamethod. | // Field metatable must be at same offset for GCtab and GCudata! -- 2.11.4.GIT