From 2144d55eb83f8b92732c3e5aa51ece61071a7b8f Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Sat, 27 Feb 2010 21:40:40 +0100
Subject: Save/restore remaining callee-save regs on trace<->interp
transitions.
---
src/buildvm_x64.h | 1327 +++++++++++++++++++++++++-------------------------
src/buildvm_x64win.h | 884 ++++++++++++++++-----------------
src/buildvm_x86.dasc | 79 ++-
src/buildvm_x86.h | 656 ++++++++++++-------------
src/lj_frame.h | 8 +-
src/lj_target_x86.h | 4 +-
6 files changed, 1511 insertions(+), 1447 deletions(-)
(limited to 'src')
diff --git a/src/buildvm_x64.h b/src/buildvm_x64.h
index 485613e0..c394624d 100644
--- a/src/buildvm_x64.h
+++ b/src/buildvm_x64.h
@@ -12,87 +12,87 @@
#define DASM_SECTION_CODE_OP 0
#define DASM_SECTION_CODE_SUB 1
#define DASM_MAXSECTION 2
-static const unsigned char build_actionlist[13995] = {
+static const unsigned char build_actionlist[14028] = {
254,1,248,10,252,247,195,237,15,132,244,11,131,227,252,248,41,218,72,141,
76,25,252,248,139,90,252,252,199,68,10,4,237,248,12,131,192,1,137,68,36,4,
252,247,195,237,15,132,244,13,248,14,252,247,195,237,15,132,244,10,65,199,
134,233,237,131,227,252,248,41,211,252,247,219,131,232,1,15,132,244,248,248,
1,139,44,10,137,106,252,248,139,108,10,4,137,106,252,252,131,194,8,131,232,
- 1,15,133,244,1,248,2,255,139,108,36,16,137,157,233,248,3,139,68,36,4,139,
- 76,36,8,248,4,57,193,15,133,244,252,248,5,131,252,234,8,137,149,233,248,15,
- 72,139,76,36,32,72,137,141,233,49,192,248,16,72,131,196,40,65,94,65,95,91,
- 93,195,248,6,15,130,244,253,59,149,233,15,135,244,254,199,66,252,252,237,
+ 1,15,133,244,1,248,2,255,139,108,36,24,137,157,233,248,3,139,68,36,4,139,
+ 76,36,16,248,4,57,193,15,133,244,252,248,5,131,252,234,8,137,149,233,248,
+ 15,72,139,76,36,32,72,137,141,233,49,192,248,16,72,131,196,40,65,94,65,95,
+ 91,93,195,248,6,15,130,244,253,59,149,233,15,135,244,254,199,66,252,252,237,
131,194,8,131,192,1,252,233,244,4,248,7,255,133,201,15,132,244,5,41,193,141,
20,202,252,233,244,5,248,8,137,149,233,137,68,36,4,137,206,137,252,239,232,
251,1,0,139,149,233,252,233,244,3,248,17,137,252,240,72,137,252,252,248,18,
- 139,108,36,16,139,173,233,199,133,233,237,252,233,244,16,248,19,72,129,231,
- 239,72,137,252,252,248,20,139,108,36,16,72,199,193,252,248,252,255,252,255,
+ 139,108,36,24,139,173,233,199,133,233,237,252,233,244,16,248,19,72,129,231,
+ 239,72,137,252,252,248,20,139,108,36,24,72,199,193,252,248,252,255,252,255,
252,255,184,237,255,139,149,233,68,139,181,233,65,129,198,239,139,90,252,
252,199,66,252,252,237,65,199,134,233,237,252,233,244,12,248,21,190,237,252,
233,244,248,248,22,131,232,8,252,233,244,247,248,23,141,68,194,252,248,248,
- 1,15,182,139,233,131,195,4,137,149,233,137,133,233,255,137,92,36,20,137,206,
+ 1,15,182,139,233,131,195,4,137,149,233,137,133,233,255,137,92,36,28,137,206,
248,2,137,252,239,232,251,1,0,139,149,233,139,133,233,139,106,252,248,139,
90,252,252,41,208,193,232,3,131,192,1,139,157,233,139,11,15,182,252,233,15,
182,205,131,195,4,65,252,255,36,252,238,248,24,85,83,65,87,65,86,72,131,252,
- 236,40,137,252,253,137,124,36,16,137,252,241,187,237,49,192,76,141,188,253,
- 36,233,68,139,181,233,65,129,198,239,76,137,189,233,137,68,36,20,72,137,68,
- 36,32,137,68,36,8,137,68,36,12,56,133,233,15,132,244,249,65,199,134,233,237,
- 136,133,233,139,149,233,139,133,233,41,200,193,232,3,131,192,1,41,209,139,
- 90,252,252,137,68,36,4,252,247,195,237,15,132,244,13,255,252,233,244,14,248,
- 25,85,83,65,87,65,86,72,131,252,236,40,187,237,137,76,36,12,252,233,244,247,
- 248,26,85,83,65,87,65,86,72,131,252,236,40,187,237,248,1,137,84,36,8,137,
- 252,253,137,124,36,16,137,252,241,248,2,76,139,189,233,76,137,124,36,32,137,
- 108,36,20,72,137,165,233,68,139,181,233,65,129,198,239,248,3,65,199,134,233,
- 237,139,149,233,1,203,41,211,139,133,233,41,200,193,232,3,131,192,1,248,27,
- 255,139,105,252,248,129,121,253,252,252,239,15,133,244,28,248,29,137,202,
- 137,90,252,252,139,157,233,139,11,15,182,252,233,15,182,205,131,195,4,65,
- 252,255,36,252,238,248,30,85,83,65,87,65,86,72,131,252,236,40,137,252,253,
- 137,124,36,16,137,108,36,20,68,139,189,233,68,43,189,233,199,68,36,12,0,0,
- 0,0,68,137,124,36,8,76,139,189,233,76,137,124,36,32,72,137,165,233,252,255,
- 209,133,192,15,132,244,15,137,193,187,237,252,233,244,2,248,11,1,209,131,
- 227,252,248,137,213,41,218,199,68,193,252,252,237,137,200,139,93,252,244,
- 72,99,77,252,240,76,141,61,245,76,1,252,249,68,139,122,252,248,69,139,191,
- 233,255,69,139,191,233,252,255,225,248,31,15,182,75,252,255,131,252,237,16,
- 141,12,202,41,252,233,15,132,244,32,252,247,217,193,252,233,3,139,124,36,
- 16,137,151,233,137,202,139,72,4,139,0,137,77,4,137,69,0,137,252,238,252,233,
- 244,33,248,34,137,4,36,199,68,36,4,237,72,141,4,36,128,123,252,252,235,15,
- 133,244,247,65,141,142,233,137,41,199,65,4,237,137,205,252,233,244,248,248,
- 35,15,182,67,252,254,255,252,242,15,42,192,252,242,15,17,4,36,255,72,141,
- 4,36,252,233,244,247,248,36,15,182,67,252,254,141,4,194,248,1,15,182,107,
- 252,255,141,44,252,234,248,2,139,124,36,16,137,151,233,137,252,238,72,137,
- 194,137,252,253,137,92,36,20,232,251,1,1,139,149,233,133,192,15,132,244,249,
- 248,32,15,182,75,252,253,139,104,4,139,0,137,108,202,4,137,4,202,139,3,15,
- 182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,139,141,
- 233,137,89,252,244,141,153,233,41,211,139,105,252,248,184,237,252,233,244,
- 29,248,37,137,4,36,199,68,36,4,237,72,141,4,36,128,123,252,252,235,15,133,
- 244,247,255,65,141,142,233,137,41,199,65,4,237,137,205,252,233,244,248,248,
- 38,15,182,67,252,254,255,72,141,4,36,252,233,244,247,248,39,15,182,67,252,
- 254,141,4,194,248,1,15,182,107,252,255,141,44,252,234,248,2,139,124,36,16,
- 137,151,233,137,252,238,72,137,194,137,252,253,137,92,36,20,232,251,1,2,139,
- 149,233,133,192,15,132,244,249,15,182,75,252,253,139,108,202,4,139,12,202,
- 137,104,4,137,8,248,40,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,
- 252,255,36,252,238,248,3,139,141,233,137,89,252,244,15,182,67,252,253,139,
- 108,194,4,139,4,194,137,105,20,137,65,16,141,153,233,41,211,139,105,252,248,
- 184,237,252,233,244,29,248,41,139,108,36,16,137,149,233,141,52,202,141,20,
- 194,137,252,239,15,182,75,252,252,137,92,36,20,232,251,1,3,248,3,139,149,
+ 236,40,137,252,253,137,124,36,24,137,252,241,187,237,49,192,76,141,188,253,
+ 36,233,68,139,181,233,65,129,198,239,76,137,189,233,137,68,36,28,72,137,68,
+ 36,32,137,68,36,16,137,68,36,20,56,133,233,15,132,244,249,65,199,134,233,
+ 237,136,133,233,139,149,233,139,133,233,41,200,193,232,3,131,192,1,41,209,
+ 139,90,252,252,137,68,36,4,252,247,195,237,15,132,244,13,255,252,233,244,
+ 14,248,25,85,83,65,87,65,86,72,131,252,236,40,187,237,137,76,36,20,252,233,
+ 244,247,248,26,85,83,65,87,65,86,72,131,252,236,40,187,237,248,1,137,84,36,
+ 16,137,252,253,137,124,36,24,137,252,241,248,2,76,139,189,233,76,137,124,
+ 36,32,137,108,36,28,72,137,165,233,68,139,181,233,65,129,198,239,248,3,65,
+ 199,134,233,237,139,149,233,1,203,41,211,139,133,233,41,200,193,232,3,131,
+ 192,1,248,27,255,139,105,252,248,129,121,253,252,252,239,15,133,244,28,248,
+ 29,137,202,137,90,252,252,139,157,233,139,11,15,182,252,233,15,182,205,131,
+ 195,4,65,252,255,36,252,238,248,30,85,83,65,87,65,86,72,131,252,236,40,137,
+ 252,253,137,124,36,24,137,108,36,28,68,139,189,233,68,43,189,233,199,68,36,
+ 20,0,0,0,0,68,137,124,36,16,76,139,189,233,76,137,124,36,32,72,137,165,233,
+ 252,255,209,133,192,15,132,244,15,137,193,187,237,252,233,244,2,248,11,1,
+ 209,131,227,252,248,137,213,41,218,199,68,193,252,252,237,137,200,139,93,
+ 252,244,72,99,77,252,240,76,141,61,245,76,1,252,249,68,139,122,252,248,69,
+ 139,191,233,255,69,139,191,233,252,255,225,248,31,15,182,75,252,255,131,252,
+ 237,16,141,12,202,41,252,233,15,132,244,32,252,247,217,193,252,233,3,139,
+ 124,36,24,137,151,233,137,202,139,72,4,139,0,137,77,4,137,69,0,137,252,238,
+ 252,233,244,33,248,34,137,4,36,199,68,36,4,237,72,141,4,36,128,123,252,252,
+ 235,15,133,244,247,65,141,142,233,137,41,199,65,4,237,137,205,252,233,244,
+ 248,248,35,15,182,67,252,254,255,252,242,15,42,192,252,242,15,17,4,36,255,
+ 72,141,4,36,252,233,244,247,248,36,15,182,67,252,254,141,4,194,248,1,15,182,
+ 107,252,255,141,44,252,234,248,2,139,124,36,24,137,151,233,137,252,238,72,
+ 137,194,137,252,253,137,92,36,28,232,251,1,1,139,149,233,133,192,15,132,244,
+ 249,248,32,15,182,75,252,253,139,104,4,139,0,137,108,202,4,137,4,202,139,
+ 3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,
+ 139,141,233,137,89,252,244,141,153,233,41,211,139,105,252,248,184,237,252,
+ 233,244,29,248,37,137,4,36,199,68,36,4,237,72,141,4,36,128,123,252,252,235,
+ 15,133,244,247,255,65,141,142,233,137,41,199,65,4,237,137,205,252,233,244,
+ 248,248,38,15,182,67,252,254,255,72,141,4,36,252,233,244,247,248,39,15,182,
+ 67,252,254,141,4,194,248,1,15,182,107,252,255,141,44,252,234,248,2,139,124,
+ 36,24,137,151,233,137,252,238,72,137,194,137,252,253,137,92,36,28,232,251,
+ 1,2,139,149,233,133,192,15,132,244,249,15,182,75,252,253,139,108,202,4,139,
+ 12,202,137,104,4,137,8,248,40,139,3,15,182,204,15,182,232,131,195,4,193,232,
+ 16,65,252,255,36,252,238,248,3,139,141,233,137,89,252,244,15,182,67,252,253,
+ 139,108,194,4,139,4,194,137,105,20,137,65,16,141,153,233,41,211,139,105,252,
+ 248,184,237,252,233,244,29,248,41,139,108,36,24,137,149,233,141,52,202,141,
+ 20,194,137,252,239,15,182,75,252,252,137,92,36,28,232,251,1,3,248,3,139,149,
233,255,131,252,248,1,15,135,244,42,248,4,141,91,4,15,130,244,252,248,5,15,
183,67,252,254,141,156,253,131,233,248,6,139,3,15,182,204,15,182,232,131,
195,4,193,232,16,65,252,255,36,252,238,248,43,131,195,4,129,120,253,4,239,
15,130,244,5,252,233,244,6,248,44,129,120,253,4,239,252,233,244,4,248,45,
- 131,252,235,4,137,206,137,252,233,139,108,36,16,137,149,233,255,137,194,137,
- 252,239,137,92,36,20,232,251,1,4,252,233,244,3,248,46,65,141,4,199,252,233,
+ 131,252,235,4,137,206,137,252,233,139,108,36,24,137,149,233,255,137,194,137,
+ 252,239,137,92,36,28,232,251,1,4,252,233,244,3,248,46,65,141,4,199,252,233,
244,247,248,47,65,141,4,199,141,44,252,234,149,252,233,244,248,248,48,141,
4,194,137,197,252,233,244,248,248,49,141,4,194,248,1,141,44,252,234,248,2,
- 141,12,202,68,15,182,67,252,252,137,206,137,193,139,124,36,16,137,151,233,
- 137,252,234,137,252,253,137,92,36,20,232,251,1,5,139,149,233,133,192,15,132,
+ 141,12,202,68,15,182,67,252,252,137,206,137,193,139,124,36,24,137,151,233,
+ 137,252,234,137,252,253,137,92,36,28,232,251,1,5,139,149,233,133,192,15,132,
244,40,248,42,137,193,41,208,137,89,252,244,141,152,233,255,184,237,252,233,
- 244,27,248,50,139,108,36,16,137,149,233,141,52,194,137,252,239,137,92,36,
- 20,232,251,1,6,139,149,233,252,233,244,42,248,51,141,76,202,8,248,28,137,
- 76,36,4,137,4,36,131,252,233,8,139,108,36,16,137,149,233,137,206,141,20,193,
- 137,252,239,137,92,36,20,232,251,1,7,139,149,233,139,76,36,4,139,4,36,139,
+ 244,27,248,50,139,108,36,24,137,149,233,141,52,194,137,252,239,137,92,36,
+ 28,232,251,1,6,139,149,233,252,233,244,42,248,51,141,76,202,8,248,28,137,
+ 76,36,4,137,4,36,131,252,233,8,139,108,36,24,137,149,233,137,206,141,20,193,
+ 137,252,239,137,92,36,28,232,251,1,7,139,149,233,139,76,36,4,139,4,36,139,
105,252,248,131,192,1,65,57,215,15,132,244,52,137,202,137,90,252,252,139,
157,233,139,11,15,182,252,233,15,182,205,131,195,4,65,252,255,36,252,238,
- 248,53,139,108,36,16,137,149,233,137,206,137,252,239,137,92,36,20,232,251,
+ 248,53,139,108,36,24,137,149,233,137,206,137,252,239,137,92,36,28,232,251,
1,8,139,149,233,139,67,252,252,15,182,204,15,182,232,193,232,16,65,252,255,
164,253,252,238,233,248,54,255,129,252,248,239,15,130,244,55,139,106,4,129,
252,253,239,15,131,244,55,139,90,252,252,137,68,36,4,137,106,252,252,139,
@@ -116,7 +116,7 @@ static const unsigned char build_actionlist[13995] = {
8,137,133,233,139,90,252,252,199,66,252,252,237,137,106,252,248,252,246,133,
233,235,15,132,244,247,128,165,233,235,255,65,139,134,233,65,137,174,233,
137,133,233,248,1,252,233,244,58,248,61,129,252,248,239,15,130,244,55,129,
- 122,253,4,239,15,133,244,55,137,213,139,50,141,82,8,139,124,36,16,232,251,
+ 122,253,4,239,15,133,244,55,137,213,139,50,141,82,8,139,124,36,24,232,251,
1,9,137,252,234,139,40,139,64,4,139,90,252,252,137,106,252,248,137,66,252,
252,252,233,244,58,248,62,129,252,248,239,15,133,244,55,129,122,253,4,239,
255,15,135,244,55,255,252,242,15,16,2,252,233,244,63,255,221,2,252,233,244,
@@ -124,10 +124,10 @@ static const unsigned char build_actionlist[13995] = {
239,15,133,244,249,139,2,248,2,199,66,252,252,237,137,66,252,248,252,233,
244,58,248,3,129,122,253,4,239,15,135,244,55,65,131,190,233,0,15,133,244,
55,65,139,174,233,65,59,174,233,255,15,130,244,247,232,244,66,248,1,139,108,
- 36,16,137,149,233,137,92,36,20,137,214,137,252,239,232,251,1,10,139,149,233,
+ 36,24,137,149,233,137,92,36,28,137,214,137,252,239,232,251,1,10,139,149,233,
252,233,244,2,248,67,129,252,248,239,15,130,244,55,15,132,244,248,248,1,129,
- 122,253,4,239,15,133,244,55,139,108,36,16,137,149,233,255,139,90,252,252,
- 139,50,141,82,8,137,252,239,137,92,36,20,232,251,1,11,139,149,233,133,192,
+ 122,253,4,239,15,133,244,55,139,108,36,24,137,149,233,255,139,90,252,252,
+ 139,50,141,82,8,137,252,239,137,92,36,28,232,251,1,11,139,149,233,133,192,
15,132,244,249,139,106,8,139,66,12,137,106,252,248,137,66,252,252,139,106,
16,139,66,20,137,42,137,66,4,248,68,184,237,252,233,244,69,248,2,199,66,12,
237,252,233,244,1,248,3,199,66,252,252,237,252,233,244,58,248,70,129,252,
@@ -148,36 +148,36 @@ static const unsigned char build_actionlist[13995] = {
235,252,233,244,27,248,75,129,252,248,239,15,130,244,55,129,122,253,12,239,
15,133,244,55,255,139,106,4,137,106,12,199,66,4,237,139,42,139,90,8,137,106,
8,137,26,141,74,16,131,232,2,187,237,252,233,244,1,248,76,129,252,248,239,
- 15,130,244,55,139,42,139,90,252,252,137,92,36,20,137,44,36,129,122,253,4,
+ 15,130,244,55,139,42,139,90,252,252,137,92,36,28,137,44,36,129,122,253,4,
239,15,133,244,55,72,131,189,233,0,15,133,244,55,128,189,233,235,15,135,244,
55,139,141,233,15,132,244,247,255,59,141,233,15,132,244,55,248,1,141,92,193,
- 252,240,59,157,233,15,135,244,55,137,157,233,139,108,36,16,137,149,233,131,
+ 252,240,59,157,233,15,135,244,55,137,157,233,139,108,36,24,137,149,233,131,
194,8,137,149,233,141,108,194,232,72,41,221,57,203,15,132,244,249,248,2,139,
68,43,4,137,67,252,252,139,4,43,137,67,252,248,131,252,235,8,57,203,15,133,
244,2,248,3,137,206,139,60,36,232,244,24,65,199,134,233,237,255,139,108,36,
- 16,139,28,36,139,149,233,129,252,248,239,15,135,244,254,248,4,139,139,233,
+ 24,139,28,36,139,149,233,129,252,248,239,15,135,244,254,248,4,139,139,233,
68,139,187,233,137,139,233,68,137,252,251,41,203,15,132,244,252,141,4,26,
193,252,235,3,59,133,233,15,135,244,255,137,213,72,41,205,248,5,139,1,137,
4,41,139,65,4,137,68,41,4,131,193,8,68,57,252,249,15,133,244,5,248,6,141,
- 67,2,199,66,252,252,237,248,7,139,92,36,20,137,68,36,4,72,199,193,252,248,
+ 67,2,199,66,252,252,237,248,7,139,92,36,28,137,68,36,4,72,199,193,252,248,
252,255,252,255,252,255,252,247,195,237,255,15,132,244,13,252,233,244,14,
248,8,199,66,252,252,237,139,139,233,131,252,233,8,137,139,233,139,1,137,
2,139,65,4,137,66,4,184,237,252,233,244,7,248,9,139,12,36,68,137,185,233,
137,222,137,252,239,232,251,1,0,139,149,233,252,233,244,4,248,77,139,106,
- 252,248,139,173,233,139,90,252,252,137,92,36,20,137,44,36,72,131,189,233,
+ 252,248,139,173,233,139,90,252,252,137,92,36,28,137,44,36,72,131,189,233,
0,15,133,244,55,255,128,189,233,235,15,135,244,55,139,141,233,15,132,244,
247,59,141,233,15,132,244,55,248,1,141,92,193,252,248,59,157,233,15,135,244,
- 55,137,157,233,139,108,36,16,137,149,233,137,149,233,141,108,194,252,240,
+ 55,137,157,233,139,108,36,24,137,149,233,137,149,233,141,108,194,252,240,
72,41,221,57,203,15,132,244,249,248,2,255,139,68,43,4,137,67,252,252,139,
4,43,137,67,252,248,131,252,235,8,57,203,15,133,244,2,248,3,137,206,139,60,
- 36,232,244,24,65,199,134,233,237,139,108,36,16,139,28,36,139,149,233,129,
+ 36,232,244,24,65,199,134,233,237,139,108,36,24,139,28,36,139,149,233,129,
252,248,239,15,135,244,254,248,4,139,139,233,68,139,187,233,137,139,233,68,
137,252,251,41,203,15,132,244,252,141,4,26,193,252,235,3,59,133,233,15,135,
244,255,255,137,213,72,41,205,248,5,139,1,137,4,41,139,65,4,137,68,41,4,131,
- 193,8,68,57,252,249,15,133,244,5,248,6,141,67,1,248,7,139,92,36,20,137,68,
+ 193,8,68,57,252,249,15,133,244,5,248,6,141,67,1,248,7,139,92,36,28,137,68,
36,4,49,201,252,247,195,237,15,132,244,13,252,233,244,14,248,8,137,222,137,
252,239,232,251,1,13,248,9,139,12,36,68,137,185,233,137,222,137,252,239,232,
- 251,1,0,139,149,233,252,233,244,4,248,78,139,108,36,16,72,252,247,133,233,
+ 251,1,0,139,149,233,252,233,244,4,248,78,139,108,36,24,72,252,247,133,233,
237,15,132,244,55,255,137,149,233,141,68,194,252,248,137,133,233,49,192,72,
137,133,233,176,235,136,133,233,252,233,244,16,255,248,64,139,90,252,252,
221,90,252,248,252,233,244,58,248,79,129,252,248,239,15,130,244,55,129,122,
@@ -266,42 +266,42 @@ static const unsigned char build_actionlist[13995] = {
252,233,244,64,255,248,112,65,139,174,233,65,59,174,233,15,130,244,247,232,
244,66,248,1,129,252,248,239,15,133,244,55,129,122,253,4,239,15,135,244,55,
255,252,242,15,45,2,61,252,255,0,0,0,15,135,244,55,137,68,36,4,255,221,2,
- 219,92,36,4,129,124,36,4,252,255,0,0,0,15,135,244,55,255,199,68,36,24,1,0,
- 0,0,72,141,68,36,4,248,113,139,108,36,16,137,149,233,139,84,36,24,72,137,
- 198,137,252,239,137,92,36,20,232,251,1,17,139,149,233,139,90,252,252,199,
- 66,252,252,237,137,66,252,248,252,233,244,58,248,114,65,139,174,233,65,59,
- 174,233,15,130,244,247,232,244,66,248,1,199,68,36,4,252,255,252,255,252,255,
- 252,255,129,252,248,239,15,130,244,55,15,134,244,247,129,122,253,20,239,255,
- 252,242,15,45,106,16,137,108,36,4,255,221,66,16,219,92,36,4,255,248,1,129,
- 122,253,4,239,15,133,244,55,129,122,253,12,239,15,135,244,55,139,42,137,108,
- 36,24,139,173,233,255,252,242,15,45,74,8,255,139,68,36,4,57,197,15,130,244,
- 251,248,2,133,201,15,142,244,253,248,3,139,108,36,24,41,200,15,140,244,115,
- 141,172,253,13,233,131,192,1,248,4,137,68,36,24,137,232,252,233,244,113,248,
- 5,15,140,244,252,141,68,40,1,252,233,244,2,248,6,137,232,252,233,244,2,248,
+ 219,92,36,4,129,124,36,4,252,255,0,0,0,15,135,244,55,255,199,68,36,8,1,0,
+ 0,0,72,141,68,36,4,248,113,139,108,36,24,137,149,233,139,84,36,8,72,137,198,
+ 137,252,239,137,92,36,28,232,251,1,17,139,149,233,139,90,252,252,199,66,252,
+ 252,237,137,66,252,248,252,233,244,58,248,114,65,139,174,233,65,59,174,233,
+ 15,130,244,247,232,244,66,248,1,199,68,36,4,252,255,252,255,252,255,252,255,
+ 129,252,248,239,15,130,244,55,15,134,244,247,129,122,253,20,239,255,252,242,
+ 15,45,106,16,137,108,36,4,255,221,66,16,219,92,36,4,255,248,1,129,122,253,
+ 4,239,15,133,244,55,129,122,253,12,239,15,135,244,55,139,42,137,108,36,8,
+ 139,173,233,255,252,242,15,45,74,8,255,139,68,36,4,57,197,15,130,244,251,
+ 248,2,133,201,15,142,244,253,248,3,139,108,36,8,41,200,15,140,244,115,141,
+ 172,253,13,233,131,192,1,248,4,137,68,36,8,137,232,252,233,244,113,248,5,
+ 15,140,244,252,141,68,40,1,252,233,244,2,248,6,137,232,252,233,244,2,248,
7,255,15,132,244,254,1,252,233,131,193,1,15,143,244,3,248,8,185,1,0,0,0,252,
233,244,3,248,115,49,192,252,233,244,4,248,116,129,252,248,239,15,130,244,
55,65,139,174,233,65,59,174,233,15,130,244,247,232,244,66,248,1,255,129,122,
253,4,239,15,133,244,55,129,122,253,12,239,15,135,244,55,139,42,255,252,242,
15,45,66,8,255,221,66,8,219,92,36,4,139,68,36,4,255,133,192,15,142,244,115,
131,189,233,1,15,130,244,115,15,133,244,117,65,57,134,233,15,130,244,117,
- 15,182,141,233,65,139,174,233,137,68,36,24,248,1,136,77,0,131,197,1,131,232,
+ 15,182,141,233,65,139,174,233,137,68,36,8,248,1,136,77,0,131,197,1,131,232,
1,15,133,244,1,65,139,134,233,252,233,244,113,248,118,129,252,248,239,255,
15,130,244,55,65,139,174,233,65,59,174,233,15,130,244,247,232,244,66,248,
1,129,122,253,4,239,15,133,244,55,139,42,139,133,233,133,192,15,132,244,115,
- 65,57,134,233,15,130,244,119,129,197,239,137,92,36,4,137,68,36,24,65,139,
- 158,233,248,1,255,15,182,77,0,131,197,1,131,232,1,136,12,3,15,133,244,1,137,
- 216,139,92,36,4,252,233,244,113,248,120,129,252,248,239,15,130,244,55,65,
- 139,174,233,65,59,174,233,15,130,244,247,232,244,66,248,1,129,122,253,4,239,
- 15,133,244,55,139,42,139,133,233,65,57,134,233,255,15,130,244,119,129,197,
- 239,137,92,36,4,137,68,36,24,65,139,158,233,252,233,244,249,248,1,15,182,
- 76,5,0,131,252,249,65,15,130,244,248,131,252,249,90,15,135,244,248,131,252,
- 241,32,248,2,136,12,3,248,3,131,232,1,15,137,244,1,137,216,139,92,36,4,252,
- 233,244,113,248,121,129,252,248,239,15,130,244,55,255,65,139,174,233,65,59,
- 174,233,15,130,244,247,232,244,66,248,1,129,122,253,4,239,15,133,244,55,139,
- 42,139,133,233,65,57,134,233,15,130,244,119,129,197,239,137,92,36,4,137,68,
- 36,24,65,139,158,233,252,233,244,249,248,1,15,182,76,5,0,131,252,249,97,15,
- 130,244,248,255,131,252,249,122,15,135,244,248,131,252,241,32,248,2,136,12,
- 3,248,3,131,232,1,15,137,244,1,137,216,139,92,36,4,252,233,244,113,248,122,
+ 65,57,134,233,15,130,244,119,129,197,239,137,92,36,4,137,68,36,8,65,139,158,
+ 233,248,1,255,15,182,77,0,131,197,1,131,232,1,136,12,3,15,133,244,1,137,216,
+ 139,92,36,4,252,233,244,113,248,120,129,252,248,239,15,130,244,55,65,139,
+ 174,233,65,59,174,233,15,130,244,247,232,244,66,248,1,129,122,253,4,239,15,
+ 133,244,55,139,42,139,133,233,65,57,134,233,255,15,130,244,119,129,197,239,
+ 137,92,36,4,137,68,36,8,65,139,158,233,252,233,244,249,248,1,15,182,76,5,
+ 0,131,252,249,65,15,130,244,248,131,252,249,90,15,135,244,248,131,252,241,
+ 32,248,2,136,12,3,248,3,131,232,1,15,137,244,1,137,216,139,92,36,4,252,233,
+ 244,113,248,121,129,252,248,239,15,130,244,55,255,65,139,174,233,65,59,174,
+ 233,15,130,244,247,232,244,66,248,1,129,122,253,4,239,15,133,244,55,139,42,
+ 139,133,233,65,57,134,233,15,130,244,119,129,197,239,137,92,36,4,137,68,36,
+ 8,65,139,158,233,252,233,244,249,248,1,15,182,76,5,0,131,252,249,97,15,130,
+ 244,248,255,131,252,249,122,15,135,244,248,131,252,241,32,248,2,136,12,3,
+ 248,3,131,232,1,15,137,244,1,137,216,139,92,36,4,252,233,244,113,248,122,
129,252,248,239,15,130,244,55,129,122,253,4,239,15,133,244,55,137,213,139,
58,232,251,1,18,137,252,234,255,252,242,15,42,192,252,233,244,63,255,248,
123,129,252,248,239,15,130,244,55,129,122,253,4,239,15,135,244,55,252,242,
@@ -342,8 +342,8 @@ static const unsigned char build_actionlist[13995] = {
135,244,55,129,122,253,12,239,15,135,244,55,252,242,15,16,2,252,242,15,16,
74,8,72,189,237,237,102,72,15,110,213,252,242,15,88,194,252,242,15,88,202,
137,200,102,15,126,197,102,15,126,201,255,211,205,137,193,252,233,244,125,
- 248,117,184,237,252,233,244,55,248,119,184,237,248,55,139,108,36,16,139,90,
- 252,252,137,92,36,20,137,149,233,141,68,194,252,248,141,136,233,137,133,233,
+ 248,117,184,237,252,233,244,55,248,119,184,237,248,55,139,108,36,24,139,90,
+ 252,252,137,92,36,28,137,149,233,141,68,194,252,248,141,136,233,137,133,233,
139,66,252,248,59,141,233,15,135,244,251,137,252,239,252,255,144,233,139,
149,233,133,192,15,133,244,69,248,1,255,139,133,233,41,208,193,232,3,131,
192,1,139,106,252,248,57,90,252,252,15,133,244,248,139,157,233,139,11,15,
@@ -351,21 +351,21 @@ static const unsigned char build_actionlist[13995] = {
247,195,237,15,133,244,249,15,182,107,252,253,72,252,247,213,141,20,252,234,
252,233,244,27,248,3,137,221,131,229,252,248,41,252,234,252,233,244,27,248,
5,190,237,137,252,239,232,251,1,0,139,149,233,252,233,244,1,248,66,93,72,
- 137,108,36,24,139,108,36,16,137,92,36,20,137,149,233,255,141,68,194,252,248,
+ 137,108,36,8,139,108,36,24,137,92,36,28,137,149,233,255,141,68,194,252,248,
137,252,239,137,133,233,232,251,1,19,139,149,233,139,133,233,41,208,193,232,
- 3,131,192,1,72,139,108,36,24,85,195,248,136,255,65,15,182,134,233,168,235,
+ 3,131,192,1,72,139,108,36,8,85,195,248,136,255,65,15,182,134,233,168,235,
15,133,244,251,168,235,15,133,244,247,168,235,15,132,244,247,65,252,255,142,
233,252,233,244,247,255,248,137,65,15,182,134,233,168,235,15,133,244,251,
252,233,244,247,248,138,65,15,182,134,233,168,235,15,133,244,251,168,235,
15,132,244,251,65,252,255,142,233,15,132,244,247,168,235,15,132,244,251,248,
- 1,255,139,108,36,16,137,149,233,137,222,137,252,239,232,251,1,20,248,3,139,
+ 1,255,139,108,36,24,137,149,233,137,222,137,252,239,232,251,1,20,248,3,139,
149,233,248,4,15,182,75,252,253,248,5,15,182,107,252,252,15,183,67,252,254,
65,252,255,164,253,252,238,233,248,139,131,195,4,139,77,232,137,76,36,4,252,
233,244,4,248,140,255,139,106,252,248,139,173,233,15,182,133,233,141,4,194,
- 139,108,36,16,137,149,233,137,133,233,137,222,65,141,190,233,73,137,174,233,
- 137,92,36,20,232,251,1,21,252,233,244,3,255,248,141,137,92,36,20,255,248,
- 142,255,137,92,36,20,131,203,1,248,1,255,141,68,194,252,248,139,108,36,16,
- 137,149,233,137,133,233,137,222,137,252,239,232,251,1,22,199,68,36,20,0,0,
+ 139,108,36,24,137,149,233,137,133,233,137,222,65,141,190,233,73,137,174,233,
+ 137,92,36,28,232,251,1,21,252,233,244,3,255,248,141,137,92,36,28,255,248,
+ 142,255,137,92,36,28,131,203,1,248,1,255,141,68,194,252,248,139,108,36,24,
+ 137,149,233,137,133,233,137,222,137,252,239,232,251,1,22,199,68,36,28,0,0,
0,0,255,131,227,252,254,255,139,149,233,72,137,193,139,133,233,41,208,72,
137,205,15,182,75,252,253,193,232,3,131,192,1,252,255,229,248,143,255,65,
85,65,84,65,83,65,82,65,81,65,80,87,86,85,72,141,108,36,88,85,83,82,81,80,
@@ -378,253 +378,254 @@ static const unsigned char build_actionlist[13995] = {
168,252,242,15,17,101,160,252,242,15,17,93,152,252,242,15,17,85,144,252,242,
15,17,77,136,252,242,15,17,69,128,65,139,174,233,65,139,150,233,73,137,174,
233,137,149,233,72,137,230,65,141,190,233,232,251,1,23,72,139,141,233,72,
- 129,225,239,72,137,204,137,108,36,16,133,192,15,133,244,247,139,149,233,139,
- 92,36,20,255,248,144,255,68,139,122,252,248,69,139,191,233,69,139,191,233,
- 65,199,134,233,0,0,0,0,65,199,134,233,237,139,3,15,182,204,15,182,232,131,
- 195,4,193,232,16,65,252,255,36,252,238,248,1,137,252,239,137,198,232,251,
- 1,24,255,248,82,255,217,124,36,4,137,68,36,8,102,184,0,4,102,11,68,36,4,102,
- 37,252,255,252,247,102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,
- 139,68,36,8,195,255,248,145,72,184,237,237,102,72,15,110,208,72,184,237,237,
- 102,72,15,110,216,15,40,200,102,15,84,202,102,15,46,217,15,134,244,247,102,
- 15,85,208,252,242,15,88,203,252,242,15,92,203,102,15,86,202,72,184,237,237,
- 102,72,15,110,208,252,242,15,194,193,1,102,15,84,194,252,242,15,92,200,15,
- 40,193,248,1,195,248,84,255,217,124,36,4,137,68,36,8,102,184,0,8,102,11,68,
- 36,4,102,37,252,255,252,251,102,137,68,36,6,217,108,36,6,217,252,252,217,
- 108,36,4,139,68,36,8,195,255,248,146,72,184,237,237,102,72,15,110,208,72,
- 184,237,237,102,72,15,110,216,15,40,200,102,15,84,202,102,15,46,217,15,134,
- 244,247,102,15,85,208,252,242,15,88,203,252,242,15,92,203,102,15,86,202,72,
- 184,237,237,102,72,15,110,208,252,242,15,194,193,6,102,15,84,194,252,242,
- 15,92,200,15,40,193,248,1,195,248,104,255,217,124,36,4,137,68,36,8,102,184,
- 0,12,102,11,68,36,4,102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,
- 139,68,36,8,195,255,248,147,72,184,237,237,102,72,15,110,208,72,184,237,237,
- 102,72,15,110,216,15,40,200,102,15,84,202,102,15,46,217,15,134,244,247,102,
- 15,85,208,15,40,193,252,242,15,88,203,252,242,15,92,203,72,184,237,237,102,
- 72,15,110,216,252,242,15,194,193,1,102,15,84,195,252,242,15,92,200,102,15,
- 86,202,15,40,193,248,1,195,248,148,255,15,40,232,252,242,15,94,193,72,184,
- 237,237,102,72,15,110,208,72,184,237,237,102,72,15,110,216,15,40,224,102,
- 15,84,226,102,15,46,220,15,134,244,247,102,15,85,208,252,242,15,88,227,252,
- 242,15,92,227,102,15,86,226,72,184,237,237,102,72,15,110,208,252,242,15,194,
- 196,1,102,15,84,194,252,242,15,92,224,15,40,197,252,242,15,89,204,252,242,
- 15,92,193,195,248,1,252,242,15,89,200,15,40,197,252,242,15,92,193,195,255,
- 217,193,216,252,241,217,124,36,4,102,184,0,4,102,11,68,36,4,102,37,252,255,
- 252,247,102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,222,201,222,
- 252,233,195,255,248,88,217,252,234,222,201,248,149,217,84,36,252,248,129,
- 124,36,252,248,0,0,128,127,15,132,244,247,129,124,36,252,248,0,0,128,252,
- 255,15,132,244,248,248,150,217,192,217,252,252,220,252,233,217,201,217,252,
- 240,217,232,222,193,217,252,253,221,217,248,1,195,248,2,221,216,217,252,238,
- 195,255,248,107,255,248,151,252,242,15,45,193,252,242,15,42,208,102,15,46,
- 202,15,133,244,254,15,138,244,255,248,152,131,252,248,1,15,142,244,252,248,
- 1,169,1,0,0,0,15,133,244,248,252,242,15,89,192,209,232,252,233,244,1,248,
- 2,209,232,15,132,244,251,15,40,200,248,3,252,242,15,89,192,209,232,15,132,
- 244,250,15,131,244,3,255,252,242,15,89,200,252,233,244,3,248,4,252,242,15,
- 89,193,248,5,195,248,6,15,132,244,5,15,130,244,253,80,72,184,237,237,102,
- 72,15,110,200,252,242,15,94,200,88,15,40,193,252,247,216,131,252,248,1,15,
- 132,244,5,252,233,244,1,248,7,72,184,237,237,102,72,15,110,192,195,248,8,
- 102,72,15,126,200,72,209,224,72,193,192,12,72,61,252,254,15,0,0,15,132,244,
- 248,255,102,72,15,126,192,72,209,224,15,132,244,250,72,193,192,12,72,61,252,
- 254,15,0,0,15,132,244,251,252,242,15,17,76,36,252,240,252,242,15,17,68,36,
- 252,248,221,68,36,252,240,221,68,36,252,248,217,252,241,217,192,217,252,252,
- 220,252,233,217,201,217,252,240,217,232,222,193,217,252,253,221,217,221,92,
- 36,252,248,252,242,15,16,68,36,252,248,195,248,9,72,184,237,237,102,72,15,
- 110,208,102,15,46,194,15,132,244,247,15,40,193,248,1,195,248,2,72,184,237,
- 237,102,72,15,110,208,102,15,84,194,72,184,237,237,102,72,15,110,208,102,
- 15,46,194,15,132,244,1,102,15,80,193,15,87,192,136,196,15,146,208,48,224,
- 15,133,244,1,248,3,72,184,237,237,255,102,72,15,110,192,195,248,4,102,15,
- 80,193,133,192,15,133,244,3,15,87,192,195,248,5,102,15,80,193,133,192,15,
- 132,244,3,15,87,192,195,248,153,255,131,252,255,1,15,130,244,82,15,132,244,
- 84,131,252,255,3,15,130,244,104,15,135,244,248,252,242,15,81,192,195,248,
- 2,252,242,15,17,68,36,252,248,221,68,36,252,248,131,252,255,5,15,135,244,
- 248,15,132,244,247,232,244,88,252,233,244,253,248,1,232,244,149,255,252,233,
- 244,253,248,2,131,252,255,7,15,132,244,247,15,135,244,248,217,252,237,217,
- 201,217,252,241,252,233,244,253,248,1,217,232,217,201,217,252,241,252,233,
- 244,253,248,2,131,252,255,9,15,132,244,247,15,135,244,248,217,252,236,217,
- 201,217,252,241,252,233,244,253,248,1,255,217,252,254,252,233,244,253,248,
- 2,131,252,255,11,15,132,244,247,15,135,244,255,217,252,255,252,233,244,253,
- 248,1,217,252,242,221,216,248,7,221,92,36,252,248,252,242,15,16,68,36,252,
- 248,195,255,139,124,36,12,221,68,36,4,131,252,255,1,15,130,244,82,15,132,
- 244,84,131,252,255,3,15,130,244,104,15,135,244,248,217,252,250,195,248,2,
- 131,252,255,5,15,130,244,88,15,132,244,149,131,252,255,7,15,132,244,247,15,
- 135,244,248,217,252,237,217,201,217,252,241,195,248,1,217,232,217,201,217,
- 252,241,195,248,2,131,252,255,9,15,132,244,247,255,15,135,244,248,217,252,
- 236,217,201,217,252,241,195,248,1,217,252,254,195,248,2,131,252,255,11,15,
- 132,244,247,15,135,244,255,217,252,255,195,248,1,217,252,242,221,216,195,
- 255,248,9,204,248,154,255,131,252,255,1,15,132,244,247,15,135,244,248,252,
- 242,15,88,193,195,248,1,252,242,15,92,193,195,248,2,131,252,255,3,15,132,
- 244,247,15,135,244,248,252,242,15,89,193,195,248,1,252,242,15,94,193,195,
- 248,2,131,252,255,5,15,130,244,148,15,132,244,107,131,252,255,7,15,132,244,
- 247,15,135,244,248,72,184,237,237,255,102,72,15,110,200,15,87,193,195,248,
- 1,72,184,237,237,102,72,15,110,200,15,84,193,195,248,2,131,252,255,9,15,135,
- 244,248,252,242,15,17,68,36,252,248,252,242,15,17,76,36,252,240,221,68,36,
- 252,248,221,68,36,252,240,15,132,244,247,217,252,243,248,7,221,92,36,252,
- 248,252,242,15,16,68,36,252,248,195,248,1,217,201,217,252,253,221,217,252,
- 233,244,7,248,2,131,252,255,11,15,132,244,247,15,135,244,255,252,242,15,93,
- 193,195,248,1,252,242,15,95,193,195,248,9,204,255,139,68,36,20,221,68,36,
- 4,221,68,36,12,131,252,248,1,15,132,244,247,15,135,244,248,222,193,195,248,
- 1,222,252,233,195,248,2,131,252,248,3,15,132,244,247,15,135,244,248,222,201,
- 195,248,1,222,252,249,195,248,2,131,252,248,5,15,130,244,148,15,132,244,107,
- 131,252,248,7,15,132,244,247,15,135,244,248,255,221,216,217,224,195,248,1,
- 221,216,217,225,195,248,2,131,252,248,9,15,132,244,247,15,135,244,248,217,
- 252,243,195,248,1,217,201,217,252,253,221,217,195,248,2,131,252,248,11,15,
- 132,244,247,15,135,244,255,255,219,252,233,219,209,221,217,195,248,1,219,
- 252,233,218,209,221,217,195,255,221,225,223,224,252,246,196,1,15,132,244,
- 248,217,201,248,2,221,216,195,248,1,221,225,223,224,252,246,196,1,15,133,
- 244,248,217,201,248,2,221,216,195,255,248,155,137,252,248,83,15,162,137,6,
- 137,94,4,137,78,8,137,86,12,91,195,255,129,124,253,202,4,239,15,135,244,41,
- 129,124,253,194,4,239,15,135,244,41,255,252,242,15,16,4,194,131,195,4,102,
- 15,46,4,202,255,221,4,202,221,4,194,131,195,4,255,223,252,233,221,216,255,
- 218,252,233,223,224,158,255,15,134,244,248,255,15,131,244,248,255,248,1,15,
- 183,67,252,254,141,156,253,131,233,248,2,139,3,15,182,204,15,182,232,131,
- 195,4,193,232,16,65,252,255,36,252,238,255,139,108,194,4,131,195,4,129,252,
- 253,239,15,135,244,251,129,124,253,202,4,239,15,135,244,251,255,252,242,15,
- 16,4,194,102,15,46,4,202,255,221,4,202,221,4,194,255,15,138,244,248,15,133,
- 244,248,255,15,138,244,248,15,132,244,247,255,248,1,15,183,67,252,254,141,
- 156,253,131,233,248,2,255,248,2,15,183,67,252,254,141,156,253,131,233,248,
- 1,255,248,5,57,108,202,4,15,133,244,2,129,252,253,239,15,131,244,1,139,12,
- 202,139,4,194,57,193,15,132,244,1,129,252,253,239,15,135,244,2,139,169,233,
- 133,252,237,15,132,244,2,252,246,133,233,235,15,133,244,2,255,49,252,237,
- 255,189,1,0,0,0,255,252,233,244,45,255,72,252,247,208,131,195,4,129,124,253,
- 202,4,239,15,133,244,248,139,12,202,65,59,12,135,255,131,195,4,129,124,253,
- 202,4,239,15,135,244,248,255,252,242,65,15,16,4,199,102,15,46,4,202,255,221,
- 4,202,65,221,4,199,255,72,252,247,208,131,195,4,57,68,202,4,255,139,108,194,
- 4,131,195,4,129,252,253,239,255,15,131,244,247,255,15,130,244,247,255,137,
- 108,202,4,139,44,194,137,44,202,255,15,183,67,252,254,141,156,253,131,233,
- 248,1,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,
- 238,255,139,108,194,4,139,4,194,137,108,202,4,137,4,202,139,3,15,182,204,
- 15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,49,252,237,129,
- 124,253,194,4,239,129,213,239,137,108,202,4,139,3,15,182,204,15,182,232,131,
- 195,4,193,232,16,65,252,255,36,252,238,255,129,124,253,194,4,239,15,135,244,
- 48,255,252,242,15,16,4,194,72,184,237,237,102,72,15,110,200,15,87,193,252,
- 242,15,17,4,202,255,221,4,194,217,224,221,28,202,255,129,124,253,194,4,239,
- 15,133,244,248,139,4,194,255,15,87,192,252,242,15,42,128,233,248,1,252,242,
- 15,17,4,202,255,219,128,233,248,1,221,28,202,255,139,3,15,182,204,15,182,
- 232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,129,124,253,194,4,239,
- 15,133,244,50,139,60,194,137,213,232,251,1,18,255,252,242,15,42,192,137,252,
- 234,255,15,182,75,252,253,252,233,244,1,255,15,182,252,236,15,182,192,255,
- 129,124,253,252,234,4,239,15,135,244,46,255,252,242,15,16,4,252,234,252,242,
- 65,15,88,4,199,255,221,4,252,234,65,220,4,199,255,129,124,253,252,234,4,239,
- 15,135,244,47,255,252,242,65,15,16,4,199,252,242,15,88,4,252,234,255,65,221,
- 4,199,220,4,252,234,255,129,124,253,252,234,4,239,15,135,244,49,129,124,253,
- 194,4,239,15,135,244,49,255,252,242,15,16,4,252,234,252,242,15,88,4,194,255,
- 221,4,252,234,220,4,194,255,252,242,15,16,4,252,234,252,242,65,15,92,4,199,
- 255,221,4,252,234,65,220,36,199,255,252,242,65,15,16,4,199,252,242,15,92,
- 4,252,234,255,65,221,4,199,220,36,252,234,255,252,242,15,16,4,252,234,252,
- 242,15,92,4,194,255,221,4,252,234,220,36,194,255,252,242,15,16,4,252,234,
- 252,242,65,15,89,4,199,255,221,4,252,234,65,220,12,199,255,252,242,65,15,
- 16,4,199,252,242,15,89,4,252,234,255,65,221,4,199,220,12,252,234,255,252,
- 242,15,16,4,252,234,252,242,15,89,4,194,255,221,4,252,234,220,12,194,255,
- 252,242,15,16,4,252,234,252,242,65,15,94,4,199,255,221,4,252,234,65,220,52,
- 199,255,252,242,65,15,16,4,199,252,242,15,94,4,252,234,255,65,221,4,199,220,
- 52,252,234,255,252,242,15,16,4,252,234,252,242,15,94,4,194,255,221,4,252,
- 234,220,52,194,255,252,242,15,16,4,252,234,252,242,65,15,16,12,199,255,221,
- 4,252,234,65,221,4,199,255,252,242,65,15,16,4,199,252,242,15,16,12,252,234,
- 255,65,221,4,199,221,4,252,234,255,252,242,15,16,4,252,234,252,242,15,16,
- 12,194,255,221,4,252,234,221,4,194,255,248,156,232,244,148,255,252,233,244,
- 156,255,232,244,107,255,15,182,252,236,15,182,192,139,124,36,16,137,151,233,
- 141,52,194,137,194,41,252,234,248,33,137,252,253,137,92,36,20,232,251,1,25,
- 139,149,233,133,192,15,133,244,42,15,182,107,252,255,15,182,75,252,253,139,
- 68,252,234,4,139,44,252,234,137,68,202,4,137,44,202,139,3,15,182,204,15,182,
- 232,131,195,4,193,232,16,65,252,255,36,252,238,255,72,252,247,208,65,139,
- 4,135,199,68,202,4,237,137,4,202,139,3,15,182,204,15,182,232,131,195,4,193,
- 232,16,65,252,255,36,252,238,255,15,191,192,252,242,15,42,192,252,242,15,
- 17,4,202,255,223,67,252,254,221,28,202,255,252,242,65,15,16,4,199,252,242,
- 15,17,4,202,255,65,221,4,199,221,28,202,255,72,252,247,208,137,68,202,4,139,
+ 129,225,239,72,137,204,137,169,233,139,149,233,139,153,233,252,233,244,247,
+ 255,248,144,255,49,192,72,131,196,16,248,1,76,139,108,36,8,76,139,36,36,133,
+ 192,15,133,244,248,68,139,122,252,248,69,139,191,233,69,139,191,233,65,199,
+ 134,233,0,0,0,0,65,199,134,233,237,139,3,15,182,204,15,182,232,131,195,4,
+ 193,232,16,65,252,255,36,252,238,248,2,137,252,239,137,198,232,251,1,24,255,
+ 248,82,255,217,124,36,4,137,68,36,8,102,184,0,4,102,11,68,36,4,102,37,252,
+ 255,252,247,102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,139,68,
+ 36,8,195,255,248,145,72,184,237,237,102,72,15,110,208,72,184,237,237,102,
+ 72,15,110,216,15,40,200,102,15,84,202,102,15,46,217,15,134,244,247,102,15,
+ 85,208,252,242,15,88,203,252,242,15,92,203,102,15,86,202,72,184,237,237,102,
+ 72,15,110,208,252,242,15,194,193,1,102,15,84,194,252,242,15,92,200,15,40,
+ 193,248,1,195,248,84,255,217,124,36,4,137,68,36,8,102,184,0,8,102,11,68,36,
+ 4,102,37,252,255,252,251,102,137,68,36,6,217,108,36,6,217,252,252,217,108,
+ 36,4,139,68,36,8,195,255,248,146,72,184,237,237,102,72,15,110,208,72,184,
+ 237,237,102,72,15,110,216,15,40,200,102,15,84,202,102,15,46,217,15,134,244,
+ 247,102,15,85,208,252,242,15,88,203,252,242,15,92,203,102,15,86,202,72,184,
+ 237,237,102,72,15,110,208,252,242,15,194,193,6,102,15,84,194,252,242,15,92,
+ 200,15,40,193,248,1,195,248,104,255,217,124,36,4,137,68,36,8,102,184,0,12,
+ 102,11,68,36,4,102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,139,
+ 68,36,8,195,255,248,147,72,184,237,237,102,72,15,110,208,72,184,237,237,102,
+ 72,15,110,216,15,40,200,102,15,84,202,102,15,46,217,15,134,244,247,102,15,
+ 85,208,15,40,193,252,242,15,88,203,252,242,15,92,203,72,184,237,237,102,72,
+ 15,110,216,252,242,15,194,193,1,102,15,84,195,252,242,15,92,200,102,15,86,
+ 202,15,40,193,248,1,195,248,148,255,15,40,232,252,242,15,94,193,72,184,237,
+ 237,102,72,15,110,208,72,184,237,237,102,72,15,110,216,15,40,224,102,15,84,
+ 226,102,15,46,220,15,134,244,247,102,15,85,208,252,242,15,88,227,252,242,
+ 15,92,227,102,15,86,226,72,184,237,237,102,72,15,110,208,252,242,15,194,196,
+ 1,102,15,84,194,252,242,15,92,224,15,40,197,252,242,15,89,204,252,242,15,
+ 92,193,195,248,1,252,242,15,89,200,15,40,197,252,242,15,92,193,195,255,217,
+ 193,216,252,241,217,124,36,4,102,184,0,4,102,11,68,36,4,102,37,252,255,252,
+ 247,102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,222,201,222,252,
+ 233,195,255,248,88,217,252,234,222,201,248,149,217,84,36,252,248,129,124,
+ 36,252,248,0,0,128,127,15,132,244,247,129,124,36,252,248,0,0,128,252,255,
+ 15,132,244,248,248,150,217,192,217,252,252,220,252,233,217,201,217,252,240,
+ 217,232,222,193,217,252,253,221,217,248,1,195,248,2,221,216,217,252,238,195,
+ 255,248,107,255,248,151,252,242,15,45,193,252,242,15,42,208,102,15,46,202,
+ 15,133,244,254,15,138,244,255,248,152,131,252,248,1,15,142,244,252,248,1,
+ 169,1,0,0,0,15,133,244,248,252,242,15,89,192,209,232,252,233,244,1,248,2,
+ 209,232,15,132,244,251,15,40,200,248,3,252,242,15,89,192,209,232,15,132,244,
+ 250,15,131,244,3,255,252,242,15,89,200,252,233,244,3,248,4,252,242,15,89,
+ 193,248,5,195,248,6,15,132,244,5,15,130,244,253,80,72,184,237,237,102,72,
+ 15,110,200,252,242,15,94,200,88,15,40,193,252,247,216,131,252,248,1,15,132,
+ 244,5,252,233,244,1,248,7,72,184,237,237,102,72,15,110,192,195,248,8,102,
+ 72,15,126,200,72,209,224,72,193,192,12,72,61,252,254,15,0,0,15,132,244,248,
+ 255,102,72,15,126,192,72,209,224,15,132,244,250,72,193,192,12,72,61,252,254,
+ 15,0,0,15,132,244,251,252,242,15,17,76,36,252,240,252,242,15,17,68,36,252,
+ 248,221,68,36,252,240,221,68,36,252,248,217,252,241,217,192,217,252,252,220,
+ 252,233,217,201,217,252,240,217,232,222,193,217,252,253,221,217,221,92,36,
+ 252,248,252,242,15,16,68,36,252,248,195,248,9,72,184,237,237,102,72,15,110,
+ 208,102,15,46,194,15,132,244,247,15,40,193,248,1,195,248,2,72,184,237,237,
+ 102,72,15,110,208,102,15,84,194,72,184,237,237,102,72,15,110,208,102,15,46,
+ 194,15,132,244,1,102,15,80,193,15,87,192,136,196,15,146,208,48,224,15,133,
+ 244,1,248,3,72,184,237,237,255,102,72,15,110,192,195,248,4,102,15,80,193,
+ 133,192,15,133,244,3,15,87,192,195,248,5,102,15,80,193,133,192,15,132,244,
+ 3,15,87,192,195,248,153,255,131,252,255,1,15,130,244,82,15,132,244,84,131,
+ 252,255,3,15,130,244,104,15,135,244,248,252,242,15,81,192,195,248,2,252,242,
+ 15,17,68,36,252,248,221,68,36,252,248,131,252,255,5,15,135,244,248,15,132,
+ 244,247,232,244,88,252,233,244,253,248,1,232,244,149,255,252,233,244,253,
+ 248,2,131,252,255,7,15,132,244,247,15,135,244,248,217,252,237,217,201,217,
+ 252,241,252,233,244,253,248,1,217,232,217,201,217,252,241,252,233,244,253,
+ 248,2,131,252,255,9,15,132,244,247,15,135,244,248,217,252,236,217,201,217,
+ 252,241,252,233,244,253,248,1,255,217,252,254,252,233,244,253,248,2,131,252,
+ 255,11,15,132,244,247,15,135,244,255,217,252,255,252,233,244,253,248,1,217,
+ 252,242,221,216,248,7,221,92,36,252,248,252,242,15,16,68,36,252,248,195,255,
+ 139,124,36,12,221,68,36,4,131,252,255,1,15,130,244,82,15,132,244,84,131,252,
+ 255,3,15,130,244,104,15,135,244,248,217,252,250,195,248,2,131,252,255,5,15,
+ 130,244,88,15,132,244,149,131,252,255,7,15,132,244,247,15,135,244,248,217,
+ 252,237,217,201,217,252,241,195,248,1,217,232,217,201,217,252,241,195,248,
+ 2,131,252,255,9,15,132,244,247,255,15,135,244,248,217,252,236,217,201,217,
+ 252,241,195,248,1,217,252,254,195,248,2,131,252,255,11,15,132,244,247,15,
+ 135,244,255,217,252,255,195,248,1,217,252,242,221,216,195,255,248,9,204,248,
+ 154,255,131,252,255,1,15,132,244,247,15,135,244,248,252,242,15,88,193,195,
+ 248,1,252,242,15,92,193,195,248,2,131,252,255,3,15,132,244,247,15,135,244,
+ 248,252,242,15,89,193,195,248,1,252,242,15,94,193,195,248,2,131,252,255,5,
+ 15,130,244,148,15,132,244,107,131,252,255,7,15,132,244,247,15,135,244,248,
+ 72,184,237,237,255,102,72,15,110,200,15,87,193,195,248,1,72,184,237,237,102,
+ 72,15,110,200,15,84,193,195,248,2,131,252,255,9,15,135,244,248,252,242,15,
+ 17,68,36,252,248,252,242,15,17,76,36,252,240,221,68,36,252,248,221,68,36,
+ 252,240,15,132,244,247,217,252,243,248,7,221,92,36,252,248,252,242,15,16,
+ 68,36,252,248,195,248,1,217,201,217,252,253,221,217,252,233,244,7,248,2,131,
+ 252,255,11,15,132,244,247,15,135,244,255,252,242,15,93,193,195,248,1,252,
+ 242,15,95,193,195,248,9,204,255,139,68,36,20,221,68,36,4,221,68,36,12,131,
+ 252,248,1,15,132,244,247,15,135,244,248,222,193,195,248,1,222,252,233,195,
+ 248,2,131,252,248,3,15,132,244,247,15,135,244,248,222,201,195,248,1,222,252,
+ 249,195,248,2,131,252,248,5,15,130,244,148,15,132,244,107,131,252,248,7,15,
+ 132,244,247,15,135,244,248,255,221,216,217,224,195,248,1,221,216,217,225,
+ 195,248,2,131,252,248,9,15,132,244,247,15,135,244,248,217,252,243,195,248,
+ 1,217,201,217,252,253,221,217,195,248,2,131,252,248,11,15,132,244,247,15,
+ 135,244,255,255,219,252,233,219,209,221,217,195,248,1,219,252,233,218,209,
+ 221,217,195,255,221,225,223,224,252,246,196,1,15,132,244,248,217,201,248,
+ 2,221,216,195,248,1,221,225,223,224,252,246,196,1,15,133,244,248,217,201,
+ 248,2,221,216,195,255,248,155,137,252,248,83,15,162,137,6,137,94,4,137,78,
+ 8,137,86,12,91,195,255,129,124,253,202,4,239,15,135,244,41,129,124,253,194,
+ 4,239,15,135,244,41,255,252,242,15,16,4,194,131,195,4,102,15,46,4,202,255,
+ 221,4,202,221,4,194,131,195,4,255,223,252,233,221,216,255,218,252,233,223,
+ 224,158,255,15,134,244,248,255,15,131,244,248,255,248,1,15,183,67,252,254,
+ 141,156,253,131,233,248,2,139,3,15,182,204,15,182,232,131,195,4,193,232,16,
+ 65,252,255,36,252,238,255,139,108,194,4,131,195,4,129,252,253,239,15,135,
+ 244,251,129,124,253,202,4,239,15,135,244,251,255,252,242,15,16,4,194,102,
+ 15,46,4,202,255,221,4,202,221,4,194,255,15,138,244,248,15,133,244,248,255,
+ 15,138,244,248,15,132,244,247,255,248,1,15,183,67,252,254,141,156,253,131,
+ 233,248,2,255,248,2,15,183,67,252,254,141,156,253,131,233,248,1,255,248,5,
+ 57,108,202,4,15,133,244,2,129,252,253,239,15,131,244,1,139,12,202,139,4,194,
+ 57,193,15,132,244,1,129,252,253,239,15,135,244,2,139,169,233,133,252,237,
+ 15,132,244,2,252,246,133,233,235,15,133,244,2,255,49,252,237,255,189,1,0,
+ 0,0,255,252,233,244,45,255,72,252,247,208,131,195,4,129,124,253,202,4,239,
+ 15,133,244,248,139,12,202,65,59,12,135,255,131,195,4,129,124,253,202,4,239,
+ 15,135,244,248,255,252,242,65,15,16,4,199,102,15,46,4,202,255,221,4,202,65,
+ 221,4,199,255,72,252,247,208,131,195,4,57,68,202,4,255,139,108,194,4,131,
+ 195,4,129,252,253,239,255,15,131,244,247,255,15,130,244,247,255,137,108,202,
+ 4,139,44,194,137,44,202,255,15,183,67,252,254,141,156,253,131,233,248,1,139,
+ 3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,139,
+ 108,194,4,139,4,194,137,108,202,4,137,4,202,139,3,15,182,204,15,182,232,131,
+ 195,4,193,232,16,65,252,255,36,252,238,255,49,252,237,129,124,253,194,4,239,
+ 129,213,239,137,108,202,4,139,3,15,182,204,15,182,232,131,195,4,193,232,16,
+ 65,252,255,36,252,238,255,129,124,253,194,4,239,15,135,244,48,255,252,242,
+ 15,16,4,194,72,184,237,237,102,72,15,110,200,15,87,193,252,242,15,17,4,202,
+ 255,221,4,194,217,224,221,28,202,255,129,124,253,194,4,239,15,133,244,248,
+ 139,4,194,255,15,87,192,252,242,15,42,128,233,248,1,252,242,15,17,4,202,255,
+ 219,128,233,248,1,221,28,202,255,139,3,15,182,204,15,182,232,131,195,4,193,
+ 232,16,65,252,255,36,252,238,248,2,129,124,253,194,4,239,15,133,244,50,139,
+ 60,194,137,213,232,251,1,18,255,252,242,15,42,192,137,252,234,255,15,182,
+ 75,252,253,252,233,244,1,255,15,182,252,236,15,182,192,255,129,124,253,252,
+ 234,4,239,15,135,244,46,255,252,242,15,16,4,252,234,252,242,65,15,88,4,199,
+ 255,221,4,252,234,65,220,4,199,255,129,124,253,252,234,4,239,15,135,244,47,
+ 255,252,242,65,15,16,4,199,252,242,15,88,4,252,234,255,65,221,4,199,220,4,
+ 252,234,255,129,124,253,252,234,4,239,15,135,244,49,129,124,253,194,4,239,
+ 15,135,244,49,255,252,242,15,16,4,252,234,252,242,15,88,4,194,255,221,4,252,
+ 234,220,4,194,255,252,242,15,16,4,252,234,252,242,65,15,92,4,199,255,221,
+ 4,252,234,65,220,36,199,255,252,242,65,15,16,4,199,252,242,15,92,4,252,234,
+ 255,65,221,4,199,220,36,252,234,255,252,242,15,16,4,252,234,252,242,15,92,
+ 4,194,255,221,4,252,234,220,36,194,255,252,242,15,16,4,252,234,252,242,65,
+ 15,89,4,199,255,221,4,252,234,65,220,12,199,255,252,242,65,15,16,4,199,252,
+ 242,15,89,4,252,234,255,65,221,4,199,220,12,252,234,255,252,242,15,16,4,252,
+ 234,252,242,15,89,4,194,255,221,4,252,234,220,12,194,255,252,242,15,16,4,
+ 252,234,252,242,65,15,94,4,199,255,221,4,252,234,65,220,52,199,255,252,242,
+ 65,15,16,4,199,252,242,15,94,4,252,234,255,65,221,4,199,220,52,252,234,255,
+ 252,242,15,16,4,252,234,252,242,15,94,4,194,255,221,4,252,234,220,52,194,
+ 255,252,242,15,16,4,252,234,252,242,65,15,16,12,199,255,221,4,252,234,65,
+ 221,4,199,255,252,242,65,15,16,4,199,252,242,15,16,12,252,234,255,65,221,
+ 4,199,221,4,252,234,255,252,242,15,16,4,252,234,252,242,15,16,12,194,255,
+ 221,4,252,234,221,4,194,255,248,156,232,244,148,255,252,233,244,156,255,232,
+ 244,107,255,15,182,252,236,15,182,192,139,124,36,24,137,151,233,141,52,194,
+ 137,194,41,252,234,248,33,137,252,253,137,92,36,28,232,251,1,25,139,149,233,
+ 133,192,15,133,244,42,15,182,107,252,255,15,182,75,252,253,139,68,252,234,
+ 4,139,44,252,234,137,68,202,4,137,44,202,139,3,15,182,204,15,182,232,131,
+ 195,4,193,232,16,65,252,255,36,252,238,255,72,252,247,208,65,139,4,135,199,
+ 68,202,4,237,137,4,202,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,
+ 252,255,36,252,238,255,15,191,192,252,242,15,42,192,252,242,15,17,4,202,255,
+ 223,67,252,254,221,28,202,255,252,242,65,15,16,4,199,252,242,15,17,4,202,
+ 255,65,221,4,199,221,28,202,255,72,252,247,208,137,68,202,4,139,3,15,182,
+ 204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,141,76,202,
+ 12,141,68,194,4,189,237,137,105,252,248,248,1,137,41,131,193,8,57,193,15,
+ 134,244,1,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,
+ 252,238,255,139,106,252,248,139,172,253,133,233,139,173,233,139,69,4,139,
+ 109,0,137,68,202,4,137,44,202,139,3,15,182,204,15,182,232,131,195,4,193,232,
+ 16,65,252,255,36,252,238,255,139,106,252,248,139,172,253,141,233,128,189,
+ 233,0,139,173,233,139,12,194,139,68,194,4,137,77,0,137,69,4,15,132,244,247,
+ 252,246,133,233,235,15,133,244,248,248,1,139,3,15,182,204,15,182,232,131,
+ 195,4,193,232,16,65,252,255,36,252,238,248,2,129,232,239,129,252,248,239,
+ 15,134,244,1,252,246,129,233,235,15,132,244,1,137,252,238,137,213,65,141,
+ 190,233,255,232,251,1,26,137,252,234,252,233,244,1,255,72,252,247,208,139,
+ 106,252,248,139,172,253,141,233,65,139,12,135,139,133,233,137,8,199,64,4,
+ 237,252,246,133,233,235,15,133,244,248,248,1,139,3,15,182,204,15,182,232,
+ 131,195,4,193,232,16,65,252,255,36,252,238,248,2,252,246,129,233,235,15,132,
+ 244,1,128,189,233,0,15,132,244,1,137,213,137,198,65,141,190,233,232,251,1,
+ 26,137,252,234,252,233,244,1,255,139,106,252,248,255,252,242,65,15,16,4,199,
+ 255,139,172,253,141,233,139,141,233,255,252,242,15,17,1,255,221,25,255,72,
+ 252,247,208,139,106,252,248,139,172,253,141,233,139,141,233,137,65,4,139,
3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,141,
- 76,202,12,141,68,194,4,189,237,137,105,252,248,248,1,137,41,131,193,8,57,
- 193,15,134,244,1,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,
- 255,36,252,238,255,139,106,252,248,139,172,253,133,233,139,173,233,139,69,
- 4,139,109,0,137,68,202,4,137,44,202,139,3,15,182,204,15,182,232,131,195,4,
- 193,232,16,65,252,255,36,252,238,255,139,106,252,248,139,172,253,141,233,
- 128,189,233,0,139,173,233,139,12,194,139,68,194,4,137,77,0,137,69,4,15,132,
- 244,247,252,246,133,233,235,15,133,244,248,248,1,139,3,15,182,204,15,182,
- 232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,129,232,239,129,252,
- 248,239,15,134,244,1,252,246,129,233,235,15,132,244,1,137,252,238,137,213,
- 65,141,190,233,255,232,251,1,26,137,252,234,252,233,244,1,255,72,252,247,
- 208,139,106,252,248,139,172,253,141,233,65,139,12,135,139,133,233,137,8,199,
- 64,4,237,252,246,133,233,235,15,133,244,248,248,1,139,3,15,182,204,15,182,
- 232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,252,246,129,233,235,
- 15,132,244,1,128,189,233,0,15,132,244,1,137,213,137,198,65,141,190,233,232,
- 251,1,26,137,252,234,252,233,244,1,255,139,106,252,248,255,252,242,65,15,
- 16,4,199,255,139,172,253,141,233,139,141,233,255,252,242,15,17,1,255,221,
- 25,255,72,252,247,208,139,106,252,248,139,172,253,141,233,139,141,233,137,
- 65,4,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,
- 255,141,156,253,131,233,139,108,36,16,131,189,233,0,15,132,244,247,137,149,
- 233,141,52,202,137,252,239,232,251,1,27,139,149,233,248,1,139,3,15,182,204,
- 15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,72,252,247,208,
- 139,108,36,16,137,149,233,139,82,252,248,65,139,52,135,137,252,239,137,92,
- 36,20,232,251,1,28,139,149,233,15,182,75,252,253,137,4,202,199,68,202,4,237,
- 139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,
- 139,124,36,16,137,151,233,248,1,137,194,37,252,255,7,0,0,193,252,234,11,61,
- 252,255,7,0,0,15,132,244,249,248,2,137,198,65,139,134,233,137,252,253,65,
- 59,134,233,137,92,36,20,15,131,244,251,232,251,1,29,139,149,233,15,182,75,
- 252,253,137,4,202,199,68,202,4,237,139,3,15,182,204,15,182,232,131,195,4,
- 193,232,16,65,252,255,36,252,238,248,3,184,1,8,0,0,252,233,244,2,248,5,232,
- 251,1,30,15,183,67,252,254,137,252,239,252,233,244,1,255,72,252,247,208,139,
- 108,36,16,65,139,142,233,137,92,36,20,65,59,142,233,137,149,233,15,131,244,
- 249,248,2,65,139,52,135,137,252,239,232,251,1,31,139,149,233,15,182,75,252,
- 253,137,4,202,199,68,202,4,237,139,3,15,182,204,15,182,232,131,195,4,193,
- 232,16,65,252,255,36,252,238,248,3,137,252,239,232,251,1,30,15,183,67,252,
- 254,72,252,247,208,252,233,244,2,255,72,252,247,208,139,106,252,248,139,173,
- 233,65,139,4,135,252,233,244,157,255,72,252,247,208,139,106,252,248,139,173,
- 233,65,139,4,135,252,233,244,158,255,15,182,252,236,15,182,192,129,124,253,
- 252,234,4,239,15,133,244,36,139,44,252,234,129,124,253,194,4,239,15,135,244,
- 251,255,252,242,15,16,4,194,252,242,15,45,192,252,242,15,42,200,102,15,46,
- 193,255,15,133,244,36,59,133,233,15,131,244,36,193,224,3,3,133,233,129,120,
- 253,4,239,15,132,244,248,248,1,139,40,139,64,4,137,44,202,137,68,202,4,139,
- 3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,
- 131,189,233,0,15,132,244,1,139,141,233,252,246,129,233,235,15,132,244,36,
- 15,182,75,252,253,252,233,244,1,248,5,255,129,124,253,194,4,239,15,133,244,
- 36,139,4,194,252,233,244,157,255,15,182,252,236,15,182,192,72,252,247,208,
- 65,139,4,135,129,124,253,252,234,4,239,15,133,244,34,139,44,252,234,248,157,
- 139,141,233,35,136,233,105,201,239,3,141,233,248,1,129,185,233,239,15,133,
- 244,250,57,129,233,15,133,244,250,129,121,253,4,239,15,132,244,251,15,182,
- 67,252,253,139,41,139,73,4,137,44,194,248,2,255,137,76,194,4,139,3,15,182,
- 204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,15,182,67,
- 252,253,185,237,252,233,244,2,248,4,139,137,233,133,201,15,133,244,1,248,
- 5,139,141,233,133,201,15,132,244,3,252,246,129,233,235,15,133,244,3,252,233,
- 244,34,255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,
- 35,139,44,252,234,59,133,233,15,131,244,35,193,224,3,3,133,233,129,120,253,
- 4,239,15,132,244,248,248,1,139,40,139,64,4,137,44,202,137,68,202,4,139,3,
- 15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,131,
- 189,233,0,15,132,244,1,139,141,233,252,246,129,233,235,15,132,244,35,255,
- 15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,39,139,44,
- 252,234,129,124,253,194,4,239,15,135,244,251,255,15,133,244,39,59,133,233,
- 15,131,244,39,193,224,3,3,133,233,129,120,253,4,239,15,132,244,249,248,1,
- 252,246,133,233,235,15,133,244,253,248,2,139,108,202,4,139,12,202,137,104,
- 4,137,8,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,
- 238,248,3,131,189,233,0,15,132,244,1,139,141,233,255,252,246,129,233,235,
- 15,132,244,39,15,182,75,252,253,252,233,244,1,248,5,129,124,253,194,4,239,
- 15,133,244,39,139,4,194,252,233,244,158,248,7,128,165,233,235,65,139,142,
- 233,65,137,174,233,137,141,233,15,182,75,252,253,252,233,244,2,255,15,182,
- 252,236,15,182,192,72,252,247,208,65,139,4,135,129,124,253,252,234,4,239,
- 15,133,244,37,139,44,252,234,248,158,139,141,233,35,136,233,105,201,239,198,
- 133,233,0,3,141,233,248,1,129,185,233,239,15,133,244,251,57,129,233,15,133,
- 244,251,129,121,253,4,239,15,132,244,250,248,2,255,252,246,133,233,235,15,
- 133,244,253,248,3,15,182,67,252,253,139,108,194,4,139,4,194,137,105,4,137,
- 1,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,
- 248,4,131,189,233,0,15,132,244,2,137,12,36,139,141,233,252,246,129,233,235,
- 15,132,244,37,139,12,36,252,233,244,2,248,5,139,137,233,133,201,15,133,244,
- 1,255,139,141,233,133,201,15,132,244,252,252,246,129,233,235,15,132,244,37,
- 248,6,137,4,36,199,68,36,4,237,137,108,36,24,139,124,36,16,137,151,233,72,
- 141,20,36,137,252,238,137,252,253,137,92,36,20,232,251,1,32,139,149,233,139,
- 108,36,24,137,193,252,233,244,2,248,7,128,165,233,235,65,139,134,233,65,137,
- 174,233,137,133,233,252,233,244,3,255,15,182,252,236,15,182,192,129,124,253,
- 252,234,4,239,15,133,244,38,139,44,252,234,59,133,233,15,131,244,38,193,224,
- 3,3,133,233,129,120,253,4,239,15,132,244,249,248,1,252,246,133,233,235,15,
- 133,244,253,248,2,139,108,202,4,139,12,202,137,104,4,137,8,139,3,15,182,204,
- 15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,131,189,233,0,
- 15,132,244,1,255,139,141,233,252,246,129,233,235,15,132,244,38,15,182,75,
- 252,253,252,233,244,1,248,7,128,165,233,235,65,139,142,233,65,137,174,233,
- 137,141,233,15,182,75,252,253,252,233,244,2,255,68,137,60,36,255,248,1,141,
- 12,202,139,105,252,248,252,246,133,233,235,15,133,244,253,248,2,139,68,36,
- 4,255,252,242,68,15,45,252,248,255,131,232,1,15,132,244,250,68,1,252,248,
- 59,133,233,15,131,244,251,68,41,252,248,65,193,231,3,68,3,189,233,248,3,139,
- 41,65,137,47,139,105,4,131,193,8,65,137,111,4,65,131,199,8,131,232,1,15,133,
- 244,3,248,4,68,139,60,36,139,3,15,182,204,15,182,232,131,195,4,193,232,16,
- 65,252,255,36,252,238,248,5,139,124,36,16,137,151,233,137,252,238,137,194,
- 137,252,253,137,92,36,20,232,251,1,33,139,149,233,15,182,75,252,253,252,233,
- 244,1,248,7,128,165,233,235,65,139,134,233,65,137,174,233,255,137,133,233,
- 252,233,244,2,255,3,68,36,4,255,129,124,253,202,4,239,139,44,202,15,133,244,
- 51,141,84,202,8,137,90,252,252,139,157,233,139,11,15,182,252,233,15,182,205,
+ 156,253,131,233,139,108,36,24,131,189,233,0,15,132,244,247,137,149,233,141,
+ 52,202,137,252,239,232,251,1,27,139,149,233,248,1,139,3,15,182,204,15,182,
+ 232,131,195,4,193,232,16,65,252,255,36,252,238,255,72,252,247,208,139,108,
+ 36,24,137,149,233,139,82,252,248,65,139,52,135,137,252,239,137,92,36,28,232,
+ 251,1,28,139,149,233,15,182,75,252,253,137,4,202,199,68,202,4,237,139,3,15,
+ 182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,255,139,124,
+ 36,24,137,151,233,248,1,137,194,37,252,255,7,0,0,193,252,234,11,61,252,255,
+ 7,0,0,15,132,244,249,248,2,137,198,65,139,134,233,137,252,253,65,59,134,233,
+ 137,92,36,28,15,131,244,251,232,251,1,29,139,149,233,15,182,75,252,253,137,
+ 4,202,199,68,202,4,237,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,
+ 252,255,36,252,238,248,3,184,1,8,0,0,252,233,244,2,248,5,232,251,1,30,15,
+ 183,67,252,254,137,252,239,252,233,244,1,255,72,252,247,208,139,108,36,24,
+ 65,139,142,233,137,92,36,28,65,59,142,233,137,149,233,15,131,244,249,248,
+ 2,65,139,52,135,137,252,239,232,251,1,31,139,149,233,15,182,75,252,253,137,
+ 4,202,199,68,202,4,237,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,
+ 252,255,36,252,238,248,3,137,252,239,232,251,1,30,15,183,67,252,254,72,252,
+ 247,208,252,233,244,2,255,72,252,247,208,139,106,252,248,139,173,233,65,139,
+ 4,135,252,233,244,157,255,72,252,247,208,139,106,252,248,139,173,233,65,139,
+ 4,135,252,233,244,158,255,15,182,252,236,15,182,192,129,124,253,252,234,4,
+ 239,15,133,244,36,139,44,252,234,129,124,253,194,4,239,15,135,244,251,255,
+ 252,242,15,16,4,194,252,242,15,45,192,252,242,15,42,200,102,15,46,193,255,
+ 15,133,244,36,59,133,233,15,131,244,36,193,224,3,3,133,233,129,120,253,4,
+ 239,15,132,244,248,248,1,139,40,139,64,4,137,44,202,137,68,202,4,139,3,15,
+ 182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,131,189,
+ 233,0,15,132,244,1,139,141,233,252,246,129,233,235,15,132,244,36,15,182,75,
+ 252,253,252,233,244,1,248,5,255,129,124,253,194,4,239,15,133,244,36,139,4,
+ 194,252,233,244,157,255,15,182,252,236,15,182,192,72,252,247,208,65,139,4,
+ 135,129,124,253,252,234,4,239,15,133,244,34,139,44,252,234,248,157,139,141,
+ 233,35,136,233,105,201,239,3,141,233,248,1,129,185,233,239,15,133,244,250,
+ 57,129,233,15,133,244,250,129,121,253,4,239,15,132,244,251,15,182,67,252,
+ 253,139,41,139,73,4,137,44,194,248,2,255,137,76,194,4,139,3,15,182,204,15,
+ 182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,15,182,67,252,253,
+ 185,237,252,233,244,2,248,4,139,137,233,133,201,15,133,244,1,248,5,139,141,
+ 233,133,201,15,132,244,3,252,246,129,233,235,15,133,244,3,252,233,244,34,
+ 255,15,182,252,236,15,182,192,129,124,253,252,234,4,239,15,133,244,35,139,
+ 44,252,234,59,133,233,15,131,244,35,193,224,3,3,133,233,129,120,253,4,239,
+ 15,132,244,248,248,1,139,40,139,64,4,137,44,202,137,68,202,4,139,3,15,182,
+ 204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,2,131,189,233,
+ 0,15,132,244,1,139,141,233,252,246,129,233,235,15,132,244,35,255,15,182,252,
+ 236,15,182,192,129,124,253,252,234,4,239,15,133,244,39,139,44,252,234,129,
+ 124,253,194,4,239,15,135,244,251,255,15,133,244,39,59,133,233,15,131,244,
+ 39,193,224,3,3,133,233,129,120,253,4,239,15,132,244,249,248,1,252,246,133,
+ 233,235,15,133,244,253,248,2,139,108,202,4,139,12,202,137,104,4,137,8,139,
+ 3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,
+ 131,189,233,0,15,132,244,1,139,141,233,255,252,246,129,233,235,15,132,244,
+ 39,15,182,75,252,253,252,233,244,1,248,5,129,124,253,194,4,239,15,133,244,
+ 39,139,4,194,252,233,244,158,248,7,128,165,233,235,65,139,142,233,65,137,
+ 174,233,137,141,233,15,182,75,252,253,252,233,244,2,255,15,182,252,236,15,
+ 182,192,72,252,247,208,65,139,4,135,129,124,253,252,234,4,239,15,133,244,
+ 37,139,44,252,234,248,158,139,141,233,35,136,233,105,201,239,198,133,233,
+ 0,3,141,233,248,1,129,185,233,239,15,133,244,251,57,129,233,15,133,244,251,
+ 129,121,253,4,239,15,132,244,250,248,2,255,252,246,133,233,235,15,133,244,
+ 253,248,3,15,182,67,252,253,139,108,194,4,139,4,194,137,105,4,137,1,139,3,
+ 15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,4,131,
+ 189,233,0,15,132,244,2,137,12,36,139,141,233,252,246,129,233,235,15,132,244,
+ 37,139,12,36,252,233,244,2,248,5,139,137,233,133,201,15,133,244,1,255,139,
+ 141,233,133,201,15,132,244,252,252,246,129,233,235,15,132,244,37,248,6,137,
+ 4,36,199,68,36,4,237,137,108,36,8,139,124,36,24,137,151,233,72,141,20,36,
+ 137,252,238,137,252,253,137,92,36,28,232,251,1,32,139,149,233,139,108,36,
+ 8,137,193,252,233,244,2,248,7,128,165,233,235,65,139,134,233,65,137,174,233,
+ 137,133,233,252,233,244,3,255,15,182,252,236,15,182,192,129,124,253,252,234,
+ 4,239,15,133,244,38,139,44,252,234,59,133,233,15,131,244,38,193,224,3,3,133,
+ 233,129,120,253,4,239,15,132,244,249,248,1,252,246,133,233,235,15,133,244,
+ 253,248,2,139,108,202,4,139,12,202,137,104,4,137,8,139,3,15,182,204,15,182,
+ 232,131,195,4,193,232,16,65,252,255,36,252,238,248,3,131,189,233,0,15,132,
+ 244,1,255,139,141,233,252,246,129,233,235,15,132,244,38,15,182,75,252,253,
+ 252,233,244,1,248,7,128,165,233,235,65,139,142,233,65,137,174,233,137,141,
+ 233,15,182,75,252,253,252,233,244,2,255,68,137,60,36,255,248,1,141,12,202,
+ 139,105,252,248,252,246,133,233,235,15,133,244,253,248,2,139,68,36,4,255,
+ 252,242,68,15,45,252,248,255,131,232,1,15,132,244,250,68,1,252,248,59,133,
+ 233,15,131,244,251,68,41,252,248,65,193,231,3,68,3,189,233,248,3,139,41,65,
+ 137,47,139,105,4,131,193,8,65,137,111,4,65,131,199,8,131,232,1,15,133,244,
+ 3,248,4,68,139,60,36,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,
+ 252,255,36,252,238,248,5,139,124,36,24,137,151,233,137,252,238,137,194,137,
+ 252,253,137,92,36,28,232,251,1,33,139,149,233,15,182,75,252,253,252,233,244,
+ 1,248,7,128,165,233,235,65,139,134,233,65,137,174,233,255,137,133,233,252,
+ 233,244,2,255,3,68,36,4,255,129,124,253,202,4,239,139,44,202,15,133,244,51,
+ 141,84,202,8,137,90,252,252,139,157,233,139,11,15,182,252,233,15,182,205,
131,195,4,65,252,255,36,252,238,255,141,76,202,8,65,137,215,139,105,252,248,
129,121,253,252,252,239,15,133,244,28,248,52,139,90,252,252,252,247,195,237,
15,133,244,253,248,1,137,106,252,248,137,68,36,4,131,232,1,15,132,244,249,
@@ -646,9 +647,9 @@ static const unsigned char build_actionlist[13995] = {
237,131,193,8,57,252,233,15,130,244,2,248,3,68,139,60,36,139,3,15,182,204,
15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,5,199,68,36,4,1,
0,0,0,137,208,68,41,252,248,15,134,244,3,255,137,197,193,252,237,3,131,197,
- 1,137,108,36,4,139,108,36,16,1,200,59,133,233,15,135,244,253,248,6,65,139,
+ 1,137,108,36,4,139,108,36,24,1,200,59,133,233,15,135,244,253,248,6,65,139,
71,252,248,137,1,65,139,71,252,252,65,131,199,8,137,65,4,131,193,8,65,57,
- 215,15,130,244,6,252,233,244,3,248,7,137,149,233,137,141,233,137,92,36,20,
+ 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,
@@ -672,24 +673,24 @@ static const unsigned char build_actionlist[13995] = {
255,248,3,102,15,46,193,252,233,244,1,255,141,12,202,139,105,4,129,252,253,
239,15,132,244,247,255,137,105,252,252,139,41,137,105,252,248,252,233,245,
255,141,156,253,131,233,139,1,137,105,252,252,137,65,252,248,255,65,139,142,
- 233,139,4,193,72,139,128,233,139,108,36,16,65,137,150,233,65,137,174,233,
- 252,255,224,255,141,156,253,131,233,139,3,15,182,204,15,182,232,131,195,4,
- 193,232,16,65,252,255,36,252,238,255,68,139,187,233,139,108,36,16,141,12,
- 202,59,141,233,15,135,244,23,15,182,139,233,57,200,15,134,244,249,248,2,255,
- 15,183,67,252,254,252,233,245,255,248,3,199,68,194,252,252,237,131,192,1,
- 57,200,15,134,244,3,252,233,244,2,255,141,44,197,237,141,4,194,68,139,122,
- 252,248,137,104,252,252,68,137,120,252,248,139,108,36,16,141,12,200,59,141,
- 233,15,135,244,22,137,209,137,194,15,182,171,233,133,252,237,15,132,244,248,
- 248,1,131,193,8,57,209,15,131,244,249,68,139,121,252,248,68,137,56,68,139,
- 121,252,252,68,137,120,4,131,192,8,199,65,252,252,237,131,252,237,1,15,133,
- 244,1,248,2,255,68,139,187,233,139,3,15,182,204,15,182,232,131,195,4,193,
- 232,16,65,252,255,36,252,238,255,248,3,199,64,4,237,131,192,8,131,252,237,
- 1,15,133,244,3,252,233,244,2,255,139,106,252,248,76,139,189,233,139,108,36,
- 16,141,68,194,252,248,137,149,233,141,136,233,59,141,233,137,133,233,255,
- 137,252,239,255,76,137,252,254,137,252,239,255,15,135,244,21,65,199,134,233,
- 237,255,65,252,255,215,255,65,252,255,150,233,255,65,199,134,233,237,139,
- 149,233,141,12,194,252,247,217,3,141,233,139,90,252,252,252,233,244,12,255,
- 254,0
+ 233,139,4,193,72,139,128,233,139,108,36,24,65,137,150,233,65,137,174,233,
+ 76,137,36,36,76,137,108,36,8,72,131,252,236,16,252,255,224,255,141,156,253,
+ 131,233,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,
+ 238,255,68,139,187,233,139,108,36,24,141,12,202,59,141,233,15,135,244,23,
+ 15,182,139,233,57,200,15,134,244,249,248,2,255,15,183,67,252,254,252,233,
+ 245,255,248,3,199,68,194,252,252,237,131,192,1,57,200,15,134,244,3,252,233,
+ 244,2,255,141,44,197,237,141,4,194,68,139,122,252,248,137,104,252,252,68,
+ 137,120,252,248,139,108,36,24,141,12,200,59,141,233,15,135,244,22,137,209,
+ 137,194,15,182,171,233,133,252,237,15,132,244,248,248,1,131,193,8,57,209,
+ 15,131,244,249,68,139,121,252,248,68,137,56,68,139,121,252,252,68,137,120,
+ 4,131,192,8,199,65,252,252,237,131,252,237,1,15,133,244,1,248,2,255,68,139,
+ 187,233,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,
+ 238,255,248,3,199,64,4,237,131,192,8,131,252,237,1,15,133,244,3,252,233,244,
+ 2,255,139,106,252,248,76,139,189,233,139,108,36,24,141,68,194,252,248,137,
+ 149,233,141,136,233,59,141,233,137,133,233,255,137,252,239,255,76,137,252,
+ 254,137,252,239,255,15,135,244,21,65,199,134,233,237,255,65,252,255,215,255,
+ 65,252,255,150,233,255,65,199,134,233,237,139,149,233,141,12,194,252,247,
+ 217,3,141,233,139,90,252,252,252,233,244,12,255,254,0
};
enum {
@@ -1364,62 +1365,62 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse)
#endif
dasm_put(Dst, 7296, Dt1(->base), Dt1(->top));
#if LJ_HASJIT
- dasm_put(Dst, 7327, DISPATCH_GL(vmstate), DISPATCH_GL(vmstate), ~LJ_VMST_EXIT, DISPATCH_J(exitno), DISPATCH_J(parent), 16*8, DISPATCH_GL(jit_L), DISPATCH_GL(jit_base), DISPATCH_J(L), Dt1(->base), GG_DISP2J, Dt1(->cframe), CFRAME_RAWMASK, Dt1(->base));
+ dasm_put(Dst, 7327, DISPATCH_GL(vmstate), DISPATCH_GL(vmstate), ~LJ_VMST_EXIT, DISPATCH_J(exitno), DISPATCH_J(parent), 16*8, DISPATCH_GL(jit_L), DISPATCH_GL(jit_base), DISPATCH_J(L), Dt1(->base), GG_DISP2J, Dt1(->cframe), CFRAME_RAWMASK, CFRAME_OFS_L, Dt1(->base), CFRAME_OFS_PC);
#endif
- dasm_put(Dst, 7562);
+ dasm_put(Dst, 7558);
#if LJ_HASJIT
- dasm_put(Dst, 7565, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP);
+ dasm_put(Dst, 7561, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP);
#endif
- dasm_put(Dst, 7623);
+ dasm_put(Dst, 7642);
if (!sse) {
- dasm_put(Dst, 7626);
+ dasm_put(Dst, 7645);
}
- dasm_put(Dst, 7671, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32));
+ dasm_put(Dst, 7690, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32));
if (!sse) {
- dasm_put(Dst, 7757);
+ dasm_put(Dst, 7776);
}
- dasm_put(Dst, 7802, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(bff00000,00000000)), (unsigned int)((U64x(bff00000,00000000))>>32));
+ dasm_put(Dst, 7821, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(bff00000,00000000)), (unsigned int)((U64x(bff00000,00000000))>>32));
if (!sse) {
- dasm_put(Dst, 7888);
+ dasm_put(Dst, 7907);
}
- dasm_put(Dst, 7927, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32));
+ dasm_put(Dst, 7946, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32));
if (sse) {
- dasm_put(Dst, 8016, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32));
+ dasm_put(Dst, 8035, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32));
} else {
- dasm_put(Dst, 8130);
+ dasm_put(Dst, 8149);
}
- dasm_put(Dst, 8177);
+ dasm_put(Dst, 8196);
if (!sse) {
} else {
- dasm_put(Dst, 8254);
+ dasm_put(Dst, 8273);
}
- dasm_put(Dst, 8257);
- dasm_put(Dst, 8342, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32));
- dasm_put(Dst, 8443, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(7ff00000,00000000)), (unsigned int)((U64x(7ff00000,00000000))>>32));
- dasm_put(Dst, 8617);
+ dasm_put(Dst, 8276);
+ dasm_put(Dst, 8361, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32));
+ dasm_put(Dst, 8462, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(7ff00000,00000000)), (unsigned int)((U64x(7ff00000,00000000))>>32));
+ dasm_put(Dst, 8636);
if (sse) {
- dasm_put(Dst, 8658);
- dasm_put(Dst, 8728);
- dasm_put(Dst, 8800);
+ dasm_put(Dst, 8677);
+ dasm_put(Dst, 8747);
+ dasm_put(Dst, 8819);
} else {
- dasm_put(Dst, 8852);
- dasm_put(Dst, 8944);
+ dasm_put(Dst, 8871);
+ dasm_put(Dst, 8963);
}
- dasm_put(Dst, 8990);
+ dasm_put(Dst, 9009);
if (sse) {
- dasm_put(Dst, 8996, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32));
- dasm_put(Dst, 9081, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32));
+ dasm_put(Dst, 9015, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32));
+ dasm_put(Dst, 9100, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32));
} else {
- dasm_put(Dst, 9209);
- dasm_put(Dst, 9292);
+ dasm_put(Dst, 9228);
+ dasm_put(Dst, 9311);
if (cmov) {
- dasm_put(Dst, 9347);
- } else {
dasm_put(Dst, 9366);
+ } else {
+ dasm_put(Dst, 9385);
}
- dasm_put(Dst, 9205);
+ dasm_put(Dst, 9224);
}
- dasm_put(Dst, 9407);
+ dasm_put(Dst, 9426);
}
/* Generate the code for a single instruction. */
@@ -1435,600 +1436,600 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
/* Remember: all ops branch for a true comparison, fall through otherwise. */
case BC_ISLT: case BC_ISGE: case BC_ISLE: case BC_ISGT:
- dasm_put(Dst, 9429, LJ_TISNUM, LJ_TISNUM);
+ dasm_put(Dst, 9448, LJ_TISNUM, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 9450);
+ dasm_put(Dst, 9469);
} else {
- dasm_put(Dst, 9465);
+ dasm_put(Dst, 9484);
if (cmov) {
- dasm_put(Dst, 9475);
+ dasm_put(Dst, 9494);
} else {
- dasm_put(Dst, 9481);
+ dasm_put(Dst, 9500);
}
}
switch (op) {
case BC_ISLT:
- dasm_put(Dst, 9488);
+ dasm_put(Dst, 9507);
break;
case BC_ISGE:
- dasm_put(Dst, 9287);
+ dasm_put(Dst, 9306);
break;
case BC_ISLE:
dasm_put(Dst, 5942);
break;
case BC_ISGT:
- dasm_put(Dst, 9493);
+ dasm_put(Dst, 9512);
break;
default: break; /* Shut up GCC. */
}
- dasm_put(Dst, 9498, -BCBIAS_J*4);
+ dasm_put(Dst, 9517, -BCBIAS_J*4);
break;
case BC_ISEQV: case BC_ISNEV:
vk = op == BC_ISEQV;
- dasm_put(Dst, 9533, LJ_TISNUM, LJ_TISNUM);
+ dasm_put(Dst, 9552, LJ_TISNUM, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 9559);
+ dasm_put(Dst, 9578);
} else {
- dasm_put(Dst, 9571);
+ dasm_put(Dst, 9590);
if (cmov) {
- dasm_put(Dst, 9475);
+ dasm_put(Dst, 9494);
} else {
- dasm_put(Dst, 9481);
+ dasm_put(Dst, 9500);
}
}
iseqne_fp:
if (vk) {
- dasm_put(Dst, 9578);
+ dasm_put(Dst, 9597);
} else {
- dasm_put(Dst, 9587);
+ dasm_put(Dst, 9606);
}
iseqne_end:
if (vk) {
- dasm_put(Dst, 9596, -BCBIAS_J*4);
+ dasm_put(Dst, 9615, -BCBIAS_J*4);
} else {
- dasm_put(Dst, 9611, -BCBIAS_J*4);
+ dasm_put(Dst, 9630, -BCBIAS_J*4);
}
- dasm_put(Dst, 9512);
+ dasm_put(Dst, 9531);
if (op == BC_ISEQV || op == BC_ISNEV) {
- dasm_put(Dst, 9626, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<<MM_eq);
+ dasm_put(Dst, 9645, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<<MM_eq);
if (vk) {
- dasm_put(Dst, 9684);
+ dasm_put(Dst, 9703);
} else {
- dasm_put(Dst, 9688);
+ dasm_put(Dst, 9707);
}
- dasm_put(Dst, 9694);
+ dasm_put(Dst, 9713);
}
break;
case BC_ISEQS: case BC_ISNES:
vk = op == BC_ISEQS;
- dasm_put(Dst, 9699, LJ_TSTR);
+ dasm_put(Dst, 9718, LJ_TSTR);
iseqne_test:
if (vk) {
- dasm_put(Dst, 9582);
+ dasm_put(Dst, 9601);
} else {
dasm_put(Dst, 2833);
}
goto iseqne_end;
case BC_ISEQN: case BC_ISNEN:
vk = op == BC_ISEQN;
- dasm_put(Dst, 9724, LJ_TISNUM);
+ dasm_put(Dst, 9743, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 9738);
+ dasm_put(Dst, 9757);
} else {
- dasm_put(Dst, 9751);
+ dasm_put(Dst, 9770);
if (cmov) {
- dasm_put(Dst, 9475);
+ dasm_put(Dst, 9494);
} else {
- dasm_put(Dst, 9481);
+ dasm_put(Dst, 9500);
}
}
goto iseqne_fp;
case BC_ISEQP: case BC_ISNEP:
vk = op == BC_ISEQP;
- dasm_put(Dst, 9759);
+ dasm_put(Dst, 9778);
goto iseqne_test;
/* -- Unary test and copy ops ------------------------------------------- */
case BC_ISTC: case BC_ISFC: case BC_IST: case BC_ISF:
- dasm_put(Dst, 9771, LJ_TISTRUECOND);
+ dasm_put(Dst, 9790, LJ_TISTRUECOND);
if (op == BC_IST || op == BC_ISTC) {
- dasm_put(Dst, 9783);
+ dasm_put(Dst, 9802);
} else {
- dasm_put(Dst, 9788);
+ dasm_put(Dst, 9807);
}
if (op == BC_ISTC || op == BC_ISFC) {
- dasm_put(Dst, 9793);
+ dasm_put(Dst, 9812);
}
- dasm_put(Dst, 9804, -BCBIAS_J*4);
+ dasm_put(Dst, 9823, -BCBIAS_J*4);
break;
/* -- Unary ops --------------------------------------------------------- */
case BC_MOV:
- dasm_put(Dst, 9837);
+ dasm_put(Dst, 9856);
break;
case BC_NOT:
- dasm_put(Dst, 9872, LJ_TISTRUECOND, LJ_TTRUE);
+ dasm_put(Dst, 9891, LJ_TISTRUECOND, LJ_TTRUE);
break;
case BC_UNM:
- dasm_put(Dst, 9909, LJ_TISNUM);
+ dasm_put(Dst, 9928, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 9920, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32));
+ dasm_put(Dst, 9939, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32));
} else {
- dasm_put(Dst, 9945);
+ dasm_put(Dst, 9964);
}
- dasm_put(Dst, 9512);
+ dasm_put(Dst, 9531);
break;
case BC_LEN:
- dasm_put(Dst, 9954, LJ_TSTR);
+ dasm_put(Dst, 9973, LJ_TSTR);
if (sse) {
- dasm_put(Dst, 9968, Dt5(->len));
+ dasm_put(Dst, 9987, Dt5(->len));
} else {
- dasm_put(Dst, 9986, Dt5(->len));
+ dasm_put(Dst, 10005, Dt5(->len));
}
- dasm_put(Dst, 9995, LJ_TTAB);
+ dasm_put(Dst, 10014, LJ_TTAB);
if (sse) {
- dasm_put(Dst, 10037);
+ dasm_put(Dst, 10056);
} else {
}
- dasm_put(Dst, 10046);
+ dasm_put(Dst, 10065);
break;
/* -- Binary ops -------------------------------------------------------- */
case BC_ADDVN: case BC_ADDNV: case BC_ADDVV:
- dasm_put(Dst, 10056);
+ dasm_put(Dst, 10075);
vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
switch (vk) {
case 0:
- dasm_put(Dst, 10064, LJ_TISNUM);
+ dasm_put(Dst, 10083, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10076);
+ dasm_put(Dst, 10095);
} else {
- dasm_put(Dst, 10091);
+ dasm_put(Dst, 10110);
}
break;
case 1:
- dasm_put(Dst, 10100, LJ_TISNUM);
+ dasm_put(Dst, 10119, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10112);
+ dasm_put(Dst, 10131);
} else {
- dasm_put(Dst, 10127);
+ dasm_put(Dst, 10146);
}
break;
default:
- dasm_put(Dst, 10136, LJ_TISNUM, LJ_TISNUM);
+ dasm_put(Dst, 10155, LJ_TISNUM, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10158);
+ dasm_put(Dst, 10177);
} else {
- dasm_put(Dst, 10172);
+ dasm_put(Dst, 10191);
}
break;
}
if (sse) {
- dasm_put(Dst, 9938);
+ dasm_put(Dst, 9957);
} else {
- dasm_put(Dst, 9950);
+ dasm_put(Dst, 9969);
}
- dasm_put(Dst, 9512);
+ dasm_put(Dst, 9531);
break;
case BC_SUBVN: case BC_SUBNV: case BC_SUBVV:
- dasm_put(Dst, 10056);
+ dasm_put(Dst, 10075);
vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
switch (vk) {
case 0:
- dasm_put(Dst, 10064, LJ_TISNUM);
+ dasm_put(Dst, 10083, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10180);
+ dasm_put(Dst, 10199);
} else {
- dasm_put(Dst, 10195);
+ dasm_put(Dst, 10214);
}
break;
case 1:
- dasm_put(Dst, 10100, LJ_TISNUM);
+ dasm_put(Dst, 10119, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10204);
+ dasm_put(Dst, 10223);
} else {
- dasm_put(Dst, 10219);
+ dasm_put(Dst, 10238);
}
break;
default:
- dasm_put(Dst, 10136, LJ_TISNUM, LJ_TISNUM);
+ dasm_put(Dst, 10155, LJ_TISNUM, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10228);
+ dasm_put(Dst, 10247);
} else {
- dasm_put(Dst, 10242);
+ dasm_put(Dst, 10261);
}
break;
}
if (sse) {
- dasm_put(Dst, 9938);
+ dasm_put(Dst, 9957);
} else {
- dasm_put(Dst, 9950);
+ dasm_put(Dst, 9969);
}
- dasm_put(Dst, 9512);
+ dasm_put(Dst, 9531);
break;
case BC_MULVN: case BC_MULNV: case BC_MULVV:
- dasm_put(Dst, 10056);
+ dasm_put(Dst, 10075);
vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
switch (vk) {
case 0:
- dasm_put(Dst, 10064, LJ_TISNUM);
+ dasm_put(Dst, 10083, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10250);
+ dasm_put(Dst, 10269);
} else {
- dasm_put(Dst, 10265);
+ dasm_put(Dst, 10284);
}
break;
case 1:
- dasm_put(Dst, 10100, LJ_TISNUM);
+ dasm_put(Dst, 10119, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10274);
+ dasm_put(Dst, 10293);
} else {
- dasm_put(Dst, 10289);
+ dasm_put(Dst, 10308);
}
break;
default:
- dasm_put(Dst, 10136, LJ_TISNUM, LJ_TISNUM);
+ dasm_put(Dst, 10155, LJ_TISNUM, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10298);
+ dasm_put(Dst, 10317);
} else {
- dasm_put(Dst, 10312);
+ dasm_put(Dst, 10331);
}
break;
}
if (sse) {
- dasm_put(Dst, 9938);
+ dasm_put(Dst, 9957);
} else {
- dasm_put(Dst, 9950);
+ dasm_put(Dst, 9969);
}
- dasm_put(Dst, 9512);
+ dasm_put(Dst, 9531);
break;
case BC_DIVVN: case BC_DIVNV: case BC_DIVVV:
- dasm_put(Dst, 10056);
+ dasm_put(Dst, 10075);
vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
switch (vk) {
case 0:
- dasm_put(Dst, 10064, LJ_TISNUM);
+ dasm_put(Dst, 10083, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10320);
+ dasm_put(Dst, 10339);
} else {
- dasm_put(Dst, 10335);
+ dasm_put(Dst, 10354);
}
break;
case 1:
- dasm_put(Dst, 10100, LJ_TISNUM);
+ dasm_put(Dst, 10119, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10344);
+ dasm_put(Dst, 10363);
} else {
- dasm_put(Dst, 10359);
+ dasm_put(Dst, 10378);
}
break;
default:
- dasm_put(Dst, 10136, LJ_TISNUM, LJ_TISNUM);
+ dasm_put(Dst, 10155, LJ_TISNUM, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10368);
+ dasm_put(Dst, 10387);
} else {
- dasm_put(Dst, 10382);
+ dasm_put(Dst, 10401);
}
break;
}
if (sse) {
- dasm_put(Dst, 9938);
+ dasm_put(Dst, 9957);
} else {
- dasm_put(Dst, 9950);
+ dasm_put(Dst, 9969);
}
- dasm_put(Dst, 9512);
+ dasm_put(Dst, 9531);
break;
case BC_MODVN:
- dasm_put(Dst, 10056);
+ dasm_put(Dst, 10075);
vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
switch (vk) {
case 0:
- dasm_put(Dst, 10064, LJ_TISNUM);
+ dasm_put(Dst, 10083, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10390);
+ dasm_put(Dst, 10409);
} else {
- dasm_put(Dst, 10405);
+ dasm_put(Dst, 10424);
}
break;
case 1:
- dasm_put(Dst, 10100, LJ_TISNUM);
+ dasm_put(Dst, 10119, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10414);
+ dasm_put(Dst, 10433);
} else {
- dasm_put(Dst, 10429);
+ dasm_put(Dst, 10448);
}
break;
default:
- dasm_put(Dst, 10136, LJ_TISNUM, LJ_TISNUM);
+ dasm_put(Dst, 10155, LJ_TISNUM, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10438);
+ dasm_put(Dst, 10457);
} else {
- dasm_put(Dst, 10452);
+ dasm_put(Dst, 10471);
}
break;
}
- dasm_put(Dst, 10460);
+ dasm_put(Dst, 10479);
if (sse) {
- dasm_put(Dst, 9938);
+ dasm_put(Dst, 9957);
} else {
- dasm_put(Dst, 9950);
+ dasm_put(Dst, 9969);
}
- dasm_put(Dst, 9512);
+ dasm_put(Dst, 9531);
break;
case BC_MODNV: case BC_MODVV:
- dasm_put(Dst, 10056);
+ dasm_put(Dst, 10075);
vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
switch (vk) {
case 0:
- dasm_put(Dst, 10064, LJ_TISNUM);
+ dasm_put(Dst, 10083, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10390);
+ dasm_put(Dst, 10409);
} else {
- dasm_put(Dst, 10405);
+ dasm_put(Dst, 10424);
}
break;
case 1:
- dasm_put(Dst, 10100, LJ_TISNUM);
+ dasm_put(Dst, 10119, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10414);
+ dasm_put(Dst, 10433);
} else {
- dasm_put(Dst, 10429);
+ dasm_put(Dst, 10448);
}
break;
default:
- dasm_put(Dst, 10136, LJ_TISNUM, LJ_TISNUM);
+ dasm_put(Dst, 10155, LJ_TISNUM, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10438);
+ dasm_put(Dst, 10457);
} else {
- dasm_put(Dst, 10452);
+ dasm_put(Dst, 10471);
}
break;
}
- dasm_put(Dst, 10466);
+ dasm_put(Dst, 10485);
break;
case BC_POW:
- dasm_put(Dst, 10056);
+ dasm_put(Dst, 10075);
vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
switch (vk) {
case 0:
- dasm_put(Dst, 10064, LJ_TISNUM);
+ dasm_put(Dst, 10083, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10390);
+ dasm_put(Dst, 10409);
} else {
- dasm_put(Dst, 10405);
+ dasm_put(Dst, 10424);
}
break;
case 1:
- dasm_put(Dst, 10100, LJ_TISNUM);
+ dasm_put(Dst, 10119, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10414);
+ dasm_put(Dst, 10433);
} else {
- dasm_put(Dst, 10429);
+ dasm_put(Dst, 10448);
}
break;
default:
- dasm_put(Dst, 10136, LJ_TISNUM, LJ_TISNUM);
+ dasm_put(Dst, 10155, LJ_TISNUM, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10438);
+ dasm_put(Dst, 10457);
} else {
- dasm_put(Dst, 10452);
+ dasm_put(Dst, 10471);
}
break;
}
- dasm_put(Dst, 10471);
+ dasm_put(Dst, 10490);
if (sse) {
- dasm_put(Dst, 9938);
+ dasm_put(Dst, 9957);
} else {
- dasm_put(Dst, 9950);
+ dasm_put(Dst, 9969);
}
- dasm_put(Dst, 9512);
+ dasm_put(Dst, 9531);
break;
case BC_CAT:
- dasm_put(Dst, 10475, Dt1(->base), Dt1(->base));
+ dasm_put(Dst, 10494, Dt1(->base), Dt1(->base));
break;
/* -- Constant ops ------------------------------------------------------ */
case BC_KSTR:
- dasm_put(Dst, 10566, LJ_TSTR);
+ dasm_put(Dst, 10585, LJ_TSTR);
break;
case BC_KSHORT:
if (sse) {
- dasm_put(Dst, 10603);
+ dasm_put(Dst, 10622);
} else {
- dasm_put(Dst, 10618);
+ dasm_put(Dst, 10637);
}
- dasm_put(Dst, 9512);
+ dasm_put(Dst, 9531);
break;
case BC_KNUM:
if (sse) {
- dasm_put(Dst, 10626);
+ dasm_put(Dst, 10645);
} else {
- dasm_put(Dst, 10640);
+ dasm_put(Dst, 10659);
}
- dasm_put(Dst, 9512);
+ dasm_put(Dst, 9531);
break;
case BC_KPRI:
- dasm_put(Dst, 10648);
+ dasm_put(Dst, 10667);
break;
case BC_KNIL:
- dasm_put(Dst, 10677, LJ_TNIL);
+ dasm_put(Dst, 10696, LJ_TNIL);
break;
/* -- Upvalue and function ops ------------------------------------------ */
case BC_UGET:
- dasm_put(Dst, 10725, offsetof(GCfuncL, uvptr), DtA(->v));
+ dasm_put(Dst, 10744, offsetof(GCfuncL, uvptr), DtA(->v));
break;
case BC_USETV:
#define TV2MARKOFS \
((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv))
- dasm_put(Dst, 10771, 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, 10867);
+ dasm_put(Dst, 10790, 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, 10886);
break;
#undef TV2MARKOFS
case BC_USETS:
- dasm_put(Dst, 10879, 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, 10898, 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, 10975);
+ dasm_put(Dst, 10994);
if (sse) {
- dasm_put(Dst, 10980);
+ dasm_put(Dst, 10999);
} else {
- dasm_put(Dst, 9754);
+ dasm_put(Dst, 9773);
}
- dasm_put(Dst, 10988, offsetof(GCfuncL, uvptr), DtA(->v));
+ dasm_put(Dst, 11007, offsetof(GCfuncL, uvptr), DtA(->v));
if (sse) {
- dasm_put(Dst, 10997);
+ dasm_put(Dst, 11016);
} else {
- dasm_put(Dst, 11003);
+ dasm_put(Dst, 11022);
}
- dasm_put(Dst, 9512);
+ dasm_put(Dst, 9531);
break;
case BC_USETP:
- dasm_put(Dst, 11006, offsetof(GCfuncL, uvptr), DtA(->v));
+ dasm_put(Dst, 11025, offsetof(GCfuncL, uvptr), DtA(->v));
break;
case BC_UCLO:
- dasm_put(Dst, 11046, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base));
+ dasm_put(Dst, 11065, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base));
break;
case BC_FNEW:
- dasm_put(Dst, 11102, Dt1(->base), Dt1(->base), LJ_TFUNC);
+ dasm_put(Dst, 11121, Dt1(->base), Dt1(->base), LJ_TFUNC);
break;
/* -- Table ops --------------------------------------------------------- */
case BC_TNEW:
- dasm_put(Dst, 11169, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB);
+ dasm_put(Dst, 11188, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB);
break;
case BC_TDUP:
- dasm_put(Dst, 11293, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB);
+ dasm_put(Dst, 11312, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB);
break;
case BC_GGET:
- dasm_put(Dst, 11392, Dt7(->env));
+ dasm_put(Dst, 11411, Dt7(->env));
break;
case BC_GSET:
- dasm_put(Dst, 11412, Dt7(->env));
+ dasm_put(Dst, 11431, Dt7(->env));
break;
case BC_TGETV:
- dasm_put(Dst, 11432, LJ_TTAB, LJ_TISNUM);
+ dasm_put(Dst, 11451, LJ_TTAB, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 11465);
+ dasm_put(Dst, 11484);
} else {
}
- dasm_put(Dst, 11486, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
- dasm_put(Dst, 11580, LJ_TSTR);
+ dasm_put(Dst, 11505, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
+ dasm_put(Dst, 11599, LJ_TSTR);
break;
case BC_TGETS:
- dasm_put(Dst, 11598, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL);
- dasm_put(Dst, 11684, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
+ dasm_put(Dst, 11617, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL);
+ dasm_put(Dst, 11703, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
break;
case BC_TGETB:
- dasm_put(Dst, 11757, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
- dasm_put(Dst, 10046);
+ dasm_put(Dst, 11776, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
+ dasm_put(Dst, 10065);
break;
case BC_TSETV:
- dasm_put(Dst, 11858, LJ_TTAB, LJ_TISNUM);
+ dasm_put(Dst, 11877, LJ_TTAB, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 11465);
+ dasm_put(Dst, 11484);
} else {
}
- dasm_put(Dst, 11891, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable));
- dasm_put(Dst, 11976, Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
+ dasm_put(Dst, 11910, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable));
+ dasm_put(Dst, 11995, Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
break;
case BC_TSETS:
- dasm_put(Dst, 12040, 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, 12117, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, DtB(->next));
- dasm_put(Dst, 12209, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
+ dasm_put(Dst, 12059, 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, 12136, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, DtB(->next));
+ dasm_put(Dst, 12228, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
break;
case BC_TSETB:
- dasm_put(Dst, 12301, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable));
- dasm_put(Dst, 12401, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
+ dasm_put(Dst, 12320, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable));
+ dasm_put(Dst, 12420, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
break;
case BC_TSETM:
- dasm_put(Dst, 12449);
+ dasm_put(Dst, 12468);
if (sse) {
- dasm_put(Dst, 10980);
+ dasm_put(Dst, 10999);
} else {
}
- dasm_put(Dst, 12454, Dt6(->marked), LJ_GC_BLACK);
+ dasm_put(Dst, 12473, Dt6(->marked), LJ_GC_BLACK);
if (sse) {
- dasm_put(Dst, 12479);
+ dasm_put(Dst, 12498);
} else {
}
- dasm_put(Dst, 12487, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain));
- dasm_put(Dst, 12623, Dt6(->gclist));
+ dasm_put(Dst, 12506, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain));
+ dasm_put(Dst, 12642, Dt6(->gclist));
break;
/* -- Calls and vararg handling ----------------------------------------- */
case BC_CALL: case BC_CALLM:
- dasm_put(Dst, 10060);
+ dasm_put(Dst, 10079);
if (op == BC_CALLM) {
- dasm_put(Dst, 12631);
+ dasm_put(Dst, 12650);
}
- dasm_put(Dst, 12636, LJ_TFUNC, Dt7(->pc));
+ dasm_put(Dst, 12655, LJ_TFUNC, Dt7(->pc));
break;
case BC_CALLMT:
- dasm_put(Dst, 12631);
+ dasm_put(Dst, 12650);
break;
case BC_CALLT:
- dasm_put(Dst, 12679, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc));
- dasm_put(Dst, 12803, FRAME_TYPE, Dt7(->pc), PC2PROTO(k));
+ dasm_put(Dst, 12698, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc));
+ dasm_put(Dst, 12822, FRAME_TYPE, Dt7(->pc), PC2PROTO(k));
break;
case BC_ITERC:
- dasm_put(Dst, 12864, LJ_TFUNC, 2+1, Dt7(->pc));
+ dasm_put(Dst, 12883, LJ_TFUNC, 2+1, Dt7(->pc));
break;
case BC_VARG:
- dasm_put(Dst, 12946, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL);
- dasm_put(Dst, 13100, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top));
+ dasm_put(Dst, 12965, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL);
+ dasm_put(Dst, 13119, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top));
break;
/* -- Returns ----------------------------------------------------------- */
case BC_RETM:
- dasm_put(Dst, 12631);
+ dasm_put(Dst, 12650);
break;
case BC_RET: case BC_RET0: case BC_RET1:
if (op != BC_RET0) {
- dasm_put(Dst, 13205);
+ dasm_put(Dst, 13224);
}
- dasm_put(Dst, 13209, FRAME_TYPE);
+ dasm_put(Dst, 13228, FRAME_TYPE);
switch (op) {
case BC_RET:
- dasm_put(Dst, 13228);
+ dasm_put(Dst, 13247);
break;
case BC_RET1:
- dasm_put(Dst, 13292);
+ dasm_put(Dst, 13311);
/* fallthrough */
case BC_RET0:
- dasm_put(Dst, 13308);
+ dasm_put(Dst, 13327);
default:
break;
}
- dasm_put(Dst, 13319, Dt7(->pc), PC2PROTO(k));
+ dasm_put(Dst, 13338, Dt7(->pc), PC2PROTO(k));
if (op == BC_RET) {
- dasm_put(Dst, 13367, LJ_TNIL);
+ dasm_put(Dst, 13386, LJ_TNIL);
} else {
- dasm_put(Dst, 13378, LJ_TNIL);
+ dasm_put(Dst, 13397, LJ_TNIL);
}
- dasm_put(Dst, 13385);
+ dasm_put(Dst, 13404);
if (op != BC_RET0) {
- dasm_put(Dst, 13405);
+ dasm_put(Dst, 13424);
}
dasm_put(Dst, 4596);
break;
@@ -2038,7 +2039,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
case BC_FORL:
#if LJ_HASJIT
- dasm_put(Dst, 13408, HOTCOUNT_PCMASK, GG_DISP2HOT);
+ dasm_put(Dst, 13427, HOTCOUNT_PCMASK, GG_DISP2HOT);
#endif
break;
@@ -2050,57 +2051,57 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
case BC_FORI:
case BC_IFORL:
vk = (op == BC_IFORL || op == BC_JFORL);
- dasm_put(Dst, 13429);
+ dasm_put(Dst, 13448);
if (!vk) {
- dasm_put(Dst, 13433, LJ_TISNUM, LJ_TISNUM);
+ dasm_put(Dst, 13452, LJ_TISNUM, LJ_TISNUM);
}
- dasm_put(Dst, 13452);
+ dasm_put(Dst, 13471);
if (!vk) {
- dasm_put(Dst, 13456, LJ_TISNUM);
+ dasm_put(Dst, 13475, LJ_TISNUM);
}
if (sse) {
- dasm_put(Dst, 13465);
+ dasm_put(Dst, 13484);
if (vk) {
- dasm_put(Dst, 13477);
- } else {
dasm_put(Dst, 13496);
+ } else {
+ dasm_put(Dst, 13515);
}
- dasm_put(Dst, 13501);
+ dasm_put(Dst, 13520);
} else {
- dasm_put(Dst, 13514);
+ dasm_put(Dst, 13533);
if (vk) {
- dasm_put(Dst, 13520);
+ dasm_put(Dst, 13539);
} else {
- dasm_put(Dst, 13536);
+ dasm_put(Dst, 13555);
}
- dasm_put(Dst, 13544);
+ dasm_put(Dst, 13563);
if (cmov) {
- dasm_put(Dst, 9475);
+ dasm_put(Dst, 9494);
} else {
- dasm_put(Dst, 9481);
+ dasm_put(Dst, 9500);
}
if (!cmov) {
- dasm_put(Dst, 13549);
+ dasm_put(Dst, 13568);
}
}
if (op == BC_FORI) {
- dasm_put(Dst, 13555, -BCBIAS_J*4);
+ dasm_put(Dst, 13574, -BCBIAS_J*4);
} else if (op == BC_JFORI) {
- dasm_put(Dst, 13565, -BCBIAS_J*4, BC_JLOOP);
+ dasm_put(Dst, 13584, -BCBIAS_J*4, BC_JLOOP);
} else if (op == BC_IFORL) {
- dasm_put(Dst, 13579, -BCBIAS_J*4);
+ dasm_put(Dst, 13598, -BCBIAS_J*4);
} else {
- dasm_put(Dst, 13575, BC_JLOOP);
+ dasm_put(Dst, 13594, BC_JLOOP);
}
- dasm_put(Dst, 9510);
+ dasm_put(Dst, 9529);
if (sse) {
- dasm_put(Dst, 13589);
+ dasm_put(Dst, 13608);
}
break;
case BC_ITERL:
#if LJ_HASJIT
- dasm_put(Dst, 13408, HOTCOUNT_PCMASK, GG_DISP2HOT);
+ dasm_put(Dst, 13427, HOTCOUNT_PCMASK, GG_DISP2HOT);
#endif
break;
@@ -2109,33 +2110,33 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
break;
#endif
case BC_IITERL:
- dasm_put(Dst, 13600, LJ_TNIL);
+ dasm_put(Dst, 13619, LJ_TNIL);
if (op == BC_JITERL) {
- dasm_put(Dst, 13615, BC_JLOOP);
+ dasm_put(Dst, 13634, BC_JLOOP);
} else {
- dasm_put(Dst, 13629, -BCBIAS_J*4);
+ dasm_put(Dst, 13648, -BCBIAS_J*4);
}
- dasm_put(Dst, 9814);
+ dasm_put(Dst, 9833);
break;
case BC_LOOP:
#if LJ_HASJIT
- dasm_put(Dst, 13408, HOTCOUNT_PCMASK, GG_DISP2HOT);
+ dasm_put(Dst, 13427, HOTCOUNT_PCMASK, GG_DISP2HOT);
#endif
break;
case BC_ILOOP:
- dasm_put(Dst, 9512);
+ dasm_put(Dst, 9531);
break;
case BC_JLOOP:
#if LJ_HASJIT
- dasm_put(Dst, 13645, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L));
+ dasm_put(Dst, 13664, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L));
#endif
break;
case BC_JMP:
- dasm_put(Dst, 13672, -BCBIAS_J*4);
+ dasm_put(Dst, 13705, -BCBIAS_J*4);
break;
/* -- Function headers -------------------------------------------------- */
@@ -2158,47 +2159,47 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
break;
#endif
case BC_IFUNCF:
- dasm_put(Dst, 13698, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams));
+ dasm_put(Dst, 13731, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams));
if (op == BC_JFUNCF) {
- dasm_put(Dst, 13729, BC_JLOOP);
+ dasm_put(Dst, 13762, BC_JLOOP);
} else {
- dasm_put(Dst, 9512);
+ dasm_put(Dst, 9531);
}
- dasm_put(Dst, 13738, LJ_TNIL);
+ dasm_put(Dst, 13771, LJ_TNIL);
break;
case BC_JFUNCV:
#if !LJ_HASJIT
break;
#endif
- dasm_put(Dst, 9207);
+ dasm_put(Dst, 9226);
break; /* NYI: compiled vararg functions. */
case BC_IFUNCV:
- dasm_put(Dst, 13760, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL);
+ dasm_put(Dst, 13793, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL);
if (op == BC_JFUNCV) {
- dasm_put(Dst, 13729, BC_JLOOP);
+ dasm_put(Dst, 13762, BC_JLOOP);
} else {
- dasm_put(Dst, 13857, -4+PC2PROTO(k));
+ dasm_put(Dst, 13890, -4+PC2PROTO(k));
}
- dasm_put(Dst, 13882, LJ_TNIL);
+ dasm_put(Dst, 13915, LJ_TNIL);
break;
case BC_FUNCC:
case BC_FUNCCW:
- dasm_put(Dst, 13904, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top));
+ dasm_put(Dst, 13937, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top));
if (op == BC_FUNCC) {
- dasm_put(Dst, 13934);
+ dasm_put(Dst, 13967);
} else {
- dasm_put(Dst, 13938);
+ dasm_put(Dst, 13971);
}
- dasm_put(Dst, 13946, DISPATCH_GL(vmstate), ~LJ_VMST_C);
+ dasm_put(Dst, 13979, DISPATCH_GL(vmstate), ~LJ_VMST_C);
if (op == BC_FUNCC) {
- dasm_put(Dst, 13956);
+ dasm_put(Dst, 13989);
} else {
- dasm_put(Dst, 13961, DISPATCH_GL(wrapf));
+ dasm_put(Dst, 13994, DISPATCH_GL(wrapf));
}
- dasm_put(Dst, 13967, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top));
+ dasm_put(Dst, 14000, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top));
break;
/* ---------------------------------------------------------------------- */
@@ -2226,7 +2227,7 @@ static int build_backend(BuildCtx *ctx)
build_subroutines(ctx, cmov, sse);
- dasm_put(Dst, 13993);
+ dasm_put(Dst, 14026);
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 b0c90b81..de65f400 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[13802] = {
+static const unsigned char build_actionlist[13976] = {
254,1,248,10,252,247,198,237,15,132,244,11,131,230,252,248,41,252,242,72,
141,76,49,252,248,139,114,252,252,199,68,10,4,237,248,12,131,192,1,137,68,
36,84,252,247,198,237,15,132,244,13,248,14,252,247,198,237,15,132,244,10,
@@ -377,138 +377,142 @@ static const unsigned char build_actionlist[13802] = {
117,176,252,242,15,17,109,168,252,242,15,17,101,160,252,242,15,17,93,152,
252,242,15,17,85,144,252,242,15,17,77,136,252,242,15,17,69,128,139,171,233,
139,147,233,72,137,171,233,137,149,233,72,141,148,253,36,233,141,139,233,
- 232,251,1,23,72,139,141,233,72,129,225,239,72,137,204,137,108,36,96,133,192,
- 15,133,244,247,139,149,233,139,116,36,100,255,248,144,255,139,122,252,248,
- 139,191,233,139,191,233,199,131,233,0,0,0,0,199,131,233,237,139,6,15,182,
- 204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,1,137,252,233,
- 137,194,232,251,1,24,255,248,82,255,217,124,36,4,137,68,36,8,102,184,0,4,
- 102,11,68,36,4,102,37,252,255,252,247,102,137,68,36,6,217,108,36,6,217,252,
- 252,217,108,36,4,139,68,36,8,195,255,248,145,72,184,237,237,102,72,15,110,
- 208,72,184,237,237,102,72,15,110,216,15,40,200,102,15,84,202,102,15,46,217,
- 15,134,244,247,102,15,85,208,252,242,15,88,203,252,242,15,92,203,102,15,86,
- 202,72,184,237,237,102,72,15,110,208,252,242,15,194,193,1,102,15,84,194,252,
- 242,15,92,200,15,40,193,248,1,195,248,84,255,217,124,36,4,137,68,36,8,102,
- 184,0,8,102,11,68,36,4,102,37,252,255,252,251,102,137,68,36,6,217,108,36,
- 6,217,252,252,217,108,36,4,139,68,36,8,195,255,248,146,72,184,237,237,102,
- 72,15,110,208,72,184,237,237,102,72,15,110,216,15,40,200,102,15,84,202,102,
- 15,46,217,15,134,244,247,102,15,85,208,252,242,15,88,203,252,242,15,92,203,
- 102,15,86,202,72,184,237,237,102,72,15,110,208,252,242,15,194,193,6,102,15,
- 84,194,252,242,15,92,200,15,40,193,248,1,195,248,104,255,217,124,36,4,137,
- 68,36,8,102,184,0,12,102,11,68,36,4,102,137,68,36,6,217,108,36,6,217,252,
- 252,217,108,36,4,139,68,36,8,195,255,248,147,72,184,237,237,102,72,15,110,
- 208,72,184,237,237,102,72,15,110,216,15,40,200,102,15,84,202,102,15,46,217,
- 15,134,244,247,102,15,85,208,15,40,193,252,242,15,88,203,252,242,15,92,203,
- 72,184,237,237,102,72,15,110,216,252,242,15,194,193,1,102,15,84,195,252,242,
- 15,92,200,102,15,86,202,15,40,193,248,1,195,248,148,255,15,40,232,252,242,
- 15,94,193,72,184,237,237,102,72,15,110,208,72,184,237,237,102,72,15,110,216,
- 15,40,224,102,15,84,226,102,15,46,220,15,134,244,247,102,15,85,208,252,242,
- 15,88,227,252,242,15,92,227,102,15,86,226,72,184,237,237,102,72,15,110,208,
- 252,242,15,194,196,1,102,15,84,194,252,242,15,92,224,15,40,197,252,242,15,
- 89,204,252,242,15,92,193,195,248,1,252,242,15,89,200,15,40,197,252,242,15,
- 92,193,195,255,217,193,216,252,241,217,124,36,4,102,184,0,4,102,11,68,36,
- 4,102,37,252,255,252,247,102,137,68,36,6,217,108,36,6,217,252,252,217,108,
- 36,4,222,201,222,252,233,195,255,248,88,217,252,234,222,201,248,149,217,84,
- 36,8,129,124,36,8,0,0,128,127,15,132,244,247,129,124,36,8,0,0,128,252,255,
- 15,132,244,248,248,150,217,192,217,252,252,220,252,233,217,201,217,252,240,
- 217,232,222,193,217,252,253,221,217,248,1,195,248,2,221,216,217,252,238,195,
- 255,248,107,255,248,151,252,242,15,45,193,252,242,15,42,208,102,15,46,202,
- 15,133,244,254,15,138,244,255,248,152,131,252,248,1,15,142,244,252,248,1,
- 169,1,0,0,0,15,133,244,248,252,242,15,89,192,209,232,252,233,244,1,248,2,
- 209,232,15,132,244,251,15,40,200,248,3,252,242,15,89,192,209,232,15,132,244,
- 250,15,131,244,3,255,252,242,15,89,200,252,233,244,3,248,4,252,242,15,89,
- 193,248,5,195,248,6,15,132,244,5,15,130,244,253,80,72,184,237,237,102,72,
- 15,110,200,252,242,15,94,200,88,15,40,193,252,247,216,131,252,248,1,15,132,
- 244,5,252,233,244,1,248,7,72,184,237,237,102,72,15,110,192,195,248,8,102,
- 72,15,126,200,72,209,224,72,193,192,12,72,61,252,254,15,0,0,15,132,244,248,
- 255,102,72,15,126,192,72,209,224,15,132,244,250,72,193,192,12,72,61,252,254,
- 15,0,0,15,132,244,251,252,242,15,17,76,36,16,252,242,15,17,68,36,8,221,68,
- 36,16,221,68,36,8,217,252,241,217,192,217,252,252,220,252,233,217,201,217,
- 252,240,217,232,222,193,217,252,253,221,217,221,92,36,8,252,242,15,16,68,
- 36,8,195,248,9,72,184,237,237,102,72,15,110,208,102,15,46,194,15,132,244,
- 247,15,40,193,248,1,195,248,2,72,184,237,237,102,72,15,110,208,102,15,84,
- 194,72,184,237,237,102,72,15,110,208,102,15,46,194,15,132,244,1,102,15,80,
- 193,15,87,192,136,196,15,146,208,48,224,15,133,244,1,248,3,72,184,237,237,
- 255,102,72,15,110,192,195,248,4,102,15,80,193,133,192,15,133,244,3,15,87,
- 192,195,248,5,102,15,80,193,133,192,15,132,244,3,15,87,192,195,248,153,255,
+ 232,251,1,23,72,139,141,233,72,129,225,239,137,169,233,139,149,233,139,177,
+ 233,252,233,244,247,255,248,144,255,49,192,72,141,140,253,36,233,248,1,102,
+ 68,15,111,185,233,102,68,15,111,177,233,102,68,15,111,169,233,102,68,15,111,
+ 161,233,102,68,15,111,153,233,102,68,15,111,145,233,102,68,15,111,137,233,
+ 102,68,15,111,129,233,102,15,111,185,233,72,137,204,102,15,111,49,76,139,
+ 124,36,16,76,139,116,36,24,76,139,108,36,32,76,139,100,36,80,133,192,15,133,
+ 244,248,139,122,252,248,139,191,233,139,191,233,199,131,233,0,0,0,0,199,131,
+ 233,237,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,
+ 248,2,137,252,233,137,194,232,251,1,24,255,248,82,255,217,124,36,4,137,68,
+ 36,8,102,184,0,4,102,11,68,36,4,102,37,252,255,252,247,102,137,68,36,6,217,
+ 108,36,6,217,252,252,217,108,36,4,139,68,36,8,195,255,248,145,72,184,237,
+ 237,102,72,15,110,208,72,184,237,237,102,72,15,110,216,15,40,200,102,15,84,
+ 202,102,15,46,217,15,134,244,247,102,15,85,208,252,242,15,88,203,252,242,
+ 15,92,203,102,15,86,202,72,184,237,237,102,72,15,110,208,252,242,15,194,193,
+ 1,102,15,84,194,252,242,15,92,200,15,40,193,248,1,195,248,84,255,217,124,
+ 36,4,137,68,36,8,102,184,0,8,102,11,68,36,4,102,37,252,255,252,251,102,137,
+ 68,36,6,217,108,36,6,217,252,252,217,108,36,4,139,68,36,8,195,255,248,146,
+ 72,184,237,237,102,72,15,110,208,72,184,237,237,102,72,15,110,216,15,40,200,
+ 102,15,84,202,102,15,46,217,15,134,244,247,102,15,85,208,252,242,15,88,203,
+ 252,242,15,92,203,102,15,86,202,72,184,237,237,102,72,15,110,208,252,242,
+ 15,194,193,6,102,15,84,194,252,242,15,92,200,15,40,193,248,1,195,248,104,
+ 255,217,124,36,4,137,68,36,8,102,184,0,12,102,11,68,36,4,102,137,68,36,6,
+ 217,108,36,6,217,252,252,217,108,36,4,139,68,36,8,195,255,248,147,72,184,
+ 237,237,102,72,15,110,208,72,184,237,237,102,72,15,110,216,15,40,200,102,
+ 15,84,202,102,15,46,217,15,134,244,247,102,15,85,208,15,40,193,252,242,15,
+ 88,203,252,242,15,92,203,72,184,237,237,102,72,15,110,216,252,242,15,194,
+ 193,1,102,15,84,195,252,242,15,92,200,102,15,86,202,15,40,193,248,1,195,248,
+ 148,255,15,40,232,252,242,15,94,193,72,184,237,237,102,72,15,110,208,72,184,
+ 237,237,102,72,15,110,216,15,40,224,102,15,84,226,102,15,46,220,15,134,244,
+ 247,102,15,85,208,252,242,15,88,227,252,242,15,92,227,102,15,86,226,72,184,
+ 237,237,102,72,15,110,208,252,242,15,194,196,1,102,15,84,194,252,242,15,92,
+ 224,15,40,197,252,242,15,89,204,252,242,15,92,193,195,248,1,252,242,15,89,
+ 200,15,40,197,252,242,15,92,193,195,255,217,193,216,252,241,217,124,36,4,
+ 102,184,0,4,102,11,68,36,4,102,37,252,255,252,247,102,137,68,36,6,217,108,
+ 36,6,217,252,252,217,108,36,4,222,201,222,252,233,195,255,248,88,217,252,
+ 234,222,201,248,149,217,84,36,8,129,124,36,8,0,0,128,127,15,132,244,247,129,
+ 124,36,8,0,0,128,252,255,15,132,244,248,248,150,217,192,217,252,252,220,252,
+ 233,217,201,217,252,240,217,232,222,193,217,252,253,221,217,248,1,195,248,
+ 2,221,216,217,252,238,195,255,248,107,255,248,151,252,242,15,45,193,252,242,
+ 15,42,208,102,15,46,202,15,133,244,254,15,138,244,255,248,152,131,252,248,
+ 1,15,142,244,252,248,1,169,1,0,0,0,15,133,244,248,252,242,15,89,192,209,232,
+ 252,233,244,1,248,2,209,232,15,132,244,251,15,40,200,248,3,252,242,15,89,
+ 192,209,232,15,132,244,250,15,131,244,3,255,252,242,15,89,200,252,233,244,
+ 3,248,4,252,242,15,89,193,248,5,195,248,6,15,132,244,5,15,130,244,253,80,
+ 72,184,237,237,102,72,15,110,200,252,242,15,94,200,88,15,40,193,252,247,216,
+ 131,252,248,1,15,132,244,5,252,233,244,1,248,7,72,184,237,237,102,72,15,110,
+ 192,195,248,8,102,72,15,126,200,72,209,224,72,193,192,12,72,61,252,254,15,
+ 0,0,15,132,244,248,255,102,72,15,126,192,72,209,224,15,132,244,250,72,193,
+ 192,12,72,61,252,254,15,0,0,15,132,244,251,252,242,15,17,76,36,16,252,242,
+ 15,17,68,36,8,221,68,36,16,221,68,36,8,217,252,241,217,192,217,252,252,220,
+ 252,233,217,201,217,252,240,217,232,222,193,217,252,253,221,217,221,92,36,
+ 8,252,242,15,16,68,36,8,195,248,9,72,184,237,237,102,72,15,110,208,102,15,
+ 46,194,15,132,244,247,15,40,193,248,1,195,248,2,72,184,237,237,102,72,15,
+ 110,208,102,15,84,194,72,184,237,237,102,72,15,110,208,102,15,46,194,15,132,
+ 244,1,102,15,80,193,15,87,192,136,196,15,146,208,48,224,15,133,244,1,248,
+ 3,72,184,237,237,255,102,72,15,110,192,195,248,4,102,15,80,193,133,192,15,
+ 133,244,3,15,87,192,195,248,5,102,15,80,193,133,192,15,132,244,3,15,87,192,
+ 195,248,153,255,131,252,250,1,15,130,244,82,15,132,244,84,131,252,250,3,15,
+ 130,244,104,15,135,244,248,252,242,15,81,192,195,248,2,252,242,15,17,68,36,
+ 8,221,68,36,8,131,252,250,5,15,135,244,248,88,15,132,244,247,232,244,88,80,
+ 252,233,244,253,248,1,232,244,149,255,80,252,233,244,253,248,2,131,252,250,
+ 7,15,132,244,247,15,135,244,248,217,252,237,217,201,217,252,241,252,233,244,
+ 253,248,1,217,232,217,201,217,252,241,252,233,244,253,248,2,131,252,250,9,
+ 15,132,244,247,15,135,244,248,217,252,236,217,201,217,252,241,252,233,244,
+ 253,248,1,255,217,252,254,252,233,244,253,248,2,131,252,250,11,15,132,244,
+ 247,15,135,244,255,217,252,255,252,233,244,253,248,1,217,252,242,221,216,
+ 248,7,221,92,36,8,252,242,15,16,68,36,8,195,255,139,84,36,12,221,68,36,4,
131,252,250,1,15,130,244,82,15,132,244,84,131,252,250,3,15,130,244,104,15,
- 135,244,248,252,242,15,81,192,195,248,2,252,242,15,17,68,36,8,221,68,36,8,
- 131,252,250,5,15,135,244,248,88,15,132,244,247,232,244,88,80,252,233,244,
- 253,248,1,232,244,149,255,80,252,233,244,253,248,2,131,252,250,7,15,132,244,
- 247,15,135,244,248,217,252,237,217,201,217,252,241,252,233,244,253,248,1,
- 217,232,217,201,217,252,241,252,233,244,253,248,2,131,252,250,9,15,132,244,
- 247,15,135,244,248,217,252,236,217,201,217,252,241,252,233,244,253,248,1,
- 255,217,252,254,252,233,244,253,248,2,131,252,250,11,15,132,244,247,15,135,
- 244,255,217,252,255,252,233,244,253,248,1,217,252,242,221,216,248,7,221,92,
- 36,8,252,242,15,16,68,36,8,195,255,139,84,36,12,221,68,36,4,131,252,250,1,
- 15,130,244,82,15,132,244,84,131,252,250,3,15,130,244,104,15,135,244,248,217,
- 252,250,195,248,2,131,252,250,5,15,130,244,88,15,132,244,149,131,252,250,
- 7,15,132,244,247,15,135,244,248,217,252,237,217,201,217,252,241,195,248,1,
- 217,232,217,201,217,252,241,195,248,2,131,252,250,9,15,132,244,247,255,15,
- 135,244,248,217,252,236,217,201,217,252,241,195,248,1,217,252,254,195,248,
- 2,131,252,250,11,15,132,244,247,15,135,244,255,217,252,255,195,248,1,217,
- 252,242,221,216,195,255,248,9,204,248,154,255,65,131,252,248,1,15,132,244,
- 247,15,135,244,248,252,242,15,88,193,195,248,1,252,242,15,92,193,195,248,
- 2,65,131,252,248,3,15,132,244,247,15,135,244,248,252,242,15,89,193,195,248,
- 1,252,242,15,94,193,195,248,2,65,131,252,248,5,15,130,244,148,15,132,244,
- 107,65,131,252,248,7,15,132,244,247,15,135,244,248,72,184,237,237,255,102,
- 72,15,110,200,15,87,193,195,248,1,72,184,237,237,102,72,15,110,200,15,84,
- 193,195,248,2,65,131,252,248,9,15,135,244,248,252,242,15,17,68,36,8,252,242,
- 15,17,76,36,16,221,68,36,8,221,68,36,16,15,132,244,247,217,252,243,248,7,
- 221,92,36,8,252,242,15,16,68,36,8,195,248,1,217,201,217,252,253,221,217,252,
- 233,244,7,248,2,65,131,252,248,11,15,132,244,247,15,135,244,255,252,242,15,
- 93,193,195,248,1,252,242,15,95,193,195,248,9,204,255,139,68,36,20,221,68,
- 36,4,221,68,36,12,131,252,248,1,15,132,244,247,15,135,244,248,222,193,195,
- 248,1,222,252,233,195,248,2,131,252,248,3,15,132,244,247,15,135,244,248,222,
- 201,195,248,1,222,252,249,195,248,2,131,252,248,5,15,130,244,148,15,132,244,
- 107,131,252,248,7,15,132,244,247,15,135,244,248,255,221,216,217,224,195,248,
- 1,221,216,217,225,195,248,2,131,252,248,9,15,132,244,247,15,135,244,248,217,
- 252,243,195,248,1,217,201,217,252,253,221,217,195,248,2,131,252,248,11,15,
- 132,244,247,15,135,244,255,255,219,252,233,219,209,221,217,195,248,1,219,
- 252,233,218,209,221,217,195,255,221,225,223,224,252,246,196,1,15,132,244,
- 248,217,201,248,2,221,216,195,248,1,221,225,223,224,252,246,196,1,15,133,
- 244,248,217,201,248,2,221,216,195,255,248,155,137,200,86,72,137,214,83,15,
- 162,137,6,137,94,4,137,78,8,137,86,12,91,94,195,255,129,124,253,202,4,239,
- 15,135,244,41,129,124,253,194,4,239,15,135,244,41,255,252,242,15,16,4,194,
- 131,198,4,102,15,46,4,202,255,221,4,202,221,4,194,131,198,4,255,223,252,233,
- 221,216,255,218,252,233,223,224,158,255,15,134,244,248,255,15,131,244,248,
- 255,248,1,15,183,70,252,254,141,180,253,134,233,248,2,139,6,15,182,204,15,
- 182,232,131,198,4,193,232,16,252,255,36,252,235,255,139,108,194,4,131,198,
- 4,129,252,253,239,15,135,244,251,129,124,253,202,4,239,15,135,244,251,255,
- 252,242,15,16,4,194,102,15,46,4,202,255,221,4,202,221,4,194,255,15,138,244,
- 248,15,133,244,248,255,15,138,244,248,15,132,244,247,255,248,1,15,183,70,
- 252,254,141,180,253,134,233,248,2,255,248,2,15,183,70,252,254,141,180,253,
- 134,233,248,1,255,248,5,57,108,202,4,15,133,244,2,129,252,253,239,15,131,
- 244,1,139,12,202,139,4,194,57,193,15,132,244,1,129,252,253,239,15,135,244,
- 2,139,169,233,133,252,237,15,132,244,2,252,246,133,233,235,15,133,244,2,255,
- 49,252,237,255,189,1,0,0,0,255,252,233,244,45,255,72,252,247,208,131,198,
- 4,129,124,253,202,4,239,15,133,244,248,139,12,202,59,12,135,255,131,198,4,
- 129,124,253,202,4,239,15,135,244,248,255,252,242,15,16,4,199,102,15,46,4,
- 202,255,221,4,202,221,4,199,255,72,252,247,208,131,198,4,57,68,202,4,255,
- 139,108,194,4,131,198,4,129,252,253,239,255,15,131,244,247,255,15,130,244,
- 247,255,137,108,202,4,139,44,194,137,44,202,255,15,183,70,252,254,141,180,
- 253,134,233,248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,255,
- 36,252,235,255,139,108,194,4,139,4,194,137,108,202,4,137,4,202,139,6,15,182,
- 204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,49,252,237,129,
- 124,253,194,4,239,129,213,239,137,108,202,4,139,6,15,182,204,15,182,232,131,
- 198,4,193,232,16,252,255,36,252,235,255,129,124,253,194,4,239,15,135,244,
- 48,255,252,242,15,16,4,194,72,184,237,237,102,72,15,110,200,15,87,193,252,
- 242,15,17,4,202,255,221,4,194,217,224,221,28,202,255,129,124,253,194,4,239,
- 15,133,244,248,139,4,194,255,15,87,192,252,242,15,42,128,233,248,1,252,242,
- 15,17,4,202,255,219,128,233,248,1,221,28,202,255,139,6,15,182,204,15,182,
- 232,131,198,4,193,232,16,252,255,36,252,235,248,2,129,124,253,194,4,239,15,
- 133,244,50,139,12,194,137,213,232,251,1,18,255,252,242,15,42,192,137,252,
- 234,255,15,182,78,252,253,252,233,244,1,255,15,182,252,236,15,182,192,255,
- 129,124,253,252,234,4,239,15,135,244,46,255,252,242,15,16,4,252,234,252,242,
- 15,88,4,199,255,221,4,252,234,220,4,199,255,129,124,253,252,234,4,239,15,
- 135,244,47,255,252,242,15,16,4,199,252,242,15,88,4,252,234,255,221,4,199,
- 220,4,252,234,255,129,124,253,252,234,4,239,15,135,244,49,129,124,253,194,
- 4,239,15,135,244,49,255,252,242,15,16,4,252,234,252,242,15,88,4,194,255,221,
- 4,252,234,220,4,194,255,252,242,15,16,4,252,234,252,242,15,92,4,199,255,221,
- 4,252,234,220,36,199,255,252,242,15,16,4,199,252,242,15,92,4,252,234,255,
- 221,4,199,220,36,252,234,255,252,242,15,16,4,252,234,252,242,15,92,4,194,
- 255,221,4,252,234,220,36,194,255,252,242,15,16,4,252,234,252,242,15,89,4,
- 199,255,221,4,252,234,220,12,199,255,252,242,15,16,4,199,252,242,15,89,4,
- 252,234,255,221,4,199,220,12,252,234,255,252,242,15,16,4,252,234,252,242,
+ 135,244,248,217,252,250,195,248,2,131,252,250,5,15,130,244,88,15,132,244,
+ 149,131,252,250,7,15,132,244,247,15,135,244,248,217,252,237,217,201,217,252,
+ 241,195,248,1,217,232,217,201,217,252,241,195,248,2,131,252,250,9,15,132,
+ 244,247,255,15,135,244,248,217,252,236,217,201,217,252,241,195,248,1,217,
+ 252,254,195,248,2,131,252,250,11,15,132,244,247,15,135,244,255,217,252,255,
+ 195,248,1,217,252,242,221,216,195,255,248,9,204,248,154,255,65,131,252,248,
+ 1,15,132,244,247,15,135,244,248,252,242,15,88,193,195,248,1,252,242,15,92,
+ 193,195,248,2,65,131,252,248,3,15,132,244,247,15,135,244,248,252,242,15,89,
+ 193,195,248,1,252,242,15,94,193,195,248,2,65,131,252,248,5,15,130,244,148,
+ 15,132,244,107,65,131,252,248,7,15,132,244,247,15,135,244,248,72,184,237,
+ 237,255,102,72,15,110,200,15,87,193,195,248,1,72,184,237,237,102,72,15,110,
+ 200,15,84,193,195,248,2,65,131,252,248,9,15,135,244,248,252,242,15,17,68,
+ 36,8,252,242,15,17,76,36,16,221,68,36,8,221,68,36,16,15,132,244,247,217,252,
+ 243,248,7,221,92,36,8,252,242,15,16,68,36,8,195,248,1,217,201,217,252,253,
+ 221,217,252,233,244,7,248,2,65,131,252,248,11,15,132,244,247,15,135,244,255,
+ 252,242,15,93,193,195,248,1,252,242,15,95,193,195,248,9,204,255,139,68,36,
+ 20,221,68,36,4,221,68,36,12,131,252,248,1,15,132,244,247,15,135,244,248,222,
+ 193,195,248,1,222,252,233,195,248,2,131,252,248,3,15,132,244,247,15,135,244,
+ 248,222,201,195,248,1,222,252,249,195,248,2,131,252,248,5,15,130,244,148,
+ 15,132,244,107,131,252,248,7,15,132,244,247,15,135,244,248,255,221,216,217,
+ 224,195,248,1,221,216,217,225,195,248,2,131,252,248,9,15,132,244,247,15,135,
+ 244,248,217,252,243,195,248,1,217,201,217,252,253,221,217,195,248,2,131,252,
+ 248,11,15,132,244,247,15,135,244,255,255,219,252,233,219,209,221,217,195,
+ 248,1,219,252,233,218,209,221,217,195,255,221,225,223,224,252,246,196,1,15,
+ 132,244,248,217,201,248,2,221,216,195,248,1,221,225,223,224,252,246,196,1,
+ 15,133,244,248,217,201,248,2,221,216,195,255,248,155,137,200,86,72,137,214,
+ 83,15,162,137,6,137,94,4,137,78,8,137,86,12,91,94,195,255,129,124,253,202,
+ 4,239,15,135,244,41,129,124,253,194,4,239,15,135,244,41,255,252,242,15,16,
+ 4,194,131,198,4,102,15,46,4,202,255,221,4,202,221,4,194,131,198,4,255,223,
+ 252,233,221,216,255,218,252,233,223,224,158,255,15,134,244,248,255,15,131,
+ 244,248,255,248,1,15,183,70,252,254,141,180,253,134,233,248,2,139,6,15,182,
+ 204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,139,108,194,4,
+ 131,198,4,129,252,253,239,15,135,244,251,129,124,253,202,4,239,15,135,244,
+ 251,255,252,242,15,16,4,194,102,15,46,4,202,255,221,4,202,221,4,194,255,15,
+ 138,244,248,15,133,244,248,255,15,138,244,248,15,132,244,247,255,248,1,15,
+ 183,70,252,254,141,180,253,134,233,248,2,255,248,2,15,183,70,252,254,141,
+ 180,253,134,233,248,1,255,248,5,57,108,202,4,15,133,244,2,129,252,253,239,
+ 15,131,244,1,139,12,202,139,4,194,57,193,15,132,244,1,129,252,253,239,15,
+ 135,244,2,139,169,233,133,252,237,15,132,244,2,252,246,133,233,235,15,133,
+ 244,2,255,49,252,237,255,189,1,0,0,0,255,252,233,244,45,255,72,252,247,208,
+ 131,198,4,129,124,253,202,4,239,15,133,244,248,139,12,202,59,12,135,255,131,
+ 198,4,129,124,253,202,4,239,15,135,244,248,255,252,242,15,16,4,199,102,15,
+ 46,4,202,255,221,4,202,221,4,199,255,72,252,247,208,131,198,4,57,68,202,4,
+ 255,139,108,194,4,131,198,4,129,252,253,239,255,15,131,244,247,255,15,130,
+ 244,247,255,137,108,202,4,139,44,194,137,44,202,255,15,183,70,252,254,141,
+ 180,253,134,233,248,1,139,6,15,182,204,15,182,232,131,198,4,193,232,16,252,
+ 255,36,252,235,255,139,108,194,4,139,4,194,137,108,202,4,137,4,202,139,6,
+ 15,182,204,15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,49,252,
+ 237,129,124,253,194,4,239,129,213,239,137,108,202,4,139,6,15,182,204,15,182,
+ 232,131,198,4,193,232,16,252,255,36,252,235,255,129,124,253,194,4,239,15,
+ 135,244,48,255,252,242,15,16,4,194,72,184,237,237,102,72,15,110,200,15,87,
+ 193,252,242,15,17,4,202,255,221,4,194,217,224,221,28,202,255,129,124,253,
+ 194,4,239,15,133,244,248,139,4,194,255,15,87,192,252,242,15,42,128,233,248,
+ 1,252,242,15,17,4,202,255,219,128,233,248,1,221,28,202,255,139,6,15,182,204,
+ 15,182,232,131,198,4,193,232,16,252,255,36,252,235,248,2,129,124,253,194,
+ 4,239,15,133,244,50,139,12,194,137,213,232,251,1,18,255,252,242,15,42,192,
+ 137,252,234,255,15,182,78,252,253,252,233,244,1,255,15,182,252,236,15,182,
+ 192,255,129,124,253,252,234,4,239,15,135,244,46,255,252,242,15,16,4,252,234,
+ 252,242,15,88,4,199,255,221,4,252,234,220,4,199,255,129,124,253,252,234,4,
+ 239,15,135,244,47,255,252,242,15,16,4,199,252,242,15,88,4,252,234,255,221,
+ 4,199,220,4,252,234,255,129,124,253,252,234,4,239,15,135,244,49,129,124,253,
+ 194,4,239,15,135,244,49,255,252,242,15,16,4,252,234,252,242,15,88,4,194,255,
+ 221,4,252,234,220,4,194,255,252,242,15,16,4,252,234,252,242,15,92,4,199,255,
+ 221,4,252,234,220,36,199,255,252,242,15,16,4,199,252,242,15,92,4,252,234,
+ 255,221,4,199,220,36,252,234,255,252,242,15,16,4,252,234,252,242,15,92,4,
+ 194,255,221,4,252,234,220,36,194,255,252,242,15,16,4,252,234,252,242,15,89,
+ 4,199,255,221,4,252,234,220,12,199,255,252,242,15,16,4,199,252,242,15,89,
+ 4,252,234,255,221,4,199,220,12,252,234,255,252,242,15,16,4,252,234,252,242,
15,89,4,194,255,221,4,252,234,220,12,194,255,252,242,15,16,4,252,234,252,
242,15,94,4,199,255,221,4,252,234,220,52,199,255,252,242,15,16,4,199,252,
242,15,94,4,252,234,255,221,4,199,220,52,252,234,255,252,242,15,16,4,252,
@@ -667,22 +671,26 @@ static const unsigned char build_actionlist[13802] = {
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,193,72,139,128,233,139,108,36,96,137,
- 147,233,137,171,233,252,255,224,255,141,180,253,134,233,139,6,15,182,204,
- 15,182,232,131,198,4,193,232,16,252,255,36,252,235,255,139,190,233,139,108,
- 36,96,141,12,202,59,141,233,15,135,244,23,15,182,142,233,57,200,15,134,244,
- 249,248,2,255,15,183,70,252,254,252,233,245,255,248,3,199,68,194,252,252,
- 237,131,192,1,57,200,15,134,244,3,252,233,244,2,255,141,44,197,237,141,4,
- 194,139,122,252,248,137,104,252,252,137,120,252,248,139,108,36,96,141,12,
- 200,59,141,233,15,135,244,22,137,209,137,194,15,182,174,233,133,252,237,15,
- 132,244,248,248,1,131,193,8,57,209,15,131,244,249,139,121,252,248,137,56,
- 139,121,252,252,137,120,4,131,192,8,199,65,252,252,237,131,252,237,1,15,133,
- 244,1,248,2,255,139,190,233,139,6,15,182,204,15,182,232,131,198,4,193,232,
- 16,252,255,36,252,235,255,248,3,199,64,4,237,131,192,8,131,252,237,1,15,133,
- 244,3,252,233,244,2,255,139,106,252,248,72,139,189,233,139,108,36,96,141,
- 68,194,252,248,137,149,233,141,136,233,59,141,233,137,133,233,255,137,252,
- 233,255,72,137,252,250,137,252,233,255,15,135,244,21,199,131,233,237,255,
- 252,255,215,255,252,255,147,233,255,199,131,233,237,139,149,233,141,12,194,
- 252,247,217,3,141,233,139,114,252,252,252,233,244,12,255,254,0
+ 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,139,190,233,
+ 139,108,36,96,141,12,202,59,141,233,15,135,244,23,15,182,142,233,57,200,15,
+ 134,244,249,248,2,255,15,183,70,252,254,252,233,245,255,248,3,199,68,194,
+ 252,252,237,131,192,1,57,200,15,134,244,3,252,233,244,2,255,141,44,197,237,
+ 141,4,194,139,122,252,248,137,104,252,252,137,120,252,248,139,108,36,96,141,
+ 12,200,59,141,233,15,135,244,22,137,209,137,194,15,182,174,233,133,252,237,
+ 15,132,244,248,248,1,131,193,8,57,209,15,131,244,249,139,121,252,248,137,
+ 56,139,121,252,252,137,120,4,131,192,8,199,65,252,252,237,131,252,237,1,15,
+ 133,244,1,248,2,255,139,190,233,139,6,15,182,204,15,182,232,131,198,4,193,
+ 232,16,252,255,36,252,235,255,248,3,199,64,4,237,131,192,8,131,252,237,1,
+ 15,133,244,3,252,233,244,2,255,139,106,252,248,72,139,189,233,139,108,36,
+ 96,141,68,194,252,248,137,149,233,141,136,233,59,141,233,137,133,233,255,
+ 137,252,233,255,72,137,252,250,137,252,233,255,15,135,244,21,199,131,233,
+ 237,255,252,255,215,255,252,255,147,233,255,199,131,233,237,139,149,233,141,
+ 12,194,252,247,217,3,141,233,139,114,252,252,252,233,244,12,255,254,0
};
enum {
@@ -1357,62 +1365,62 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse)
#endif
dasm_put(Dst, 7251, Dt1(->base), Dt1(->top));
#if LJ_HASJIT
- dasm_put(Dst, 7282, DISPATCH_GL(vmstate), DISPATCH_GL(vmstate), ~LJ_VMST_EXIT, DISPATCH_J(exitno), DISPATCH_J(parent), 16*8+4*8, DISPATCH_GL(jit_L), DISPATCH_GL(jit_base), DISPATCH_J(L), Dt1(->base), 4*8, GG_DISP2J, Dt1(->cframe), CFRAME_RAWMASK, Dt1(->base));
+ dasm_put(Dst, 7282, DISPATCH_GL(vmstate), DISPATCH_GL(vmstate), ~LJ_VMST_EXIT, DISPATCH_J(exitno), DISPATCH_J(parent), 16*8+4*8, DISPATCH_GL(jit_L), DISPATCH_GL(jit_base), DISPATCH_J(L), Dt1(->base), 4*8, GG_DISP2J, Dt1(->cframe), CFRAME_RAWMASK, CFRAME_OFS_L, Dt1(->base), CFRAME_OFS_PC);
#endif
- dasm_put(Dst, 7512);
+ dasm_put(Dst, 7505);
#if LJ_HASJIT
- dasm_put(Dst, 7515, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP);
+ dasm_put(Dst, 7508, 9*16+4*8, -9*16, -8*16, -7*16, -6*16, -5*16, -4*16, -3*16, -2*16, -1*16, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP);
#endif
- dasm_put(Dst, 7567);
+ dasm_put(Dst, 7656);
if (!sse) {
- dasm_put(Dst, 7570);
+ dasm_put(Dst, 7659);
}
- dasm_put(Dst, 7615, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32));
+ dasm_put(Dst, 7704, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32));
if (!sse) {
- dasm_put(Dst, 7701);
+ dasm_put(Dst, 7790);
}
- dasm_put(Dst, 7746, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(bff00000,00000000)), (unsigned int)((U64x(bff00000,00000000))>>32));
+ dasm_put(Dst, 7835, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(bff00000,00000000)), (unsigned int)((U64x(bff00000,00000000))>>32));
if (!sse) {
- dasm_put(Dst, 7832);
+ dasm_put(Dst, 7921);
}
- dasm_put(Dst, 7871, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32));
+ dasm_put(Dst, 7960, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32));
if (sse) {
- dasm_put(Dst, 7960, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32));
+ dasm_put(Dst, 8049, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(43300000,00000000)), (unsigned int)((U64x(43300000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32));
} else {
- dasm_put(Dst, 8074);
+ dasm_put(Dst, 8163);
}
- dasm_put(Dst, 8121);
+ dasm_put(Dst, 8210);
if (!sse) {
} else {
- dasm_put(Dst, 8195);
+ dasm_put(Dst, 8284);
}
- dasm_put(Dst, 8198);
- dasm_put(Dst, 8283, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32));
- dasm_put(Dst, 8384, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(7ff00000,00000000)), (unsigned int)((U64x(7ff00000,00000000))>>32));
- dasm_put(Dst, 8552);
+ dasm_put(Dst, 8287);
+ dasm_put(Dst, 8372, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32));
+ dasm_put(Dst, 8473, (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32), (unsigned int)(U64x(3ff00000,00000000)), (unsigned int)((U64x(3ff00000,00000000))>>32), (unsigned int)(U64x(7ff00000,00000000)), (unsigned int)((U64x(7ff00000,00000000))>>32));
+ dasm_put(Dst, 8641);
if (sse) {
- dasm_put(Dst, 8593);
- dasm_put(Dst, 8663);
- dasm_put(Dst, 8736);
+ dasm_put(Dst, 8682);
+ dasm_put(Dst, 8752);
+ dasm_put(Dst, 8825);
} else {
- dasm_put(Dst, 8786);
- dasm_put(Dst, 8878);
+ dasm_put(Dst, 8875);
+ dasm_put(Dst, 8967);
}
- dasm_put(Dst, 8924);
+ dasm_put(Dst, 9013);
if (sse) {
- dasm_put(Dst, 8930, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32));
- dasm_put(Dst, 9019, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32));
+ dasm_put(Dst, 9019, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32));
+ dasm_put(Dst, 9108, (unsigned int)(U64x(7fffffff,ffffffff)), (unsigned int)((U64x(7fffffff,ffffffff))>>32));
} else {
- dasm_put(Dst, 9143);
- dasm_put(Dst, 9226);
+ dasm_put(Dst, 9232);
+ dasm_put(Dst, 9315);
if (cmov) {
- dasm_put(Dst, 9281);
+ dasm_put(Dst, 9370);
} else {
- dasm_put(Dst, 9300);
+ dasm_put(Dst, 9389);
}
- dasm_put(Dst, 9139);
+ dasm_put(Dst, 9228);
}
- dasm_put(Dst, 9341);
+ dasm_put(Dst, 9430);
}
/* Generate the code for a single instruction. */
@@ -1428,600 +1436,600 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
/* Remember: all ops branch for a true comparison, fall through otherwise. */
case BC_ISLT: case BC_ISGE: case BC_ISLE: case BC_ISGT:
- dasm_put(Dst, 9367, LJ_TISNUM, LJ_TISNUM);
+ dasm_put(Dst, 9456, LJ_TISNUM, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 9388);
+ dasm_put(Dst, 9477);
} else {
- dasm_put(Dst, 9403);
+ dasm_put(Dst, 9492);
if (cmov) {
- dasm_put(Dst, 9413);
+ dasm_put(Dst, 9502);
} else {
- dasm_put(Dst, 9419);
+ dasm_put(Dst, 9508);
}
}
switch (op) {
case BC_ISLT:
- dasm_put(Dst, 9426);
+ dasm_put(Dst, 9515);
break;
case BC_ISGE:
- dasm_put(Dst, 9221);
+ dasm_put(Dst, 9310);
break;
case BC_ISLE:
dasm_put(Dst, 5900);
break;
case BC_ISGT:
- dasm_put(Dst, 9431);
+ dasm_put(Dst, 9520);
break;
default: break; /* Shut up GCC. */
}
- dasm_put(Dst, 9436, -BCBIAS_J*4);
+ dasm_put(Dst, 9525, -BCBIAS_J*4);
break;
case BC_ISEQV: case BC_ISNEV:
vk = op == BC_ISEQV;
- dasm_put(Dst, 9470, LJ_TISNUM, LJ_TISNUM);
+ dasm_put(Dst, 9559, LJ_TISNUM, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 9496);
+ dasm_put(Dst, 9585);
} else {
- dasm_put(Dst, 9508);
+ dasm_put(Dst, 9597);
if (cmov) {
- dasm_put(Dst, 9413);
+ dasm_put(Dst, 9502);
} else {
- dasm_put(Dst, 9419);
+ dasm_put(Dst, 9508);
}
}
iseqne_fp:
if (vk) {
- dasm_put(Dst, 9515);
+ dasm_put(Dst, 9604);
} else {
- dasm_put(Dst, 9524);
+ dasm_put(Dst, 9613);
}
iseqne_end:
if (vk) {
- dasm_put(Dst, 9533, -BCBIAS_J*4);
+ dasm_put(Dst, 9622, -BCBIAS_J*4);
} else {
- dasm_put(Dst, 9548, -BCBIAS_J*4);
+ dasm_put(Dst, 9637, -BCBIAS_J*4);
}
- dasm_put(Dst, 9450);
+ dasm_put(Dst, 9539);
if (op == BC_ISEQV || op == BC_ISNEV) {
- dasm_put(Dst, 9563, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<<MM_eq);
+ dasm_put(Dst, 9652, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<<MM_eq);
if (vk) {
- dasm_put(Dst, 9621);
+ dasm_put(Dst, 9710);
} else {
- dasm_put(Dst, 9625);
+ dasm_put(Dst, 9714);
}
- dasm_put(Dst, 9631);
+ dasm_put(Dst, 9720);
}
break;
case BC_ISEQS: case BC_ISNES:
vk = op == BC_ISEQS;
- dasm_put(Dst, 9636, LJ_TSTR);
+ dasm_put(Dst, 9725, LJ_TSTR);
iseqne_test:
if (vk) {
- dasm_put(Dst, 9519);
+ dasm_put(Dst, 9608);
} else {
dasm_put(Dst, 2802);
}
goto iseqne_end;
case BC_ISEQN: case BC_ISNEN:
vk = op == BC_ISEQN;
- dasm_put(Dst, 9660, LJ_TISNUM);
+ dasm_put(Dst, 9749, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 9674);
+ dasm_put(Dst, 9763);
} else {
- dasm_put(Dst, 9686);
+ dasm_put(Dst, 9775);
if (cmov) {
- dasm_put(Dst, 9413);
+ dasm_put(Dst, 9502);
} else {
- dasm_put(Dst, 9419);
+ dasm_put(Dst, 9508);
}
}
goto iseqne_fp;
case BC_ISEQP: case BC_ISNEP:
vk = op == BC_ISEQP;
- dasm_put(Dst, 9693);
+ dasm_put(Dst, 9782);
goto iseqne_test;
/* -- Unary test and copy ops ------------------------------------------- */
case BC_ISTC: case BC_ISFC: case BC_IST: case BC_ISF:
- dasm_put(Dst, 9705, LJ_TISTRUECOND);
+ dasm_put(Dst, 9794, LJ_TISTRUECOND);
if (op == BC_IST || op == BC_ISTC) {
- dasm_put(Dst, 9717);
+ dasm_put(Dst, 9806);
} else {
- dasm_put(Dst, 9722);
+ dasm_put(Dst, 9811);
}
if (op == BC_ISTC || op == BC_ISFC) {
- dasm_put(Dst, 9727);
+ dasm_put(Dst, 9816);
}
- dasm_put(Dst, 9738, -BCBIAS_J*4);
+ dasm_put(Dst, 9827, -BCBIAS_J*4);
break;
/* -- Unary ops --------------------------------------------------------- */
case BC_MOV:
- dasm_put(Dst, 9770);
+ dasm_put(Dst, 9859);
break;
case BC_NOT:
- dasm_put(Dst, 9804, LJ_TISTRUECOND, LJ_TTRUE);
+ dasm_put(Dst, 9893, LJ_TISTRUECOND, LJ_TTRUE);
break;
case BC_UNM:
- dasm_put(Dst, 9840, LJ_TISNUM);
+ dasm_put(Dst, 9929, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 9851, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32));
+ dasm_put(Dst, 9940, (unsigned int)(U64x(80000000,00000000)), (unsigned int)((U64x(80000000,00000000))>>32));
} else {
- dasm_put(Dst, 9876);
+ dasm_put(Dst, 9965);
}
- dasm_put(Dst, 9450);
+ dasm_put(Dst, 9539);
break;
case BC_LEN:
- dasm_put(Dst, 9885, LJ_TSTR);
+ dasm_put(Dst, 9974, LJ_TSTR);
if (sse) {
- dasm_put(Dst, 9899, Dt5(->len));
+ dasm_put(Dst, 9988, Dt5(->len));
} else {
- dasm_put(Dst, 9917, Dt5(->len));
+ dasm_put(Dst, 10006, Dt5(->len));
}
- dasm_put(Dst, 9926, LJ_TTAB);
+ dasm_put(Dst, 10015, LJ_TTAB);
if (sse) {
- dasm_put(Dst, 9967);
+ dasm_put(Dst, 10056);
} else {
}
- dasm_put(Dst, 9976);
+ dasm_put(Dst, 10065);
break;
/* -- Binary ops -------------------------------------------------------- */
case BC_ADDVN: case BC_ADDNV: case BC_ADDVV:
- dasm_put(Dst, 9986);
+ dasm_put(Dst, 10075);
vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
switch (vk) {
case 0:
- dasm_put(Dst, 9994, LJ_TISNUM);
+ dasm_put(Dst, 10083, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10006);
+ dasm_put(Dst, 10095);
} else {
- dasm_put(Dst, 10020);
+ dasm_put(Dst, 10109);
}
break;
case 1:
- dasm_put(Dst, 10028, LJ_TISNUM);
+ dasm_put(Dst, 10117, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10040);
+ dasm_put(Dst, 10129);
} else {
- dasm_put(Dst, 10054);
+ dasm_put(Dst, 10143);
}
break;
default:
- dasm_put(Dst, 10062, LJ_TISNUM, LJ_TISNUM);
+ dasm_put(Dst, 10151, LJ_TISNUM, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10084);
+ dasm_put(Dst, 10173);
} else {
- dasm_put(Dst, 10098);
+ dasm_put(Dst, 10187);
}
break;
}
if (sse) {
- dasm_put(Dst, 9869);
+ dasm_put(Dst, 9958);
} else {
- dasm_put(Dst, 9881);
+ dasm_put(Dst, 9970);
}
- dasm_put(Dst, 9450);
+ dasm_put(Dst, 9539);
break;
case BC_SUBVN: case BC_SUBNV: case BC_SUBVV:
- dasm_put(Dst, 9986);
+ dasm_put(Dst, 10075);
vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
switch (vk) {
case 0:
- dasm_put(Dst, 9994, LJ_TISNUM);
+ dasm_put(Dst, 10083, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10106);
+ dasm_put(Dst, 10195);
} else {
- dasm_put(Dst, 10120);
+ dasm_put(Dst, 10209);
}
break;
case 1:
- dasm_put(Dst, 10028, LJ_TISNUM);
+ dasm_put(Dst, 10117, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10128);
+ dasm_put(Dst, 10217);
} else {
- dasm_put(Dst, 10142);
+ dasm_put(Dst, 10231);
}
break;
default:
- dasm_put(Dst, 10062, LJ_TISNUM, LJ_TISNUM);
+ dasm_put(Dst, 10151, LJ_TISNUM, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10150);
+ dasm_put(Dst, 10239);
} else {
- dasm_put(Dst, 10164);
+ dasm_put(Dst, 10253);
}
break;
}
if (sse) {
- dasm_put(Dst, 9869);
+ dasm_put(Dst, 9958);
} else {
- dasm_put(Dst, 9881);
+ dasm_put(Dst, 9970);
}
- dasm_put(Dst, 9450);
+ dasm_put(Dst, 9539);
break;
case BC_MULVN: case BC_MULNV: case BC_MULVV:
- dasm_put(Dst, 9986);
+ dasm_put(Dst, 10075);
vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
switch (vk) {
case 0:
- dasm_put(Dst, 9994, LJ_TISNUM);
+ dasm_put(Dst, 10083, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10172);
+ dasm_put(Dst, 10261);
} else {
- dasm_put(Dst, 10186);
+ dasm_put(Dst, 10275);
}
break;
case 1:
- dasm_put(Dst, 10028, LJ_TISNUM);
+ dasm_put(Dst, 10117, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10194);
+ dasm_put(Dst, 10283);
} else {
- dasm_put(Dst, 10208);
+ dasm_put(Dst, 10297);
}
break;
default:
- dasm_put(Dst, 10062, LJ_TISNUM, LJ_TISNUM);
+ dasm_put(Dst, 10151, LJ_TISNUM, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10216);
+ dasm_put(Dst, 10305);
} else {
- dasm_put(Dst, 10230);
+ dasm_put(Dst, 10319);
}
break;
}
if (sse) {
- dasm_put(Dst, 9869);
+ dasm_put(Dst, 9958);
} else {
- dasm_put(Dst, 9881);
+ dasm_put(Dst, 9970);
}
- dasm_put(Dst, 9450);
+ dasm_put(Dst, 9539);
break;
case BC_DIVVN: case BC_DIVNV: case BC_DIVVV:
- dasm_put(Dst, 9986);
+ dasm_put(Dst, 10075);
vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
switch (vk) {
case 0:
- dasm_put(Dst, 9994, LJ_TISNUM);
+ dasm_put(Dst, 10083, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10238);
+ dasm_put(Dst, 10327);
} else {
- dasm_put(Dst, 10252);
+ dasm_put(Dst, 10341);
}
break;
case 1:
- dasm_put(Dst, 10028, LJ_TISNUM);
+ dasm_put(Dst, 10117, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10260);
+ dasm_put(Dst, 10349);
} else {
- dasm_put(Dst, 10274);
+ dasm_put(Dst, 10363);
}
break;
default:
- dasm_put(Dst, 10062, LJ_TISNUM, LJ_TISNUM);
+ dasm_put(Dst, 10151, LJ_TISNUM, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10282);
+ dasm_put(Dst, 10371);
} else {
- dasm_put(Dst, 10296);
+ dasm_put(Dst, 10385);
}
break;
}
if (sse) {
- dasm_put(Dst, 9869);
+ dasm_put(Dst, 9958);
} else {
- dasm_put(Dst, 9881);
+ dasm_put(Dst, 9970);
}
- dasm_put(Dst, 9450);
+ dasm_put(Dst, 9539);
break;
case BC_MODVN:
- dasm_put(Dst, 9986);
+ dasm_put(Dst, 10075);
vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
switch (vk) {
case 0:
- dasm_put(Dst, 9994, LJ_TISNUM);
+ dasm_put(Dst, 10083, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10304);
+ dasm_put(Dst, 10393);
} else {
- dasm_put(Dst, 10318);
+ dasm_put(Dst, 10407);
}
break;
case 1:
- dasm_put(Dst, 10028, LJ_TISNUM);
+ dasm_put(Dst, 10117, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10326);
+ dasm_put(Dst, 10415);
} else {
- dasm_put(Dst, 10340);
+ dasm_put(Dst, 10429);
}
break;
default:
- dasm_put(Dst, 10062, LJ_TISNUM, LJ_TISNUM);
+ dasm_put(Dst, 10151, LJ_TISNUM, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10348);
+ dasm_put(Dst, 10437);
} else {
- dasm_put(Dst, 10362);
+ dasm_put(Dst, 10451);
}
break;
}
- dasm_put(Dst, 10370);
+ dasm_put(Dst, 10459);
if (sse) {
- dasm_put(Dst, 9869);
+ dasm_put(Dst, 9958);
} else {
- dasm_put(Dst, 9881);
+ dasm_put(Dst, 9970);
}
- dasm_put(Dst, 9450);
+ dasm_put(Dst, 9539);
break;
case BC_MODNV: case BC_MODVV:
- dasm_put(Dst, 9986);
+ dasm_put(Dst, 10075);
vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
switch (vk) {
case 0:
- dasm_put(Dst, 9994, LJ_TISNUM);
+ dasm_put(Dst, 10083, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10304);
+ dasm_put(Dst, 10393);
} else {
- dasm_put(Dst, 10318);
+ dasm_put(Dst, 10407);
}
break;
case 1:
- dasm_put(Dst, 10028, LJ_TISNUM);
+ dasm_put(Dst, 10117, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10326);
+ dasm_put(Dst, 10415);
} else {
- dasm_put(Dst, 10340);
+ dasm_put(Dst, 10429);
}
break;
default:
- dasm_put(Dst, 10062, LJ_TISNUM, LJ_TISNUM);
+ dasm_put(Dst, 10151, LJ_TISNUM, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10348);
+ dasm_put(Dst, 10437);
} else {
- dasm_put(Dst, 10362);
+ dasm_put(Dst, 10451);
}
break;
}
- dasm_put(Dst, 10376);
+ dasm_put(Dst, 10465);
break;
case BC_POW:
- dasm_put(Dst, 9986);
+ dasm_put(Dst, 10075);
vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
switch (vk) {
case 0:
- dasm_put(Dst, 9994, LJ_TISNUM);
+ dasm_put(Dst, 10083, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10304);
+ dasm_put(Dst, 10393);
} else {
- dasm_put(Dst, 10318);
+ dasm_put(Dst, 10407);
}
break;
case 1:
- dasm_put(Dst, 10028, LJ_TISNUM);
+ dasm_put(Dst, 10117, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10326);
+ dasm_put(Dst, 10415);
} else {
- dasm_put(Dst, 10340);
+ dasm_put(Dst, 10429);
}
break;
default:
- dasm_put(Dst, 10062, LJ_TISNUM, LJ_TISNUM);
+ dasm_put(Dst, 10151, LJ_TISNUM, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10348);
+ dasm_put(Dst, 10437);
} else {
- dasm_put(Dst, 10362);
+ dasm_put(Dst, 10451);
}
break;
}
- dasm_put(Dst, 10381);
+ dasm_put(Dst, 10470);
if (sse) {
- dasm_put(Dst, 9869);
+ dasm_put(Dst, 9958);
} else {
- dasm_put(Dst, 9881);
+ dasm_put(Dst, 9970);
}
- dasm_put(Dst, 9450);
+ dasm_put(Dst, 9539);
break;
case BC_CAT:
- dasm_put(Dst, 10385, Dt1(->base), Dt1(->base));
+ dasm_put(Dst, 10474, Dt1(->base), Dt1(->base));
break;
/* -- Constant ops ------------------------------------------------------ */
case BC_KSTR:
- dasm_put(Dst, 10475, LJ_TSTR);
+ dasm_put(Dst, 10564, LJ_TSTR);
break;
case BC_KSHORT:
if (sse) {
- dasm_put(Dst, 10510);
+ dasm_put(Dst, 10599);
} else {
- dasm_put(Dst, 10525);
+ dasm_put(Dst, 10614);
}
- dasm_put(Dst, 9450);
+ dasm_put(Dst, 9539);
break;
case BC_KNUM:
if (sse) {
- dasm_put(Dst, 10533);
+ dasm_put(Dst, 10622);
} else {
- dasm_put(Dst, 10546);
+ dasm_put(Dst, 10635);
}
- dasm_put(Dst, 9450);
+ dasm_put(Dst, 9539);
break;
case BC_KPRI:
- dasm_put(Dst, 10553);
+ dasm_put(Dst, 10642);
break;
case BC_KNIL:
- dasm_put(Dst, 10581, LJ_TNIL);
+ dasm_put(Dst, 10670, LJ_TNIL);
break;
/* -- Upvalue and function ops ------------------------------------------ */
case BC_UGET:
- dasm_put(Dst, 10628, offsetof(GCfuncL, uvptr), DtA(->v));
+ dasm_put(Dst, 10717, offsetof(GCfuncL, uvptr), DtA(->v));
break;
case BC_USETV:
#define TV2MARKOFS \
((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv))
- dasm_put(Dst, 10673, 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, 10764);
+ dasm_put(Dst, 10762, 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, 10853);
break;
#undef TV2MARKOFS
case BC_USETS:
- dasm_put(Dst, 10776, 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, 10865, 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, 10869);
+ dasm_put(Dst, 10958);
if (sse) {
- dasm_put(Dst, 10874);
+ dasm_put(Dst, 10963);
} else {
- dasm_put(Dst, 9689);
+ dasm_put(Dst, 9778);
}
- dasm_put(Dst, 10881, offsetof(GCfuncL, uvptr), DtA(->v));
+ dasm_put(Dst, 10970, offsetof(GCfuncL, uvptr), DtA(->v));
if (sse) {
- dasm_put(Dst, 10890);
+ dasm_put(Dst, 10979);
} else {
- dasm_put(Dst, 10896);
+ dasm_put(Dst, 10985);
}
- dasm_put(Dst, 9450);
+ dasm_put(Dst, 9539);
break;
case BC_USETP:
- dasm_put(Dst, 10899, offsetof(GCfuncL, uvptr), DtA(->v));
+ dasm_put(Dst, 10988, offsetof(GCfuncL, uvptr), DtA(->v));
break;
case BC_UCLO:
- dasm_put(Dst, 10938, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base));
+ dasm_put(Dst, 11027, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base));
break;
case BC_FNEW:
- dasm_put(Dst, 10993, Dt1(->base), Dt1(->base), LJ_TFUNC);
+ dasm_put(Dst, 11082, Dt1(->base), Dt1(->base), LJ_TFUNC);
break;
/* -- Table ops --------------------------------------------------------- */
case BC_TNEW:
- dasm_put(Dst, 11059, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB);
+ dasm_put(Dst, 11148, Dt1(->base), DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), LJ_TTAB);
break;
case BC_TDUP:
- dasm_put(Dst, 11180, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB);
+ dasm_put(Dst, 11269, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB);
break;
case BC_GGET:
- dasm_put(Dst, 11275, Dt7(->env));
+ dasm_put(Dst, 11364, Dt7(->env));
break;
case BC_GSET:
- dasm_put(Dst, 11294, Dt7(->env));
+ dasm_put(Dst, 11383, Dt7(->env));
break;
case BC_TGETV:
- dasm_put(Dst, 11313, LJ_TTAB, LJ_TISNUM);
+ dasm_put(Dst, 11402, LJ_TTAB, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 11346);
+ dasm_put(Dst, 11435);
} else {
}
- dasm_put(Dst, 11367, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
- dasm_put(Dst, 11460, LJ_TSTR);
+ dasm_put(Dst, 11456, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
+ dasm_put(Dst, 11549, LJ_TSTR);
break;
case BC_TGETS:
- dasm_put(Dst, 11478, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL);
- dasm_put(Dst, 11563, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
+ dasm_put(Dst, 11567, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL);
+ dasm_put(Dst, 11652, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
break;
case BC_TGETB:
- dasm_put(Dst, 11635, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
- dasm_put(Dst, 9976);
+ dasm_put(Dst, 11724, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
+ dasm_put(Dst, 10065);
break;
case BC_TSETV:
- dasm_put(Dst, 11735, LJ_TTAB, LJ_TISNUM);
+ dasm_put(Dst, 11824, LJ_TTAB, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 11346);
+ dasm_put(Dst, 11435);
} else {
}
- dasm_put(Dst, 11768, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable));
- dasm_put(Dst, 11852, Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
+ dasm_put(Dst, 11857, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable));
+ dasm_put(Dst, 11941, Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
break;
case BC_TSETS:
- dasm_put(Dst, 11914, 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, 11990, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, DtB(->next));
- dasm_put(Dst, 12083, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
+ dasm_put(Dst, 12003, 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, 12079, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, DtB(->next));
+ dasm_put(Dst, 12172, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
break;
case BC_TSETB:
- dasm_put(Dst, 12174, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable));
- dasm_put(Dst, 12273, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
+ dasm_put(Dst, 12263, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable));
+ dasm_put(Dst, 12362, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
break;
case BC_TSETM:
- dasm_put(Dst, 12319);
+ dasm_put(Dst, 12408);
if (sse) {
- dasm_put(Dst, 10874);
+ dasm_put(Dst, 10963);
} else {
}
- dasm_put(Dst, 12324, Dt6(->marked), LJ_GC_BLACK);
+ dasm_put(Dst, 12413, Dt6(->marked), LJ_GC_BLACK);
if (sse) {
- dasm_put(Dst, 12349);
+ dasm_put(Dst, 12438);
} else {
}
- dasm_put(Dst, 12356, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain));
- dasm_put(Dst, 12482, Dt6(->gclist));
+ dasm_put(Dst, 12445, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain));
+ dasm_put(Dst, 12571, Dt6(->gclist));
break;
/* -- Calls and vararg handling ----------------------------------------- */
case BC_CALL: case BC_CALLM:
- dasm_put(Dst, 9990);
+ dasm_put(Dst, 10079);
if (op == BC_CALLM) {
- dasm_put(Dst, 12490);
+ dasm_put(Dst, 12579);
}
- dasm_put(Dst, 12495, LJ_TFUNC, Dt7(->pc));
+ dasm_put(Dst, 12584, LJ_TFUNC, Dt7(->pc));
break;
case BC_CALLMT:
- dasm_put(Dst, 12490);
+ dasm_put(Dst, 12579);
break;
case BC_CALLT:
- dasm_put(Dst, 12537, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc));
- dasm_put(Dst, 12656, FRAME_TYPE, Dt7(->pc), PC2PROTO(k));
+ dasm_put(Dst, 12626, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc));
+ dasm_put(Dst, 12745, FRAME_TYPE, Dt7(->pc), PC2PROTO(k));
break;
case BC_ITERC:
- dasm_put(Dst, 12714, LJ_TFUNC, 2+1, Dt7(->pc));
+ dasm_put(Dst, 12803, LJ_TFUNC, 2+1, Dt7(->pc));
break;
case BC_VARG:
- dasm_put(Dst, 12795, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL);
- dasm_put(Dst, 12940, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top));
+ dasm_put(Dst, 12884, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL);
+ dasm_put(Dst, 13029, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top));
break;
/* -- Returns ----------------------------------------------------------- */
case BC_RETM:
- dasm_put(Dst, 12490);
+ dasm_put(Dst, 12579);
break;
case BC_RET: case BC_RET0: case BC_RET1:
if (op != BC_RET0) {
- dasm_put(Dst, 13039);
+ dasm_put(Dst, 13128);
}
- dasm_put(Dst, 13043, FRAME_TYPE);
+ dasm_put(Dst, 13132, FRAME_TYPE);
switch (op) {
case BC_RET:
- dasm_put(Dst, 13062);
+ dasm_put(Dst, 13151);
break;
case BC_RET1:
- dasm_put(Dst, 13120);
+ dasm_put(Dst, 13209);
/* fallthrough */
case BC_RET0:
- dasm_put(Dst, 13136);
+ dasm_put(Dst, 13225);
default:
break;
}
- dasm_put(Dst, 13147, Dt7(->pc), PC2PROTO(k));
+ dasm_put(Dst, 13236, Dt7(->pc), PC2PROTO(k));
if (op == BC_RET) {
- dasm_put(Dst, 13191, LJ_TNIL);
+ dasm_put(Dst, 13280, LJ_TNIL);
} else {
- dasm_put(Dst, 13200, LJ_TNIL);
+ dasm_put(Dst, 13289, LJ_TNIL);
}
- dasm_put(Dst, 13207);
+ dasm_put(Dst, 13296);
if (op != BC_RET0) {
- dasm_put(Dst, 13228);
+ dasm_put(Dst, 13317);
}
dasm_put(Dst, 4570);
break;
@@ -2031,7 +2039,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
case BC_FORL:
#if LJ_HASJIT
- dasm_put(Dst, 13232, HOTCOUNT_PCMASK, GG_DISP2HOT);
+ dasm_put(Dst, 13321, HOTCOUNT_PCMASK, GG_DISP2HOT);
#endif
break;
@@ -2043,57 +2051,57 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
case BC_FORI:
case BC_IFORL:
vk = (op == BC_IFORL || op == BC_JFORL);
- dasm_put(Dst, 13253);
+ dasm_put(Dst, 13342);
if (!vk) {
- dasm_put(Dst, 13257, LJ_TISNUM, LJ_TISNUM);
+ dasm_put(Dst, 13346, LJ_TISNUM, LJ_TISNUM);
}
- dasm_put(Dst, 13276);
+ dasm_put(Dst, 13365);
if (!vk) {
- dasm_put(Dst, 13280, LJ_TISNUM);
+ dasm_put(Dst, 13369, LJ_TISNUM);
}
if (sse) {
- dasm_put(Dst, 13289);
+ dasm_put(Dst, 13378);
if (vk) {
- dasm_put(Dst, 13301);
+ dasm_put(Dst, 13390);
} else {
- dasm_put(Dst, 13320);
+ dasm_put(Dst, 13409);
}
- dasm_put(Dst, 13325);
+ dasm_put(Dst, 13414);
} else {
- dasm_put(Dst, 13338);
+ dasm_put(Dst, 13427);
if (vk) {
- dasm_put(Dst, 13344);
+ dasm_put(Dst, 13433);
} else {
- dasm_put(Dst, 13360);
+ dasm_put(Dst, 13449);
}
- dasm_put(Dst, 13368);
+ dasm_put(Dst, 13457);
if (cmov) {
- dasm_put(Dst, 9413);
+ dasm_put(Dst, 9502);
} else {
- dasm_put(Dst, 9419);
+ dasm_put(Dst, 9508);
}
if (!cmov) {
- dasm_put(Dst, 13373);
+ dasm_put(Dst, 13462);
}
}
if (op == BC_FORI) {
- dasm_put(Dst, 13379, -BCBIAS_J*4);
+ dasm_put(Dst, 13468, -BCBIAS_J*4);
} else if (op == BC_JFORI) {
- dasm_put(Dst, 13389, -BCBIAS_J*4, BC_JLOOP);
+ dasm_put(Dst, 13478, -BCBIAS_J*4, BC_JLOOP);
} else if (op == BC_IFORL) {
- dasm_put(Dst, 13403, -BCBIAS_J*4);
+ dasm_put(Dst, 13492, -BCBIAS_J*4);
} else {
- dasm_put(Dst, 13399, BC_JLOOP);
+ dasm_put(Dst, 13488, BC_JLOOP);
}
- dasm_put(Dst, 9448);
+ dasm_put(Dst, 9537);
if (sse) {
- dasm_put(Dst, 13413);
+ dasm_put(Dst, 13502);
}
break;
case BC_ITERL:
#if LJ_HASJIT
- dasm_put(Dst, 13232, HOTCOUNT_PCMASK, GG_DISP2HOT);
+ dasm_put(Dst, 13321, HOTCOUNT_PCMASK, GG_DISP2HOT);
#endif
break;
@@ -2102,33 +2110,33 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
break;
#endif
case BC_IITERL:
- dasm_put(Dst, 13424, LJ_TNIL);
+ dasm_put(Dst, 13513, LJ_TNIL);
if (op == BC_JITERL) {
- dasm_put(Dst, 13439, BC_JLOOP);
+ dasm_put(Dst, 13528, BC_JLOOP);
} else {
- dasm_put(Dst, 13453, -BCBIAS_J*4);
+ dasm_put(Dst, 13542, -BCBIAS_J*4);
}
- dasm_put(Dst, 9748);
+ dasm_put(Dst, 9837);
break;
case BC_LOOP:
#if LJ_HASJIT
- dasm_put(Dst, 13232, HOTCOUNT_PCMASK, GG_DISP2HOT);
+ dasm_put(Dst, 13321, HOTCOUNT_PCMASK, GG_DISP2HOT);
#endif
break;
case BC_ILOOP:
- dasm_put(Dst, 9450);
+ dasm_put(Dst, 9539);
break;
case BC_JLOOP:
#if LJ_HASJIT
- dasm_put(Dst, 13469, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L));
+ dasm_put(Dst, 13558, 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, 13493, -BCBIAS_J*4);
+ dasm_put(Dst, 13667, -BCBIAS_J*4);
break;
/* -- Function headers -------------------------------------------------- */
@@ -2151,47 +2159,47 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
break;
#endif
case BC_IFUNCF:
- dasm_put(Dst, 13518, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams));
+ dasm_put(Dst, 13692, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams));
if (op == BC_JFUNCF) {
- dasm_put(Dst, 13548, BC_JLOOP);
+ dasm_put(Dst, 13722, BC_JLOOP);
} else {
- dasm_put(Dst, 9450);
+ dasm_put(Dst, 9539);
}
- dasm_put(Dst, 13557, LJ_TNIL);
+ dasm_put(Dst, 13731, LJ_TNIL);
break;
case BC_JFUNCV:
#if !LJ_HASJIT
break;
#endif
- dasm_put(Dst, 9141);
+ dasm_put(Dst, 9230);
break; /* NYI: compiled vararg functions. */
case BC_IFUNCV:
- dasm_put(Dst, 13579, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL);
+ dasm_put(Dst, 13753, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL);
if (op == BC_JFUNCV) {
- dasm_put(Dst, 13548, BC_JLOOP);
+ dasm_put(Dst, 13722, BC_JLOOP);
} else {
- dasm_put(Dst, 13670, -4+PC2PROTO(k));
+ dasm_put(Dst, 13844, -4+PC2PROTO(k));
}
- dasm_put(Dst, 13693, LJ_TNIL);
+ dasm_put(Dst, 13867, LJ_TNIL);
break;
case BC_FUNCC:
case BC_FUNCCW:
- dasm_put(Dst, 13715, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top));
+ dasm_put(Dst, 13889, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top));
if (op == BC_FUNCC) {
- dasm_put(Dst, 13745);
+ dasm_put(Dst, 13919);
} else {
- dasm_put(Dst, 13749);
+ dasm_put(Dst, 13923);
}
- dasm_put(Dst, 13757, DISPATCH_GL(vmstate), ~LJ_VMST_C);
+ dasm_put(Dst, 13931, DISPATCH_GL(vmstate), ~LJ_VMST_C);
if (op == BC_FUNCC) {
- dasm_put(Dst, 13766);
+ dasm_put(Dst, 13940);
} else {
- dasm_put(Dst, 13770, DISPATCH_GL(wrapf));
+ dasm_put(Dst, 13944, DISPATCH_GL(wrapf));
}
- dasm_put(Dst, 13775, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top));
+ dasm_put(Dst, 13949, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top));
break;
/* ---------------------------------------------------------------------- */
@@ -2219,7 +2227,7 @@ static int build_backend(BuildCtx *ctx)
build_subroutines(ctx, cmov, sse);
- dasm_put(Dst, 13800);
+ dasm_put(Dst, 13974);
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 7758cd15..a3e65174 100644
--- a/src/buildvm_x86.dasc
+++ b/src/buildvm_x86.dasc
@@ -223,19 +223,18 @@
|.define SAVE_R2, aword [rsp+aword*6]
|.define SAVE_R1, aword [rsp+aword*5] //<-- rsp after register saves.
|.define SAVE_CFRAME, aword [rsp+aword*4]
-|.define TMPa, aword [rsp+aword*3]
-|//----- ^^^ awords above, vvv dwords below
-|.define SAVE_PC, dword [rsp+dword*5]
-|.define SAVE_L, dword [rsp+dword*4]
-|.define SAVE_ERRF, dword [rsp+dword*3]
-|.define SAVE_NRES, dword [rsp+dword*2]
+|.define SAVE_PC, dword [rsp+dword*7]
+|.define SAVE_L, dword [rsp+dword*6]
+|.define SAVE_ERRF, dword [rsp+dword*5]
+|.define SAVE_NRES, dword [rsp+dword*4]
+|.define TMPa, aword [rsp+aword*1]
|.define TMP2, dword [rsp+dword*1]
|.define TMP1, dword [rsp] //<-- rsp while in interpreter.
|//----- 16 byte aligned
|
|// TMPQ overlaps TMP1/TMP2. MULTRES overlaps TMP2 (and TMPQ).
|.define TMPQ, qword [rsp]
-|.define TMP3, dword [rsp+aword*3]
+|.define TMP3, dword [rsp+aword*1]
|.define MULTRES, TMP2
|
|.endif
@@ -2627,18 +2626,51 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse)
| // Error code returned in eax (RD).
| mov RAa, L:RB->cframe
| and RAa, CFRAME_RAWMASK
- |.if X64
+ |.if X64WIN
+ | // Reposition stack later.
+ |.elif X64
| mov rsp, RAa // Reposition stack to C frame.
|.else
| mov esp, RAa // Reposition stack to C frame.
|.endif
- | mov SAVE_L, L:RB // Needed for on-trace resume/yield.
- | test RD, RD; jnz >1 // Check for error from exit.
+ | mov [RAa+CFRAME_OFS_L], L:RB // Set SAVE_L (on-trace resume/yield).
| mov BASE, L:RB->base
- | mov PC, SAVE_PC
+ | mov PC, [RAa+CFRAME_OFS_PC] // Get SAVE_PC.
+ |.if X64
+ | jmp >1
+ |.else
+ | test RD, RD; jnz >2 // Check for error from exit.
+ |.endif
#endif
|->vm_exit_interp:
#if LJ_HASJIT
+ |.if X64
+ | xor RD, RD
+ | // Restore additional callee-save registers only used in compiled code.
+ |.if X64WIN
+ | lea RAa, [rsp+9*16+4*8]
+ |1:
+ | movdqa xmm15, [RAa-9*16]
+ | movdqa xmm14, [RAa-8*16]
+ | movdqa xmm13, [RAa-7*16]
+ | movdqa xmm12, [RAa-6*16]
+ | movdqa xmm11, [RAa-5*16]
+ | movdqa xmm10, [RAa-4*16]
+ | movdqa xmm9, [RAa-3*16]
+ | movdqa xmm8, [RAa-2*16]
+ | movdqa xmm7, [RAa-1*16]
+ | mov rsp, RAa // Reposition stack to C frame.
+ | movdqa xmm6, [RAa]
+ | mov r15, CSAVE_3
+ | mov r14, CSAVE_4
+ |.else
+ | add rsp, 16 // Reposition stack to C frame.
+ |1:
+ |.endif
+ | mov r13, TMPa
+ | mov r12, TMPQ
+ | test RD, RD; jnz >2 // Check for error from exit.
+ |.endif
| mov LFUNC:KBASE, [BASE-8]
| mov KBASE, LFUNC:KBASE->pc
| mov KBASE, [KBASE+PC2PROTO(k)]
@@ -2646,7 +2678,7 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse)
| set_vmstate INTERP
| ins_next
|
- |1: // Rethrow error from the right C frame.
+ |2: // Rethrow error from the right C frame.
| mov FCARG1, L:RB
| mov FCARG2, RD
| call extern lj_err_throw@8 // (lua_State *L, int errcode)
@@ -4714,6 +4746,29 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
| mov L:RB, SAVE_L
| mov [DISPATCH+DISPATCH_GL(jit_base)], BASE
| mov [DISPATCH+DISPATCH_GL(jit_L)], L:RB
+ | // Save additional callee-save registers only used in compiled code.
+ |.if X64WIN
+ | mov TMPQ, r12
+ | mov TMPa, r13
+ | mov CSAVE_4, r14
+ | mov CSAVE_3, r15
+ | mov RAa, rsp
+ | sub rsp, 9*16+4*8
+ | movdqa [RAa], xmm6
+ | movdqa [RAa-1*16], xmm7
+ | movdqa [RAa-2*16], xmm8
+ | movdqa [RAa-3*16], xmm9
+ | movdqa [RAa-4*16], xmm10
+ | movdqa [RAa-5*16], xmm11
+ | movdqa [RAa-6*16], xmm12
+ | movdqa [RAa-7*16], xmm13
+ | movdqa [RAa-8*16], xmm14
+ | movdqa [RAa-9*16], xmm15
+ |.elif X64
+ | mov TMPQ, r12
+ | mov TMPa, r13
+ | sub rsp, 16
+ |.endif
| jmp RDa
#endif
break;
diff --git a/src/buildvm_x86.h b/src/buildvm_x86.h
index 0cbf9c68..5bf7e60c 100644
--- a/src/buildvm_x86.h
+++ b/src/buildvm_x86.h
@@ -12,7 +12,7 @@
#define DASM_SECTION_CODE_OP 0
#define DASM_SECTION_CODE_SUB 1
#define DASM_MAXSECTION 2
-static const unsigned char build_actionlist[15179] = {
+static const unsigned char build_actionlist[15177] = {
254,1,248,10,252,247,198,237,15,132,244,11,131,230,252,248,41,252,242,141,
76,49,252,248,139,114,252,252,199,68,10,4,237,248,12,131,192,1,137,68,36,
20,252,247,198,237,15,132,244,13,248,14,252,247,198,237,15,132,244,10,199,
@@ -417,20 +417,20 @@ static const unsigned char build_actionlist[15179] = {
252,242,15,17,109,200,252,242,15,17,101,192,252,242,15,17,93,184,252,242,
15,17,85,176,252,242,15,17,77,168,252,242,15,17,69,160,139,171,233,139,147,
233,137,171,233,137,149,233,141,84,36,16,141,139,233,232,251,1,23,139,141,
- 233,129,225,239,137,204,137,108,36,48,133,192,15,133,244,247,139,149,233,
- 139,116,36,24,255,248,144,255,139,122,252,248,139,191,233,139,191,233,199,
- 131,233,0,0,0,0,199,131,233,237,139,6,15,182,204,15,182,232,131,198,4,193,
- 232,16,252,255,36,171,248,1,137,252,233,137,194,232,251,1,24,255,248,82,255,
- 217,124,36,4,137,68,36,8,102,184,0,4,102,11,68,36,4,102,37,252,255,252,247,
- 102,137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,139,68,36,8,195,255,
- 248,145,102,15,252,239,210,102,15,118,210,102,15,115,210,1,184,0,0,48,67,
- 102,15,110,216,102,15,112,219,81,15,40,200,102,15,84,202,102,15,46,217,15,
- 134,244,247,102,15,85,208,252,242,15,88,203,252,242,15,92,203,102,15,86,202,
- 184,0,0,252,240,63,102,15,110,208,102,15,112,210,81,252,242,15,194,193,1,
- 102,15,84,194,252,242,15,92,200,15,40,193,248,1,195,248,84,255,217,124,36,
- 4,137,68,36,8,102,184,0,8,102,11,68,36,4,102,37,252,255,252,251,102,137,68,
- 36,6,217,108,36,6,217,252,252,217,108,36,4,139,68,36,8,195,255,248,146,102,
- 15,252,239,210,102,15,118,210,102,15,115,210,1,184,0,0,48,67,102,15,110,216,
+ 233,129,225,239,137,204,137,169,233,139,149,233,139,177,233,133,192,15,133,
+ 244,248,255,248,144,255,139,122,252,248,139,191,233,139,191,233,199,131,233,
+ 0,0,0,0,199,131,233,237,139,6,15,182,204,15,182,232,131,198,4,193,232,16,
+ 252,255,36,171,248,2,137,252,233,137,194,232,251,1,24,255,248,82,255,217,
+ 124,36,4,137,68,36,8,102,184,0,4,102,11,68,36,4,102,37,252,255,252,247,102,
+ 137,68,36,6,217,108,36,6,217,252,252,217,108,36,4,139,68,36,8,195,255,248,
+ 145,102,15,252,239,210,102,15,118,210,102,15,115,210,1,184,0,0,48,67,102,
+ 15,110,216,102,15,112,219,81,15,40,200,102,15,84,202,102,15,46,217,15,134,
+ 244,247,102,15,85,208,252,242,15,88,203,252,242,15,92,203,102,15,86,202,184,
+ 0,0,252,240,63,102,15,110,208,102,15,112,210,81,252,242,15,194,193,1,102,
+ 15,84,194,252,242,15,92,200,15,40,193,248,1,195,248,84,255,217,124,36,4,137,
+ 68,36,8,102,184,0,8,102,11,68,36,4,102,37,252,255,252,251,102,137,68,36,6,
+ 217,108,36,6,217,252,252,217,108,36,4,139,68,36,8,195,255,248,146,102,15,
+ 252,239,210,102,15,118,210,102,15,115,210,1,184,0,0,48,67,102,15,110,216,
102,15,112,219,81,15,40,200,102,15,84,202,102,15,46,217,15,134,244,247,102,
15,85,208,252,242,15,88,203,252,242,15,92,203,102,15,86,202,184,0,0,252,240,
191,102,15,110,208,102,15,112,210,81,252,242,15,194,193,6,102,15,84,194,252,
@@ -1454,91 +1454,91 @@ static void build_subroutines(BuildCtx *ctx, int cmov, int sse)
#endif
dasm_put(Dst, 8218, Dt1(->base), Dt1(->top));
#if LJ_HASJIT
- dasm_put(Dst, 8247, DISPATCH_GL(vmstate), DISPATCH_GL(vmstate), ~LJ_VMST_EXIT, DISPATCH_J(exitno), DISPATCH_J(parent), 8*8+16, DISPATCH_GL(jit_L), DISPATCH_GL(jit_base), DISPATCH_J(L), Dt1(->base), GG_DISP2J, Dt1(->cframe), CFRAME_RAWMASK, Dt1(->base));
+ dasm_put(Dst, 8247, DISPATCH_GL(vmstate), DISPATCH_GL(vmstate), ~LJ_VMST_EXIT, DISPATCH_J(exitno), DISPATCH_J(parent), 8*8+16, DISPATCH_GL(jit_L), DISPATCH_GL(jit_base), DISPATCH_J(L), Dt1(->base), GG_DISP2J, Dt1(->cframe), CFRAME_RAWMASK, CFRAME_OFS_L, Dt1(->base), CFRAME_OFS_PC);
#endif
- dasm_put(Dst, 8391);
+ dasm_put(Dst, 8389);
#if LJ_HASJIT
- dasm_put(Dst, 8394, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP);
+ dasm_put(Dst, 8392, Dt7(->pc), PC2PROTO(k), DISPATCH_GL(jit_L), DISPATCH_GL(vmstate), ~LJ_VMST_INTERP);
#endif
- dasm_put(Dst, 8445);
+ dasm_put(Dst, 8443);
if (!sse) {
- dasm_put(Dst, 8448);
+ dasm_put(Dst, 8446);
}
- dasm_put(Dst, 8493);
+ dasm_put(Dst, 8491);
if (!sse) {
- dasm_put(Dst, 8595);
+ dasm_put(Dst, 8593);
}
- dasm_put(Dst, 8640);
+ dasm_put(Dst, 8638);
if (!sse) {
- dasm_put(Dst, 8742);
+ dasm_put(Dst, 8740);
}
- dasm_put(Dst, 8781);
+ dasm_put(Dst, 8779);
if (sse) {
- dasm_put(Dst, 8886);
+ dasm_put(Dst, 8884);
} else {
- dasm_put(Dst, 9016);
+ dasm_put(Dst, 9014);
}
- dasm_put(Dst, 9063);
+ dasm_put(Dst, 9061);
if (!sse) {
- dasm_put(Dst, 9137);
+ dasm_put(Dst, 9135);
if (cmov) {
- dasm_put(Dst, 9148);
+ dasm_put(Dst, 9146);
} else {
- dasm_put(Dst, 9152);
+ dasm_put(Dst, 9150);
}
- dasm_put(Dst, 9159);
- dasm_put(Dst, 9233);
- dasm_put(Dst, 9333);
+ dasm_put(Dst, 9157);
+ dasm_put(Dst, 9231);
+ dasm_put(Dst, 9331);
if (cmov) {
- dasm_put(Dst, 9336);
+ dasm_put(Dst, 9334);
} else {
- dasm_put(Dst, 9340);
+ dasm_put(Dst, 9338);
}
- dasm_put(Dst, 9347);
+ dasm_put(Dst, 9345);
if (cmov) {
- dasm_put(Dst, 9148);
+ dasm_put(Dst, 9146);
} else {
- dasm_put(Dst, 9152);
+ dasm_put(Dst, 9150);
}
- dasm_put(Dst, 9365);
+ dasm_put(Dst, 9363);
} else {
- dasm_put(Dst, 9444);
+ dasm_put(Dst, 9442);
}
- dasm_put(Dst, 9447);
- dasm_put(Dst, 9532);
- dasm_put(Dst, 9663);
- dasm_put(Dst, 9862);
+ dasm_put(Dst, 9445);
+ dasm_put(Dst, 9530);
+ dasm_put(Dst, 9661);
+ dasm_put(Dst, 9860);
if (sse) {
- dasm_put(Dst, 9885);
- dasm_put(Dst, 9942);
- dasm_put(Dst, 10033);
+ dasm_put(Dst, 9883);
+ dasm_put(Dst, 9940);
+ dasm_put(Dst, 10031);
} else {
- dasm_put(Dst, 10075);
- dasm_put(Dst, 10167);
+ dasm_put(Dst, 10073);
+ dasm_put(Dst, 10165);
}
- dasm_put(Dst, 10213);
+ dasm_put(Dst, 10211);
if (sse) {
- dasm_put(Dst, 10219);
- dasm_put(Dst, 10324);
- dasm_put(Dst, 10407);
+ dasm_put(Dst, 10217);
+ dasm_put(Dst, 10322);
+ dasm_put(Dst, 10405);
} else {
- dasm_put(Dst, 10479);
- dasm_put(Dst, 10562);
+ dasm_put(Dst, 10477);
+ dasm_put(Dst, 10560);
if (cmov) {
- dasm_put(Dst, 10617);
+ dasm_put(Dst, 10615);
} else {
- dasm_put(Dst, 10636);
+ dasm_put(Dst, 10634);
}
- dasm_put(Dst, 10475);
+ dasm_put(Dst, 10473);
}
- dasm_put(Dst, 10677);
+ dasm_put(Dst, 10675);
}
/* Generate the code for a single instruction. */
static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
{
int vk = 0;
- dasm_put(Dst, 10731, defop);
+ dasm_put(Dst, 10729, defop);
switch (op) {
@@ -1547,617 +1547,617 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
/* Remember: all ops branch for a true comparison, fall through otherwise. */
case BC_ISLT: case BC_ISGE: case BC_ISLE: case BC_ISGT:
- dasm_put(Dst, 10733, LJ_TISNUM, LJ_TISNUM);
+ dasm_put(Dst, 10731, LJ_TISNUM, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10754);
+ dasm_put(Dst, 10752);
} else {
- dasm_put(Dst, 10769);
+ dasm_put(Dst, 10767);
if (cmov) {
- dasm_put(Dst, 10779);
+ dasm_put(Dst, 10777);
} else {
- dasm_put(Dst, 10785);
+ dasm_put(Dst, 10783);
}
}
switch (op) {
case BC_ISLT:
- dasm_put(Dst, 10792);
+ dasm_put(Dst, 10790);
break;
case BC_ISGE:
- dasm_put(Dst, 10028);
+ dasm_put(Dst, 10026);
break;
case BC_ISLE:
dasm_put(Dst, 6181);
break;
case BC_ISGT:
- dasm_put(Dst, 10797);
+ dasm_put(Dst, 10795);
break;
default: break; /* Shut up GCC. */
}
- dasm_put(Dst, 10802, -BCBIAS_J*4);
+ dasm_put(Dst, 10800, -BCBIAS_J*4);
break;
case BC_ISEQV: case BC_ISNEV:
vk = op == BC_ISEQV;
- dasm_put(Dst, 10835, LJ_TISNUM, LJ_TISNUM);
+ dasm_put(Dst, 10833, LJ_TISNUM, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 10861);
+ dasm_put(Dst, 10859);
} else {
- dasm_put(Dst, 10873);
+ dasm_put(Dst, 10871);
if (cmov) {
- dasm_put(Dst, 10779);
+ dasm_put(Dst, 10777);
} else {
- dasm_put(Dst, 10785);
+ dasm_put(Dst, 10783);
}
}
iseqne_fp:
if (vk) {
- dasm_put(Dst, 10880);
+ dasm_put(Dst, 10878);
} else {
- dasm_put(Dst, 10889);
+ dasm_put(Dst, 10887);
}
iseqne_end:
if (vk) {
- dasm_put(Dst, 10898, -BCBIAS_J*4);
+ dasm_put(Dst, 10896, -BCBIAS_J*4);
} else {
- dasm_put(Dst, 10913, -BCBIAS_J*4);
+ dasm_put(Dst, 10911, -BCBIAS_J*4);
}
- dasm_put(Dst, 10816);
+ dasm_put(Dst, 10814);
if (op == BC_ISEQV || op == BC_ISNEV) {
- dasm_put(Dst, 10928, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<<MM_eq);
+ dasm_put(Dst, 10926, LJ_TISPRI, LJ_TISTABUD, Dt6(->metatable), Dt6(->nomm), 1<<MM_eq);
if (vk) {
- dasm_put(Dst, 10986);
+ dasm_put(Dst, 10984);
} else {
- dasm_put(Dst, 10990);
+ dasm_put(Dst, 10988);
}
- dasm_put(Dst, 10996);
+ dasm_put(Dst, 10994);
}
break;
case BC_ISEQS: case BC_ISNES:
vk = op == BC_ISEQS;
- dasm_put(Dst, 11001, LJ_TSTR);
+ dasm_put(Dst, 10999, LJ_TSTR);
iseqne_test:
if (vk) {
- dasm_put(Dst, 10884);
+ dasm_put(Dst, 8384);
} else {
dasm_put(Dst, 2811);
}
goto iseqne_end;
case BC_ISEQN: case BC_ISNEN:
vk = op == BC_ISEQN;
- dasm_put(Dst, 11024, LJ_TISNUM);
+ dasm_put(Dst, 11022, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 11038);
+ dasm_put(Dst, 11036);
} else {
- dasm_put(Dst, 11050);
+ dasm_put(Dst, 11048);
if (cmov) {
- dasm_put(Dst, 10779);
+ dasm_put(Dst, 10777);
} else {
- dasm_put(Dst, 10785);
+ dasm_put(Dst, 10783);
}
}
goto iseqne_fp;
case BC_ISEQP: case BC_ISNEP:
vk = op == BC_ISEQP;
- dasm_put(Dst, 11057);
+ dasm_put(Dst, 11055);
goto iseqne_test;
/* -- Unary test and copy ops ------------------------------------------- */
case BC_ISTC: case BC_ISFC: case BC_IST: case BC_ISF:
- dasm_put(Dst, 11068, LJ_TISTRUECOND);
+ dasm_put(Dst, 11066, LJ_TISTRUECOND);
if (op == BC_IST || op == BC_ISTC) {
- dasm_put(Dst, 11080);
+ dasm_put(Dst, 11078);
} else {
- dasm_put(Dst, 11085);
+ dasm_put(Dst, 11083);
}
if (op == BC_ISTC || op == BC_ISFC) {
- dasm_put(Dst, 11090);
+ dasm_put(Dst, 11088);
}
- dasm_put(Dst, 11101, -BCBIAS_J*4);
+ dasm_put(Dst, 11099, -BCBIAS_J*4);
break;
/* -- Unary ops --------------------------------------------------------- */
case BC_MOV:
- dasm_put(Dst, 11132);
+ dasm_put(Dst, 11130);
break;
case BC_NOT:
- dasm_put(Dst, 11165, LJ_TISTRUECOND, LJ_TTRUE);
+ dasm_put(Dst, 11163, LJ_TISTRUECOND, LJ_TTRUE);
break;
case BC_UNM:
- dasm_put(Dst, 11200, LJ_TISNUM);
+ dasm_put(Dst, 11198, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 11211);
+ dasm_put(Dst, 11209);
} else {
- dasm_put(Dst, 11241);
+ dasm_put(Dst, 11239);
}
- dasm_put(Dst, 10816);
+ dasm_put(Dst, 10814);
break;
case BC_LEN:
- dasm_put(Dst, 11250, LJ_TSTR);
+ dasm_put(Dst, 11248, LJ_TSTR);
if (sse) {
- dasm_put(Dst, 11264, Dt5(->len));
+ dasm_put(Dst, 11262, Dt5(->len));
} else {
- dasm_put(Dst, 11282, Dt5(->len));
+ dasm_put(Dst, 11280, Dt5(->len));
}
- dasm_put(Dst, 11291, LJ_TTAB);
+ dasm_put(Dst, 11289, LJ_TTAB);
if (sse) {
- dasm_put(Dst, 11331);
+ dasm_put(Dst, 11329);
} else {
- dasm_put(Dst, 11340);
+ dasm_put(Dst, 11338);
}
- dasm_put(Dst, 11350);
+ dasm_put(Dst, 11348);
break;
/* -- Binary ops -------------------------------------------------------- */
case BC_ADDVN: case BC_ADDNV: case BC_ADDVV:
- dasm_put(Dst, 11360);
+ dasm_put(Dst, 11358);
vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
switch (vk) {
case 0:
- dasm_put(Dst, 11368, LJ_TISNUM);
+ dasm_put(Dst, 11366, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 11380);
+ dasm_put(Dst, 11378);
} else {
- dasm_put(Dst, 11394);
+ dasm_put(Dst, 11392);
}
break;
case 1:
- dasm_put(Dst, 11402, LJ_TISNUM);
+ dasm_put(Dst, 11400, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 11414);
+ dasm_put(Dst, 11412);
} else {
- dasm_put(Dst, 11428);
+ dasm_put(Dst, 11426);
}
break;
default:
- dasm_put(Dst, 11436, LJ_TISNUM, LJ_TISNUM);
+ dasm_put(Dst, 11434, LJ_TISNUM, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 11458);
+ dasm_put(Dst, 11456);
} else {
- dasm_put(Dst, 11472);
+ dasm_put(Dst, 11470);
}
break;
}
if (sse) {
- dasm_put(Dst, 11234);
+ dasm_put(Dst, 11232);
} else {
- dasm_put(Dst, 11246);
+ dasm_put(Dst, 11244);
}
- dasm_put(Dst, 10816);
+ dasm_put(Dst, 10814);
break;
case BC_SUBVN: case BC_SUBNV: case BC_SUBVV:
- dasm_put(Dst, 11360);
+ dasm_put(Dst, 11358);
vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
switch (vk) {
case 0:
- dasm_put(Dst, 11368, LJ_TISNUM);
+ dasm_put(Dst, 11366, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 11480);
+ dasm_put(Dst, 11478);
} else {
- dasm_put(Dst, 11494);
+ dasm_put(Dst, 11492);
}
break;
case 1:
- dasm_put(Dst, 11402, LJ_TISNUM);
+ dasm_put(Dst, 11400, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 11502);
+ dasm_put(Dst, 11500);
} else {
- dasm_put(Dst, 11516);
+ dasm_put(Dst, 11514);
}
break;
default:
- dasm_put(Dst, 11436, LJ_TISNUM, LJ_TISNUM);
+ dasm_put(Dst, 11434, LJ_TISNUM, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 11524);
+ dasm_put(Dst, 11522);
} else {
- dasm_put(Dst, 11538);
+ dasm_put(Dst, 11536);
}
break;
}
if (sse) {
- dasm_put(Dst, 11234);
+ dasm_put(Dst, 11232);
} else {
- dasm_put(Dst, 11246);
+ dasm_put(Dst, 11244);
}
- dasm_put(Dst, 10816);
+ dasm_put(Dst, 10814);
break;
case BC_MULVN: case BC_MULNV: case BC_MULVV:
- dasm_put(Dst, 11360);
+ dasm_put(Dst, 11358);
vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
switch (vk) {
case 0:
- dasm_put(Dst, 11368, LJ_TISNUM);
+ dasm_put(Dst, 11366, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 11546);
+ dasm_put(Dst, 11544);
} else {
- dasm_put(Dst, 11560);
+ dasm_put(Dst, 11558);
}
break;
case 1:
- dasm_put(Dst, 11402, LJ_TISNUM);
+ dasm_put(Dst, 11400, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 11568);
+ dasm_put(Dst, 11566);
} else {
- dasm_put(Dst, 11582);
+ dasm_put(Dst, 11580);
}
break;
default:
- dasm_put(Dst, 11436, LJ_TISNUM, LJ_TISNUM);
+ dasm_put(Dst, 11434, LJ_TISNUM, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 11590);
+ dasm_put(Dst, 11588);
} else {
- dasm_put(Dst, 11604);
+ dasm_put(Dst, 11602);
}
break;
}
if (sse) {
- dasm_put(Dst, 11234);
+ dasm_put(Dst, 11232);
} else {
- dasm_put(Dst, 11246);
+ dasm_put(Dst, 11244);
}
- dasm_put(Dst, 10816);
+ dasm_put(Dst, 10814);
break;
case BC_DIVVN: case BC_DIVNV: case BC_DIVVV:
- dasm_put(Dst, 11360);
+ dasm_put(Dst, 11358);
vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
switch (vk) {
case 0:
- dasm_put(Dst, 11368, LJ_TISNUM);
+ dasm_put(Dst, 11366, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 11612);
+ dasm_put(Dst, 11610);
} else {
- dasm_put(Dst, 11626);
+ dasm_put(Dst, 11624);
}
break;
case 1:
- dasm_put(Dst, 11402, LJ_TISNUM);
+ dasm_put(Dst, 11400, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 11634);
+ dasm_put(Dst, 11632);
} else {
- dasm_put(Dst, 11648);
+ dasm_put(Dst, 11646);
}
break;
default:
- dasm_put(Dst, 11436, LJ_TISNUM, LJ_TISNUM);
+ dasm_put(Dst, 11434, LJ_TISNUM, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 11656);
+ dasm_put(Dst, 11654);
} else {
- dasm_put(Dst, 11670);
+ dasm_put(Dst, 11668);
}
break;
}
if (sse) {
- dasm_put(Dst, 11234);
+ dasm_put(Dst, 11232);
} else {
- dasm_put(Dst, 11246);
+ dasm_put(Dst, 11244);
}
- dasm_put(Dst, 10816);
+ dasm_put(Dst, 10814);
break;
case BC_MODVN:
- dasm_put(Dst, 11360);
+ dasm_put(Dst, 11358);
vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
switch (vk) {
case 0:
- dasm_put(Dst, 11368, LJ_TISNUM);
+ dasm_put(Dst, 11366, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 11678);
+ dasm_put(Dst, 11676);
} else {
- dasm_put(Dst, 11692);
+ dasm_put(Dst, 11690);
}
break;
case 1:
- dasm_put(Dst, 11402, LJ_TISNUM);
+ dasm_put(Dst, 11400, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 11700);
+ dasm_put(Dst, 11698);
} else {
- dasm_put(Dst, 11714);
+ dasm_put(Dst, 11712);
}
break;
default:
- dasm_put(Dst, 11436, LJ_TISNUM, LJ_TISNUM);
+ dasm_put(Dst, 11434, LJ_TISNUM, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 11722);
+ dasm_put(Dst, 11720);
} else {
- dasm_put(Dst, 11736);
+ dasm_put(Dst, 11734);
}
break;
}
- dasm_put(Dst, 11744);
+ dasm_put(Dst, 11742);
if (sse) {
- dasm_put(Dst, 11234);
+ dasm_put(Dst, 11232);
} else {
- dasm_put(Dst, 11246);
+ dasm_put(Dst, 11244);
}
- dasm_put(Dst, 10816);
+ dasm_put(Dst, 10814);
break;
case BC_MODNV: case BC_MODVV:
- dasm_put(Dst, 11360);
+ dasm_put(Dst, 11358);
vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
switch (vk) {
case 0:
- dasm_put(Dst, 11368, LJ_TISNUM);
+ dasm_put(Dst, 11366, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 11678);
+ dasm_put(Dst, 11676);
} else {
- dasm_put(Dst, 11692);
+ dasm_put(Dst, 11690);
}
break;
case 1:
- dasm_put(Dst, 11402, LJ_TISNUM);
+ dasm_put(Dst, 11400, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 11700);
+ dasm_put(Dst, 11698);
} else {
- dasm_put(Dst, 11714);
+ dasm_put(Dst, 11712);
}
break;
default:
- dasm_put(Dst, 11436, LJ_TISNUM, LJ_TISNUM);
+ dasm_put(Dst, 11434, LJ_TISNUM, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 11722);
+ dasm_put(Dst, 11720);
} else {
- dasm_put(Dst, 11736);
+ dasm_put(Dst, 11734);
}
break;
}
- dasm_put(Dst, 11750);
+ dasm_put(Dst, 11748);
break;
case BC_POW:
- dasm_put(Dst, 11360);
+ dasm_put(Dst, 11358);
vk = ((int)op - BC_ADDVN) / (BC_ADDNV-BC_ADDVN);
switch (vk) {
case 0:
- dasm_put(Dst, 11368, LJ_TISNUM);
+ dasm_put(Dst, 11366, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 11678);
+ dasm_put(Dst, 11676);
} else {
- dasm_put(Dst, 11692);
+ dasm_put(Dst, 11690);
}
break;
case 1:
- dasm_put(Dst, 11402, LJ_TISNUM);
+ dasm_put(Dst, 11400, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 11700);
+ dasm_put(Dst, 11698);
} else {
- dasm_put(Dst, 11714);
+ dasm_put(Dst, 11712);
}
break;
default:
- dasm_put(Dst, 11436, LJ_TISNUM, LJ_TISNUM);
+ dasm_put(Dst, 11434, LJ_TISNUM, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 11722);
+ dasm_put(Dst, 11720);
} else {
- dasm_put(Dst, 11736);
+ dasm_put(Dst, 11734);
}
break;
}
- dasm_put(Dst, 11755);
+ dasm_put(Dst, 11753);
if (sse) {
- dasm_put(Dst, 11234);
+ dasm_put(Dst, 11232);
} else {
- dasm_put(Dst, 11246);
+ dasm_put(Dst, 11244);
}
- dasm_put(Dst, 10816);
+ dasm_put(Dst, 10814);
break;
case BC_CAT:
- dasm_put(Dst, 11759, Dt1(->base), Dt1(->base));
+ dasm_put(Dst, 11757, Dt1(->base), Dt1(->base));
break;
/* -- Constant ops ------------------------------------------------------ */
case BC_KSTR:
- dasm_put(Dst, 11853, LJ_TSTR);
+ dasm_put(Dst, 11851, LJ_TSTR);
break;
case BC_KSHORT:
if (sse) {
- dasm_put(Dst, 11886);
+ dasm_put(Dst, 11884);
} else {
- dasm_put(Dst, 11901);
+ dasm_put(Dst, 11899);
}
- dasm_put(Dst, 10816);
+ dasm_put(Dst, 10814);
break;
case BC_KNUM:
if (sse) {
- dasm_put(Dst, 11909);
+ dasm_put(Dst, 11907);
} else {
- dasm_put(Dst, 11922);
+ dasm_put(Dst, 11920);
}
- dasm_put(Dst, 10816);
+ dasm_put(Dst, 10814);
break;
case BC_KPRI:
- dasm_put(Dst, 11929);
+ dasm_put(Dst, 11927);
break;
case BC_KNIL:
- dasm_put(Dst, 11955, LJ_TNIL);
+ dasm_put(Dst, 11953, LJ_TNIL);
break;
/* -- Upvalue and function ops ------------------------------------------ */
case BC_UGET:
- dasm_put(Dst, 12001, offsetof(GCfuncL, uvptr), DtA(->v));
+ dasm_put(Dst, 11999, offsetof(GCfuncL, uvptr), DtA(->v));
break;
case BC_USETV:
#define TV2MARKOFS \
((int32_t)offsetof(GCupval, marked)-(int32_t)offsetof(GCupval, tv))
- dasm_put(Dst, 12045, 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, 12135);
+ dasm_put(Dst, 12043, 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, 12133);
break;
#undef TV2MARKOFS
case BC_USETS:
- dasm_put(Dst, 12147, 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, 12145, 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, 12238);
+ dasm_put(Dst, 12236);
if (sse) {
- dasm_put(Dst, 12243);
+ dasm_put(Dst, 12241);
} else {
- dasm_put(Dst, 11053);
+ dasm_put(Dst, 11051);
}
- dasm_put(Dst, 12250, offsetof(GCfuncL, uvptr), DtA(->v));
+ dasm_put(Dst, 12248, offsetof(GCfuncL, uvptr), DtA(->v));
if (sse) {
- dasm_put(Dst, 12259);
+ dasm_put(Dst, 12257);
} else {
- dasm_put(Dst, 12265);
+ dasm_put(Dst, 12263);
}
- dasm_put(Dst, 10816);
+ dasm_put(Dst, 10814);
break;
case BC_USETP:
- dasm_put(Dst, 12268, offsetof(GCfuncL, uvptr), DtA(->v));
+ dasm_put(Dst, 12266, offsetof(GCfuncL, uvptr), DtA(->v));
break;
case BC_UCLO:
- dasm_put(Dst, 12305, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base));
+ dasm_put(Dst, 12303, -BCBIAS_J*4, Dt1(->openupval), Dt1(->base), Dt1(->base));
break;
case BC_FNEW:
- dasm_put(Dst, 12359, Dt1(->base), Dt1(->base), LJ_TFUNC);
+ dasm_put(Dst, 12357, Dt1(->base), Dt1(->base), LJ_TFUNC);
break;
/* -- Table ops --------------------------------------------------------- */
case BC_TNEW:
- dasm_put(Dst, 12430, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB);
+ dasm_put(Dst, 12428, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB);
break;
case BC_TDUP:
- dasm_put(Dst, 12551, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB);
+ dasm_put(Dst, 12549, DISPATCH_GL(gc.total), DISPATCH_GL(gc.threshold), Dt1(->base), Dt1(->base), LJ_TTAB);
break;
case BC_GGET:
- dasm_put(Dst, 12643, Dt7(->env));
+ dasm_put(Dst, 12641, Dt7(->env));
break;
case BC_GSET:
- dasm_put(Dst, 12661, Dt7(->env));
+ dasm_put(Dst, 12659, Dt7(->env));
break;
case BC_TGETV:
- dasm_put(Dst, 12679, LJ_TTAB, LJ_TISNUM);
+ dasm_put(Dst, 12677, LJ_TTAB, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 12712);
+ dasm_put(Dst, 12710);
} else {
- dasm_put(Dst, 12733);
+ dasm_put(Dst, 12731);
if (cmov) {
- dasm_put(Dst, 10779);
+ dasm_put(Dst, 10777);
} else {
- dasm_put(Dst, 10785);
+ dasm_put(Dst, 10783);
}
dasm_put(Dst, 2524);
}
- dasm_put(Dst, 12743, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
- dasm_put(Dst, 12835, LJ_TSTR);
+ dasm_put(Dst, 12741, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
+ dasm_put(Dst, 12833, LJ_TSTR);
break;
case BC_TGETS:
- dasm_put(Dst, 12853, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL);
- dasm_put(Dst, 12937, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
+ dasm_put(Dst, 12851, LJ_TTAB, Dt6(->hmask), Dt5(->hash), sizeof(Node), Dt6(->node), DtB(->key.it), LJ_TSTR, DtB(->key.gcr), LJ_TNIL);
+ dasm_put(Dst, 12935, LJ_TNIL, DtB(->next), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
break;
case BC_TGETB:
- dasm_put(Dst, 13008, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
- dasm_put(Dst, 11350);
+ dasm_put(Dst, 13006, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_index);
+ dasm_put(Dst, 11348);
break;
case BC_TSETV:
- dasm_put(Dst, 13107, LJ_TTAB, LJ_TISNUM);
+ dasm_put(Dst, 13105, LJ_TTAB, LJ_TISNUM);
if (sse) {
- dasm_put(Dst, 12712);
+ dasm_put(Dst, 12710);
} else {
- dasm_put(Dst, 12733);
+ dasm_put(Dst, 12731);
if (cmov) {
- dasm_put(Dst, 10779);
+ dasm_put(Dst, 10777);
} else {
- dasm_put(Dst, 10785);
+ dasm_put(Dst, 10783);
}
dasm_put(Dst, 2524);
}
- dasm_put(Dst, 13140, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable));
- dasm_put(Dst, 13223, Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
+ dasm_put(Dst, 13138, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable));
+ dasm_put(Dst, 13221, Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
break;
case BC_TSETS:
- dasm_put(Dst, 13285, 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, 13360, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, DtB(->next));
- dasm_put(Dst, 13452, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
+ dasm_put(Dst, 13283, 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, 13358, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable), Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, DtB(->next));
+ dasm_put(Dst, 13450, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, LJ_TSTR, Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
break;
case BC_TSETB:
- dasm_put(Dst, 13548, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable));
- dasm_put(Dst, 13646, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
+ dasm_put(Dst, 13546, LJ_TTAB, Dt6(->asize), Dt6(->array), LJ_TNIL, Dt6(->marked), LJ_GC_BLACK, Dt6(->metatable));
+ dasm_put(Dst, 13644, Dt6(->metatable), Dt6(->nomm), 1<<MM_newindex, Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain), Dt6(->gclist));
break;
case BC_TSETM:
- dasm_put(Dst, 13692);
+ dasm_put(Dst, 13690);
if (sse) {
- dasm_put(Dst, 12243);
+ dasm_put(Dst, 12241);
} else {
- dasm_put(Dst, 13697);
+ dasm_put(Dst, 13695);
}
- dasm_put(Dst, 13705, Dt6(->marked), LJ_GC_BLACK);
+ dasm_put(Dst, 13703, Dt6(->marked), LJ_GC_BLACK);
if (sse) {
- dasm_put(Dst, 13730);
+ dasm_put(Dst, 13728);
} else {
- dasm_put(Dst, 13737);
+ dasm_put(Dst, 13735);
}
- dasm_put(Dst, 13742, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain));
- dasm_put(Dst, 13870, Dt6(->gclist));
+ dasm_put(Dst, 13740, Dt6(->asize), Dt6(->array), Dt1(->base), Dt1(->base), Dt6(->marked), cast_byte(~LJ_GC_BLACK), DISPATCH_GL(gc.grayagain), DISPATCH_GL(gc.grayagain));
+ dasm_put(Dst, 13868, Dt6(->gclist));
break;
/* -- Calls and vararg handling ----------------------------------------- */
case BC_CALL: case BC_CALLM:
- dasm_put(Dst, 11364);
+ dasm_put(Dst, 11362);
if (op == BC_CALLM) {
- dasm_put(Dst, 13878);
+ dasm_put(Dst, 13876);
}
- dasm_put(Dst, 13883, LJ_TFUNC, Dt7(->pc));
+ dasm_put(Dst, 13881, LJ_TFUNC, Dt7(->pc));
break;
case BC_CALLMT:
- dasm_put(Dst, 13878);
+ dasm_put(Dst, 13876);
break;
case BC_CALLT:
- dasm_put(Dst, 13924, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc));
- dasm_put(Dst, 14042, FRAME_TYPE, Dt7(->pc), PC2PROTO(k));
+ dasm_put(Dst, 13922, LJ_TFUNC, FRAME_TYPE, Dt7(->ffid), Dt7(->pc));
+ dasm_put(Dst, 14040, FRAME_TYPE, Dt7(->pc), PC2PROTO(k));
break;
case BC_ITERC:
- dasm_put(Dst, 14099, LJ_TFUNC, 2+1, Dt7(->pc));
+ dasm_put(Dst, 14097, LJ_TFUNC, 2+1, Dt7(->pc));
break;
case BC_VARG:
- dasm_put(Dst, 14179, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL);
- dasm_put(Dst, 14323, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top));
+ dasm_put(Dst, 14177, Dt7(->pc), PC2PROTO(numparams), (8+FRAME_VARG), LJ_TNIL);
+ dasm_put(Dst, 14321, Dt1(->maxstack), Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top));
break;
/* -- Returns ----------------------------------------------------------- */
case BC_RETM:
- dasm_put(Dst, 13878);
+ dasm_put(Dst, 13876);
break;
case BC_RET: case BC_RET0: case BC_RET1:
if (op != BC_RET0) {
- dasm_put(Dst, 14422);
+ dasm_put(Dst, 14420);
}
- dasm_put(Dst, 14426, FRAME_TYPE);
+ dasm_put(Dst, 14424, FRAME_TYPE);
switch (op) {
case BC_RET:
- dasm_put(Dst, 14445);
+ dasm_put(Dst, 14443);
break;
case BC_RET1:
- dasm_put(Dst, 14503);
+ dasm_put(Dst, 14501);
/* fallthrough */
case BC_RET0:
- dasm_put(Dst, 14519);
+ dasm_put(Dst, 14517);
default:
break;
}
- dasm_put(Dst, 14530, Dt7(->pc), PC2PROTO(k));
+ dasm_put(Dst, 14528, Dt7(->pc), PC2PROTO(k));
if (op == BC_RET) {
- dasm_put(Dst, 14572, LJ_TNIL);
+ dasm_put(Dst, 14570, LJ_TNIL);
} else {
- dasm_put(Dst, 14581, LJ_TNIL);
+ dasm_put(Dst, 14579, LJ_TNIL);
}
- dasm_put(Dst, 14588);
+ dasm_put(Dst, 14586);
if (op != BC_RET0) {
- dasm_put(Dst, 14609);
+ dasm_put(Dst, 14607);
}
dasm_put(Dst, 4680);
break;
@@ -2167,7 +2167,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
case BC_FORL:
#if LJ_HASJIT
- dasm_put(Dst, 14613, HOTCOUNT_PCMASK, GG_DISP2HOT);
+ dasm_put(Dst, 14611, HOTCOUNT_PCMASK, GG_DISP2HOT);
#endif
break;
@@ -2179,57 +2179,57 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
case BC_FORI:
case BC_IFORL:
vk = (op == BC_IFORL || op == BC_JFORL);
- dasm_put(Dst, 14634);
+ dasm_put(Dst, 14632);
if (!vk) {
- dasm_put(Dst, 14638, LJ_TISNUM, LJ_TISNUM);
+ dasm_put(Dst, 14636, LJ_TISNUM, LJ_TISNUM);
}
- dasm_put(Dst, 14657);
+ dasm_put(Dst, 14655);
if (!vk) {
- dasm_put(Dst, 14661, LJ_TISNUM);
+ dasm_put(Dst, 14659, LJ_TISNUM);
}
if (sse) {
- dasm_put(Dst, 14670);
+ dasm_put(Dst, 14668);
if (vk) {
- dasm_put(Dst, 14682);
+ dasm_put(Dst, 14680);
} else {
- dasm_put(Dst, 14701);
+ dasm_put(Dst, 14699);
}
- dasm_put(Dst, 14706);
+ dasm_put(Dst, 14704);
} else {
- dasm_put(Dst, 14719);
+ dasm_put(Dst, 14717);
if (vk) {
- dasm_put(Dst, 14725);
+ dasm_put(Dst, 14723);
} else {
- dasm_put(Dst, 14741);
+ dasm_put(Dst, 14739);
}
- dasm_put(Dst, 14749);
+ dasm_put(Dst, 14747);
if (cmov) {
- dasm_put(Dst, 10779);
+ dasm_put(Dst, 10777);
} else {
- dasm_put(Dst, 10785);
+ dasm_put(Dst, 10783);
}
if (!cmov) {
- dasm_put(Dst, 14754);
+ dasm_put(Dst, 14752);
}
}
if (op == BC_FORI) {
- dasm_put(Dst, 14760, -BCBIAS_J*4);
+ dasm_put(Dst, 14758, -BCBIAS_J*4);
} else if (op == BC_JFORI) {
- dasm_put(Dst, 14770, -BCBIAS_J*4, BC_JLOOP);
+ dasm_put(Dst, 14768, -BCBIAS_J*4, BC_JLOOP);
} else if (op == BC_IFORL) {
- dasm_put(Dst, 14784, -BCBIAS_J*4);
+ dasm_put(Dst, 14782, -BCBIAS_J*4);
} else {
- dasm_put(Dst, 14780, BC_JLOOP);
+ dasm_put(Dst, 14778, BC_JLOOP);
}
- dasm_put(Dst, 10814);
+ dasm_put(Dst, 10812);
if (sse) {
- dasm_put(Dst, 14794);
+ dasm_put(Dst, 14792);
}
break;
case BC_ITERL:
#if LJ_HASJIT
- dasm_put(Dst, 14613, HOTCOUNT_PCMASK, GG_DISP2HOT);
+ dasm_put(Dst, 14611, HOTCOUNT_PCMASK, GG_DISP2HOT);
#endif
break;
@@ -2238,33 +2238,33 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
break;
#endif
case BC_IITERL:
- dasm_put(Dst, 14805, LJ_TNIL);
+ dasm_put(Dst, 14803, LJ_TNIL);
if (op == BC_JITERL) {
- dasm_put(Dst, 14820, BC_JLOOP);
+ dasm_put(Dst, 14818, BC_JLOOP);
} else {
- dasm_put(Dst, 14834, -BCBIAS_J*4);
+ dasm_put(Dst, 14832, -BCBIAS_J*4);
}
- dasm_put(Dst, 11111);
+ dasm_put(Dst, 11109);
break;
case BC_LOOP:
#if LJ_HASJIT
- dasm_put(Dst, 14613, HOTCOUNT_PCMASK, GG_DISP2HOT);
+ dasm_put(Dst, 14611, HOTCOUNT_PCMASK, GG_DISP2HOT);
#endif
break;
case BC_ILOOP:
- dasm_put(Dst, 10816);
+ dasm_put(Dst, 10814);
break;
case BC_JLOOP:
#if LJ_HASJIT
- dasm_put(Dst, 14850, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L));
+ dasm_put(Dst, 14848, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L));
#endif
break;
case BC_JMP:
- dasm_put(Dst, 14873, -BCBIAS_J*4);
+ dasm_put(Dst, 14871, -BCBIAS_J*4);
break;
/* -- Function headers -------------------------------------------------- */
@@ -2287,47 +2287,47 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse)
break;
#endif
case BC_IFUNCF:
- dasm_put(Dst, 14897, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams));
+ dasm_put(Dst, 14895, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams));
if (op == BC_JFUNCF) {
- dasm_put(Dst, 14927, BC_JLOOP);
+ dasm_put(Dst, 14925, BC_JLOOP);
} else {
- dasm_put(Dst, 10816);
+ dasm_put(Dst, 10814);
}
- dasm_put(Dst, 14936, LJ_TNIL);
+ dasm_put(Dst, 14934, LJ_TNIL);
break;
case BC_JFUNCV:
#if !LJ_HASJIT
break;
#endif
- dasm_put(Dst, 10477);
+ dasm_put(Dst, 10475);
break; /* NYI: compiled vararg functions. */
case BC_IFUNCV:
- dasm_put(Dst, 14958, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL);
+ dasm_put(Dst, 14956, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL);
if (op == BC_JFUNCV) {
- dasm_put(Dst, 14927, BC_JLOOP);
+ dasm_put(Dst, 14925, BC_JLOOP);
} else {
- dasm_put(Dst, 15049, -4+PC2PROTO(k));
+ dasm_put(Dst, 15047, -4+PC2PROTO(k));
}
- dasm_put(Dst, 15071, LJ_TNIL);
+ dasm_put(Dst, 15069, LJ_TNIL);
break;
case BC_FUNCC:
case BC_FUNCCW:
- dasm_put(Dst, 15093, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top));
+ dasm_put(Dst, 15091, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top));
if (op == BC_FUNCC) {
- dasm_put(Dst, 15122);
+ dasm_put(Dst, 15120);
} else {
- dasm_put(Dst, 15126);
+ dasm_put(Dst, 15124);
}
- dasm_put(Dst, 15134, DISPATCH_GL(vmstate), ~LJ_VMST_C);
+ dasm_put(Dst, 15132, DISPATCH_GL(vmstate), ~LJ_VMST_C);
if (op == BC_FUNCC) {
- dasm_put(Dst, 15143);
+ dasm_put(Dst, 15141);
} else {
- dasm_put(Dst, 15147, DISPATCH_GL(wrapf));
+ dasm_put(Dst, 15145, DISPATCH_GL(wrapf));
}
- dasm_put(Dst, 15152, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top));
+ dasm_put(Dst, 15150, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top));
break;
/* ---------------------------------------------------------------------- */
@@ -2355,7 +2355,7 @@ static int build_backend(BuildCtx *ctx)
build_subroutines(ctx, cmov, sse);
- dasm_put(Dst, 15177);
+ dasm_put(Dst, 15175);
for (op = 0; op < BC__MAX; op++)
build_ins(ctx, (BCOp)op, op, cmov, sse);
diff --git a/src/lj_frame.h b/src/lj_frame.h
index 0d7b177b..089b24f6 100644
--- a/src/lj_frame.h
+++ b/src/lj_frame.h
@@ -77,10 +77,10 @@ enum {
#define CFRAME_SIZE (10*8)
#else
#define CFRAME_OFS_PREV (4*8)
-#define CFRAME_OFS_PC (5*4)
-#define CFRAME_OFS_L (4*4)
-#define CFRAME_OFS_ERRF (3*4)
-#define CFRAME_OFS_NRES (2*4)
+#define CFRAME_OFS_PC (7*4)
+#define CFRAME_OFS_L (6*4)
+#define CFRAME_OFS_ERRF (5*4)
+#define CFRAME_OFS_NRES (4*4)
#define CFRAME_OFS_MULTRES (1*4)
#define CFRAME_SIZE (10*8)
#endif
diff --git a/src/lj_target_x86.h b/src/lj_target_x86.h
index 83eba0ec..65f829ac 100644
--- a/src/lj_target_x86.h
+++ b/src/lj_target_x86.h
@@ -118,10 +118,10 @@ enum {
*/
#if LJ_64
#ifdef _WIN64
-#define SPS_FIXED (5*2)
+#define SPS_FIXED (4*2)
#define SPS_FIRST (4*2) /* Don't use callee register save area. */
#else
-#define SPS_FIXED 2
+#define SPS_FIXED 4
#define SPS_FIRST 2
#endif
#else
--
cgit v1.2.3-55-g6feb