diff options
Diffstat (limited to 'src/buildvm_x64.h')
-rw-r--r-- | src/buildvm_x64.h | 255 |
1 files changed, 148 insertions, 107 deletions
diff --git a/src/buildvm_x64.h b/src/buildvm_x64.h index b3022a17..8bcfd63f 100644 --- a/src/buildvm_x64.h +++ b/src/buildvm_x64.h | |||
@@ -12,7 +12,7 @@ | |||
12 | #define DASM_SECTION_CODE_OP 0 | 12 | #define DASM_SECTION_CODE_OP 0 |
13 | #define DASM_SECTION_CODE_SUB 1 | 13 | #define DASM_SECTION_CODE_SUB 1 |
14 | #define DASM_MAXSECTION 2 | 14 | #define DASM_MAXSECTION 2 |
15 | static const unsigned char build_actionlist[13946] = { | 15 | static const unsigned char build_actionlist[14263] = { |
16 | 254,1,248,10,252,247,195,237,15,132,244,11,131,227,252,248,41,218,72,141, | 16 | 254,1,248,10,252,247,195,237,15,132,244,11,131,227,252,248,41,218,72,141, |
17 | 76,25,252,248,139,90,252,252,199,68,10,4,237,248,12,131,192,1,137,68,36,4, | 17 | 76,25,252,248,139,90,252,252,199,68,10,4,237,248,12,131,192,1,137,68,36,4, |
18 | 252,247,195,237,15,132,244,13,248,14,129,252,243,239,252,247,195,237,15,133, | 18 | 252,247,195,237,15,132,244,13,248,14,129,252,243,239,252,247,195,237,15,133, |
@@ -636,58 +636,73 @@ static const unsigned char build_actionlist[13946] = { | |||
636 | 105,232,72,139,65,252,240,72,137,41,72,137,65,8,139,105,224,139,65,228,137, | 636 | 105,232,72,139,65,252,240,72,137,41,72,137,65,8,139,105,224,139,65,228,137, |
637 | 105,252,248,137,65,252,252,129,252,248,239,184,237,15,133,244,28,137,202, | 637 | 105,252,248,137,65,252,252,129,252,248,239,184,237,15,133,244,28,137,202, |
638 | 137,90,252,252,139,157,233,139,11,15,182,252,233,15,182,205,131,195,4,65, | 638 | 137,90,252,252,139,157,233,139,11,15,182,252,233,15,182,205,131,195,4,65, |
639 | 252,255,36,252,238,255,15,182,252,236,15,182,192,68,137,60,36,68,141,188, | 639 | 252,255,36,252,238,255,68,137,60,36,68,137,116,36,4,139,108,202,252,240,139, |
640 | 253,194,233,141,12,202,68,43,122,252,252,133,252,237,15,132,244,251,141,108, | 640 | 68,202,252,248,68,139,181,233,131,195,4,68,139,189,233,248,1,68,57,252,240, |
641 | 252,233,252,248,65,57,215,15,131,244,248,248,1,73,139,71,252,248,65,131,199, | 641 | 15,131,244,251,65,129,124,253,199,4,239,15,132,244,250,255,252,242,15,42, |
642 | 8,72,137,1,131,193,8,57,252,233,15,131,244,249,65,57,215,15,130,244,1,248, | 642 | 192,255,219,68,202,252,248,255,73,139,44,199,72,137,108,202,8,131,192,1,255, |
643 | 2,199,65,4,237,131,193,8,57,252,233,15,130,244,2,248,3,68,139,60,36,139,3, | 643 | 137,68,202,252,248,248,2,15,183,67,252,254,141,156,253,131,233,248,3,68,139, |
644 | 15,182,204,15,182,232,131,195,4,193,232,16,65,252,255,36,252,238,248,5,199, | 644 | 116,36,4,68,139,60,36,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65, |
645 | 68,36,4,1,0,0,0,137,208,68,41,252,248,15,134,244,3,137,197,193,252,237,3, | 645 | 252,255,36,252,238,248,4,131,192,1,255,137,68,202,252,248,255,252,233,244, |
646 | 131,197,1,137,108,36,4,139,108,36,24,1,200,59,133,233,15,135,244,253,248, | 646 | 1,248,5,68,41,252,240,248,6,59,133,233,15,135,244,3,68,105,252,248,239,68, |
647 | 6,255,73,139,71,252,248,65,131,199,8,72,137,1,131,193,8,65,57,215,15,130, | 647 | 3,189,233,65,129,191,233,239,15,132,244,253,70,141,116,48,1,73,139,175,233, |
648 | 244,6,252,233,244,3,248,7,137,149,233,137,141,233,137,92,36,28,65,41,215, | 648 | 73,139,135,233,72,137,44,202,72,137,68,202,8,68,137,116,202,252,248,252,233, |
649 | 139,116,36,4,131,252,238,1,137,252,239,232,251,1,0,139,149,233,139,141,233, | 649 | 244,2,248,7,131,192,1,252,233,244,6,255,129,124,253,202,252,236,239,15,133, |
650 | 65,1,215,252,233,244,6,255,193,225,3,255,248,1,139,90,252,252,137,68,36,4, | 650 | 244,251,139,108,202,232,129,124,253,202,252,244,239,15,133,244,251,129,124, |
651 | 252,247,195,237,15,133,244,253,255,248,13,65,137,215,131,232,1,15,132,244, | 651 | 253,202,252,252,239,15,133,244,251,128,189,233,235,15,133,244,251,141,156, |
652 | 249,248,2,73,139,44,15,73,137,111,252,248,65,131,199,8,131,232,1,15,133,244, | 652 | 253,131,233,199,68,202,252,248,0,0,0,0,248,1,139,3,15,182,204,15,182,232, |
653 | 2,248,3,139,68,36,4,15,182,107,252,255,248,5,57,197,15,135,244,252,255,72, | 653 | 131,195,4,193,232,16,65,252,255,36,252,238,248,5,198,67,252,252,235,141,156, |
654 | 139,44,10,72,137,106,252,248,255,248,5,56,67,252,255,15,135,244,252,255,15, | 654 | 253,131,233,198,3,235,252,233,244,1,255,15,182,252,236,15,182,192,68,137, |
655 | 182,75,252,253,72,252,247,209,141,20,202,68,139,122,252,248,69,139,191,233, | 655 | 60,36,68,141,188,253,194,233,141,12,202,68,43,122,252,252,133,252,237,15, |
656 | 69,139,191,233,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255, | 656 | 132,244,251,141,108,252,233,252,248,65,57,215,15,131,244,248,248,1,73,139, |
657 | 36,252,238,248,6,255,65,199,71,252,252,237,65,131,199,8,255,199,68,194,252, | 657 | 71,252,248,65,131,199,8,72,137,1,131,193,8,57,252,233,15,131,244,249,65,57, |
658 | 244,237,255,131,192,1,252,233,244,5,248,7,141,171,233,252,247,197,237,15, | 658 | 215,15,130,244,1,248,2,199,65,4,237,131,193,8,57,252,233,15,130,244,2,248, |
659 | 133,244,14,41,252,234,255,1,252,233,255,137,221,209,252,237,129,229,239,102, | 659 | 3,68,139,60,36,139,3,15,182,204,15,182,232,131,195,4,193,232,16,65,252,255, |
660 | 65,131,172,253,46,233,1,15,132,244,140,255,141,12,202,255,129,121,253,4,239, | 660 | 36,252,238,248,5,199,68,36,4,1,0,0,0,137,208,68,41,252,248,15,134,244,3,137, |
661 | 15,135,244,53,129,121,253,12,239,15,135,244,53,255,139,105,20,255,129,252, | 661 | 197,193,252,237,3,131,197,1,137,108,36,4,139,108,36,24,1,200,59,133,233,15, |
662 | 253,239,15,135,244,53,255,252,242,15,16,1,252,242,15,16,73,8,255,252,242, | 662 | 135,244,253,248,6,255,73,139,71,252,248,65,131,199,8,72,137,1,131,193,8,65, |
663 | 15,88,65,16,252,242,15,17,1,133,252,237,15,136,244,249,255,15,140,244,249, | 663 | 57,215,15,130,244,6,252,233,244,3,248,7,137,149,233,137,141,233,137,92,36, |
664 | 255,102,15,46,200,248,1,252,242,15,17,65,24,255,221,65,8,221,1,255,220,65, | 664 | 28,65,41,215,139,116,36,4,131,252,238,1,137,252,239,232,251,1,0,139,149,233, |
665 | 16,221,17,221,81,24,133,252,237,15,136,244,247,255,221,81,24,15,140,244,247, | 665 | 139,141,233,65,1,215,252,233,244,6,255,193,225,3,255,248,1,139,90,252,252, |
666 | 255,217,201,248,1,255,15,183,67,252,254,255,15,131,244,248,141,156,253,131, | 666 | 137,68,36,4,252,247,195,237,15,133,244,253,255,248,13,65,137,215,131,232, |
667 | 233,255,141,156,253,131,233,15,183,67,252,254,15,131,245,255,15,130,244,248, | 667 | 1,15,132,244,249,248,2,73,139,44,15,73,137,111,252,248,65,131,199,8,131,232, |
668 | 141,156,253,131,233,255,248,3,102,15,46,193,252,233,244,1,255,141,12,202, | 668 | 1,15,133,244,2,248,3,139,68,36,4,15,182,107,252,255,248,5,57,197,15,135,244, |
669 | 139,105,4,129,252,253,239,15,132,244,247,255,137,105,252,252,139,41,137,105, | 669 | 252,255,72,139,44,10,72,137,106,252,248,255,248,5,56,67,252,255,15,135,244, |
670 | 252,248,252,233,245,255,141,156,253,131,233,139,1,137,105,252,252,137,65, | 670 | 252,255,15,182,75,252,253,72,252,247,209,141,20,202,68,139,122,252,248,69, |
671 | 252,248,255,65,139,142,233,139,4,129,72,139,128,233,139,108,36,24,65,137, | 671 | 139,191,233,69,139,191,233,139,3,15,182,204,15,182,232,131,195,4,193,232, |
672 | 150,233,65,137,174,233,76,137,36,36,76,137,108,36,8,72,131,252,236,16,252, | 672 | 16,65,252,255,36,252,238,248,6,255,65,199,71,252,252,237,65,131,199,8,255, |
673 | 255,224,255,141,156,253,131,233,139,3,15,182,204,15,182,232,131,195,4,193, | 673 | 199,68,194,252,244,237,255,131,192,1,252,233,244,5,248,7,141,171,233,252, |
674 | 232,16,65,252,255,36,252,238,255,137,221,209,252,237,129,229,239,102,65,131, | 674 | 247,197,237,15,133,244,14,41,252,234,255,1,252,233,255,137,221,209,252,237, |
675 | 172,253,46,233,1,15,132,244,142,255,68,139,187,233,139,108,36,24,141,12,202, | 675 | 129,229,239,102,65,131,172,253,46,233,1,15,132,244,140,255,141,12,202,255, |
676 | 59,141,233,15,135,244,23,15,182,139,233,57,200,15,134,244,249,248,2,255,15, | 676 | 129,121,253,4,239,15,135,244,53,129,121,253,12,239,15,135,244,53,255,139, |
677 | 183,67,252,254,252,233,245,255,248,3,199,68,194,252,252,237,131,192,1,57, | 677 | 105,20,255,129,252,253,239,15,135,244,53,255,252,242,15,16,1,252,242,15,16, |
678 | 200,15,134,244,3,252,233,244,2,255,141,44,197,237,141,4,194,68,139,122,252, | 678 | 73,8,255,252,242,15,88,65,16,252,242,15,17,1,133,252,237,15,136,244,249,255, |
679 | 248,137,104,252,252,68,137,120,252,248,139,108,36,24,141,12,200,59,141,233, | 679 | 15,140,244,249,255,102,15,46,200,248,1,252,242,15,17,65,24,255,221,65,8,221, |
680 | 15,135,244,22,137,209,137,194,15,182,171,233,133,252,237,15,132,244,248,248, | 680 | 1,255,220,65,16,221,17,221,81,24,133,252,237,15,136,244,247,255,221,81,24, |
681 | 1,131,193,8,57,209,15,131,244,249,68,139,121,252,248,68,137,56,68,139,121, | 681 | 15,140,244,247,255,217,201,248,1,255,15,183,67,252,254,255,15,131,244,248, |
682 | 252,252,68,137,120,4,131,192,8,199,65,252,252,237,131,252,237,1,15,133,244, | 682 | 141,156,253,131,233,255,141,156,253,131,233,15,183,67,252,254,15,131,245, |
683 | 1,248,2,255,68,139,187,233,139,3,15,182,204,15,182,232,131,195,4,193,232, | 683 | 255,15,130,244,248,141,156,253,131,233,255,248,3,102,15,46,193,252,233,244, |
684 | 16,65,252,255,36,252,238,255,248,3,199,64,4,237,131,192,8,131,252,237,1,15, | 684 | 1,255,141,12,202,139,105,4,129,252,253,239,15,132,244,247,255,137,105,252, |
685 | 133,244,3,252,233,244,2,255,139,106,252,248,76,139,189,233,139,108,36,24, | 685 | 252,139,41,137,105,252,248,252,233,245,255,141,156,253,131,233,139,1,137, |
686 | 141,68,194,252,248,137,149,233,141,136,233,59,141,233,137,133,233,255,137, | 686 | 105,252,252,137,65,252,248,255,65,139,142,233,139,4,129,72,139,128,233,139, |
687 | 252,239,255,76,137,252,254,137,252,239,255,15,135,244,21,65,199,134,233,237, | 687 | 108,36,24,65,137,150,233,65,137,174,233,76,137,36,36,76,137,108,36,8,72,131, |
688 | 255,65,252,255,215,255,65,252,255,150,233,255,65,199,134,233,237,139,149, | 688 | 252,236,16,252,255,224,255,141,156,253,131,233,139,3,15,182,204,15,182,232, |
689 | 233,141,12,194,252,247,217,3,141,233,139,90,252,252,252,233,244,12,255,254, | 689 | 131,195,4,193,232,16,65,252,255,36,252,238,255,137,221,209,252,237,129,229, |
690 | 0 | 690 | 239,102,65,131,172,253,46,233,1,15,132,244,142,255,68,139,187,233,139,108, |
691 | 36,24,141,12,202,59,141,233,15,135,244,23,15,182,139,233,57,200,15,134,244, | ||
692 | 249,248,2,255,15,183,67,252,254,252,233,245,255,248,3,199,68,194,252,252, | ||
693 | 237,131,192,1,57,200,15,134,244,3,252,233,244,2,255,141,44,197,237,141,4, | ||
694 | 194,68,139,122,252,248,137,104,252,252,68,137,120,252,248,139,108,36,24,141, | ||
695 | 12,200,59,141,233,15,135,244,22,137,209,137,194,15,182,171,233,133,252,237, | ||
696 | 15,132,244,248,248,1,131,193,8,57,209,15,131,244,249,68,139,121,252,248,68, | ||
697 | 137,56,68,139,121,252,252,68,137,120,4,131,192,8,199,65,252,252,237,131,252, | ||
698 | 237,1,15,133,244,1,248,2,255,68,139,187,233,139,3,15,182,204,15,182,232,131, | ||
699 | 195,4,193,232,16,65,252,255,36,252,238,255,248,3,199,64,4,237,131,192,8,131, | ||
700 | 252,237,1,15,133,244,3,252,233,244,2,255,139,106,252,248,76,139,189,233,139, | ||
701 | 108,36,24,141,68,194,252,248,137,149,233,141,136,233,59,141,233,137,133,233, | ||
702 | 255,137,252,239,255,76,137,252,254,137,252,239,255,15,135,244,21,65,199,134, | ||
703 | 233,237,255,65,252,255,215,255,65,252,255,150,233,255,65,199,134,233,237, | ||
704 | 139,149,233,141,12,194,252,247,217,3,141,233,139,90,252,252,252,233,244,12, | ||
705 | 255,254,0 | ||
691 | }; | 706 | }; |
692 | 707 | ||
693 | enum { | 708 | enum { |
@@ -1982,9 +1997,35 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) | |||
1982 | dasm_put(Dst, 12823, LJ_TFUNC, 2+1, Dt7(->pc)); | 1997 | dasm_put(Dst, 12823, LJ_TFUNC, 2+1, Dt7(->pc)); |
1983 | break; | 1998 | break; |
1984 | 1999 | ||
2000 | case BC_ITERN: | ||
2001 | #if LJ_HASJIT | ||
2002 | #endif | ||
2003 | dasm_put(Dst, 12895, Dt6(->asize), Dt6(->array), LJ_TNIL); | ||
2004 | if (sse) { | ||
2005 | dasm_put(Dst, 12947); | ||
2006 | } else { | ||
2007 | dasm_put(Dst, 12953); | ||
2008 | } | ||
2009 | dasm_put(Dst, 12959); | ||
2010 | if (sse) { | ||
2011 | dasm_put(Dst, 9917); | ||
2012 | } else { | ||
2013 | dasm_put(Dst, 9929); | ||
2014 | } | ||
2015 | dasm_put(Dst, 12972, -BCBIAS_J*4); | ||
2016 | if (!sse) { | ||
2017 | dasm_put(Dst, 13026); | ||
2018 | } | ||
2019 | dasm_put(Dst, 13032, Dt6(->hmask), sizeof(Node), Dt6(->node), DtB(->val.it), LJ_TNIL, DtB(->key), DtB(->val)); | ||
2020 | break; | ||
2021 | |||
2022 | case BC_ISNEXT: | ||
2023 | dasm_put(Dst, 13111, LJ_TFUNC, LJ_TTAB, LJ_TNIL, Dt8(->ffid), FF_next_N, -BCBIAS_J*4, BC_JMP, -BCBIAS_J*4, BC_ITERC); | ||
2024 | break; | ||
2025 | |||
1985 | case BC_VARG: | 2026 | case BC_VARG: |
1986 | dasm_put(Dst, 12895, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); | 2027 | dasm_put(Dst, 13212, (8+FRAME_VARG), LJ_TNIL, Dt1(->maxstack)); |
1987 | dasm_put(Dst, 13062, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); | 2028 | dasm_put(Dst, 13379, Dt1(->base), Dt1(->top), Dt1(->base), Dt1(->top)); |
1988 | break; | 2029 | break; |
1989 | 2030 | ||
1990 | /* -- Returns ----------------------------------------------------------- */ | 2031 | /* -- Returns ----------------------------------------------------------- */ |
@@ -1995,30 +2036,30 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) | |||
1995 | 2036 | ||
1996 | case BC_RET: case BC_RET0: case BC_RET1: | 2037 | case BC_RET: case BC_RET0: case BC_RET1: |
1997 | if (op != BC_RET0) { | 2038 | if (op != BC_RET0) { |
1998 | dasm_put(Dst, 13132); | 2039 | dasm_put(Dst, 13449); |
1999 | } | 2040 | } |
2000 | dasm_put(Dst, 13136, FRAME_TYPE); | 2041 | dasm_put(Dst, 13453, FRAME_TYPE); |
2001 | switch (op) { | 2042 | switch (op) { |
2002 | case BC_RET: | 2043 | case BC_RET: |
2003 | dasm_put(Dst, 13155); | 2044 | dasm_put(Dst, 13472); |
2004 | break; | 2045 | break; |
2005 | case BC_RET1: | 2046 | case BC_RET1: |
2006 | dasm_put(Dst, 13209); | 2047 | dasm_put(Dst, 13526); |
2007 | /* fallthrough */ | 2048 | /* fallthrough */ |
2008 | case BC_RET0: | 2049 | case BC_RET0: |
2009 | dasm_put(Dst, 13219); | 2050 | dasm_put(Dst, 13536); |
2010 | default: | 2051 | default: |
2011 | break; | 2052 | break; |
2012 | } | 2053 | } |
2013 | dasm_put(Dst, 13230, Dt7(->pc), PC2PROTO(k)); | 2054 | dasm_put(Dst, 13547, Dt7(->pc), PC2PROTO(k)); |
2014 | if (op == BC_RET) { | 2055 | if (op == BC_RET) { |
2015 | dasm_put(Dst, 13278, LJ_TNIL); | 2056 | dasm_put(Dst, 13595, LJ_TNIL); |
2016 | } else { | 2057 | } else { |
2017 | dasm_put(Dst, 13289, LJ_TNIL); | 2058 | dasm_put(Dst, 13606, LJ_TNIL); |
2018 | } | 2059 | } |
2019 | dasm_put(Dst, 13296, -FRAME_VARG, FRAME_TYPEP); | 2060 | dasm_put(Dst, 13613, -FRAME_VARG, FRAME_TYPEP); |
2020 | if (op != BC_RET0) { | 2061 | if (op != BC_RET0) { |
2021 | dasm_put(Dst, 13320); | 2062 | dasm_put(Dst, 13637); |
2022 | } | 2063 | } |
2023 | dasm_put(Dst, 4531); | 2064 | dasm_put(Dst, 4531); |
2024 | break; | 2065 | break; |
@@ -2028,7 +2069,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) | |||
2028 | 2069 | ||
2029 | case BC_FORL: | 2070 | case BC_FORL: |
2030 | #if LJ_HASJIT | 2071 | #if LJ_HASJIT |
2031 | dasm_put(Dst, 13324, HOTCOUNT_PCMASK, GG_DISP2HOT); | 2072 | dasm_put(Dst, 13641, HOTCOUNT_PCMASK, GG_DISP2HOT); |
2032 | #endif | 2073 | #endif |
2033 | break; | 2074 | break; |
2034 | 2075 | ||
@@ -2040,57 +2081,57 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) | |||
2040 | case BC_FORI: | 2081 | case BC_FORI: |
2041 | case BC_IFORL: | 2082 | case BC_IFORL: |
2042 | vk = (op == BC_IFORL || op == BC_JFORL); | 2083 | vk = (op == BC_IFORL || op == BC_JFORL); |
2043 | dasm_put(Dst, 13345); | 2084 | dasm_put(Dst, 13662); |
2044 | if (!vk) { | 2085 | if (!vk) { |
2045 | dasm_put(Dst, 13349, LJ_TISNUM, LJ_TISNUM); | 2086 | dasm_put(Dst, 13666, LJ_TISNUM, LJ_TISNUM); |
2046 | } | 2087 | } |
2047 | dasm_put(Dst, 13368); | 2088 | dasm_put(Dst, 13685); |
2048 | if (!vk) { | 2089 | if (!vk) { |
2049 | dasm_put(Dst, 13372, LJ_TISNUM); | 2090 | dasm_put(Dst, 13689, LJ_TISNUM); |
2050 | } | 2091 | } |
2051 | if (sse) { | 2092 | if (sse) { |
2052 | dasm_put(Dst, 13381); | 2093 | dasm_put(Dst, 13698); |
2053 | if (vk) { | 2094 | if (vk) { |
2054 | dasm_put(Dst, 13393); | 2095 | dasm_put(Dst, 13710); |
2055 | } else { | 2096 | } else { |
2056 | dasm_put(Dst, 13412); | 2097 | dasm_put(Dst, 13729); |
2057 | } | 2098 | } |
2058 | dasm_put(Dst, 13417); | 2099 | dasm_put(Dst, 13734); |
2059 | } else { | 2100 | } else { |
2060 | dasm_put(Dst, 13430); | 2101 | dasm_put(Dst, 13747); |
2061 | if (vk) { | 2102 | if (vk) { |
2062 | dasm_put(Dst, 13436); | 2103 | dasm_put(Dst, 13753); |
2063 | } else { | 2104 | } else { |
2064 | dasm_put(Dst, 13452); | 2105 | dasm_put(Dst, 13769); |
2065 | } | 2106 | } |
2066 | dasm_put(Dst, 13460); | 2107 | dasm_put(Dst, 13777); |
2067 | if (cmov) { | 2108 | if (cmov) { |
2068 | dasm_put(Dst, 9460); | 2109 | dasm_put(Dst, 9460); |
2069 | } else { | 2110 | } else { |
2070 | dasm_put(Dst, 9466); | 2111 | dasm_put(Dst, 9466); |
2071 | } | 2112 | } |
2072 | if (!cmov) { | 2113 | if (!cmov) { |
2073 | dasm_put(Dst, 13465); | 2114 | dasm_put(Dst, 13782); |
2074 | } | 2115 | } |
2075 | } | 2116 | } |
2076 | if (op == BC_FORI) { | 2117 | if (op == BC_FORI) { |
2077 | dasm_put(Dst, 13471, -BCBIAS_J*4); | 2118 | dasm_put(Dst, 13788, -BCBIAS_J*4); |
2078 | } else if (op == BC_JFORI) { | 2119 | } else if (op == BC_JFORI) { |
2079 | dasm_put(Dst, 13481, -BCBIAS_J*4, BC_JLOOP); | 2120 | dasm_put(Dst, 13798, -BCBIAS_J*4, BC_JLOOP); |
2080 | } else if (op == BC_IFORL) { | 2121 | } else if (op == BC_IFORL) { |
2081 | dasm_put(Dst, 13495, -BCBIAS_J*4); | 2122 | dasm_put(Dst, 13812, -BCBIAS_J*4); |
2082 | } else { | 2123 | } else { |
2083 | dasm_put(Dst, 13491, BC_JLOOP); | 2124 | dasm_put(Dst, 13808, BC_JLOOP); |
2084 | } | 2125 | } |
2085 | dasm_put(Dst, 9495); | 2126 | dasm_put(Dst, 9495); |
2086 | if (sse) { | 2127 | if (sse) { |
2087 | dasm_put(Dst, 13505); | 2128 | dasm_put(Dst, 13822); |
2088 | } | 2129 | } |
2089 | break; | 2130 | break; |
2090 | 2131 | ||
2091 | case BC_ITERL: | 2132 | case BC_ITERL: |
2092 | #if LJ_HASJIT | 2133 | #if LJ_HASJIT |
2093 | dasm_put(Dst, 13324, HOTCOUNT_PCMASK, GG_DISP2HOT); | 2134 | dasm_put(Dst, 13641, HOTCOUNT_PCMASK, GG_DISP2HOT); |
2094 | #endif | 2135 | #endif |
2095 | break; | 2136 | break; |
2096 | 2137 | ||
@@ -2099,18 +2140,18 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) | |||
2099 | break; | 2140 | break; |
2100 | #endif | 2141 | #endif |
2101 | case BC_IITERL: | 2142 | case BC_IITERL: |
2102 | dasm_put(Dst, 13516, LJ_TNIL); | 2143 | dasm_put(Dst, 13833, LJ_TNIL); |
2103 | if (op == BC_JITERL) { | 2144 | if (op == BC_JITERL) { |
2104 | dasm_put(Dst, 13531, BC_JLOOP); | 2145 | dasm_put(Dst, 13848, BC_JLOOP); |
2105 | } else { | 2146 | } else { |
2106 | dasm_put(Dst, 13545, -BCBIAS_J*4); | 2147 | dasm_put(Dst, 13862, -BCBIAS_J*4); |
2107 | } | 2148 | } |
2108 | dasm_put(Dst, 9799); | 2149 | dasm_put(Dst, 9799); |
2109 | break; | 2150 | break; |
2110 | 2151 | ||
2111 | case BC_LOOP: | 2152 | case BC_LOOP: |
2112 | #if LJ_HASJIT | 2153 | #if LJ_HASJIT |
2113 | dasm_put(Dst, 13324, HOTCOUNT_PCMASK, GG_DISP2HOT); | 2154 | dasm_put(Dst, 13641, HOTCOUNT_PCMASK, GG_DISP2HOT); |
2114 | #endif | 2155 | #endif |
2115 | break; | 2156 | break; |
2116 | 2157 | ||
@@ -2120,12 +2161,12 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) | |||
2120 | 2161 | ||
2121 | case BC_JLOOP: | 2162 | case BC_JLOOP: |
2122 | #if LJ_HASJIT | 2163 | #if LJ_HASJIT |
2123 | dasm_put(Dst, 13561, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); | 2164 | dasm_put(Dst, 13878, DISPATCH_J(trace), DtD(->mcode), DISPATCH_GL(jit_base), DISPATCH_GL(jit_L)); |
2124 | #endif | 2165 | #endif |
2125 | break; | 2166 | break; |
2126 | 2167 | ||
2127 | case BC_JMP: | 2168 | case BC_JMP: |
2128 | dasm_put(Dst, 13602, -BCBIAS_J*4); | 2169 | dasm_put(Dst, 13919, -BCBIAS_J*4); |
2129 | break; | 2170 | break; |
2130 | 2171 | ||
2131 | /* -- Function headers -------------------------------------------------- */ | 2172 | /* -- Function headers -------------------------------------------------- */ |
@@ -2139,7 +2180,7 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) | |||
2139 | 2180 | ||
2140 | case BC_FUNCF: | 2181 | case BC_FUNCF: |
2141 | #if LJ_HASJIT | 2182 | #if LJ_HASJIT |
2142 | dasm_put(Dst, 13628, HOTCOUNT_PCMASK, GG_DISP2HOT); | 2183 | dasm_put(Dst, 13945, HOTCOUNT_PCMASK, GG_DISP2HOT); |
2143 | #endif | 2184 | #endif |
2144 | case BC_FUNCV: /* NYI: compiled vararg functions. */ | 2185 | case BC_FUNCV: /* NYI: compiled vararg functions. */ |
2145 | break; | 2186 | break; |
@@ -2149,13 +2190,13 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) | |||
2149 | break; | 2190 | break; |
2150 | #endif | 2191 | #endif |
2151 | case BC_IFUNCF: | 2192 | case BC_IFUNCF: |
2152 | dasm_put(Dst, 13649, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); | 2193 | dasm_put(Dst, 13966, -4+PC2PROTO(k), Dt1(->maxstack), -4+PC2PROTO(numparams)); |
2153 | if (op == BC_JFUNCF) { | 2194 | if (op == BC_JFUNCF) { |
2154 | dasm_put(Dst, 13680, BC_JLOOP); | 2195 | dasm_put(Dst, 13997, BC_JLOOP); |
2155 | } else { | 2196 | } else { |
2156 | dasm_put(Dst, 9497); | 2197 | dasm_put(Dst, 9497); |
2157 | } | 2198 | } |
2158 | dasm_put(Dst, 13689, LJ_TNIL); | 2199 | dasm_put(Dst, 14006, LJ_TNIL); |
2159 | break; | 2200 | break; |
2160 | 2201 | ||
2161 | case BC_JFUNCV: | 2202 | case BC_JFUNCV: |
@@ -2166,30 +2207,30 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop, int cmov, int sse) | |||
2166 | break; /* NYI: compiled vararg functions. */ | 2207 | break; /* NYI: compiled vararg functions. */ |
2167 | 2208 | ||
2168 | case BC_IFUNCV: | 2209 | case BC_IFUNCV: |
2169 | dasm_put(Dst, 13711, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); | 2210 | dasm_put(Dst, 14028, FRAME_VARG, Dt1(->maxstack), -4+PC2PROTO(numparams), LJ_TNIL); |
2170 | if (op == BC_JFUNCV) { | 2211 | if (op == BC_JFUNCV) { |
2171 | dasm_put(Dst, 13680, BC_JLOOP); | 2212 | dasm_put(Dst, 13997, BC_JLOOP); |
2172 | } else { | 2213 | } else { |
2173 | dasm_put(Dst, 13808, -4+PC2PROTO(k)); | 2214 | dasm_put(Dst, 14125, -4+PC2PROTO(k)); |
2174 | } | 2215 | } |
2175 | dasm_put(Dst, 13833, LJ_TNIL); | 2216 | dasm_put(Dst, 14150, LJ_TNIL); |
2176 | break; | 2217 | break; |
2177 | 2218 | ||
2178 | case BC_FUNCC: | 2219 | case BC_FUNCC: |
2179 | case BC_FUNCCW: | 2220 | case BC_FUNCCW: |
2180 | dasm_put(Dst, 13855, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); | 2221 | dasm_put(Dst, 14172, Dt8(->f), Dt1(->base), 8*LUA_MINSTACK, Dt1(->maxstack), Dt1(->top)); |
2181 | if (op == BC_FUNCC) { | 2222 | if (op == BC_FUNCC) { |
2182 | dasm_put(Dst, 13885); | 2223 | dasm_put(Dst, 14202); |
2183 | } else { | 2224 | } else { |
2184 | dasm_put(Dst, 13889); | 2225 | dasm_put(Dst, 14206); |
2185 | } | 2226 | } |
2186 | dasm_put(Dst, 13897, DISPATCH_GL(vmstate), ~LJ_VMST_C); | 2227 | dasm_put(Dst, 14214, DISPATCH_GL(vmstate), ~LJ_VMST_C); |
2187 | if (op == BC_FUNCC) { | 2228 | if (op == BC_FUNCC) { |
2188 | dasm_put(Dst, 13907); | 2229 | dasm_put(Dst, 14224); |
2189 | } else { | 2230 | } else { |
2190 | dasm_put(Dst, 13912, DISPATCH_GL(wrapf)); | 2231 | dasm_put(Dst, 14229, DISPATCH_GL(wrapf)); |
2191 | } | 2232 | } |
2192 | dasm_put(Dst, 13918, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); | 2233 | dasm_put(Dst, 14235, DISPATCH_GL(vmstate), ~LJ_VMST_INTERP, Dt1(->base), Dt1(->top)); |
2193 | break; | 2234 | break; |
2194 | 2235 | ||
2195 | /* ---------------------------------------------------------------------- */ | 2236 | /* ---------------------------------------------------------------------- */ |
@@ -2217,7 +2258,7 @@ static int build_backend(BuildCtx *ctx) | |||
2217 | 2258 | ||
2218 | build_subroutines(ctx, cmov, sse); | 2259 | build_subroutines(ctx, cmov, sse); |
2219 | 2260 | ||
2220 | dasm_put(Dst, 13944); | 2261 | dasm_put(Dst, 14261); |
2221 | for (op = 0; op < BC__MAX; op++) | 2262 | for (op = 0; op < BC__MAX; op++) |
2222 | build_ins(ctx, (BCOp)op, op, cmov, sse); | 2263 | build_ins(ctx, (BCOp)op, op, cmov, sse); |
2223 | 2264 | ||