diff options
| author | Kimplul <kimi.h.kuparinen@gmail.com> | 2023-11-19 20:25:29 +0200 |
|---|---|---|
| committer | Kimplul <kimi.h.kuparinen@gmail.com> | 2023-11-19 20:25:29 +0200 |
| commit | 910ad02d86672cc3020cc5df0fa451ef4dd69bfd (patch) | |
| tree | d5711894ee14c62caee8f8b744cac2d28f92c87b | |
| parent | 51789d2ed69515ab81bee6633bac3d94c519dc03 (diff) | |
| download | tri-910ad02d86672cc3020cc5df0fa451ef4dd69bfd.tar.gz tri-910ad02d86672cc3020cc5df0fa451ef4dd69bfd.zip | |
implement jalr
| -rw-r--r-- | tasm/gen/gen_lexer.inc | 635 | ||||
| -rw-r--r-- | tasm/gen/gen_parser.c | 773 | ||||
| -rw-r--r-- | tasm/src/assembler.c | 9 | ||||
| -rw-r--r-- | tasm/src/lexer.l | 1 | ||||
| -rw-r--r-- | tasm/src/parser.y | 9 | ||||
| -rw-r--r-- | triscv/src/cpu.c | 29 |
6 files changed, 761 insertions, 695 deletions
diff --git a/tasm/gen/gen_lexer.inc b/tasm/gen/gen_lexer.inc index be2fc6b..80dc774 100644 --- a/tasm/gen/gen_lexer.inc +++ b/tasm/gen/gen_lexer.inc @@ -339,8 +339,8 @@ static void yynoreturn yy_fatal_error ( const char* msg , yyscan_t yyscanner ); yyg->yy_hold_char = *yy_cp; \ *yy_cp = '\0'; \ yyg->yy_c_buf_p = yy_cp; -#define YY_NUM_RULES 145 -#define YY_END_OF_BUFFER 146 +#define YY_NUM_RULES 146 +#define YY_END_OF_BUFFER 147 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -348,34 +348,34 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static const flex_int16_t yy_accept[234] = +static const flex_int16_t yy_accept[235] = { 0, - 0, 0, 0, 0, 146, 144, 143, 143, 144, 140, - 141, 142, 144, 144, 144, 2, 2, 139, 139, 139, - 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, - 139, 139, 139, 136, 138, 135, 137, 143, 0, 3, - 0, 2, 0, 0, 132, 131, 0, 0, 0, 139, - 1, 139, 139, 139, 139, 139, 139, 139, 139, 139, - 139, 139, 139, 139, 139, 120, 112, 119, 139, 139, - 139, 139, 139, 139, 139, 139, 139, 139, 113, 139, - 139, 6, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 136, 135, 134, 133, 0, 0, 131, 2, 2, + 0, 0, 0, 0, 147, 145, 144, 144, 145, 141, + 142, 143, 145, 145, 145, 2, 2, 140, 140, 140, + 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, + 140, 140, 140, 137, 139, 136, 138, 144, 0, 3, + 0, 2, 0, 0, 133, 132, 0, 0, 0, 140, + 1, 140, 140, 140, 140, 140, 140, 140, 140, 140, + 140, 140, 140, 140, 140, 121, 112, 120, 140, 140, + 119, 140, 140, 140, 140, 140, 140, 140, 140, 113, + 140, 140, 6, 7, 8, 9, 10, 11, 12, 13, + 14, 15, 137, 136, 135, 134, 0, 0, 132, 2, - 98, 139, 108, 111, 110, 109, 127, 139, 125, 139, - 122, 139, 139, 126, 139, 106, 104, 121, 118, 139, - 123, 102, 101, 96, 100, 103, 97, 124, 99, 139, - 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, - 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, - 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, - 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, - 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, - 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, - 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, + 2, 98, 140, 108, 111, 110, 109, 128, 140, 126, + 140, 123, 140, 140, 127, 140, 106, 104, 122, 118, + 140, 124, 102, 101, 96, 100, 103, 97, 125, 99, + 140, 16, 17, 18, 19, 20, 21, 22, 23, 24, + 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, + 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, + 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, + 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, - 86, 0, 4, 87, 139, 139, 93, 139, 139, 139, - 107, 139, 90, 89, 94, 88, 91, 95, 92, 0, - 105, 130, 129, 128, 139, 114, 117, 116, 0, 115, - 0, 5, 0 + 85, 86, 0, 4, 87, 140, 140, 93, 140, 140, + 140, 107, 140, 90, 89, 94, 88, 91, 95, 92, + 0, 105, 131, 130, 129, 140, 114, 117, 116, 0, + 115, 0, 5, 0 } ; static const YY_CHAR yy_ec[256] = @@ -419,67 +419,69 @@ static const YY_CHAR yy_meta[50] = 6, 2, 6, 2, 6, 2, 6, 2, 6 } ; -static const flex_int16_t yy_base[241] = +static const flex_int16_t yy_base[242] = { 0, - 0, 0, 47, 48, 144, 991, 50, 54, 56, 991, - 991, 991, 0, 27, 55, 30, 0, 62, 65, 67, + 0, 0, 47, 48, 144, 1018, 50, 54, 56, 1018, + 1018, 1018, 0, 27, 55, 30, 0, 62, 65, 67, 70, 76, 80, 83, 98, 113, 115, 123, 126, 119, - 162, 128, 207, 0, 991, 69, 136, 88, 70, 991, - 137, 0, 99, 106, 991, 0, 0, 121, 149, 154, - 991, 166, 178, 171, 176, 194, 212, 215, 228, 230, + 162, 128, 207, 0, 1018, 69, 136, 88, 70, 1018, + 137, 0, 99, 106, 1018, 0, 0, 121, 149, 154, + 1018, 166, 178, 171, 176, 194, 212, 215, 228, 230, 233, 241, 243, 246, 256, 180, 259, 272, 277, 280, - 284, 287, 293, 298, 302, 305, 316, 319, 326, 331, - 333, 341, 362, 372, 382, 392, 402, 412, 422, 442, - 444, 0, 116, 991, 991, 104, 67, 0, 0, 177, + 284, 287, 293, 298, 301, 305, 310, 319, 322, 328, + 331, 335, 343, 364, 374, 384, 394, 404, 414, 424, + 349, 444, 0, 116, 1018, 1018, 104, 67, 0, 0, - 446, 448, 450, 453, 455, 457, 459, 471, 480, 482, - 484, 488, 493, 495, 497, 505, 509, 518, 530, 532, - 534, 536, 539, 541, 543, 557, 564, 578, 580, 582, - 585, 587, 590, 592, 594, 603, 608, 615, 617, 619, - 624, 626, 629, 631, 633, 640, 642, 647, 654, 656, - 658, 663, 665, 668, 670, 672, 679, 681, 686, 693, - 695, 697, 702, 704, 707, 709, 711, 718, 720, 725, - 732, 734, 736, 741, 743, 746, 748, 750, 757, 759, - 764, 771, 773, 775, 780, 782, 785, 787, 789, 796, - 798, 803, 810, 812, 814, 819, 821, 824, 826, 828, + 177, 446, 448, 450, 452, 454, 456, 459, 461, 483, + 485, 488, 490, 492, 494, 496, 499, 506, 528, 530, + 532, 534, 536, 538, 541, 543, 545, 559, 580, 582, + 584, 586, 588, 592, 594, 596, 598, 609, 619, 621, + 624, 626, 630, 632, 634, 636, 642, 647, 657, 659, + 663, 665, 668, 670, 672, 674, 680, 686, 695, 697, + 701, 703, 707, 709, 711, 713, 718, 724, 734, 736, + 739, 741, 745, 747, 749, 751, 757, 762, 772, 774, + 778, 780, 783, 785, 787, 789, 795, 801, 810, 812, + 816, 818, 822, 824, 826, 828, 833, 839, 849, 851, - 835, 72, 991, 837, 842, 849, 851, 853, 858, 860, - 863, 865, 881, 886, 889, 896, 898, 902, 904, 57, - 907, 910, 912, 914, 919, 925, 928, 935, 64, 937, - 58, 991, 991, 959, 965, 72, 970, 976, 982, 984 + 854, 856, 72, 1018, 860, 862, 864, 866, 872, 877, + 893, 898, 900, 902, 904, 907, 914, 916, 925, 928, + 57, 930, 932, 937, 939, 941, 943, 946, 953, 64, + 964, 58, 1018, 1018, 986, 992, 72, 997, 1003, 1009, + 1011 } ; -static const flex_int16_t yy_def[241] = +static const flex_int16_t yy_def[242] = { 0, - 233, 1, 234, 234, 233, 233, 233, 233, 235, 233, - 233, 233, 236, 233, 233, 236, 236, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 238, 233, 233, 233, 233, 235, 233, - 235, 236, 233, 233, 233, 239, 240, 233, 233, 237, - 233, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 33, 33, 33, 33, 33, 33, 33, 237, - 237, 238, 233, 233, 233, 233, 233, 239, 240, 233, + 234, 1, 235, 235, 234, 234, 234, 234, 236, 234, + 234, 234, 237, 234, 234, 237, 237, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 239, 234, 234, 234, 234, 236, 234, + 236, 237, 234, 234, 234, 240, 241, 234, 234, 238, + 234, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 33, 33, 33, 33, 33, 33, 33, + 238, 238, 239, 234, 234, 234, 234, 234, 240, 241, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, + 234, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, - 237, 233, 233, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, 237, 233, - 237, 237, 237, 237, 237, 237, 237, 237, 233, 237, - 233, 233, 0, 233, 233, 233, 233, 233, 233, 233 + 238, 238, 234, 234, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 234, 238, 238, 238, 238, 238, 238, 238, 238, 234, + 238, 234, 234, 0, 234, 234, 234, 234, 234, 234, + 234 } ; -static const flex_int16_t yy_nxt[1041] = +static const flex_int16_t yy_nxt[1068] = { 0, 6, 7, 8, 9, 10, 11, 6, 12, 13, 14, 15, 16, 17, 17, 17, 17, 17, 17, 17, 17, @@ -488,116 +490,119 @@ static const flex_int16_t yy_nxt[1041] = 29, 18, 30, 31, 18, 32, 18, 18, 33, 35, 35, 38, 38, 36, 36, 38, 38, 37, 37, 40, 43, 45, 47, 49, 49, 46, 49, 49, 49, 49, - 44, 49, 49, 40, 48, 93, 42, 49, 49, 94, - 41, 49, 49, 51, 49, 49, 51, 232, 51, 38, - 38, 51, 231, 52, 41, 58, 54, 51, 55, 49, + 44, 49, 49, 40, 48, 94, 42, 49, 49, 95, + 41, 49, 49, 51, 49, 49, 51, 233, 51, 38, + 38, 51, 232, 52, 41, 58, 54, 51, 55, 49, - 49, 51, 229, 56, 51, 57, 61, 62, 220, 60, - 53, 203, 64, 59, 49, 49, 49, 49, 63, 51, - 49, 49, 93, 65, 49, 49, 94, 49, 49, 49, - 49, 202, 100, 100, 51, 97, 51, 96, 66, 233, - 51, 67, 95, 233, 51, 233, 68, 51, 73, 51, - 49, 49, 233, 72, 100, 49, 49, 233, 69, 233, - 70, 233, 71, 49, 49, 233, 81, 49, 49, 233, - 51, 233, 49, 49, 233, 51, 233, 49, 49, 49, - 49, 49, 49, 51, 233, 233, 233, 51, 100, 100, - 233, 74, 51, 75, 101, 49, 49, 51, 76, 51, + 49, 51, 230, 56, 51, 57, 61, 62, 221, 60, + 53, 204, 64, 59, 49, 49, 49, 49, 63, 51, + 49, 49, 94, 65, 49, 49, 95, 49, 49, 49, + 49, 203, 101, 101, 51, 98, 51, 97, 66, 234, + 51, 67, 96, 234, 51, 234, 68, 51, 74, 51, + 49, 49, 234, 73, 101, 49, 49, 234, 69, 234, + 70, 71, 72, 49, 49, 234, 82, 49, 49, 234, + 51, 234, 49, 49, 234, 51, 234, 49, 49, 49, + 49, 49, 49, 51, 234, 234, 234, 51, 101, 101, + 234, 75, 51, 76, 102, 49, 49, 51, 77, 51, - 77, 51, 233, 233, 78, 104, 79, 80, 49, 49, - 100, 102, 103, 49, 49, 51, 49, 49, 82, 83, - 84, 85, 86, 87, 88, 89, 90, 91, 51, 49, - 49, 49, 49, 51, 49, 49, 51, 233, 105, 233, - 233, 106, 49, 49, 49, 49, 233, 49, 49, 51, - 233, 51, 233, 233, 51, 233, 233, 49, 49, 107, - 49, 49, 51, 233, 51, 233, 113, 51, 233, 110, - 108, 233, 109, 49, 49, 112, 111, 51, 49, 49, - 51, 49, 49, 233, 115, 49, 49, 114, 49, 49, - 233, 233, 116, 51, 49, 49, 233, 233, 51, 49, + 78, 51, 234, 234, 79, 105, 80, 81, 49, 49, + 101, 103, 104, 49, 49, 51, 49, 49, 83, 84, + 85, 86, 87, 88, 89, 90, 91, 92, 51, 49, + 49, 49, 49, 51, 49, 49, 51, 234, 106, 234, + 234, 107, 49, 49, 49, 49, 234, 49, 49, 51, + 234, 51, 234, 234, 51, 234, 234, 49, 49, 108, + 49, 49, 51, 234, 51, 234, 114, 51, 234, 111, + 109, 234, 110, 49, 49, 113, 112, 51, 49, 49, + 51, 49, 49, 234, 116, 49, 49, 115, 49, 49, + 234, 234, 117, 51, 49, 49, 234, 234, 51, 49, - 49, 51, 233, 49, 49, 51, 49, 49, 51, 233, - 117, 233, 120, 233, 51, 233, 118, 49, 49, 51, - 49, 49, 233, 51, 119, 233, 51, 49, 49, 233, - 121, 123, 49, 49, 49, 49, 233, 51, 233, 122, - 51, 124, 49, 49, 233, 126, 233, 51, 233, 125, - 233, 233, 51, 233, 51, 127, 233, 129, 233, 233, - 233, 233, 51, 233, 233, 233, 233, 233, 233, 233, - 128, 233, 130, 131, 132, 133, 134, 135, 136, 137, - 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, - 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, + 49, 51, 49, 49, 234, 51, 49, 49, 51, 234, + 118, 49, 49, 234, 51, 234, 119, 234, 121, 51, + 49, 49, 51, 49, 49, 234, 51, 120, 234, 49, + 49, 51, 49, 49, 124, 122, 49, 49, 234, 234, + 51, 234, 123, 51, 49, 49, 125, 234, 127, 51, + 49, 49, 51, 234, 126, 234, 51, 130, 128, 234, + 202, 234, 234, 234, 51, 234, 234, 234, 234, 234, + 51, 234, 129, 234, 131, 132, 133, 134, 135, 136, + 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, + 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, - 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, - 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, - 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, - 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, - 198, 199, 200, 49, 49, 49, 49, 49, 49, 49, - 49, 49, 49, 201, 49, 49, 49, 49, 49, 49, - 49, 49, 233, 51, 233, 51, 233, 51, 233, 51, - 233, 51, 49, 49, 51, 233, 51, 233, 51, 204, - 51, 49, 49, 49, 49, 49, 49, 233, 205, 49, - 49, 233, 51, 233, 49, 49, 49, 49, 49, 49, + 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, + 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, + 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, + 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, + 197, 198, 199, 200, 201, 49, 49, 49, 49, 49, + 49, 49, 49, 49, 49, 49, 49, 49, 49, 234, + 49, 49, 49, 49, 234, 51, 234, 51, 234, 51, + 234, 51, 234, 51, 234, 51, 234, 51, 234, 205, + 51, 234, 51, 234, 49, 49, 49, 49, 206, 49, + 49, 49, 49, 49, 49, 49, 49, 49, 49, 234, - 233, 51, 233, 51, 233, 51, 49, 49, 233, 51, - 49, 49, 233, 206, 51, 233, 51, 208, 51, 49, - 49, 233, 207, 233, 210, 233, 51, 233, 233, 209, - 51, 49, 49, 49, 49, 49, 49, 49, 49, 51, - 49, 49, 49, 49, 49, 49, 233, 211, 233, 233, - 233, 51, 233, 51, 233, 51, 233, 51, 49, 49, - 51, 233, 51, 233, 51, 49, 49, 233, 212, 213, - 233, 233, 214, 233, 215, 233, 216, 233, 51, 49, - 49, 49, 49, 49, 49, 51, 49, 49, 49, 49, - 217, 49, 49, 49, 49, 49, 49, 218, 233, 51, + 49, 49, 234, 207, 51, 234, 51, 49, 49, 51, + 234, 51, 234, 51, 234, 51, 234, 51, 234, 209, + 51, 234, 234, 211, 234, 208, 234, 51, 210, 49, + 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, + 49, 212, 49, 49, 49, 49, 49, 49, 234, 51, + 234, 51, 234, 51, 234, 51, 234, 51, 234, 51, + 49, 49, 51, 234, 51, 234, 51, 234, 213, 214, + 234, 215, 234, 234, 216, 234, 217, 234, 218, 234, + 51, 49, 49, 49, 49, 49, 49, 49, 49, 49, + 49, 234, 219, 49, 49, 49, 49, 49, 49, 49, - 233, 51, 233, 51, 49, 49, 51, 233, 51, 49, - 49, 51, 233, 51, 233, 51, 49, 49, 49, 49, - 49, 49, 219, 233, 51, 49, 49, 49, 49, 51, - 49, 49, 49, 49, 49, 49, 51, 233, 51, 233, - 51, 49, 49, 49, 49, 51, 233, 51, 49, 49, - 51, 233, 51, 233, 51, 49, 49, 49, 49, 49, - 49, 51, 233, 51, 49, 49, 49, 49, 51, 49, - 49, 49, 49, 49, 49, 51, 233, 51, 233, 51, - 49, 49, 49, 49, 51, 233, 51, 49, 49, 51, - 233, 51, 233, 51, 49, 49, 49, 49, 49, 49, + 49, 51, 234, 51, 234, 51, 234, 51, 234, 51, + 49, 49, 234, 51, 234, 51, 234, 51, 234, 51, + 49, 49, 49, 49, 220, 49, 49, 49, 49, 234, + 51, 49, 49, 49, 49, 49, 49, 49, 49, 234, + 51, 234, 51, 49, 49, 51, 234, 51, 49, 49, + 234, 51, 234, 51, 234, 51, 234, 51, 49, 49, + 49, 49, 234, 51, 49, 49, 49, 49, 51, 49, + 49, 49, 49, 49, 49, 49, 49, 234, 51, 234, + 51, 49, 49, 234, 51, 234, 51, 49, 49, 51, + 234, 51, 234, 51, 234, 51, 49, 49, 49, 49, - 51, 233, 51, 49, 49, 49, 49, 51, 49, 49, - 49, 49, 49, 49, 51, 233, 51, 233, 51, 49, - 49, 49, 49, 51, 233, 51, 49, 49, 51, 233, - 51, 233, 51, 49, 49, 49, 49, 49, 49, 51, - 233, 51, 49, 49, 49, 49, 51, 49, 49, 49, - 49, 49, 49, 51, 233, 51, 233, 51, 49, 49, - 49, 49, 51, 233, 51, 49, 49, 51, 233, 51, - 233, 51, 49, 49, 49, 49, 49, 49, 51, 233, - 51, 49, 49, 49, 49, 51, 49, 49, 49, 49, - 49, 49, 51, 233, 51, 233, 51, 49, 49, 49, + 234, 51, 49, 49, 49, 49, 234, 51, 49, 49, + 49, 49, 49, 49, 49, 49, 51, 234, 51, 49, + 49, 234, 51, 234, 51, 49, 49, 234, 51, 234, + 51, 234, 51, 234, 51, 49, 49, 49, 49, 51, + 49, 49, 49, 49, 234, 51, 49, 49, 49, 49, + 49, 49, 49, 49, 234, 51, 234, 51, 49, 49, + 51, 234, 51, 49, 49, 234, 51, 234, 51, 234, + 51, 234, 51, 49, 49, 49, 49, 234, 51, 49, + 49, 49, 49, 51, 49, 49, 49, 49, 49, 49, + 49, 49, 234, 51, 234, 51, 49, 49, 234, 51, - 49, 51, 233, 51, 49, 49, 51, 233, 51, 233, - 51, 49, 49, 49, 49, 49, 49, 51, 233, 51, - 49, 49, 49, 49, 51, 49, 49, 49, 49, 49, - 49, 51, 233, 51, 233, 51, 49, 49, 49, 49, - 51, 233, 51, 49, 49, 51, 233, 51, 233, 51, - 49, 49, 49, 49, 49, 49, 51, 233, 51, 49, - 49, 49, 49, 51, 49, 49, 49, 49, 233, 221, - 51, 233, 51, 233, 51, 233, 222, 233, 225, 51, - 233, 51, 49, 49, 51, 233, 51, 49, 49, 227, - 49, 49, 223, 233, 226, 233, 224, 49, 49, 49, + 234, 51, 49, 49, 51, 234, 51, 234, 51, 234, + 51, 49, 49, 49, 49, 234, 51, 49, 49, 49, + 49, 234, 51, 49, 49, 49, 49, 49, 49, 49, + 49, 51, 234, 51, 49, 49, 234, 51, 234, 51, + 49, 49, 234, 51, 234, 51, 234, 51, 234, 51, + 49, 49, 49, 49, 51, 49, 49, 49, 49, 234, + 51, 49, 49, 49, 49, 49, 49, 49, 49, 234, + 51, 234, 51, 49, 49, 51, 234, 51, 49, 49, + 234, 51, 234, 51, 234, 51, 234, 51, 234, 222, + 234, 223, 234, 51, 49, 49, 234, 226, 51, 49, - 49, 228, 51, 49, 49, 49, 49, 51, 49, 49, - 51, 49, 49, 49, 49, 49, 49, 51, 233, 51, - 49, 49, 233, 51, 233, 51, 49, 49, 51, 49, - 49, 51, 233, 51, 233, 51, 49, 49, 49, 49, - 51, 233, 233, 233, 233, 233, 51, 233, 233, 51, - 233, 233, 233, 233, 230, 233, 51, 233, 51, 34, - 34, 34, 34, 34, 34, 39, 39, 39, 39, 39, - 39, 50, 50, 233, 50, 50, 92, 92, 233, 233, - 92, 92, 98, 98, 233, 98, 98, 98, 99, 99, - 5, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 49, 49, 49, 49, 49, 49, 49, 224, 49, 49, + 234, 225, 234, 227, 51, 49, 49, 49, 49, 51, + 234, 51, 228, 51, 234, 51, 49, 49, 51, 49, + 49, 49, 49, 49, 49, 51, 229, 51, 49, 49, + 49, 49, 49, 49, 49, 49, 51, 49, 49, 51, + 234, 51, 234, 51, 49, 49, 234, 234, 51, 234, + 51, 234, 51, 234, 51, 49, 49, 51, 234, 234, + 234, 234, 234, 234, 51, 234, 231, 234, 234, 234, + 234, 234, 234, 234, 234, 51, 34, 34, 34, 34, + 34, 34, 39, 39, 39, 39, 39, 39, 50, 50, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233 + 234, 50, 50, 93, 93, 234, 234, 93, 93, 99, + 99, 234, 99, 99, 99, 100, 100, 5, 234, 234, + 234, 234, 234, 234, 234, 234, 234, 234, 234, 234, + 234, 234, 234, 234, 234, 234, 234, 234, 234, 234, + 234, 234, 234, 234, 234, 234, 234, 234, 234, 234, + 234, 234, 234, 234, 234, 234, 234, 234, 234, 234, + 234, 234, 234, 234, 234, 234, 234 } ; -static const flex_int16_t yy_chk[1041] = +static const flex_int16_t yy_chk[1068] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -606,23 +611,23 @@ static const flex_int16_t yy_chk[1041] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 4, 7, 7, 3, 4, 8, 8, 3, 4, 9, 14, 15, 16, 18, 18, 15, 19, 19, 20, 20, - 14, 21, 21, 39, 16, 36, 236, 22, 22, 36, - 9, 23, 23, 18, 24, 24, 19, 231, 20, 38, - 38, 21, 229, 19, 39, 21, 20, 22, 20, 25, + 14, 21, 21, 39, 16, 36, 237, 22, 22, 36, + 9, 23, 23, 18, 24, 24, 19, 232, 20, 38, + 38, 21, 230, 19, 39, 21, 20, 22, 20, 25, - 25, 23, 220, 20, 24, 20, 23, 23, 202, 22, - 19, 97, 24, 21, 26, 26, 27, 27, 23, 25, - 30, 30, 93, 25, 28, 28, 93, 29, 29, 32, - 32, 96, 48, 48, 26, 44, 27, 43, 26, 41, + 25, 23, 221, 20, 24, 20, 23, 23, 203, 22, + 19, 98, 24, 21, 26, 26, 27, 27, 23, 25, + 30, 30, 94, 25, 28, 28, 94, 29, 29, 32, + 32, 97, 48, 48, 26, 44, 27, 43, 26, 41, 30, 26, 37, 5, 28, 0, 26, 29, 30, 32, 49, 49, 0, 29, 48, 50, 50, 0, 26, 0, - 27, 0, 28, 31, 31, 0, 32, 52, 52, 0, + 27, 27, 28, 31, 31, 0, 32, 52, 52, 0, 49, 0, 54, 54, 0, 50, 0, 55, 55, 53, - 53, 66, 66, 31, 0, 0, 0, 52, 100, 100, + 53, 66, 66, 31, 0, 0, 0, 52, 101, 101, 0, 31, 54, 31, 52, 56, 56, 55, 31, 53, 31, 66, 0, 0, 31, 55, 31, 31, 33, 33, - 100, 53, 54, 57, 57, 56, 58, 58, 33, 33, + 101, 53, 54, 57, 57, 56, 58, 58, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 59, 59, 60, 60, 57, 61, 61, 58, 0, 56, 0, 0, 57, 62, 62, 63, 63, 0, 64, 64, 59, @@ -632,87 +637,90 @@ static const flex_int16_t yy_chk[1041] = 67, 70, 70, 0, 64, 71, 71, 63, 72, 72, 0, 0, 65, 68, 73, 73, 0, 0, 69, 74, - 74, 70, 0, 75, 75, 71, 76, 76, 72, 0, - 69, 0, 72, 0, 73, 0, 70, 77, 77, 74, - 78, 78, 0, 75, 71, 0, 76, 79, 79, 0, - 73, 75, 80, 80, 81, 81, 0, 77, 0, 74, - 78, 76, 82, 82, 0, 77, 0, 79, 0, 76, - 0, 0, 80, 0, 81, 78, 0, 80, 0, 0, - 0, 0, 82, 0, 0, 0, 0, 0, 0, 0, - 79, 0, 81, 83, 83, 83, 83, 83, 83, 83, - 83, 83, 83, 84, 84, 84, 84, 84, 84, 84, - 84, 84, 84, 85, 85, 85, 85, 85, 85, 85, + 74, 70, 75, 75, 0, 71, 76, 76, 72, 0, + 69, 77, 77, 0, 73, 0, 70, 0, 73, 74, + 78, 78, 75, 79, 79, 0, 76, 72, 0, 80, + 80, 77, 81, 81, 76, 74, 82, 82, 0, 0, + 78, 0, 75, 79, 83, 83, 77, 0, 78, 80, + 91, 91, 81, 0, 77, 0, 82, 81, 79, 0, + 91, 0, 0, 0, 83, 0, 0, 0, 0, 0, + 91, 0, 80, 0, 82, 84, 84, 84, 84, 84, + 84, 84, 84, 84, 84, 85, 85, 85, 85, 85, + 85, 85, 85, 85, 85, 86, 86, 86, 86, 86, - 85, 85, 85, 86, 86, 86, 86, 86, 86, 86, - 86, 86, 86, 87, 87, 87, 87, 87, 87, 87, - 87, 87, 87, 88, 88, 88, 88, 88, 88, 88, - 88, 88, 88, 89, 89, 89, 89, 89, 89, 89, - 89, 89, 89, 90, 90, 91, 91, 101, 101, 102, - 102, 103, 103, 90, 104, 104, 105, 105, 106, 106, - 107, 107, 0, 90, 0, 91, 0, 101, 0, 102, - 0, 103, 108, 108, 104, 0, 105, 0, 106, 101, - 107, 109, 109, 110, 110, 111, 111, 0, 102, 112, - 112, 0, 108, 0, 113, 113, 114, 114, 115, 115, + 86, 86, 86, 86, 86, 87, 87, 87, 87, 87, + 87, 87, 87, 87, 87, 88, 88, 88, 88, 88, + 88, 88, 88, 88, 88, 89, 89, 89, 89, 89, + 89, 89, 89, 89, 89, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 92, 92, 102, 102, 103, + 103, 104, 104, 105, 105, 106, 106, 107, 107, 0, + 108, 108, 109, 109, 0, 92, 0, 102, 0, 103, + 0, 104, 0, 105, 0, 106, 0, 107, 0, 102, + 108, 0, 109, 0, 110, 110, 111, 111, 103, 112, + 112, 113, 113, 114, 114, 115, 115, 116, 116, 0, - 0, 109, 0, 110, 0, 111, 116, 116, 0, 112, - 117, 117, 0, 108, 113, 0, 114, 112, 115, 118, - 118, 0, 110, 0, 115, 0, 116, 0, 0, 113, - 117, 119, 119, 120, 120, 121, 121, 122, 122, 118, - 123, 123, 124, 124, 125, 125, 0, 116, 0, 0, - 0, 119, 0, 120, 0, 121, 0, 122, 126, 126, - 123, 0, 124, 0, 125, 127, 127, 0, 120, 122, - 0, 0, 123, 0, 124, 0, 125, 0, 126, 128, - 128, 129, 129, 130, 130, 127, 131, 131, 132, 132, - 126, 133, 133, 134, 134, 135, 135, 127, 0, 128, + 117, 117, 0, 109, 110, 0, 111, 118, 118, 112, + 0, 113, 0, 114, 0, 115, 0, 116, 0, 113, + 117, 0, 0, 116, 0, 111, 0, 118, 114, 119, + 119, 120, 120, 121, 121, 122, 122, 123, 123, 124, + 124, 117, 125, 125, 126, 126, 127, 127, 0, 119, + 0, 120, 0, 121, 0, 122, 0, 123, 0, 124, + 128, 128, 125, 0, 126, 0, 127, 0, 121, 123, + 0, 124, 0, 0, 125, 0, 126, 0, 127, 0, + 128, 129, 129, 130, 130, 131, 131, 132, 132, 133, + 133, 0, 128, 134, 134, 135, 135, 136, 136, 137, - 0, 129, 0, 130, 136, 136, 131, 0, 132, 137, - 137, 133, 0, 134, 0, 135, 138, 138, 139, 139, - 140, 140, 130, 0, 136, 141, 141, 142, 142, 137, - 143, 143, 144, 144, 145, 145, 138, 0, 139, 0, - 140, 146, 146, 147, 147, 141, 0, 142, 148, 148, - 143, 0, 144, 0, 145, 149, 149, 150, 150, 151, - 151, 146, 0, 147, 152, 152, 153, 153, 148, 154, - 154, 155, 155, 156, 156, 149, 0, 150, 0, 151, - 157, 157, 158, 158, 152, 0, 153, 159, 159, 154, - 0, 155, 0, 156, 160, 160, 161, 161, 162, 162, + 137, 129, 0, 130, 0, 131, 0, 132, 0, 133, + 138, 138, 0, 134, 0, 135, 0, 136, 0, 137, + 139, 139, 140, 140, 131, 141, 141, 142, 142, 0, + 138, 143, 143, 144, 144, 145, 145, 146, 146, 0, + 139, 0, 140, 147, 147, 141, 0, 142, 148, 148, + 0, 143, 0, 144, 0, 145, 0, 146, 149, 149, + 150, 150, 0, 147, 151, 151, 152, 152, 148, 153, + 153, 154, 154, 155, 155, 156, 156, 0, 149, 0, + 150, 157, 157, 0, 151, 0, 152, 158, 158, 153, + 0, 154, 0, 155, 0, 156, 159, 159, 160, 160, - 157, 0, 158, 163, 163, 164, 164, 159, 165, 165, - 166, 166, 167, 167, 160, 0, 161, 0, 162, 168, - 168, 169, 169, 163, 0, 164, 170, 170, 165, 0, - 166, 0, 167, 171, 171, 172, 172, 173, 173, 168, - 0, 169, 174, 174, 175, 175, 170, 176, 176, 177, - 177, 178, 178, 171, 0, 172, 0, 173, 179, 179, - 180, 180, 174, 0, 175, 181, 181, 176, 0, 177, - 0, 178, 182, 182, 183, 183, 184, 184, 179, 0, - 180, 185, 185, 186, 186, 181, 187, 187, 188, 188, - 189, 189, 182, 0, 183, 0, 184, 190, 190, 191, + 0, 157, 161, 161, 162, 162, 0, 158, 163, 163, + 164, 164, 165, 165, 166, 166, 159, 0, 160, 167, + 167, 0, 161, 0, 162, 168, 168, 0, 163, 0, + 164, 0, 165, 0, 166, 169, 169, 170, 170, 167, + 171, 171, 172, 172, 0, 168, 173, 173, 174, 174, + 175, 175, 176, 176, 0, 169, 0, 170, 177, 177, + 171, 0, 172, 178, 178, 0, 173, 0, 174, 0, + 175, 0, 176, 179, 179, 180, 180, 0, 177, 181, + 181, 182, 182, 178, 183, 183, 184, 184, 185, 185, + 186, 186, 0, 179, 0, 180, 187, 187, 0, 181, - 191, 185, 0, 186, 192, 192, 187, 0, 188, 0, - 189, 193, 193, 194, 194, 195, 195, 190, 0, 191, - 196, 196, 197, 197, 192, 198, 198, 199, 199, 200, - 200, 193, 0, 194, 0, 195, 201, 201, 204, 204, - 196, 0, 197, 205, 205, 198, 0, 199, 0, 200, - 206, 206, 207, 207, 208, 208, 201, 0, 204, 209, - 209, 210, 210, 205, 211, 211, 212, 212, 0, 205, - 206, 0, 207, 0, 208, 0, 206, 0, 208, 209, - 0, 210, 213, 213, 211, 0, 212, 214, 214, 210, - 215, 215, 206, 0, 209, 0, 206, 216, 216, 217, + 0, 182, 188, 188, 183, 0, 184, 0, 185, 0, + 186, 189, 189, 190, 190, 0, 187, 191, 191, 192, + 192, 0, 188, 193, 193, 194, 194, 195, 195, 196, + 196, 189, 0, 190, 197, 197, 0, 191, 0, 192, + 198, 198, 0, 193, 0, 194, 0, 195, 0, 196, + 199, 199, 200, 200, 197, 201, 201, 202, 202, 0, + 198, 205, 205, 206, 206, 207, 207, 208, 208, 0, + 199, 0, 200, 209, 209, 201, 0, 202, 210, 210, + 0, 205, 0, 206, 0, 207, 0, 208, 0, 206, + 0, 207, 0, 209, 211, 211, 0, 209, 210, 212, - 217, 212, 213, 218, 218, 219, 219, 214, 221, 221, - 215, 222, 222, 223, 223, 224, 224, 216, 0, 217, - 225, 225, 0, 218, 0, 219, 226, 226, 221, 227, - 227, 222, 0, 223, 0, 224, 228, 228, 230, 230, - 225, 0, 0, 0, 0, 0, 226, 0, 0, 227, - 0, 0, 0, 0, 225, 0, 228, 0, 230, 234, - 234, 234, 234, 234, 234, 235, 235, 235, 235, 235, - 235, 237, 237, 0, 237, 237, 238, 238, 0, 0, - 238, 238, 239, 239, 0, 239, 239, 239, 240, 240, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 212, 213, 213, 214, 214, 215, 215, 207, 216, 216, + 0, 207, 0, 210, 211, 217, 217, 218, 218, 212, + 0, 213, 211, 214, 0, 215, 219, 219, 216, 220, + 220, 222, 222, 223, 223, 217, 213, 218, 224, 224, + 225, 225, 226, 226, 227, 227, 219, 228, 228, 220, + 0, 222, 0, 223, 229, 229, 0, 0, 224, 0, + 225, 0, 226, 0, 227, 231, 231, 228, 0, 0, + 0, 0, 0, 0, 229, 0, 226, 0, 0, 0, + 0, 0, 0, 0, 0, 231, 235, 235, 235, 235, + 235, 235, 236, 236, 236, 236, 236, 236, 238, 238, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 233, 233, 233, 233, 233, 233, 233 + 0, 238, 238, 239, 239, 0, 0, 239, 239, 240, + 240, 0, 240, 240, 240, 241, 241, 234, 234, 234, + 234, 234, 234, 234, 234, 234, 234, 234, 234, 234, + 234, 234, 234, 234, 234, 234, 234, 234, 234, 234, + 234, 234, 234, 234, 234, 234, 234, 234, 234, 234, + 234, 234, 234, 234, 234, 234, 234, 234, 234, 234, + 234, 234, 234, 234, 234, 234, 234 } ; /* The intent behind this definition is that it'll catch @@ -749,9 +757,9 @@ static void update_yylloc(struct parser *parser, YYLTYPE *lloc, const char *text } #define YY_USER_ACTION update_yylloc(parser, yylloc, yytext); -#line 753 "gen/gen_lexer.inc" +#line 761 "gen/gen_lexer.inc" -#line 755 "gen/gen_lexer.inc" +#line 763 "gen/gen_lexer.inc" #define INITIAL 0 #define SC_COMMENT 1 @@ -1013,7 +1021,7 @@ YY_DECL #line 42 "src/lexer.l" -#line 1017 "gen/gen_lexer.inc" +#line 1025 "gen/gen_lexer.inc" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -1040,13 +1048,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 234 ) + if ( yy_current_state >= 235 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 991 ); + while ( yy_base[yy_current_state] != 1018 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -1682,82 +1690,87 @@ YY_RULE_SETUP case 119: YY_RULE_SETUP #line 184 "src/lexer.l" -{return li;} +{return mv;} YY_BREAK case 120: YY_RULE_SETUP #line 185 "src/lexer.l" -{return la;} +{return li;} YY_BREAK case 121: YY_RULE_SETUP -#line 187 "src/lexer.l" -{return mul; /* m */} +#line 186 "src/lexer.l" +{return la;} YY_BREAK case 122: YY_RULE_SETUP #line 188 "src/lexer.l" -{return diV;} +{return mul; /* m */} YY_BREAK case 123: YY_RULE_SETUP #line 189 "src/lexer.l" -{return rem;} +{return diV;} YY_BREAK case 124: YY_RULE_SETUP -#line 191 "src/lexer.l" -{return stt; /* a */} +#line 190 "src/lexer.l" +{return rem;} YY_BREAK case 125: YY_RULE_SETUP #line 192 "src/lexer.l" -{return cst;} +{return stt; /* a */} YY_BREAK case 126: YY_RULE_SETUP #line 193 "src/lexer.l" -{return ent;} +{return cst;} YY_BREAK case 127: YY_RULE_SETUP #line 194 "src/lexer.l" -{return cat;} +{return ent;} YY_BREAK case 128: YY_RULE_SETUP -#line 196 "src/lexer.l" -{return csrrw; /* Zcsr */} +#line 195 "src/lexer.l" +{return cat;} YY_BREAK case 129: YY_RULE_SETUP #line 197 "src/lexer.l" -{return csrrs;} +{return csrrw; /* Zcsr */} YY_BREAK case 130: YY_RULE_SETUP #line 198 "src/lexer.l" -{return csrrc;} +{return csrrs;} YY_BREAK case 131: YY_RULE_SETUP -#line 200 "src/lexer.l" -{/* skip line comments */} +#line 199 "src/lexer.l" +{return csrrc;} YY_BREAK case 132: YY_RULE_SETUP -#line 202 "src/lexer.l" -{BEGIN(SC_COMMENT);} +#line 201 "src/lexer.l" +{/* skip line comments */} YY_BREAK - case 133: YY_RULE_SETUP -#line 204 "src/lexer.l" -{++parser->comment_nesting;} +#line 203 "src/lexer.l" +{BEGIN(SC_COMMENT);} YY_BREAK + case 134: YY_RULE_SETUP #line 205 "src/lexer.l" +{++parser->comment_nesting;} + YY_BREAK +case 135: +YY_RULE_SETUP +#line 206 "src/lexer.l" { if (parser->comment_nesting) --parser->comment_nesting; @@ -1765,11 +1778,6 @@ YY_RULE_SETUP BEGIN(INITIAL); } YY_BREAK -case 135: -YY_RULE_SETUP -#line 212 "src/lexer.l" -{} - YY_BREAK case 136: YY_RULE_SETUP #line 213 "src/lexer.l" @@ -1781,44 +1789,49 @@ YY_RULE_SETUP {} YY_BREAK case 138: -/* rule 138 can match eol */ YY_RULE_SETUP #line 215 "src/lexer.l" {} YY_BREAK - case 139: +/* rule 139 can match eol */ +YY_RULE_SETUP +#line 216 "src/lexer.l" +{} + YY_BREAK + +case 140: YY_RULE_SETUP -#line 218 "src/lexer.l" +#line 219 "src/lexer.l" { yylval->str = yytext; return id; } YY_BREAK -case 140: -YY_RULE_SETUP -#line 223 "src/lexer.l" -{return LPAREN;} - YY_BREAK case 141: YY_RULE_SETUP #line 224 "src/lexer.l" -{return RPAREN;} +{return LPAREN;} YY_BREAK case 142: YY_RULE_SETUP #line 225 "src/lexer.l" -{return COMMA;} +{return RPAREN;} YY_BREAK case 143: -/* rule 143 can match eol */ YY_RULE_SETUP -#line 227 "src/lexer.l" -{/* skip whitespace */} +#line 226 "src/lexer.l" +{return COMMA;} YY_BREAK case 144: +/* rule 144 can match eol */ YY_RULE_SETUP -#line 229 "src/lexer.l" +#line 228 "src/lexer.l" +{/* skip whitespace */} + YY_BREAK +case 145: +YY_RULE_SETUP +#line 230 "src/lexer.l" { struct src_issue issue; issue.loc = to_src_loc(yylloc); @@ -1828,12 +1841,12 @@ YY_RULE_SETUP parser->failed = true; } YY_BREAK -case 145: +case 146: YY_RULE_SETUP -#line 237 "src/lexer.l" +#line 238 "src/lexer.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 1837 "gen/gen_lexer.inc" +#line 1850 "gen/gen_lexer.inc" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(SC_COMMENT): yyterminate(); @@ -2133,7 +2146,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 234 ) + if ( yy_current_state >= 235 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; @@ -2162,11 +2175,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 234 ) + if ( yy_current_state >= 235 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; - yy_is_jam = (yy_current_state == 233); + yy_is_jam = (yy_current_state == 234); (void)yyg; return yy_is_jam ? 0 : yy_current_state; @@ -2965,6 +2978,6 @@ void yyfree (void * ptr , yyscan_t yyscanner) #define YYTABLES_NAME "yytables" -#line 237 "src/lexer.l" +#line 238 "src/lexer.l" diff --git a/tasm/gen/gen_parser.c b/tasm/gen/gen_parser.c index dc1eac6..1123544 100644 --- a/tasm/gen/gen_parser.c +++ b/tasm/gen/gen_parser.c @@ -247,19 +247,20 @@ extern int yydebug; ebreak = 376, /* ebreak */ pcall = 377, /* pcall */ fence = 378, /* fence */ - li = 379, /* li */ - la = 380, /* la */ - nop = 381, /* nop */ - mul = 382, /* mul */ - diV = 383, /* diV */ - rem = 384, /* rem */ - stt = 385, /* stt */ - cst = 386, /* cst */ - ent = 387, /* ent */ - cat = 388, /* cat */ - csrrw = 389, /* csrrw */ - csrrs = 390, /* csrrs */ - csrrc = 391 /* csrrc */ + mv = 379, /* mv */ + li = 380, /* li */ + la = 381, /* la */ + nop = 382, /* nop */ + mul = 383, /* mul */ + diV = 384, /* diV */ + rem = 385, /* rem */ + stt = 386, /* stt */ + cst = 387, /* cst */ + ent = 388, /* ent */ + cat = 389, /* cat */ + csrrw = 390, /* csrrw */ + csrrs = 391, /* csrrs */ + csrrc = 392 /* csrrc */ }; typedef enum yytokentype yytoken_kind_t; #endif @@ -274,7 +275,7 @@ union YYSTYPE enum gpr_num gpr; tri_t tri; -#line 278 "gen/gen_parser.c" +#line 279 "gen/gen_parser.c" }; typedef union YYSTYPE YYSTYPE; @@ -431,33 +432,34 @@ enum yysymbol_kind_t YYSYMBOL_ebreak = 121, /* ebreak */ YYSYMBOL_pcall = 122, /* pcall */ YYSYMBOL_fence = 123, /* fence */ - YYSYMBOL_li = 124, /* li */ - YYSYMBOL_la = 125, /* la */ - YYSYMBOL_nop = 126, /* nop */ - YYSYMBOL_mul = 127, /* mul */ - YYSYMBOL_diV = 128, /* diV */ - YYSYMBOL_rem = 129, /* rem */ - YYSYMBOL_stt = 130, /* stt */ - YYSYMBOL_cst = 131, /* cst */ - YYSYMBOL_ent = 132, /* ent */ - YYSYMBOL_cat = 133, /* cat */ - YYSYMBOL_csrrw = 134, /* csrrw */ - YYSYMBOL_csrrs = 135, /* csrrs */ - YYSYMBOL_csrrc = 136, /* csrrc */ - YYSYMBOL_YYACCEPT = 137, /* $accept */ - YYSYMBOL_width = 138, /* width */ - YYSYMBOL_addr = 139, /* addr */ - YYSYMBOL_gpr = 140, /* gpr */ - YYSYMBOL_i = 141, /* i */ - YYSYMBOL_m = 142, /* m */ - YYSYMBOL_a = 143, /* a */ - YYSYMBOL_Zcsr = 144, /* Zcsr */ - YYSYMBOL_csr = 145, /* csr */ - YYSYMBOL_statement = 146, /* statement */ - YYSYMBOL_directive = 147, /* directive */ - YYSYMBOL_top = 148, /* top */ - YYSYMBOL_unit = 149, /* unit */ - YYSYMBOL_input = 150 /* input */ + YYSYMBOL_mv = 124, /* mv */ + YYSYMBOL_li = 125, /* li */ + YYSYMBOL_la = 126, /* la */ + YYSYMBOL_nop = 127, /* nop */ + YYSYMBOL_mul = 128, /* mul */ + YYSYMBOL_diV = 129, /* diV */ + YYSYMBOL_rem = 130, /* rem */ + YYSYMBOL_stt = 131, /* stt */ + YYSYMBOL_cst = 132, /* cst */ + YYSYMBOL_ent = 133, /* ent */ + YYSYMBOL_cat = 134, /* cat */ + YYSYMBOL_csrrw = 135, /* csrrw */ + YYSYMBOL_csrrs = 136, /* csrrs */ + YYSYMBOL_csrrc = 137, /* csrrc */ + YYSYMBOL_YYACCEPT = 138, /* $accept */ + YYSYMBOL_width = 139, /* width */ + YYSYMBOL_addr = 140, /* addr */ + YYSYMBOL_gpr = 141, /* gpr */ + YYSYMBOL_i = 142, /* i */ + YYSYMBOL_m = 143, /* m */ + YYSYMBOL_a = 144, /* a */ + YYSYMBOL_Zcsr = 145, /* Zcsr */ + YYSYMBOL_csr = 146, /* csr */ + YYSYMBOL_statement = 147, /* statement */ + YYSYMBOL_directive = 148, /* directive */ + YYSYMBOL_top = 149, /* top */ + YYSYMBOL_unit = 150, /* unit */ + YYSYMBOL_input = 151 /* input */ }; typedef enum yysymbol_kind_t yysymbol_kind_t; @@ -520,7 +522,7 @@ static void yyerror(YYLTYPE *yylloc, void *lexer, struct parser *parser, struct asm_ctx *ctx, const char *msg); -#line 524 "gen/gen_parser.c" +#line 526 "gen/gen_parser.c" #ifdef short @@ -845,21 +847,21 @@ union yyalloc #endif /* !YYCOPY_NEEDED */ /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 180 +#define YYFINAL 182 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 396 +#define YYLAST 401 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 137 +#define YYNTOKENS 138 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 14 /* YYNRULES -- Number of rules. */ -#define YYNRULES 142 +#define YYNRULES 143 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 328 +#define YYNSTATES 333 /* YYMAXUTOK -- Last valid token kind. */ -#define YYMAXUTOK 391 +#define YYMAXUTOK 392 /* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM @@ -912,7 +914,7 @@ static const yytype_uint8 yytranslate[] = 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, - 135, 136 + 135, 136, 137 }; #if YYDEBUG @@ -930,10 +932,10 @@ static const yytype_int16 yyrline[] = 233, 234, 235, 236, 237, 240, 243, 246, 249, 252, 255, 258, 261, 264, 267, 270, 273, 276, 279, 282, 285, 288, 291, 295, 298, 302, 306, 311, 315, 318, - 321, 324, 327, 330, 333, 336, 340, 343, 348, 355, - 358, 361, 365, 368, 371, 374, 378, 381, 384, 388, - 391, 392, 393, 394, 397, 398, 401, 402, 403, 406, - 407, 410, 411 + 321, 324, 327, 330, 333, 336, 340, 343, 346, 351, + 358, 361, 364, 368, 371, 374, 377, 381, 384, 387, + 391, 394, 395, 396, 397, 400, 401, 404, 405, 406, + 409, 410, 413, 414 }; #endif @@ -962,7 +964,7 @@ static const char *const yytname[] = "seqi", "snei", "unop", "diop", "slli", "srli", "sll", "srl", "add", "sub", "slt", "sge", "seq", "sne", "lui", "auipc", "jal", "jalr", "beq", "bne", "blt", "bge", "ld", "st", "ecall", "ebreak", "pcall", "fence", - "li", "la", "nop", "mul", "diV", "rem", "stt", "cst", "ent", "cat", + "mv", "li", "la", "nop", "mul", "diV", "rem", "stt", "cst", "ent", "cat", "csrrw", "csrrs", "csrrc", "$accept", "width", "addr", "gpr", "i", "m", "a", "Zcsr", "csr", "statement", "directive", "top", "unit", "input", YY_NULLPTR }; @@ -974,7 +976,7 @@ yysymbol_name (yysymbol_kind_t yysymbol) } #endif -#define YYPACT_NINF (-187) +#define YYPACT_NINF (-190) #define yypact_value_is_default(Yyn) \ ((Yyn) == YYPACT_NINF) @@ -988,39 +990,40 @@ yysymbol_name (yysymbol_kind_t yysymbol) STATE-NUM. */ static const yytype_int16 yypact[] = { - 32, -187, 22, 24, 304, 304, 304, 304, 304, 304, - 304, 304, 304, 304, 304, 304, 304, 304, 304, 304, - 304, 304, 304, 304, 304, 304, 304, 304, 304, 26, - 26, -187, -187, -187, -187, 304, 304, -187, 304, 304, - 304, -187, 26, 304, -187, 31, 31, 31, -187, -187, - -187, -187, -187, -187, 32, -187, 40, 38, -187, -187, - -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, - -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, - -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, - -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, - -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, - -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, - -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, - -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, - 37, 39, 41, 42, 43, 44, 45, 46, 47, 48, + 33, -190, 22, 24, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 27, + 27, -190, -190, -190, -190, 309, 309, 309, -190, 309, + 309, 309, -190, 27, 309, -190, 32, 32, 32, -190, + -190, -190, -190, -190, -190, 33, -190, 41, 39, -190, + -190, -190, -190, -190, -190, -190, -190, -190, -190, -190, + -190, -190, -190, -190, -190, -190, -190, -190, -190, -190, + -190, -190, -190, -190, -190, -190, -190, -190, -190, -190, + -190, -190, -190, -190, -190, -190, -190, -190, -190, -190, + -190, -190, -190, -190, -190, -190, -190, -190, -190, -190, + -190, -190, -190, -190, -190, -190, -190, -190, -190, -190, + -190, -190, -190, -190, -190, -190, -190, -190, -190, -190, + -190, -190, -190, -190, -190, -190, -190, -190, -190, -190, + -190, 38, 40, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, - 59, 60, 61, 62, 63, -187, 64, 65, 66, 67, - 68, 69, 70, 71, -187, -187, 72, 73, 74, -187, - -187, -187, 304, 304, 304, 304, 304, 304, 304, 304, - 304, 304, 304, 304, 304, 304, 304, 304, 304, 79, - 80, 78, 304, 304, 304, 304, 304, 304, 304, 82, - 78, 304, 304, 304, 304, 304, 304, 304, 84, 85, - 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, - 96, 97, 98, 99, 100, -187, -187, -187, -187, 101, - 102, 103, 104, 105, 106, 107, -187, -187, 108, 109, - 110, 111, 112, 113, 114, 83, 119, 120, 121, 166, - 165, 304, 168, 169, 304, 304, 304, 304, 304, 304, - 304, 304, 170, 78, 78, 78, 78, 171, 172, 304, - 304, 304, 173, 304, 304, 304, -187, -187, -187, -187, - -187, -187, 187, -187, -187, -187, -187, -187, -187, -187, - -187, -187, -187, -187, -187, -187, -187, -187, 188, 196, - -187, -187, -187, 197, -187, -187, -187, 190, 304, 304, - 304, -187, 36, 204, 205, -187, -187, -187 + 59, 60, 61, 62, 63, 64, -190, 65, 66, 67, + 68, 69, 70, 71, 72, 73, -190, -190, 74, 75, + 76, -190, -190, -190, 309, 309, 309, 309, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, + 309, 81, 82, 80, 84, 309, 309, 309, 309, 309, + 309, 309, 89, 80, 309, 309, 309, 309, 309, 309, + 309, 86, 87, 88, 90, 91, 92, 93, 94, 95, + 96, 97, 98, 99, 100, 101, 102, 103, -190, -190, + -190, -190, 104, 106, 107, 108, 109, 110, 111, -190, + -190, -190, 112, 113, 114, 115, 116, 117, 118, 168, + 169, 170, 171, 172, 173, 309, 174, 193, 309, 309, + 309, 309, 309, 309, 309, 309, 309, 80, 80, 80, + 80, 194, 195, 309, 309, 309, 196, 309, 309, 309, + -190, -190, -190, -190, -190, -190, 200, -190, -190, -190, + -190, -190, -190, -190, -190, -190, -190, 37, -190, -190, + -190, -190, 208, 209, -190, -190, -190, 210, -190, -190, + -190, 203, -190, 309, 309, 309, -190, 167, 211, 212, + -190, -190, -190 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -1028,53 +1031,54 @@ static const yytype_int16 yypact[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 142, 136, 0, 0, 0, 0, 0, 0, 0, 0, + 143, 137, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 110, 111, 112, 113, 0, 0, 116, 0, 0, - 0, 122, 0, 0, 125, 0, 0, 0, 130, 132, - 131, 133, 137, 138, 139, 141, 0, 0, 135, 4, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, - 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, - 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, - 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, - 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, - 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 110, 111, 112, 113, 0, 0, 0, 117, 0, + 0, 0, 123, 0, 0, 126, 0, 0, 0, 131, + 133, 132, 134, 138, 139, 140, 142, 0, 0, 136, + 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, + 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, + 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, + 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, + 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, + 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, + 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, + 84, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, - 0, 0, 0, 0, 124, 129, 0, 0, 0, 140, - 1, 134, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 125, 130, 0, 0, + 0, 141, 1, 135, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 100, 101, 3, 102, 0, - 0, 0, 0, 0, 0, 0, 118, 117, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 100, 101, + 3, 102, 0, 0, 0, 0, 0, 0, 0, 116, + 119, 118, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 85, 86, 87, 88, - 89, 114, 0, 90, 91, 98, 99, 92, 93, 94, - 95, 96, 97, 103, 104, 105, 106, 107, 0, 0, - 119, 120, 121, 0, 126, 127, 128, 0, 0, 0, - 0, 115, 0, 0, 0, 108, 109, 123 + 85, 86, 87, 88, 89, 114, 0, 90, 91, 98, + 99, 92, 93, 94, 95, 96, 97, 0, 104, 105, + 106, 107, 0, 0, 120, 121, 122, 0, 127, 128, + 129, 0, 103, 0, 0, 0, 115, 0, 0, 0, + 108, 109, 124 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -187, -3, -186, -5, -187, -187, -187, -187, -21, -187, - -187, -187, -7, -187 + -190, -3, -189, -5, -190, -190, -190, -190, -22, -190, + -190, -190, -7, -190 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_uint8 yydefgoto[] = { - 0, 166, 238, 140, 48, 49, 50, 51, 176, 52, - 53, 54, 55, 56 + 0, 167, 241, 141, 49, 50, 51, 52, 178, 53, + 54, 55, 56, 57 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -1082,90 +1086,92 @@ static const yytype_uint8 yydefgoto[] = number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_int16 yytable[] = { - 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, - 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, - 161, 162, 163, 164, 247, 177, 178, 167, 57, 58, - 168, 169, 165, 170, 171, 172, 1, 175, 174, 173, - 180, 181, 2, 3, 182, 325, 183, 179, 184, 185, - 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, - 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, - 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, - 216, 217, 235, 236, 237, 246, 286, 304, 305, 306, - 307, 255, 256, 257, 258, 259, 260, 261, 262, 263, - 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, - 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, - 284, 285, 287, 288, 289, 4, 5, 6, 7, 8, - 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, - 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, - 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, - 39, 40, 41, 42, 43, 44, 45, 46, 47, 290, - 291, 293, 294, 303, 308, 309, 313, 218, 219, 220, - 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, - 231, 232, 233, 234, 317, 321, 318, 239, 240, 241, - 242, 243, 244, 245, 319, 320, 248, 249, 250, 251, - 252, 253, 254, 326, 327, 0, 0, 0, 0, 0, + 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, + 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, + 162, 163, 164, 165, 251, 179, 180, 168, 58, 59, + 169, 170, 171, 166, 172, 173, 174, 1, 177, 176, + 175, 182, 183, 2, 3, 184, 322, 185, 181, 186, + 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, + 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, + 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, + 217, 218, 219, 220, 238, 239, 240, 242, 308, 309, + 310, 311, 250, 259, 260, 261, 0, 262, 263, 264, + 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, + 275, 0, 276, 277, 278, 279, 280, 281, 282, 283, + 284, 285, 286, 287, 288, 289, 4, 5, 6, 7, + 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, + 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, + 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, + 48, 290, 291, 292, 293, 294, 330, 297, 295, 221, + 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, + 232, 233, 234, 235, 236, 237, 298, 312, 313, 317, + 243, 244, 245, 246, 247, 248, 249, 321, 326, 252, + 253, 254, 255, 256, 257, 258, 323, 324, 325, 0, + 331, 332, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 292, 0, 0, 295, - 296, 297, 298, 299, 300, 301, 302, 0, 0, 0, - 0, 0, 0, 0, 310, 311, 312, 0, 314, 315, - 316, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 296, 0, 0, 299, 300, 301, 302, 303, 304, 305, + 306, 307, 0, 0, 0, 0, 0, 0, 314, 315, + 316, 0, 318, 319, 320, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 322, 323, 324, 59, 60, 61, 62, - 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, - 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, - 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, - 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, - 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, - 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, - 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, - 133, 134, 135, 136, 137, 138, 139 + 0, 0, 0, 0, 0, 0, 0, 0, 327, 328, + 329, 60, 61, 62, 63, 64, 65, 66, 67, 68, + 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, + 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, + 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, + 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, + 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, + 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, + 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, + 139, 140 }; static const yytype_int16 yycheck[] = { 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 28, 210, 46, 47, 30, 6, 5, - 35, 36, 6, 38, 39, 40, 4, 6, 43, 42, - 0, 3, 10, 11, 7, 9, 7, 54, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 25, 26, 27, 28, 213, 47, 48, 30, 6, 5, + 35, 36, 37, 6, 39, 40, 41, 4, 6, 44, + 43, 0, 3, 10, 11, 7, 9, 7, 55, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 3, 3, 6, 3, 3, 273, 274, 275, - 276, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 3, 3, 6, 3, 277, 278, + 279, 280, 3, 7, 7, 7, -1, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 3, 3, 3, 93, 94, 95, 96, 97, - 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, - 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, - 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, - 128, 129, 130, 131, 132, 133, 134, 135, 136, 3, - 5, 3, 3, 3, 3, 3, 3, 182, 183, 184, + 7, -1, 8, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 93, 94, 95, 96, + 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, + 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, + 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, + 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, + 137, 3, 3, 3, 3, 3, 9, 3, 5, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, - 195, 196, 197, 198, 7, 5, 8, 202, 203, 204, - 205, 206, 207, 208, 8, 8, 211, 212, 213, 214, - 215, 216, 217, 9, 9, -1, -1, -1, -1, -1, + 195, 196, 197, 198, 199, 200, 3, 3, 3, 3, + 205, 206, 207, 208, 209, 210, 211, 7, 5, 214, + 215, 216, 217, 218, 219, 220, 8, 8, 8, -1, + 9, 9, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 261, -1, -1, 264, - 265, 266, 267, 268, 269, 270, 271, -1, -1, -1, - -1, -1, -1, -1, 279, 280, 281, -1, 283, 284, - 285, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 265, -1, -1, 268, 269, 270, 271, 272, 273, 274, + 275, 276, -1, -1, -1, -1, -1, -1, 283, 284, + 285, -1, 287, 288, 289, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 318, 319, 320, 12, 13, 14, 15, - 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, - 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, - 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, - 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, - 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, - 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, - 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, - 86, 87, 88, 89, 90, 91, 92 + -1, -1, -1, -1, -1, -1, -1, -1, 323, 324, + 325, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, + 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, + 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, + 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, + 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, + 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, + 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, + 91, 92 }; /* YYSTOS[STATE-NUM] -- The symbol kind of the accessing symbol of @@ -1176,55 +1182,56 @@ static const yytype_uint8 yystos[] = 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, - 129, 130, 131, 132, 133, 134, 135, 136, 141, 142, - 143, 144, 146, 147, 148, 149, 150, 6, 5, 12, - 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, - 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, - 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, - 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, - 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, - 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, - 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, - 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, - 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, - 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, - 140, 140, 140, 140, 140, 6, 138, 138, 140, 140, - 140, 140, 140, 138, 140, 6, 145, 145, 145, 149, - 0, 3, 7, 7, 7, 7, 7, 7, 7, 7, + 129, 130, 131, 132, 133, 134, 135, 136, 137, 142, + 143, 144, 145, 147, 148, 149, 150, 151, 6, 5, + 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, + 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, + 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, + 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, + 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, + 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, + 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, + 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, + 92, 141, 141, 141, 141, 141, 141, 141, 141, 141, + 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, + 141, 141, 141, 141, 141, 141, 6, 139, 139, 141, + 141, 141, 141, 141, 141, 139, 141, 6, 146, 146, + 146, 150, 0, 3, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 140, 140, - 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, - 140, 140, 140, 140, 140, 3, 3, 6, 139, 140, - 140, 140, 140, 140, 140, 140, 3, 139, 140, 140, - 140, 140, 140, 140, 140, 7, 7, 7, 7, 7, + 7, 141, 141, 141, 141, 141, 141, 141, 141, 141, + 141, 141, 141, 141, 141, 141, 141, 141, 3, 3, + 6, 140, 3, 141, 141, 141, 141, 141, 141, 141, + 3, 140, 141, 141, 141, 141, 141, 141, 141, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 3, 3, 3, 3, - 3, 5, 140, 3, 3, 140, 140, 140, 140, 140, - 140, 140, 140, 3, 139, 139, 139, 139, 3, 3, - 140, 140, 140, 3, 140, 140, 140, 7, 8, 8, - 8, 5, 140, 140, 140, 9, 9, 9 + 3, 3, 3, 3, 3, 5, 141, 3, 3, 141, + 141, 141, 141, 141, 141, 141, 141, 141, 140, 140, + 140, 140, 3, 3, 141, 141, 141, 3, 141, 141, + 141, 7, 9, 8, 8, 8, 5, 141, 141, 141, + 9, 9, 9 }; /* YYR1[RULE-NUM] -- Symbol kind of the left-hand side of rule RULE-NUM. */ static const yytype_uint8 yyr1[] = { - 0, 137, 138, 139, 140, 140, 140, 140, 140, 140, - 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, - 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, - 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, - 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, - 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, - 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, - 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, - 140, 140, 140, 140, 140, 141, 141, 141, 141, 141, + 0, 138, 139, 140, 141, 141, 141, 141, 141, 141, + 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, + 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, + 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, + 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, - 141, 141, 141, 141, 141, 141, 141, 141, 141, 142, - 142, 142, 143, 143, 143, 143, 144, 144, 144, 145, - 146, 146, 146, 146, 147, 147, 148, 148, 148, 149, - 149, 150, 150 + 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, + 141, 141, 141, 141, 141, 142, 142, 142, 142, 142, + 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, + 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, + 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, + 143, 143, 143, 144, 144, 144, 144, 145, 145, 145, + 146, 147, 147, 147, 147, 148, 148, 149, 149, 149, + 150, 150, 151, 151 }; /* YYR2[RULE-NUM] -- Number of symbols on the right-hand side of rule RULE-NUM. */ @@ -1240,11 +1247,11 @@ static const yytype_int8 yyr2[] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 4, 4, 4, 6, 6, 6, 6, 6, 9, 9, - 1, 1, 1, 1, 6, 8, 1, 4, 4, 6, - 6, 6, 1, 9, 2, 1, 6, 6, 6, 1, - 1, 1, 1, 1, 3, 2, 1, 1, 1, 1, - 2, 1, 0 + 4, 4, 4, 7, 6, 6, 6, 6, 9, 9, + 1, 1, 1, 1, 6, 8, 4, 1, 4, 4, + 6, 6, 6, 1, 9, 2, 1, 6, 6, 6, + 1, 1, 1, 1, 1, 3, 2, 1, 1, 1, + 1, 2, 1, 0 }; @@ -2108,616 +2115,616 @@ yyreduce: case 4: /* gpr: x0 */ #line 157 "src/parser.y" {(yyval.gpr) = X0_NUM;} -#line 2112 "gen/gen_parser.c" +#line 2119 "gen/gen_parser.c" break; case 5: /* gpr: x1 */ #line 158 "src/parser.y" {(yyval.gpr) = X1_NUM;} -#line 2118 "gen/gen_parser.c" +#line 2125 "gen/gen_parser.c" break; case 6: /* gpr: x2 */ #line 159 "src/parser.y" {(yyval.gpr) = X2_NUM;} -#line 2124 "gen/gen_parser.c" +#line 2131 "gen/gen_parser.c" break; case 7: /* gpr: x3 */ #line 160 "src/parser.y" {(yyval.gpr) = X3_NUM;} -#line 2130 "gen/gen_parser.c" +#line 2137 "gen/gen_parser.c" break; case 8: /* gpr: x4 */ #line 161 "src/parser.y" {(yyval.gpr) = X4_NUM;} -#line 2136 "gen/gen_parser.c" +#line 2143 "gen/gen_parser.c" break; case 9: /* gpr: x5 */ #line 162 "src/parser.y" {(yyval.gpr) = X5_NUM;} -#line 2142 "gen/gen_parser.c" +#line 2149 "gen/gen_parser.c" break; case 10: /* gpr: x6 */ #line 163 "src/parser.y" {(yyval.gpr) = X6_NUM;} -#line 2148 "gen/gen_parser.c" +#line 2155 "gen/gen_parser.c" break; case 11: /* gpr: x7 */ #line 164 "src/parser.y" {(yyval.gpr) = X7_NUM;} -#line 2154 "gen/gen_parser.c" +#line 2161 "gen/gen_parser.c" break; case 12: /* gpr: x8 */ #line 165 "src/parser.y" {(yyval.gpr) = X8_NUM;} -#line 2160 "gen/gen_parser.c" +#line 2167 "gen/gen_parser.c" break; case 13: /* gpr: x9 */ #line 166 "src/parser.y" {(yyval.gpr) = X9_NUM;} -#line 2166 "gen/gen_parser.c" +#line 2173 "gen/gen_parser.c" break; case 14: /* gpr: x10 */ #line 167 "src/parser.y" {(yyval.gpr) = X10_NUM;} -#line 2172 "gen/gen_parser.c" +#line 2179 "gen/gen_parser.c" break; case 15: /* gpr: x11 */ #line 168 "src/parser.y" {(yyval.gpr) = X11_NUM;} -#line 2178 "gen/gen_parser.c" +#line 2185 "gen/gen_parser.c" break; case 16: /* gpr: x12 */ #line 169 "src/parser.y" {(yyval.gpr) = X12_NUM;} -#line 2184 "gen/gen_parser.c" +#line 2191 "gen/gen_parser.c" break; case 17: /* gpr: x13 */ #line 170 "src/parser.y" {(yyval.gpr) = X13_NUM;} -#line 2190 "gen/gen_parser.c" +#line 2197 "gen/gen_parser.c" break; case 18: /* gpr: x14 */ #line 171 "src/parser.y" {(yyval.gpr) = X14_NUM;} -#line 2196 "gen/gen_parser.c" +#line 2203 "gen/gen_parser.c" break; case 19: /* gpr: x15 */ #line 172 "src/parser.y" {(yyval.gpr) = X15_NUM;} -#line 2202 "gen/gen_parser.c" +#line 2209 "gen/gen_parser.c" break; case 20: /* gpr: x16 */ #line 173 "src/parser.y" {(yyval.gpr) = X16_NUM;} -#line 2208 "gen/gen_parser.c" +#line 2215 "gen/gen_parser.c" break; case 21: /* gpr: x17 */ #line 174 "src/parser.y" {(yyval.gpr) = X17_NUM;} -#line 2214 "gen/gen_parser.c" +#line 2221 "gen/gen_parser.c" break; case 22: /* gpr: x18 */ #line 175 "src/parser.y" {(yyval.gpr) = X18_NUM;} -#line 2220 "gen/gen_parser.c" +#line 2227 "gen/gen_parser.c" break; case 23: /* gpr: x19 */ #line 176 "src/parser.y" {(yyval.gpr) = X19_NUM;} -#line 2226 "gen/gen_parser.c" +#line 2233 "gen/gen_parser.c" break; case 24: /* gpr: x20 */ #line 177 "src/parser.y" {(yyval.gpr) = X20_NUM;} -#line 2232 "gen/gen_parser.c" +#line 2239 "gen/gen_parser.c" break; case 25: /* gpr: x21 */ #line 178 "src/parser.y" {(yyval.gpr) = X21_NUM;} -#line 2238 "gen/gen_parser.c" +#line 2245 "gen/gen_parser.c" break; case 26: /* gpr: x22 */ #line 179 "src/parser.y" {(yyval.gpr) = X22_NUM;} -#line 2244 "gen/gen_parser.c" +#line 2251 "gen/gen_parser.c" break; case 27: /* gpr: x23 */ #line 180 "src/parser.y" {(yyval.gpr) = X23_NUM;} -#line 2250 "gen/gen_parser.c" +#line 2257 "gen/gen_parser.c" break; case 28: /* gpr: x24 */ #line 181 "src/parser.y" {(yyval.gpr) = X24_NUM;} -#line 2256 "gen/gen_parser.c" +#line 2263 "gen/gen_parser.c" break; case 29: /* gpr: x25 */ #line 182 "src/parser.y" {(yyval.gpr) = X25_NUM;} -#line 2262 "gen/gen_parser.c" +#line 2269 "gen/gen_parser.c" break; case 30: /* gpr: x26 */ #line 183 "src/parser.y" {(yyval.gpr) = X26_NUM;} -#line 2268 "gen/gen_parser.c" +#line 2275 "gen/gen_parser.c" break; case 31: /* gpr: x27 */ #line 184 "src/parser.y" {(yyval.gpr) = X27_NUM;} -#line 2274 "gen/gen_parser.c" +#line 2281 "gen/gen_parser.c" break; case 32: /* gpr: x28 */ #line 185 "src/parser.y" {(yyval.gpr) = X28_NUM;} -#line 2280 "gen/gen_parser.c" +#line 2287 "gen/gen_parser.c" break; case 33: /* gpr: x29 */ #line 186 "src/parser.y" {(yyval.gpr) = X29_NUM;} -#line 2286 "gen/gen_parser.c" +#line 2293 "gen/gen_parser.c" break; case 34: /* gpr: x30 */ #line 187 "src/parser.y" {(yyval.gpr) = X30_NUM;} -#line 2292 "gen/gen_parser.c" +#line 2299 "gen/gen_parser.c" break; case 35: /* gpr: x31 */ #line 188 "src/parser.y" {(yyval.gpr) = X31_NUM;} -#line 2298 "gen/gen_parser.c" +#line 2305 "gen/gen_parser.c" break; case 36: /* gpr: x32 */ #line 189 "src/parser.y" {(yyval.gpr) = X32_NUM;} -#line 2304 "gen/gen_parser.c" +#line 2311 "gen/gen_parser.c" break; case 37: /* gpr: x33 */ #line 190 "src/parser.y" {(yyval.gpr) = X33_NUM;} -#line 2310 "gen/gen_parser.c" +#line 2317 "gen/gen_parser.c" break; case 38: /* gpr: x34 */ #line 191 "src/parser.y" {(yyval.gpr) = X34_NUM;} -#line 2316 "gen/gen_parser.c" +#line 2323 "gen/gen_parser.c" break; case 39: /* gpr: x35 */ #line 192 "src/parser.y" {(yyval.gpr) = X35_NUM;} -#line 2322 "gen/gen_parser.c" +#line 2329 "gen/gen_parser.c" break; case 40: /* gpr: x36 */ #line 193 "src/parser.y" {(yyval.gpr) = X36_NUM;} -#line 2328 "gen/gen_parser.c" +#line 2335 "gen/gen_parser.c" break; case 41: /* gpr: x37 */ #line 194 "src/parser.y" {(yyval.gpr) = X37_NUM;} -#line 2334 "gen/gen_parser.c" +#line 2341 "gen/gen_parser.c" break; case 42: /* gpr: x38 */ #line 195 "src/parser.y" {(yyval.gpr) = X38_NUM;} -#line 2340 "gen/gen_parser.c" +#line 2347 "gen/gen_parser.c" break; case 43: /* gpr: x39 */ #line 196 "src/parser.y" {(yyval.gpr) = X39_NUM;} -#line 2346 "gen/gen_parser.c" +#line 2353 "gen/gen_parser.c" break; case 44: /* gpr: x40 */ #line 197 "src/parser.y" {(yyval.gpr) = X40_NUM;} -#line 2352 "gen/gen_parser.c" +#line 2359 "gen/gen_parser.c" break; case 45: /* gpr: x41 */ #line 198 "src/parser.y" {(yyval.gpr) = X41_NUM;} -#line 2358 "gen/gen_parser.c" +#line 2365 "gen/gen_parser.c" break; case 46: /* gpr: x42 */ #line 199 "src/parser.y" {(yyval.gpr) = X42_NUM;} -#line 2364 "gen/gen_parser.c" +#line 2371 "gen/gen_parser.c" break; case 47: /* gpr: x43 */ #line 200 "src/parser.y" {(yyval.gpr) = X43_NUM;} -#line 2370 "gen/gen_parser.c" +#line 2377 "gen/gen_parser.c" break; case 48: /* gpr: x44 */ #line 201 "src/parser.y" {(yyval.gpr) = X44_NUM;} -#line 2376 "gen/gen_parser.c" +#line 2383 "gen/gen_parser.c" break; case 49: /* gpr: x45 */ #line 202 "src/parser.y" {(yyval.gpr) = X45_NUM;} -#line 2382 "gen/gen_parser.c" +#line 2389 "gen/gen_parser.c" break; case 50: /* gpr: x46 */ #line 203 "src/parser.y" {(yyval.gpr) = X46_NUM;} -#line 2388 "gen/gen_parser.c" +#line 2395 "gen/gen_parser.c" break; case 51: /* gpr: x47 */ #line 204 "src/parser.y" {(yyval.gpr) = X47_NUM;} -#line 2394 "gen/gen_parser.c" +#line 2401 "gen/gen_parser.c" break; case 52: /* gpr: x48 */ #line 205 "src/parser.y" {(yyval.gpr) = X48_NUM;} -#line 2400 "gen/gen_parser.c" +#line 2407 "gen/gen_parser.c" break; case 53: /* gpr: x49 */ #line 206 "src/parser.y" {(yyval.gpr) = X49_NUM;} -#line 2406 "gen/gen_parser.c" +#line 2413 "gen/gen_parser.c" break; case 54: /* gpr: x50 */ #line 207 "src/parser.y" {(yyval.gpr) = X50_NUM;} -#line 2412 "gen/gen_parser.c" +#line 2419 "gen/gen_parser.c" break; case 55: /* gpr: x51 */ #line 208 "src/parser.y" {(yyval.gpr) = X51_NUM;} -#line 2418 "gen/gen_parser.c" +#line 2425 "gen/gen_parser.c" break; case 56: /* gpr: x52 */ #line 209 "src/parser.y" {(yyval.gpr) = X52_NUM;} -#line 2424 "gen/gen_parser.c" +#line 2431 "gen/gen_parser.c" break; case 57: /* gpr: x53 */ #line 210 "src/parser.y" {(yyval.gpr) = X53_NUM;} -#line 2430 "gen/gen_parser.c" +#line 2437 "gen/gen_parser.c" break; case 58: /* gpr: x54 */ #line 211 "src/parser.y" {(yyval.gpr) = X54_NUM;} -#line 2436 "gen/gen_parser.c" +#line 2443 "gen/gen_parser.c" break; case 59: /* gpr: x55 */ #line 212 "src/parser.y" {(yyval.gpr) = X55_NUM;} -#line 2442 "gen/gen_parser.c" +#line 2449 "gen/gen_parser.c" break; case 60: /* gpr: x56 */ #line 213 "src/parser.y" {(yyval.gpr) = X56_NUM;} -#line 2448 "gen/gen_parser.c" +#line 2455 "gen/gen_parser.c" break; case 61: /* gpr: x57 */ #line 214 "src/parser.y" {(yyval.gpr) = X57_NUM;} -#line 2454 "gen/gen_parser.c" +#line 2461 "gen/gen_parser.c" break; case 62: /* gpr: x58 */ #line 215 "src/parser.y" {(yyval.gpr) = X58_NUM;} -#line 2460 "gen/gen_parser.c" +#line 2467 "gen/gen_parser.c" break; case 63: /* gpr: x59 */ #line 216 "src/parser.y" {(yyval.gpr) = X59_NUM;} -#line 2466 "gen/gen_parser.c" +#line 2473 "gen/gen_parser.c" break; case 64: /* gpr: x60 */ #line 217 "src/parser.y" {(yyval.gpr) = X60_NUM;} -#line 2472 "gen/gen_parser.c" +#line 2479 "gen/gen_parser.c" break; case 65: /* gpr: x61 */ #line 218 "src/parser.y" {(yyval.gpr) = X61_NUM;} -#line 2478 "gen/gen_parser.c" +#line 2485 "gen/gen_parser.c" break; case 66: /* gpr: x62 */ #line 219 "src/parser.y" {(yyval.gpr) = X62_NUM;} -#line 2484 "gen/gen_parser.c" +#line 2491 "gen/gen_parser.c" break; case 67: /* gpr: x63 */ #line 220 "src/parser.y" {(yyval.gpr) = X63_NUM;} -#line 2490 "gen/gen_parser.c" +#line 2497 "gen/gen_parser.c" break; case 68: /* gpr: x64 */ #line 221 "src/parser.y" {(yyval.gpr) = X64_NUM;} -#line 2496 "gen/gen_parser.c" +#line 2503 "gen/gen_parser.c" break; case 69: /* gpr: x65 */ #line 222 "src/parser.y" {(yyval.gpr) = X65_NUM;} -#line 2502 "gen/gen_parser.c" +#line 2509 "gen/gen_parser.c" break; case 70: /* gpr: x66 */ #line 223 "src/parser.y" {(yyval.gpr) = X66_NUM;} -#line 2508 "gen/gen_parser.c" +#line 2515 "gen/gen_parser.c" break; case 71: /* gpr: x67 */ #line 224 "src/parser.y" {(yyval.gpr) = X67_NUM;} -#line 2514 "gen/gen_parser.c" +#line 2521 "gen/gen_parser.c" break; case 72: /* gpr: x68 */ #line 225 "src/parser.y" {(yyval.gpr) = X68_NUM;} -#line 2520 "gen/gen_parser.c" +#line 2527 "gen/gen_parser.c" break; case 73: /* gpr: x69 */ #line 226 "src/parser.y" {(yyval.gpr) = X69_NUM;} -#line 2526 "gen/gen_parser.c" +#line 2533 "gen/gen_parser.c" break; case 74: /* gpr: x70 */ #line 227 "src/parser.y" {(yyval.gpr) = X70_NUM;} -#line 2532 "gen/gen_parser.c" +#line 2539 "gen/gen_parser.c" break; case 75: /* gpr: x71 */ #line 228 "src/parser.y" {(yyval.gpr) = X71_NUM;} -#line 2538 "gen/gen_parser.c" +#line 2545 "gen/gen_parser.c" break; case 76: /* gpr: x72 */ #line 229 "src/parser.y" {(yyval.gpr) = X72_NUM;} -#line 2544 "gen/gen_parser.c" +#line 2551 "gen/gen_parser.c" break; case 77: /* gpr: x73 */ #line 230 "src/parser.y" {(yyval.gpr) = X73_NUM;} -#line 2550 "gen/gen_parser.c" +#line 2557 "gen/gen_parser.c" break; case 78: /* gpr: x74 */ #line 231 "src/parser.y" {(yyval.gpr) = X74_NUM;} -#line 2556 "gen/gen_parser.c" +#line 2563 "gen/gen_parser.c" break; case 79: /* gpr: x75 */ #line 232 "src/parser.y" {(yyval.gpr) = X75_NUM;} -#line 2562 "gen/gen_parser.c" +#line 2569 "gen/gen_parser.c" break; case 80: /* gpr: x76 */ #line 233 "src/parser.y" {(yyval.gpr) = X76_NUM;} -#line 2568 "gen/gen_parser.c" +#line 2575 "gen/gen_parser.c" break; case 81: /* gpr: x77 */ #line 234 "src/parser.y" {(yyval.gpr) = X77_NUM;} -#line 2574 "gen/gen_parser.c" +#line 2581 "gen/gen_parser.c" break; case 82: /* gpr: x78 */ #line 235 "src/parser.y" {(yyval.gpr) = X78_NUM;} -#line 2580 "gen/gen_parser.c" +#line 2587 "gen/gen_parser.c" break; case 83: /* gpr: x79 */ #line 236 "src/parser.y" {(yyval.gpr) = X79_NUM;} -#line 2586 "gen/gen_parser.c" +#line 2593 "gen/gen_parser.c" break; case 84: /* gpr: x80 */ #line 237 "src/parser.y" {(yyval.gpr) = X80_NUM;} -#line 2592 "gen/gen_parser.c" +#line 2599 "gen/gen_parser.c" break; case 85: /* i: addi gpr "," gpr "," imm */ #line 241 "src/parser.y" {emit_i(ctx, OPCODE_OP_IMM, (yyvsp[-4].gpr), OP_IMM_ADDI, (yyvsp[-2].gpr), (yyvsp[0].tri));} -#line 2598 "gen/gen_parser.c" +#line 2605 "gen/gen_parser.c" break; case 86: /* i: slti gpr "," gpr "," imm */ #line 244 "src/parser.y" {emit_i(ctx, OPCODE_OP_IMM, (yyvsp[-4].gpr), OP_IMM_SLTI, (yyvsp[-2].gpr), (yyvsp[0].tri));} -#line 2604 "gen/gen_parser.c" +#line 2611 "gen/gen_parser.c" break; case 87: /* i: sgei gpr "," gpr "," imm */ #line 247 "src/parser.y" {emit_i(ctx, OPCODE_OP_IMM, (yyvsp[-4].gpr), OP_IMM_SGEI, (yyvsp[-2].gpr), (yyvsp[0].tri));} -#line 2610 "gen/gen_parser.c" +#line 2617 "gen/gen_parser.c" break; case 88: /* i: seqi gpr "," gpr "," imm */ #line 250 "src/parser.y" {emit_i(ctx, OPCODE_OP_IMM, (yyvsp[-4].gpr), OP_IMM_SEQI, (yyvsp[-2].gpr), (yyvsp[0].tri));} -#line 2616 "gen/gen_parser.c" +#line 2623 "gen/gen_parser.c" break; case 89: /* i: snei gpr "," gpr "," imm */ #line 253 "src/parser.y" {emit_i(ctx, OPCODE_OP_IMM, (yyvsp[-4].gpr), OP_IMM_SNEI, (yyvsp[-2].gpr), (yyvsp[0].tri));} -#line 2622 "gen/gen_parser.c" +#line 2629 "gen/gen_parser.c" break; case 90: /* i: slli gpr "," gpr "," imm */ #line 256 "src/parser.y" {check_shift((yyvsp[0].tri)); emit_i(ctx, OPCODE_OP_IMM, (yyvsp[-4].gpr), OP_IMM_SLLI, (yyvsp[-2].gpr), (yyvsp[0].tri));} -#line 2628 "gen/gen_parser.c" +#line 2635 "gen/gen_parser.c" break; case 91: /* i: srli gpr "," gpr "," imm */ #line 259 "src/parser.y" {check_shift((yyvsp[0].tri)); emit_i(ctx, OPCODE_OP_IMM, (yyvsp[-4].gpr), OP_IMM_SRLI, (yyvsp[-2].gpr), (yyvsp[0].tri));} -#line 2634 "gen/gen_parser.c" +#line 2641 "gen/gen_parser.c" break; case 92: /* i: add gpr "," gpr "," gpr */ #line 262 "src/parser.y" {emit_r(ctx, OPCODE_OP, (yyvsp[-4].gpr), OP_ADD, (yyvsp[-2].gpr), (yyvsp[0].gpr), 0);} -#line 2640 "gen/gen_parser.c" +#line 2647 "gen/gen_parser.c" break; case 93: /* i: sub gpr "," gpr "," gpr */ #line 265 "src/parser.y" {emit_r(ctx, OPCODE_OP, (yyvsp[-4].gpr), OP_SUB, (yyvsp[-2].gpr), (yyvsp[0].gpr), 0);} -#line 2646 "gen/gen_parser.c" +#line 2653 "gen/gen_parser.c" break; case 94: /* i: slt gpr "," gpr "," gpr */ #line 268 "src/parser.y" {emit_r(ctx, OPCODE_OP, (yyvsp[-4].gpr), OP_SLT, (yyvsp[-2].gpr), (yyvsp[0].gpr), 0);} -#line 2652 "gen/gen_parser.c" +#line 2659 "gen/gen_parser.c" break; case 95: /* i: sge gpr "," gpr "," gpr */ #line 271 "src/parser.y" {emit_r(ctx, OPCODE_OP, (yyvsp[-4].gpr), OP_SGE, (yyvsp[-2].gpr), (yyvsp[0].gpr), 0);} -#line 2658 "gen/gen_parser.c" +#line 2665 "gen/gen_parser.c" break; case 96: /* i: seq gpr "," gpr "," gpr */ #line 274 "src/parser.y" {emit_r(ctx, OPCODE_OP, (yyvsp[-4].gpr), OP_SEQ, (yyvsp[-2].gpr), (yyvsp[0].gpr), 0);} -#line 2664 "gen/gen_parser.c" +#line 2671 "gen/gen_parser.c" break; case 97: /* i: sne gpr "," gpr "," gpr */ #line 277 "src/parser.y" {emit_r(ctx, OPCODE_OP, (yyvsp[-4].gpr), OP_SNE, (yyvsp[-2].gpr), (yyvsp[0].gpr), 0);} -#line 2670 "gen/gen_parser.c" +#line 2677 "gen/gen_parser.c" break; case 98: /* i: sll gpr "," gpr "," gpr */ #line 280 "src/parser.y" {emit_r(ctx, OPCODE_OP, (yyvsp[-4].gpr), OP_SLL, (yyvsp[-2].gpr), (yyvsp[0].gpr), 0);} -#line 2676 "gen/gen_parser.c" +#line 2683 "gen/gen_parser.c" break; case 99: /* i: srl gpr "," gpr "," gpr */ #line 283 "src/parser.y" {emit_r(ctx, OPCODE_OP, (yyvsp[-4].gpr), OP_SRL, (yyvsp[-2].gpr), (yyvsp[0].gpr), 0);} -#line 2682 "gen/gen_parser.c" +#line 2689 "gen/gen_parser.c" break; case 100: /* i: lui gpr "," imm */ #line 286 "src/parser.y" {emit_u(ctx, OPCODE_LUI, (yyvsp[-2].gpr), (yyvsp[0].tri));} -#line 2688 "gen/gen_parser.c" +#line 2695 "gen/gen_parser.c" break; case 101: /* i: auipc gpr "," imm */ #line 289 "src/parser.y" {emit_u(ctx, OPCODE_AUIPC, (yyvsp[-2].gpr), (yyvsp[0].tri));} -#line 2694 "gen/gen_parser.c" +#line 2701 "gen/gen_parser.c" break; case 102: /* i: jal gpr "," addr */ #line 292 "src/parser.y" {emit_reloc(ctx, RELOC_J, (yyvsp[0].str)); emit_u(ctx, OPCODE_JAL, (yyvsp[-2].gpr), 0);} -#line 2701 "gen/gen_parser.c" +#line 2708 "gen/gen_parser.c" break; - case 103: /* i: jalr gpr "," gpr "," imm */ + case 103: /* i: jalr gpr "," imm "(" gpr ")" */ #line 296 "src/parser.y" - {emit_i(ctx, OPCODE_JALR, (yyvsp[-4].gpr), 0, (yyvsp[-2].gpr), (yyvsp[0].tri));} -#line 2707 "gen/gen_parser.c" + {emit_i(ctx, OPCODE_JALR, (yyvsp[-5].gpr), 0, (yyvsp[-1].gpr), (yyvsp[-3].tri));} +#line 2714 "gen/gen_parser.c" break; case 104: /* i: beq gpr "," gpr "," addr */ #line 299 "src/parser.y" {emit_reloc(ctx, RELOC_B, (yyvsp[0].str)); emit_s(ctx, OPCODE_BRANCH, BRANCH_BEQ, (yyvsp[-4].gpr), (yyvsp[-2].gpr), 0);} -#line 2714 "gen/gen_parser.c" +#line 2721 "gen/gen_parser.c" break; case 105: /* i: bne gpr "," gpr "," addr */ #line 303 "src/parser.y" {emit_reloc(ctx, RELOC_B, (yyvsp[0].str)); emit_s(ctx, OPCODE_BRANCH, BRANCH_BNE, (yyvsp[-4].gpr), (yyvsp[-2].gpr), 0);} -#line 2721 "gen/gen_parser.c" +#line 2728 "gen/gen_parser.c" break; case 106: /* i: blt gpr "," gpr "," addr */ @@ -2725,159 +2732,165 @@ yyreduce: {emit_reloc(ctx, RELOC_B, (yyvsp[0].str)); emit_s(ctx, OPCODE_BRANCH, BRANCH_BLT, (yyvsp[-4].gpr), (yyvsp[-2].gpr), 0); } -#line 2729 "gen/gen_parser.c" +#line 2736 "gen/gen_parser.c" break; case 107: /* i: bge gpr "," gpr "," addr */ #line 312 "src/parser.y" {emit_reloc(ctx, RELOC_B, (yyvsp[0].str)); emit_s(ctx, OPCODE_BRANCH, BRANCH_BGE, (yyvsp[-4].gpr), (yyvsp[-2].gpr), 0);} -#line 2736 "gen/gen_parser.c" +#line 2743 "gen/gen_parser.c" break; case 108: /* i: ld width "," gpr "," imm "(" gpr ")" */ #line 316 "src/parser.y" {emit_i(ctx, OPCODE_LOAD, check_width((yyvsp[-7].str)), (yyvsp[-5].gpr), (yyvsp[-1].gpr), (yyvsp[-3].tri));} -#line 2742 "gen/gen_parser.c" +#line 2749 "gen/gen_parser.c" break; case 109: /* i: st width "," gpr "," imm "(" gpr ")" */ #line 319 "src/parser.y" {emit_s(ctx, OPCODE_STORE, check_width((yyvsp[-7].str)), (yyvsp[-5].gpr), (yyvsp[-1].gpr), (yyvsp[-3].tri));} -#line 2748 "gen/gen_parser.c" +#line 2755 "gen/gen_parser.c" break; case 110: /* i: ecall */ #line 322 "src/parser.y" {emit_i(ctx, OPCODE_SYSTEM, X0_NUM, SYSTEM_ECALL, X0_NUM, 0);} -#line 2754 "gen/gen_parser.c" +#line 2761 "gen/gen_parser.c" break; case 111: /* i: ebreak */ #line 325 "src/parser.y" {emit_i(ctx, OPCODE_SYSTEM, X0_NUM, SYSTEM_EBREAK, X0_NUM, 0);} -#line 2760 "gen/gen_parser.c" +#line 2767 "gen/gen_parser.c" break; case 112: /* i: pcall */ #line 328 "src/parser.y" {emit_i(ctx, OPCODE_SYSTEM, X0_NUM, SYSTEM_PCALL, X0_NUM, 0);} -#line 2766 "gen/gen_parser.c" +#line 2773 "gen/gen_parser.c" break; case 113: /* i: fence */ #line 331 "src/parser.y" {emit_i(ctx, OPCODE_MEM, X0_NUM, MEM_FENCE, X0_NUM, 0); /* still todo */} -#line 2772 "gen/gen_parser.c" +#line 2779 "gen/gen_parser.c" break; case 114: /* i: unop gpr "," gpr "," str */ #line 334 "src/parser.y" {emit_i(ctx, OPCODE_OP_IMM, (yyvsp[-4].gpr), OP_IMM_UNOP, (yyvsp[-2].gpr), check_nop((yyvsp[0].str)));} -#line 2778 "gen/gen_parser.c" +#line 2785 "gen/gen_parser.c" break; case 115: /* i: diop gpr "," gpr "," gpr "," str */ #line 337 "src/parser.y" {emit_d(ctx, OPCODE_DIOP, (yyvsp[-6].gpr), (yyvsp[-4].gpr), (yyvsp[-2].gpr), check_nop3((yyvsp[0].str)));} -#line 2784 "gen/gen_parser.c" +#line 2791 "gen/gen_parser.c" break; - case 116: /* i: nop */ + case 116: /* i: mv gpr "," gpr */ #line 341 "src/parser.y" - {emit_i(ctx, OPCODE_OP_IMM, X0_NUM, OP_IMM_ADDI, X0_NUM, 0);} -#line 2790 "gen/gen_parser.c" + {emit_i(ctx, OPCODE_OP_IMM, (yyvsp[-2].gpr), OP_IMM_ADDI, (yyvsp[0].gpr), 0);} +#line 2797 "gen/gen_parser.c" break; - case 117: /* i: la gpr "," addr */ + case 117: /* i: nop */ #line 344 "src/parser.y" + {emit_i(ctx, OPCODE_OP_IMM, X0_NUM, OP_IMM_ADDI, X0_NUM, 0);} +#line 2803 "gen/gen_parser.c" + break; + + case 118: /* i: la gpr "," addr */ +#line 347 "src/parser.y" {emit_reloc(ctx, RELOC_LA, (yyvsp[0].str)); emit_u(ctx, OPCODE_LUI, (yyvsp[-2].gpr), 0); emit_i(ctx, OPCODE_OP_IMM, (yyvsp[-2].gpr), OP_IMM_ADDI, (yyvsp[-2].gpr), 0);} -#line 2798 "gen/gen_parser.c" +#line 2811 "gen/gen_parser.c" break; - case 118: /* i: li gpr "," imm */ -#line 349 "src/parser.y" + case 119: /* i: li gpr "," imm */ +#line 352 "src/parser.y" {emit_u(ctx, OPCODE_LUI, (yyvsp[-2].gpr), tri_sr((yyvsp[0].tri), 9)); emit_i(ctx, OPCODE_OP_IMM, (yyvsp[-2].gpr), OP_IMM_ADDI, (yyvsp[-2].gpr), tri_mask((yyvsp[0].tri), 9));} -#line 2805 "gen/gen_parser.c" +#line 2818 "gen/gen_parser.c" break; - case 119: /* m: mul gpr "," gpr "," gpr */ -#line 356 "src/parser.y" + case 120: /* m: mul gpr "," gpr "," gpr */ +#line 359 "src/parser.y" {emit_r(ctx, OPCODE_OP, (yyvsp[-4].gpr), OP_MUL, (yyvsp[-2].gpr), (yyvsp[0].gpr), 0);} -#line 2811 "gen/gen_parser.c" +#line 2824 "gen/gen_parser.c" break; - case 120: /* m: diV gpr "," gpr "," gpr */ -#line 359 "src/parser.y" + case 121: /* m: diV gpr "," gpr "," gpr */ +#line 362 "src/parser.y" {emit_r(ctx, OPCODE_OP, (yyvsp[-4].gpr), OP_DIV, (yyvsp[-2].gpr), (yyvsp[0].gpr), 0);} -#line 2817 "gen/gen_parser.c" +#line 2830 "gen/gen_parser.c" break; - case 121: /* m: rem gpr "," gpr "," gpr */ -#line 362 "src/parser.y" + case 122: /* m: rem gpr "," gpr "," gpr */ +#line 365 "src/parser.y" {emit_r(ctx, OPCODE_OP, (yyvsp[-4].gpr), OP_DIV, (yyvsp[-2].gpr), (yyvsp[0].gpr), 0);} -#line 2823 "gen/gen_parser.c" +#line 2836 "gen/gen_parser.c" break; - case 122: /* a: stt */ -#line 366 "src/parser.y" + case 123: /* a: stt */ +#line 369 "src/parser.y" {emit_i(ctx, OPCODE_MEM, X0_NUM, MEM_STT, X0_NUM, 0);} -#line 2829 "gen/gen_parser.c" +#line 2842 "gen/gen_parser.c" break; - case 123: /* a: cst width "," gpr "," imm "(" gpr ")" */ -#line 369 "src/parser.y" + case 124: /* a: cst width "," gpr "," imm "(" gpr ")" */ +#line 372 "src/parser.y" {emit_s(ctx, OPCODE_STORE, STORE_CST | check_width((yyvsp[-7].str)), (yyvsp[-5].gpr), (yyvsp[-1].gpr), (yyvsp[-3].tri));} -#line 2835 "gen/gen_parser.c" +#line 2848 "gen/gen_parser.c" break; - case 124: /* a: ent gpr */ -#line 372 "src/parser.y" + case 125: /* a: ent gpr */ +#line 375 "src/parser.y" {emit_i(ctx, OPCODE_MEM, (yyvsp[0].gpr), MEM_ENT, X0_NUM, 0);} -#line 2841 "gen/gen_parser.c" +#line 2854 "gen/gen_parser.c" break; - case 125: /* a: cat */ -#line 375 "src/parser.y" + case 126: /* a: cat */ +#line 378 "src/parser.y" {emit_i(ctx, OPCODE_MEM, X0_NUM, MEM_CAT, X0_NUM, 0);} -#line 2847 "gen/gen_parser.c" +#line 2860 "gen/gen_parser.c" break; - case 126: /* Zcsr: csrrw csr "," gpr "," gpr */ -#line 379 "src/parser.y" + case 127: /* Zcsr: csrrw csr "," gpr "," gpr */ +#line 382 "src/parser.y" {emit_i(ctx, OPCODE_SYSTEM, (yyvsp[-2].gpr), SYSTEM_CSRRW, (yyvsp[0].gpr), check_csr((yyvsp[-4].str)));} -#line 2853 "gen/gen_parser.c" +#line 2866 "gen/gen_parser.c" break; - case 127: /* Zcsr: csrrs csr "," gpr "," gpr */ -#line 382 "src/parser.y" + case 128: /* Zcsr: csrrs csr "," gpr "," gpr */ +#line 385 "src/parser.y" {emit_i(ctx, OPCODE_SYSTEM, (yyvsp[-2].gpr), SYSTEM_CSRRS, (yyvsp[0].gpr), check_csr((yyvsp[-4].str)));} -#line 2859 "gen/gen_parser.c" +#line 2872 "gen/gen_parser.c" break; - case 128: /* Zcsr: csrrc csr "," gpr "," gpr */ -#line 385 "src/parser.y" + case 129: /* Zcsr: csrrc csr "," gpr "," gpr */ +#line 388 "src/parser.y" {emit_i(ctx, OPCODE_SYSTEM, (yyvsp[-2].gpr), SYSTEM_CSRRC, (yyvsp[0].gpr), check_csr((yyvsp[-4].str)));} -#line 2865 "gen/gen_parser.c" +#line 2878 "gen/gen_parser.c" break; - case 135: /* directive: include str */ -#line 398 "src/parser.y" + case 136: /* directive: include str */ +#line 401 "src/parser.y" {process_file(ctx, (yyvsp[0].str));} -#line 2871 "gen/gen_parser.c" +#line 2884 "gen/gen_parser.c" break; - case 136: /* top: label */ -#line 401 "src/parser.y" + case 137: /* top: label */ +#line 404 "src/parser.y" {emit_label(ctx, (yyvsp[0].str));} -#line 2877 "gen/gen_parser.c" +#line 2890 "gen/gen_parser.c" break; -#line 2881 "gen/gen_parser.c" +#line 2894 "gen/gen_parser.c" default: break; } @@ -3106,7 +3119,7 @@ yyreturnlab: return yyresult; } -#line 413 "src/parser.y" +#line 416 "src/parser.y" static const char *find_lineno(const char *buf, size_t no) diff --git a/tasm/src/assembler.c b/tasm/src/assembler.c index 731a736..ba61045 100644 --- a/tasm/src/assembler.c +++ b/tasm/src/assembler.c @@ -378,9 +378,16 @@ static void fix_reloc_b(struct asm_ctx *ctx, size_t ro, size_t so) ctx->buf[ro] = build_s(OPCODE_BRANCH, hi, fn0, rs1, rs2, lo); } +/* convert instruction index (as used by ctx->idx) to addresses */ +static size_t asm_addr(size_t o) +{ + return o * 3; +} + static void fix_reloc_j(struct asm_ctx *ctx, size_t ro, size_t so) { - int64_t off = so - ctx->idx; + /* internal offsets are instruction indexes, so convert to address */ + int64_t off = asm_addr(so) - asm_addr(ro); tri_t t = tri_from(off); if (tri_mask(t, 18) != t) { fprintf(stderr, "jump offset at %llu too large\n", diff --git a/tasm/src/lexer.l b/tasm/src/lexer.l index 01a4bee..cf63cfe 100644 --- a/tasm/src/lexer.l +++ b/tasm/src/lexer.l @@ -181,6 +181,7 @@ str \"(\\.|[^"\\])*\" "pcall" {return pcall;} "fence" {return fence;} "nop" {return nop; /* meta */} +"mv" {return mv;} "li" {return li;} "la" {return la;} diff --git a/tasm/src/parser.y b/tasm/src/parser.y index a39c9c1..204fe0a 100644 --- a/tasm/src/parser.y +++ b/tasm/src/parser.y @@ -73,7 +73,7 @@ %token ecall ebreak pcall %token fence /* meta */ -%token li la nop +%token mv li la nop /* m (avoid name clash with stdlib div) */ %token mul diV rem @@ -292,8 +292,8 @@ i {emit_reloc(ctx, RELOC_J, $4); emit_u(ctx, OPCODE_JAL, $2, 0);} - | jalr gpr "," gpr "," imm - {emit_i(ctx, OPCODE_JALR, $2, 0, $4, $6);} + | jalr gpr "," imm "(" gpr ")" + {emit_i(ctx, OPCODE_JALR, $2, 0, $6, $4);} | beq gpr "," gpr "," addr {emit_reloc(ctx, RELOC_B, $6); @@ -337,6 +337,9 @@ i {emit_d(ctx, OPCODE_DIOP, $2, $4, $6, check_nop3($8));} /* meta */ + | mv gpr "," gpr + {emit_i(ctx, OPCODE_OP_IMM, $2, OP_IMM_ADDI, $4, 0);} + | nop {emit_i(ctx, OPCODE_OP_IMM, X0_NUM, OP_IMM_ADDI, X0_NUM, 0);} diff --git a/triscv/src/cpu.c b/triscv/src/cpu.c index fc6b721..a7213bb 100644 --- a/triscv/src/cpu.c +++ b/triscv/src/cpu.c @@ -178,6 +178,33 @@ static void do_lui(struct cpu *cpu, tri_t i) cpu->pc += 3; } +static void do_jal(struct cpu *cpu, tri_t i) +{ + tri_t rd, imm9; + parse_u(i, &rd, &imm9); + + tri_t p = tri_from(cpu->pc + 3); + set_gpr(cpu, rd, p); + + long long o = tri_to(imm9); + cpu->pc += o; +} + +static void do_jalr(struct cpu *cpu, tri_t i) +{ + tri_t rd, fn0, rs1, imm9; + parse_i(i, &rd, &fn0, &rs1, &imm9); + + tri_t p = tri_from(cpu->pc + 3); + set_gpr(cpu, rd, p); + + tri_t t = get_gpr(cpu, rs1); + t = tri_add(t, imm9); + long long j = tri_to(t); + + cpu->pc = j; +} + void cpu_reset(struct cpu *cpu) { csr_init(cpu); @@ -198,6 +225,8 @@ void cpu_run(struct cpu *cpu, vm_t start) case OPCODE_STORE: do_store(cpu, i); break; case OPCODE_SYSTEM: do_system(cpu, i); break; case OPCODE_OP_IMM: do_op_imm(cpu, i); break; + case OPCODE_JAL: do_jal(cpu, i); break; + case OPCODE_JALR: do_jalr(cpu, i); break; default: /** @todo raise illegal instruction exception */ fprintf(stderr, "illegal/unimplemented " "instruction at %lx, aborting\n", |