From ab276c733ce9dc80983e5c8ae5c530e1477cf990 Mon Sep 17 00:00:00 2001 From: Kimplul Date: Sun, 31 Mar 2024 23:10:44 +0300 Subject: implement more meta instructions + Also have a working draft of ABI names for registers, matches qbt currently but should probably codify somewhere --- core/tri.h | 14 +- tasm/gen/gen_lexer.inc | 1360 ++++++++++++++++++++++++++++------------- tasm/gen/gen_parser.c | 810 ++++++++++++------------ tasm/include/tasm/assembler.h | 4 + tasm/os.tasm | 17 + tasm/src/assembler.c | 43 +- tasm/src/lexer.l | 87 ++- tasm/src/parser.y | 24 +- tdump/src/disassembler.c | 271 +++++--- triscv/README.md | 4 +- triscv/src/cpu.c | 121 +++- triscv/src/mem.c | 13 +- 12 files changed, 1848 insertions(+), 920 deletions(-) create mode 100644 tasm/os.tasm diff --git a/core/tri.h b/core/tri.h index e4336ec..3837e95 100644 --- a/core/tri.h +++ b/core/tri.h @@ -576,9 +576,9 @@ static inline int tri_sign(tri_t t) int lz = __builtin_clzll(t); if (lz % 2 == 0) - return 1; + return -1; - return -1; + return 1; } static inline bool tri_eq(tri_t a, tri_t b) @@ -590,10 +590,10 @@ static inline bool tri_lt(tri_t a, tri_t b) { tri_t r = tri_sub(a, b); int s = tri_sign(r); - if (s >= 0) - return false; + if (s < 0) + return true; - return true; + return false; } static inline bool tri_le(tri_t a, tri_t b) @@ -603,12 +603,12 @@ static inline bool tri_le(tri_t a, tri_t b) static inline bool tri_gt(tri_t a, tri_t b) { - return tri_le(b, a); + return tri_gt(b, a); } static inline bool tri_ge(tri_t a, tri_t b) { - return tri_lt(b, a); + return tri_le(b, a); } #define tri_illegal_op()\ diff --git a/tasm/gen/gen_lexer.inc b/tasm/gen/gen_lexer.inc index 80dc774..f664b2d 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 146 -#define YY_END_OF_BUFFER 147 +#define YY_NUM_RULES 230 +#define YY_END_OF_BUFFER 231 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -348,34 +348,44 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static const flex_int16_t yy_accept[235] = +static const flex_int16_t yy_accept[322] = { 0, - 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, - - 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, - - 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 + 0, 0, 0, 0, 231, 229, 228, 228, 229, 225, + 226, 227, 229, 224, 229, 2, 2, 224, 224, 224, + 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, + 224, 224, 224, 224, 224, 221, 223, 220, 222, 228, + 0, 3, 0, 2, 0, 224, 1, 224, 224, 217, + 216, 0, 0, 90, 91, 92, 93, 94, 95, 96, + 113, 114, 115, 224, 224, 224, 224, 224, 224, 224, + 224, 224, 224, 224, 224, 224, 88, 89, 224, 201, + 192, 200, 224, 224, 199, 224, 224, 112, 224, 104, + 105, 106, 107, 108, 109, 110, 149, 150, 151, 224, + + 224, 224, 224, 87, 224, 193, 224, 97, 98, 99, + 100, 101, 102, 103, 131, 132, 133, 111, 224, 6, + 7, 8, 9, 10, 11, 12, 13, 14, 15, 221, + 220, 219, 218, 224, 224, 216, 2, 2, 116, 117, + 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, + 128, 129, 130, 178, 224, 188, 191, 205, 204, 190, + 189, 224, 212, 224, 210, 224, 207, 224, 224, 211, + 224, 186, 184, 206, 198, 224, 208, 203, 152, 153, + 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, + 164, 165, 166, 182, 181, 176, 180, 183, 177, 209, + + 179, 134, 135, 136, 137, 138, 139, 140, 141, 142, + 143, 144, 145, 146, 147, 148, 224, 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, 224, 4, + 167, 224, 202, 224, 173, 224, 224, 224, 187, 224, + + 170, 169, 174, 168, 171, 175, 172, 224, 185, 215, + 214, 213, 224, 194, 197, 196, 224, 195, 224, 5, + 0 } ; static const YY_CHAR yy_ec[256] = @@ -412,197 +422,263 @@ static const YY_CHAR yy_ec[256] = static const YY_CHAR yy_meta[50] = { 0, - 1, 2, 3, 1, 1, 1, 4, 1, 1, 1, + 1, 2, 3, 1, 1, 1, 4, 1, 1, 2, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 2, 6, 2, 1, 6, 6, 6, 6, 6, 6, 6, 6, 2, 2, 6, 2, 6, 6, 2, 6, 2, 6, 2, 6, 2, 6, 2, 6 } ; -static const flex_int16_t yy_base[242] = +static const flex_int16_t yy_base[329] = { 0, - 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, 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, 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, - - 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, - - 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 + 0, 0, 47, 48, 85, 1445, 50, 54, 56, 1445, + 1445, 1445, 0, 60, 54, 31, 0, 64, 103, 70, + 67, 76, 111, 124, 126, 133, 140, 138, 142, 149, + 170, 189, 224, 154, 259, 0, 1445, 64, 73, 81, + 70, 1445, 74, 0, 176, 192, 1445, 209, 259, 1445, + 0, 0, 78, 244, 289, 309, 247, 261, 265, 291, + 293, 295, 316, 324, 326, 330, 332, 334, 337, 339, + 347, 341, 363, 371, 380, 392, 396, 398, 401, 405, + 407, 410, 413, 419, 431, 437, 440, 442, 446, 448, + 480, 175, 452, 455, 458, 480, 483, 485, 487, 501, + + 508, 510, 512, 514, 517, 519, 522, 524, 553, 242, + 526, 554, 556, 558, 560, 581, 583, 585, 587, 589, + 616, 626, 636, 646, 656, 666, 676, 592, 594, 0, + 90, 1445, 1445, 596, 696, 0, 0, 588, 698, 700, + 702, 704, 706, 708, 710, 712, 714, 735, 737, 740, + 742, 744, 746, 748, 750, 752, 758, 773, 775, 781, + 783, 785, 787, 790, 796, 798, 808, 812, 814, 821, + 824, 826, 835, 838, 842, 851, 853, 856, 859, 863, + 865, 868, 874, 877, 880, 889, 891, 895, 898, 901, + 903, 905, 907, 912, 916, 919, 929, 933, 937, 940, + + 942, 946, 954, 958, 963, 967, 970, 972, 975, 979, + 981, 984, 988, 993, 996, 1002, 1005, 1009, 1011, 1014, + 1017, 1019, 1023, 1026, 1032, 1035, 1040, 1047, 1049, 1053, + 1056, 1058, 1061, 1063, 1065, 1070, 1074, 1079, 1086, 1088, + 1091, 1095, 1097, 1100, 1102, 1104, 1109, 1112, 1118, 1125, + 1127, 1130, 1133, 1135, 1139, 1141, 1143, 1148, 1151, 1156, + 1164, 1166, 1169, 1172, 1174, 1177, 1179, 1181, 1187, 1190, + 1195, 1202, 1204, 1208, 1211, 1213, 1216, 1218, 1220, 1225, + 1229, 1234, 1241, 1243, 1246, 1250, 1252, 1255, 1257, 1259, + 1264, 1267, 1280, 1282, 1285, 1289, 1294, 1297, 1303, 1306, + + 1310, 1315, 1318, 1320, 1331, 1333, 1336, 1342, 1344, 1346, + 1348, 1354, 1357, 1359, 1369, 1372, 1375, 1380, 1383, 1387, + 1445, 1413, 1419, 63, 1424, 1430, 1436, 1438 } ; -static const flex_int16_t yy_def[242] = +static const flex_int16_t yy_def[329] = { 0, - 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, - - 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, - - 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 + 321, 1, 322, 322, 321, 321, 321, 321, 323, 321, + 321, 321, 324, 325, 321, 324, 324, 325, 325, 325, + 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, + 325, 19, 19, 325, 33, 326, 321, 321, 321, 321, + 323, 321, 323, 324, 321, 325, 321, 325, 325, 321, + 327, 328, 321, 325, 35, 325, 325, 325, 325, 325, + 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, + 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, + 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, + 56, 56, 325, 325, 325, 325, 325, 325, 325, 325, + + 325, 325, 325, 325, 325, 325, 325, 325, 56, 56, + 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, + 56, 56, 56, 56, 56, 56, 56, 325, 325, 326, + 321, 321, 321, 325, 325, 327, 328, 321, 325, 325, + 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, + 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, + 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, + 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, + 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, + 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, + + 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, + 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, + 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, + 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, + 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, + 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, + 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, + 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, + 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, + 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, + + 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, + 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, + 0, 321, 321, 321, 321, 321, 321, 321 } ; -static const flex_int16_t yy_nxt[1068] = +static const flex_int16_t yy_nxt[1495] = { 0, 6, 7, 8, 9, 10, 11, 6, 12, 13, 14, 15, 16, 17, 17, 17, 17, 17, 17, 17, 17, 17, 6, 18, 18, 6, 19, 20, 21, 22, 23, - 24, 18, 18, 18, 25, 18, 26, 27, 28, 18, - 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, 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, 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, - - 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, 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, - - 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, - - 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, - - 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, - - 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, - - 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, 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, - - 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 + 24, 25, 18, 18, 26, 18, 27, 28, 29, 18, + 30, 18, 31, 32, 33, 34, 18, 18, 35, 37, + 37, 40, 40, 38, 38, 40, 40, 39, 39, 42, + 50, 45, 45, 52, 51, 45, 45, 44, 45, 45, + 131, 45, 45, 42, 132, 53, 321, 45, 45, 133, + 43, 47, 40, 40, 321, 47, 321, 321, 47, 138, + 138, 47, 70, 48, 43, 321, 131, 47, 321, 66, + + 132, 67, 321, 49, 45, 45, 68, 321, 69, 72, + 71, 138, 45, 45, 54, 55, 56, 57, 58, 59, + 60, 61, 62, 63, 47, 45, 45, 45, 45, 321, + 321, 64, 47, 321, 45, 45, 321, 73, 74, 45, + 45, 45, 45, 45, 45, 47, 321, 47, 65, 75, + 45, 45, 321, 76, 47, 45, 45, 321, 79, 47, + 321, 47, 321, 47, 77, 80, 78, 321, 81, 321, + 47, 45, 45, 82, 321, 47, 87, 45, 45, 321, + 321, 86, 321, 84, 85, 83, 189, 190, 191, 192, + 193, 47, 119, 45, 45, 88, 321, 47, 321, 89, + + 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, + 45, 45, 321, 47, 321, 321, 321, 46, 100, 321, + 101, 321, 321, 321, 321, 102, 321, 103, 321, 104, + 47, 105, 321, 106, 107, 108, 109, 110, 111, 112, + 113, 114, 115, 116, 117, 45, 45, 134, 45, 45, + 321, 321, 46, 212, 213, 214, 215, 216, 321, 321, + 45, 45, 45, 45, 118, 47, 45, 45, 47, 46, + 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, + 47, 321, 47, 321, 321, 321, 47, 321, 135, 321, + 321, 321, 45, 45, 45, 45, 45, 45, 321, 46, + + 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, + 45, 45, 47, 321, 47, 321, 47, 45, 45, 321, + 149, 150, 151, 152, 153, 45, 45, 45, 45, 321, + 47, 45, 45, 45, 45, 45, 45, 47, 45, 45, + 45, 45, 45, 45, 321, 47, 321, 47, 45, 45, + 321, 47, 154, 47, 321, 47, 321, 321, 47, 155, + 47, 157, 47, 159, 45, 45, 161, 321, 47, 321, + 321, 156, 45, 45, 321, 162, 158, 321, 160, 321, + 166, 45, 45, 163, 47, 321, 321, 167, 321, 164, + 321, 165, 47, 45, 45, 321, 169, 45, 45, 45, + + 45, 47, 45, 45, 321, 168, 45, 45, 45, 45, + 321, 45, 45, 47, 45, 45, 321, 47, 321, 47, + 45, 45, 47, 321, 170, 321, 47, 321, 47, 321, + 171, 47, 45, 45, 47, 321, 321, 172, 45, 45, + 47, 45, 45, 45, 45, 321, 173, 45, 45, 45, + 45, 321, 47, 45, 45, 174, 45, 45, 47, 45, + 45, 47, 321, 47, 321, 176, 321, 47, 321, 47, + 321, 321, 321, 47, 321, 321, 47, 175, 321, 47, + 321, 45, 45, 177, 45, 45, 45, 45, 45, 45, + 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, + + 188, 47, 45, 45, 47, 321, 47, 321, 47, 45, + 45, 45, 45, 45, 45, 45, 45, 321, 45, 45, + 45, 45, 47, 45, 45, 45, 45, 45, 45, 47, + 321, 47, 321, 47, 321, 47, 321, 195, 47, 321, + 47, 198, 194, 47, 321, 47, 196, 47, 201, 321, + 321, 321, 321, 199, 197, 45, 45, 45, 45, 45, + 45, 45, 45, 200, 202, 203, 204, 205, 206, 207, + 208, 209, 210, 211, 321, 47, 321, 47, 321, 47, + 321, 47, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 321, 45, 45, 45, 45, 45, 45, 138, + + 138, 321, 47, 288, 47, 321, 47, 321, 47, 321, + 47, 321, 321, 47, 321, 47, 321, 47, 321, 321, + 321, 138, 321, 289, 321, 321, 217, 218, 219, 220, + 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, + 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, + 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, + 251, 252, 253, 254, 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, 286, 287, 45, 45, 45, + + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 47, 321, 47, + 321, 47, 321, 47, 321, 47, 321, 47, 321, 47, + 321, 47, 321, 47, 321, 47, 45, 45, 45, 45, + 290, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 321, 47, 321, 47, 45, + 45, 47, 321, 47, 321, 47, 321, 47, 321, 47, + 321, 47, 321, 47, 45, 45, 45, 45, 321, 47, + 321, 291, 45, 45, 45, 45, 45, 45, 45, 45, + 292, 45, 45, 321, 47, 321, 47, 45, 45, 45, + + 45, 321, 47, 321, 47, 321, 47, 321, 47, 45, + 45, 47, 321, 45, 45, 45, 45, 47, 321, 47, + 321, 293, 45, 45, 321, 45, 45, 45, 45, 47, + 321, 321, 294, 47, 321, 47, 45, 45, 295, 45, + 45, 296, 47, 45, 45, 47, 321, 47, 321, 321, + 297, 298, 45, 45, 45, 45, 47, 45, 45, 47, + 45, 45, 321, 47, 45, 45, 45, 45, 299, 45, + 45, 321, 47, 321, 47, 45, 45, 47, 45, 45, + 47, 45, 45, 321, 47, 321, 47, 300, 321, 47, + 45, 45, 45, 45, 321, 47, 45, 45, 47, 45, + + 45, 47, 45, 45, 45, 45, 45, 45, 45, 45, + 47, 321, 47, 45, 45, 321, 47, 45, 45, 47, + 45, 45, 47, 321, 47, 321, 47, 321, 47, 321, + 45, 45, 321, 47, 45, 45, 321, 47, 45, 45, + 47, 45, 45, 45, 45, 301, 321, 45, 45, 302, + 47, 321, 303, 321, 47, 45, 45, 321, 47, 45, + 45, 47, 304, 47, 45, 45, 305, 47, 45, 45, + 306, 45, 45, 45, 45, 47, 45, 45, 321, 47, + 45, 45, 45, 45, 47, 45, 45, 321, 47, 45, + 45, 47, 321, 47, 45, 45, 47, 45, 45, 321, + + 47, 321, 47, 45, 45, 47, 45, 45, 321, 47, + 45, 45, 45, 45, 47, 45, 45, 47, 45, 45, + 45, 45, 321, 47, 45, 45, 47, 45, 45, 321, + 47, 321, 47, 45, 45, 47, 45, 45, 47, 321, + 47, 45, 45, 321, 47, 307, 321, 47, 45, 45, + 45, 45, 321, 47, 45, 45, 47, 45, 45, 45, + 45, 47, 45, 45, 45, 45, 45, 45, 47, 321, + 47, 45, 45, 321, 47, 45, 45, 47, 321, 47, + 45, 45, 47, 321, 47, 321, 47, 45, 45, 45, + 45, 47, 45, 45, 321, 47, 45, 45, 45, 45, + + 47, 45, 45, 45, 45, 45, 45, 47, 321, 47, + 45, 45, 47, 45, 45, 321, 47, 321, 47, 45, + 45, 47, 321, 47, 321, 47, 45, 45, 45, 45, + 47, 45, 45, 47, 45, 45, 45, 45, 321, 47, + 45, 45, 45, 45, 45, 45, 47, 321, 47, 45, + 45, 47, 45, 45, 47, 321, 47, 45, 45, 321, + 47, 321, 47, 321, 47, 45, 45, 45, 45, 47, + 45, 45, 47, 45, 45, 45, 45, 47, 45, 45, + 45, 45, 45, 45, 321, 47, 321, 47, 45, 45, + 47, 45, 45, 47, 321, 47, 45, 45, 47, 321, + + 47, 321, 47, 45, 45, 45, 45, 321, 47, 45, + 45, 47, 45, 45, 45, 45, 47, 45, 45, 45, + 45, 45, 45, 47, 321, 47, 45, 45, 321, 47, + 45, 45, 47, 321, 47, 45, 45, 47, 321, 47, + 321, 47, 45, 45, 45, 45, 47, 45, 45, 321, + 47, 45, 45, 45, 45, 47, 45, 45, 45, 45, + 45, 45, 47, 321, 47, 45, 45, 47, 45, 45, + 321, 47, 321, 47, 321, 321, 47, 321, 47, 321, + 47, 45, 45, 45, 45, 47, 45, 45, 47, 321, + 45, 45, 321, 308, 309, 45, 45, 321, 45, 45, + + 321, 47, 321, 47, 45, 45, 47, 45, 45, 310, + 47, 45, 45, 321, 313, 47, 45, 45, 47, 45, + 45, 45, 45, 321, 47, 311, 315, 47, 321, 312, + 314, 47, 45, 45, 45, 45, 47, 45, 45, 47, + 321, 47, 316, 45, 45, 45, 45, 45, 45, 45, + 45, 321, 47, 321, 47, 45, 45, 47, 45, 45, + 45, 45, 321, 47, 321, 47, 321, 47, 321, 47, + 45, 45, 321, 45, 45, 47, 45, 45, 47, 321, + 47, 45, 45, 321, 45, 45, 321, 317, 45, 45, + 47, 321, 318, 47, 321, 321, 47, 321, 321, 321, + + 321, 47, 321, 319, 47, 321, 321, 321, 47, 321, + 321, 321, 320, 36, 36, 36, 36, 36, 36, 41, + 41, 41, 41, 41, 41, 46, 46, 321, 46, 46, + 130, 130, 321, 321, 130, 130, 136, 136, 321, 136, + 136, 136, 137, 137, 5, 321, 321, 321, 321, 321, + 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, + 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, + 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, + 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, + 321, 321, 321, 321 + } ; -static const flex_int16_t yy_chk[1068] = +static const flex_int16_t yy_chk[1495] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -610,117 +686,165 @@ static const flex_int16_t yy_chk[1068] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 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, 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, 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, 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, 101, 101, - 0, 31, 54, 31, 52, 56, 56, 55, 31, 53, - - 31, 66, 0, 0, 31, 55, 31, 31, 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, - 0, 60, 0, 0, 61, 0, 0, 65, 65, 58, - 67, 67, 62, 0, 63, 0, 62, 64, 0, 60, - 59, 0, 59, 68, 68, 61, 60, 65, 69, 69, - 67, 70, 70, 0, 64, 71, 71, 63, 72, 72, - 0, 0, 65, 68, 73, 73, 0, 0, 69, 74, - - 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, - - 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, - - 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, - - 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, - - 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, - - 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, - - 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, - - 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 + 15, 14, 14, 16, 15, 18, 18, 324, 21, 21, + 38, 20, 20, 41, 38, 16, 43, 22, 22, 39, + 9, 14, 40, 40, 5, 18, 0, 0, 21, 53, + 53, 20, 21, 14, 41, 0, 131, 22, 0, 20, + + 131, 20, 0, 14, 19, 19, 20, 0, 20, 22, + 21, 53, 23, 23, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 24, 24, 25, 25, 0, + 0, 19, 23, 0, 26, 26, 0, 23, 23, 28, + 28, 27, 27, 29, 29, 24, 0, 25, 19, 23, + 30, 30, 0, 24, 26, 34, 34, 0, 26, 28, + 0, 27, 0, 29, 24, 27, 25, 0, 27, 0, + 30, 31, 31, 27, 0, 34, 30, 45, 45, 0, + 0, 29, 0, 28, 28, 27, 92, 92, 92, 92, + 92, 31, 34, 46, 46, 31, 0, 45, 0, 31, + + 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, + 48, 48, 0, 46, 0, 0, 0, 32, 32, 0, + 32, 0, 0, 0, 0, 32, 0, 32, 0, 32, + 48, 32, 0, 32, 32, 33, 33, 33, 33, 33, + 33, 33, 33, 33, 33, 54, 54, 48, 57, 57, + 0, 0, 33, 110, 110, 110, 110, 110, 0, 0, + 49, 49, 58, 58, 33, 54, 59, 59, 57, 33, + 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, + 49, 0, 58, 0, 0, 0, 59, 0, 49, 0, + 0, 0, 60, 60, 61, 61, 62, 62, 0, 35, + + 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, + 56, 56, 60, 0, 61, 0, 62, 63, 63, 0, + 56, 56, 56, 56, 56, 64, 64, 65, 65, 0, + 56, 66, 66, 67, 67, 68, 68, 63, 69, 69, + 70, 70, 72, 72, 0, 64, 0, 65, 71, 71, + 0, 66, 64, 67, 0, 68, 0, 0, 69, 65, + 70, 67, 72, 68, 73, 73, 69, 0, 71, 0, + 0, 66, 74, 74, 0, 70, 67, 0, 68, 0, + 72, 75, 75, 70, 73, 0, 0, 72, 0, 71, + 0, 71, 74, 76, 76, 0, 74, 77, 77, 78, + + 78, 75, 79, 79, 0, 73, 80, 80, 81, 81, + 0, 82, 82, 76, 83, 83, 0, 77, 0, 78, + 84, 84, 79, 0, 75, 0, 80, 0, 81, 0, + 76, 82, 85, 85, 83, 0, 0, 79, 86, 86, + 84, 87, 87, 88, 88, 0, 83, 89, 89, 90, + 90, 0, 85, 93, 93, 84, 94, 94, 86, 95, + 95, 87, 0, 88, 0, 87, 0, 89, 0, 90, + 0, 0, 0, 93, 0, 0, 94, 86, 0, 95, + 0, 96, 96, 89, 97, 97, 98, 98, 99, 99, + 89, 91, 91, 91, 91, 91, 91, 91, 91, 91, + + 91, 96, 100, 100, 97, 0, 98, 0, 99, 101, + 101, 102, 102, 103, 103, 104, 104, 0, 105, 105, + 106, 106, 100, 107, 107, 108, 108, 111, 111, 101, + 0, 102, 0, 103, 0, 104, 0, 101, 105, 0, + 106, 103, 100, 107, 0, 108, 102, 111, 107, 0, + 0, 0, 0, 105, 102, 112, 112, 113, 113, 114, + 114, 115, 115, 106, 109, 109, 109, 109, 109, 109, + 109, 109, 109, 109, 0, 112, 0, 113, 0, 114, + 0, 115, 116, 116, 117, 117, 118, 118, 119, 119, + 120, 120, 0, 128, 128, 129, 129, 134, 134, 138, + + 138, 0, 116, 128, 117, 0, 118, 0, 119, 0, + 120, 0, 0, 128, 0, 129, 0, 134, 0, 0, + 0, 138, 0, 134, 0, 0, 119, 121, 121, 121, + 121, 121, 121, 121, 121, 121, 121, 122, 122, 122, + 122, 122, 122, 122, 122, 122, 122, 123, 123, 123, + 123, 123, 123, 123, 123, 123, 123, 124, 124, 124, + 124, 124, 124, 124, 124, 124, 124, 125, 125, 125, + 125, 125, 125, 125, 125, 125, 125, 126, 126, 126, + 126, 126, 126, 126, 126, 126, 126, 127, 127, 127, + 127, 127, 127, 127, 127, 127, 127, 135, 135, 139, + + 139, 140, 140, 141, 141, 142, 142, 143, 143, 144, + 144, 145, 145, 146, 146, 147, 147, 135, 0, 139, + 0, 140, 0, 141, 0, 142, 0, 143, 0, 144, + 0, 145, 0, 146, 0, 147, 148, 148, 149, 149, + 135, 150, 150, 151, 151, 152, 152, 153, 153, 154, + 154, 155, 155, 156, 156, 0, 148, 0, 149, 157, + 157, 150, 0, 151, 0, 152, 0, 153, 0, 154, + 0, 155, 0, 156, 158, 158, 159, 159, 0, 157, + 0, 154, 160, 160, 161, 161, 162, 162, 163, 163, + 155, 164, 164, 0, 158, 0, 159, 165, 165, 166, + + 166, 0, 160, 0, 161, 0, 162, 0, 163, 167, + 167, 164, 0, 168, 168, 169, 169, 165, 0, 166, + 0, 162, 170, 170, 0, 171, 171, 172, 172, 167, + 0, 0, 164, 168, 0, 169, 173, 173, 166, 174, + 174, 168, 170, 175, 175, 171, 0, 172, 0, 0, + 169, 171, 176, 176, 177, 177, 173, 178, 178, 174, + 179, 179, 0, 175, 180, 180, 181, 181, 172, 182, + 182, 0, 176, 0, 177, 183, 183, 178, 184, 184, + 179, 185, 185, 0, 180, 0, 181, 176, 0, 182, + 186, 186, 187, 187, 0, 183, 188, 188, 184, 189, + + 189, 185, 190, 190, 191, 191, 192, 192, 193, 193, + 186, 0, 187, 194, 194, 0, 188, 195, 195, 189, + 196, 196, 190, 0, 191, 0, 192, 0, 193, 0, + 197, 197, 0, 194, 198, 198, 0, 195, 199, 199, + 196, 200, 200, 201, 201, 194, 0, 202, 202, 195, + 197, 0, 196, 0, 198, 203, 203, 0, 199, 204, + 204, 200, 197, 201, 205, 205, 198, 202, 206, 206, + 199, 207, 207, 208, 208, 203, 209, 209, 0, 204, + 210, 210, 211, 211, 205, 212, 212, 0, 206, 213, + 213, 207, 0, 208, 214, 214, 209, 215, 215, 0, + + 210, 0, 211, 216, 216, 212, 217, 217, 0, 213, + 218, 218, 219, 219, 214, 220, 220, 215, 221, 221, + 222, 222, 0, 216, 223, 223, 217, 224, 224, 0, + 218, 0, 219, 225, 225, 220, 226, 226, 221, 0, + 222, 227, 227, 0, 223, 217, 0, 224, 228, 228, + 229, 229, 0, 225, 230, 230, 226, 231, 231, 232, + 232, 227, 233, 233, 234, 234, 235, 235, 228, 0, + 229, 236, 236, 0, 230, 237, 237, 231, 0, 232, + 238, 238, 233, 0, 234, 0, 235, 239, 239, 240, + 240, 236, 241, 241, 0, 237, 242, 242, 243, 243, + + 238, 244, 244, 245, 245, 246, 246, 239, 0, 240, + 247, 247, 241, 248, 248, 0, 242, 0, 243, 249, + 249, 244, 0, 245, 0, 246, 250, 250, 251, 251, + 247, 252, 252, 248, 253, 253, 254, 254, 0, 249, + 255, 255, 256, 256, 257, 257, 250, 0, 251, 258, + 258, 252, 259, 259, 253, 0, 254, 260, 260, 0, + 255, 0, 256, 0, 257, 261, 261, 262, 262, 258, + 263, 263, 259, 264, 264, 265, 265, 260, 266, 266, + 267, 267, 268, 268, 0, 261, 0, 262, 269, 269, + 263, 270, 270, 264, 0, 265, 271, 271, 266, 0, + + 267, 0, 268, 272, 272, 273, 273, 0, 269, 274, + 274, 270, 275, 275, 276, 276, 271, 277, 277, 278, + 278, 279, 279, 272, 0, 273, 280, 280, 0, 274, + 281, 281, 275, 0, 276, 282, 282, 277, 0, 278, + 0, 279, 283, 283, 284, 284, 280, 285, 285, 0, + 281, 286, 286, 287, 287, 282, 288, 288, 289, 289, + 290, 290, 283, 0, 284, 291, 291, 285, 292, 292, + 0, 286, 0, 287, 0, 0, 288, 0, 289, 0, + 290, 293, 293, 294, 294, 291, 295, 295, 292, 0, + 296, 296, 0, 289, 292, 297, 297, 0, 298, 298, + + 0, 293, 0, 294, 299, 299, 295, 300, 300, 294, + 296, 301, 301, 0, 296, 297, 302, 302, 298, 303, + 303, 304, 304, 0, 299, 294, 298, 300, 0, 294, + 297, 301, 305, 305, 306, 306, 302, 307, 307, 303, + 0, 304, 300, 308, 308, 309, 309, 310, 310, 311, + 311, 0, 305, 0, 306, 312, 312, 307, 313, 313, + 314, 314, 0, 308, 0, 309, 0, 310, 0, 311, + 315, 315, 0, 316, 316, 312, 317, 317, 313, 0, + 314, 318, 318, 0, 319, 319, 0, 308, 320, 320, + 315, 0, 313, 316, 0, 0, 317, 0, 0, 0, + + 0, 318, 0, 317, 319, 0, 0, 0, 320, 0, + 0, 0, 319, 322, 322, 322, 322, 322, 322, 323, + 323, 323, 323, 323, 323, 325, 325, 0, 325, 325, + 326, 326, 0, 0, 326, 326, 327, 327, 0, 327, + 327, 327, 328, 328, 321, 321, 321, 321, 321, 321, + 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, + 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, + 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, + 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, + 321, 321, 321, 321 + } ; /* The intent behind this definition is that it'll catch @@ -757,9 +881,9 @@ static void update_yylloc(struct parser *parser, YYLTYPE *lloc, const char *text } #define YY_USER_ACTION update_yylloc(parser, yylloc, yytext); -#line 761 "gen/gen_lexer.inc" +#line 885 "gen/gen_lexer.inc" -#line 763 "gen/gen_lexer.inc" +#line 887 "gen/gen_lexer.inc" #define INITIAL 0 #define SC_COMMENT 1 @@ -1021,7 +1145,7 @@ YY_DECL #line 42 "src/lexer.l" -#line 1025 "gen/gen_lexer.inc" +#line 1149 "gen/gen_lexer.inc" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -1048,13 +1172,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 >= 235 ) + if ( yy_current_state >= 322 ) 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] != 1018 ); + while ( yy_base[yy_current_state] != 1445 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -1530,247 +1654,667 @@ YY_RULE_SETUP case 87: YY_RULE_SETUP #line 152 "src/lexer.l" -{return addi; /* i */} +{return x1;} YY_BREAK case 88: YY_RULE_SETUP #line 153 "src/lexer.l" -{return slti;} +{return x2;} YY_BREAK case 89: YY_RULE_SETUP #line 154 "src/lexer.l" -{return sgei;} +{return x3;} YY_BREAK case 90: YY_RULE_SETUP #line 155 "src/lexer.l" -{return seqi;} +{return x4;} YY_BREAK case 91: YY_RULE_SETUP #line 156 "src/lexer.l" -{return snei;} +{return x5;} YY_BREAK case 92: YY_RULE_SETUP #line 157 "src/lexer.l" -{return unop;} +{return x6;} YY_BREAK case 93: YY_RULE_SETUP #line 158 "src/lexer.l" -{return diop;} +{return x7;} YY_BREAK case 94: YY_RULE_SETUP #line 159 "src/lexer.l" -{return slli;} +{return x8;} YY_BREAK case 95: YY_RULE_SETUP #line 160 "src/lexer.l" -{return srli;} +{return x9;} YY_BREAK case 96: YY_RULE_SETUP #line 161 "src/lexer.l" -{return sll;} +{return x10;} YY_BREAK case 97: YY_RULE_SETUP #line 162 "src/lexer.l" -{return srl;} +{return x11;} YY_BREAK case 98: YY_RULE_SETUP #line 163 "src/lexer.l" -{return add;} +{return x12;} YY_BREAK case 99: YY_RULE_SETUP #line 164 "src/lexer.l" -{return sub;} +{return x13;} YY_BREAK case 100: YY_RULE_SETUP #line 165 "src/lexer.l" -{return slt;} +{return x14;} YY_BREAK case 101: YY_RULE_SETUP #line 166 "src/lexer.l" -{return sge;} +{return x15;} YY_BREAK case 102: YY_RULE_SETUP #line 167 "src/lexer.l" -{return seq;} +{return x16;} YY_BREAK case 103: YY_RULE_SETUP #line 168 "src/lexer.l" -{return sne;} +{return x17;} YY_BREAK case 104: YY_RULE_SETUP #line 169 "src/lexer.l" -{return lui;} +{return x18;} YY_BREAK case 105: YY_RULE_SETUP #line 170 "src/lexer.l" -{return auipc;} +{return x19;} YY_BREAK case 106: YY_RULE_SETUP #line 171 "src/lexer.l" -{return jal;} +{return x20;} YY_BREAK case 107: YY_RULE_SETUP #line 172 "src/lexer.l" -{return jalr;} +{return x21;} YY_BREAK case 108: YY_RULE_SETUP #line 173 "src/lexer.l" -{return beq;} +{return x22;} YY_BREAK case 109: YY_RULE_SETUP #line 174 "src/lexer.l" -{return bne;} +{return x23;} YY_BREAK case 110: YY_RULE_SETUP #line 175 "src/lexer.l" -{return blt;} +{return x24;} YY_BREAK case 111: YY_RULE_SETUP #line 176 "src/lexer.l" -{return bge;} +{return x25;} YY_BREAK case 112: YY_RULE_SETUP #line 177 "src/lexer.l" -{return ld;} +{return x26;} YY_BREAK case 113: YY_RULE_SETUP #line 178 "src/lexer.l" -{return st;} +{return x27;} YY_BREAK case 114: YY_RULE_SETUP #line 179 "src/lexer.l" -{return ecall;} +{return x28;} YY_BREAK case 115: YY_RULE_SETUP #line 180 "src/lexer.l" -{return ebreak;} +{return x29;} YY_BREAK case 116: YY_RULE_SETUP #line 181 "src/lexer.l" -{return pcall;} +{return x30;} YY_BREAK case 117: YY_RULE_SETUP #line 182 "src/lexer.l" -{return fence;} +{return x31;} YY_BREAK case 118: YY_RULE_SETUP #line 183 "src/lexer.l" -{return nop; /* meta */} +{return x32;} YY_BREAK case 119: YY_RULE_SETUP #line 184 "src/lexer.l" -{return mv;} +{return x33;} YY_BREAK case 120: YY_RULE_SETUP #line 185 "src/lexer.l" -{return li;} +{return x34;} YY_BREAK case 121: YY_RULE_SETUP #line 186 "src/lexer.l" -{return la;} +{return x35;} YY_BREAK case 122: YY_RULE_SETUP -#line 188 "src/lexer.l" -{return mul; /* m */} +#line 187 "src/lexer.l" +{return x36;} YY_BREAK case 123: YY_RULE_SETUP -#line 189 "src/lexer.l" -{return diV;} +#line 188 "src/lexer.l" +{return x37;} YY_BREAK case 124: YY_RULE_SETUP -#line 190 "src/lexer.l" -{return rem;} +#line 189 "src/lexer.l" +{return x38;} YY_BREAK case 125: YY_RULE_SETUP -#line 192 "src/lexer.l" -{return stt; /* a */} +#line 190 "src/lexer.l" +{return x39;} YY_BREAK case 126: YY_RULE_SETUP -#line 193 "src/lexer.l" -{return cst;} +#line 191 "src/lexer.l" +{return x40;} YY_BREAK case 127: YY_RULE_SETUP -#line 194 "src/lexer.l" -{return ent;} +#line 192 "src/lexer.l" +{return x41;} YY_BREAK case 128: YY_RULE_SETUP -#line 195 "src/lexer.l" -{return cat;} +#line 193 "src/lexer.l" +{return x42;} YY_BREAK case 129: YY_RULE_SETUP -#line 197 "src/lexer.l" -{return csrrw; /* Zcsr */} +#line 194 "src/lexer.l" +{return x43;} YY_BREAK case 130: YY_RULE_SETUP -#line 198 "src/lexer.l" -{return csrrs;} +#line 195 "src/lexer.l" +{return x44;} YY_BREAK case 131: YY_RULE_SETUP -#line 199 "src/lexer.l" -{return csrrc;} +#line 196 "src/lexer.l" +{return x45;} YY_BREAK case 132: YY_RULE_SETUP -#line 201 "src/lexer.l" -{/* skip line comments */} +#line 197 "src/lexer.l" +{return x46;} YY_BREAK case 133: YY_RULE_SETUP +#line 198 "src/lexer.l" +{return x47;} + YY_BREAK +case 134: +YY_RULE_SETUP +#line 199 "src/lexer.l" +{return x48;} + YY_BREAK +case 135: +YY_RULE_SETUP +#line 200 "src/lexer.l" +{return x49;} + YY_BREAK +case 136: +YY_RULE_SETUP +#line 201 "src/lexer.l" +{return x50;} + YY_BREAK +case 137: +YY_RULE_SETUP +#line 202 "src/lexer.l" +{return x51;} + YY_BREAK +case 138: +YY_RULE_SETUP #line 203 "src/lexer.l" +{return x52;} + YY_BREAK +case 139: +YY_RULE_SETUP +#line 204 "src/lexer.l" +{return x53;} + YY_BREAK +case 140: +YY_RULE_SETUP +#line 205 "src/lexer.l" +{return x54;} + YY_BREAK +case 141: +YY_RULE_SETUP +#line 206 "src/lexer.l" +{return x55;} + YY_BREAK +case 142: +YY_RULE_SETUP +#line 207 "src/lexer.l" +{return x56;} + YY_BREAK +case 143: +YY_RULE_SETUP +#line 208 "src/lexer.l" +{return x57;} + YY_BREAK +case 144: +YY_RULE_SETUP +#line 209 "src/lexer.l" +{return x58;} + YY_BREAK +case 145: +YY_RULE_SETUP +#line 210 "src/lexer.l" +{return x59;} + YY_BREAK +case 146: +YY_RULE_SETUP +#line 211 "src/lexer.l" +{return x60;} + YY_BREAK +case 147: +YY_RULE_SETUP +#line 212 "src/lexer.l" +{return x61;} + YY_BREAK +case 148: +YY_RULE_SETUP +#line 213 "src/lexer.l" +{return x62;} + YY_BREAK +case 149: +YY_RULE_SETUP +#line 214 "src/lexer.l" +{return x63;} + YY_BREAK +case 150: +YY_RULE_SETUP +#line 215 "src/lexer.l" +{return x64;} + YY_BREAK +case 151: +YY_RULE_SETUP +#line 216 "src/lexer.l" +{return x65;} + YY_BREAK +case 152: +YY_RULE_SETUP +#line 217 "src/lexer.l" +{return x66;} + YY_BREAK +case 153: +YY_RULE_SETUP +#line 218 "src/lexer.l" +{return x67;} + YY_BREAK +case 154: +YY_RULE_SETUP +#line 219 "src/lexer.l" +{return x68;} + YY_BREAK +case 155: +YY_RULE_SETUP +#line 220 "src/lexer.l" +{return x69;} + YY_BREAK +case 156: +YY_RULE_SETUP +#line 221 "src/lexer.l" +{return x70;} + YY_BREAK +case 157: +YY_RULE_SETUP +#line 222 "src/lexer.l" +{return x71;} + YY_BREAK +case 158: +YY_RULE_SETUP +#line 223 "src/lexer.l" +{return x72;} + YY_BREAK +case 159: +YY_RULE_SETUP +#line 224 "src/lexer.l" +{return x73;} + YY_BREAK +case 160: +YY_RULE_SETUP +#line 225 "src/lexer.l" +{return x74;} + YY_BREAK +case 161: +YY_RULE_SETUP +#line 226 "src/lexer.l" +{return x75;} + YY_BREAK +case 162: +YY_RULE_SETUP +#line 227 "src/lexer.l" +{return x76;} + YY_BREAK +case 163: +YY_RULE_SETUP +#line 228 "src/lexer.l" +{return x77;} + YY_BREAK +case 164: +YY_RULE_SETUP +#line 229 "src/lexer.l" +{return x78;} + YY_BREAK +case 165: +YY_RULE_SETUP +#line 230 "src/lexer.l" +{return x79;} + YY_BREAK +case 166: +YY_RULE_SETUP +#line 231 "src/lexer.l" +{return x80;} + YY_BREAK +case 167: +YY_RULE_SETUP +#line 233 "src/lexer.l" +{return addi; /* i */} + YY_BREAK +case 168: +YY_RULE_SETUP +#line 234 "src/lexer.l" +{return slti;} + YY_BREAK +case 169: +YY_RULE_SETUP +#line 235 "src/lexer.l" +{return sgei;} + YY_BREAK +case 170: +YY_RULE_SETUP +#line 236 "src/lexer.l" +{return seqi;} + YY_BREAK +case 171: +YY_RULE_SETUP +#line 237 "src/lexer.l" +{return snei;} + YY_BREAK +case 172: +YY_RULE_SETUP +#line 238 "src/lexer.l" +{return unop;} + YY_BREAK +case 173: +YY_RULE_SETUP +#line 239 "src/lexer.l" +{return diop;} + YY_BREAK +case 174: +YY_RULE_SETUP +#line 240 "src/lexer.l" +{return slli;} + YY_BREAK +case 175: +YY_RULE_SETUP +#line 241 "src/lexer.l" +{return srli;} + YY_BREAK +case 176: +YY_RULE_SETUP +#line 242 "src/lexer.l" +{return sll;} + YY_BREAK +case 177: +YY_RULE_SETUP +#line 243 "src/lexer.l" +{return srl;} + YY_BREAK +case 178: +YY_RULE_SETUP +#line 244 "src/lexer.l" +{return add;} + YY_BREAK +case 179: +YY_RULE_SETUP +#line 245 "src/lexer.l" +{return sub;} + YY_BREAK +case 180: +YY_RULE_SETUP +#line 246 "src/lexer.l" +{return slt;} + YY_BREAK +case 181: +YY_RULE_SETUP +#line 247 "src/lexer.l" +{return sge;} + YY_BREAK +case 182: +YY_RULE_SETUP +#line 248 "src/lexer.l" +{return seq;} + YY_BREAK +case 183: +YY_RULE_SETUP +#line 249 "src/lexer.l" +{return sne;} + YY_BREAK +case 184: +YY_RULE_SETUP +#line 250 "src/lexer.l" +{return lui;} + YY_BREAK +case 185: +YY_RULE_SETUP +#line 251 "src/lexer.l" +{return auipc;} + YY_BREAK +case 186: +YY_RULE_SETUP +#line 252 "src/lexer.l" +{return jal;} + YY_BREAK +case 187: +YY_RULE_SETUP +#line 253 "src/lexer.l" +{return jalr;} + YY_BREAK +case 188: +YY_RULE_SETUP +#line 254 "src/lexer.l" +{return beq;} + YY_BREAK +case 189: +YY_RULE_SETUP +#line 255 "src/lexer.l" +{return bne;} + YY_BREAK +case 190: +YY_RULE_SETUP +#line 256 "src/lexer.l" +{return blt;} + YY_BREAK +case 191: +YY_RULE_SETUP +#line 257 "src/lexer.l" +{return bge;} + YY_BREAK +case 192: +YY_RULE_SETUP +#line 258 "src/lexer.l" +{return ld;} + YY_BREAK +case 193: +YY_RULE_SETUP +#line 259 "src/lexer.l" +{return st;} + YY_BREAK +case 194: +YY_RULE_SETUP +#line 260 "src/lexer.l" +{return ecall;} + YY_BREAK +case 195: +YY_RULE_SETUP +#line 261 "src/lexer.l" +{return ebreak;} + YY_BREAK +case 196: +YY_RULE_SETUP +#line 262 "src/lexer.l" +{return pcall;} + YY_BREAK +case 197: +YY_RULE_SETUP +#line 263 "src/lexer.l" +{return fence;} + YY_BREAK +case 198: +YY_RULE_SETUP +#line 264 "src/lexer.l" +{return nop; /* meta */} + YY_BREAK +case 199: +YY_RULE_SETUP +#line 265 "src/lexer.l" +{return mv;} + YY_BREAK +case 200: +YY_RULE_SETUP +#line 266 "src/lexer.l" +{return li;} + YY_BREAK +case 201: +YY_RULE_SETUP +#line 267 "src/lexer.l" +{return la;} + YY_BREAK +case 202: +YY_RULE_SETUP +#line 268 "src/lexer.l" +{return call;} + YY_BREAK +case 203: +YY_RULE_SETUP +#line 269 "src/lexer.l" +{return ret;} + YY_BREAK +case 204: +YY_RULE_SETUP +#line 270 "src/lexer.l" +{return ble;} + YY_BREAK +case 205: +YY_RULE_SETUP +#line 271 "src/lexer.l" +{return bgt;} + YY_BREAK +case 206: +YY_RULE_SETUP +#line 273 "src/lexer.l" +{return mul; /* m */} + YY_BREAK +case 207: +YY_RULE_SETUP +#line 274 "src/lexer.l" +{return diV;} + YY_BREAK +case 208: +YY_RULE_SETUP +#line 275 "src/lexer.l" +{return rem;} + YY_BREAK +case 209: +YY_RULE_SETUP +#line 277 "src/lexer.l" +{return stt; /* a */} + YY_BREAK +case 210: +YY_RULE_SETUP +#line 278 "src/lexer.l" +{return cst;} + YY_BREAK +case 211: +YY_RULE_SETUP +#line 279 "src/lexer.l" +{return ent;} + YY_BREAK +case 212: +YY_RULE_SETUP +#line 280 "src/lexer.l" +{return cat;} + YY_BREAK +case 213: +YY_RULE_SETUP +#line 282 "src/lexer.l" +{return csrrw; /* Zcsr */} + YY_BREAK +case 214: +YY_RULE_SETUP +#line 283 "src/lexer.l" +{return csrrs;} + YY_BREAK +case 215: +YY_RULE_SETUP +#line 284 "src/lexer.l" +{return csrrc;} + YY_BREAK +case 216: +YY_RULE_SETUP +#line 286 "src/lexer.l" +{/* skip line comments */} + YY_BREAK +case 217: +YY_RULE_SETUP +#line 288 "src/lexer.l" {BEGIN(SC_COMMENT);} YY_BREAK -case 134: +case 218: YY_RULE_SETUP -#line 205 "src/lexer.l" +#line 290 "src/lexer.l" {++parser->comment_nesting;} YY_BREAK -case 135: +case 219: YY_RULE_SETUP -#line 206 "src/lexer.l" +#line 291 "src/lexer.l" { if (parser->comment_nesting) --parser->comment_nesting; @@ -1778,60 +2322,60 @@ YY_RULE_SETUP BEGIN(INITIAL); } YY_BREAK -case 136: +case 220: YY_RULE_SETUP -#line 213 "src/lexer.l" +#line 298 "src/lexer.l" {} YY_BREAK -case 137: +case 221: YY_RULE_SETUP -#line 214 "src/lexer.l" +#line 299 "src/lexer.l" {} YY_BREAK -case 138: +case 222: YY_RULE_SETUP -#line 215 "src/lexer.l" +#line 300 "src/lexer.l" {} YY_BREAK -case 139: -/* rule 139 can match eol */ +case 223: +/* rule 223 can match eol */ YY_RULE_SETUP -#line 216 "src/lexer.l" +#line 301 "src/lexer.l" {} YY_BREAK -case 140: +case 224: YY_RULE_SETUP -#line 219 "src/lexer.l" +#line 304 "src/lexer.l" { yylval->str = yytext; return id; } YY_BREAK -case 141: +case 225: YY_RULE_SETUP -#line 224 "src/lexer.l" +#line 309 "src/lexer.l" {return LPAREN;} YY_BREAK -case 142: +case 226: YY_RULE_SETUP -#line 225 "src/lexer.l" +#line 310 "src/lexer.l" {return RPAREN;} YY_BREAK -case 143: +case 227: YY_RULE_SETUP -#line 226 "src/lexer.l" +#line 311 "src/lexer.l" {return COMMA;} YY_BREAK -case 144: -/* rule 144 can match eol */ +case 228: +/* rule 228 can match eol */ YY_RULE_SETUP -#line 228 "src/lexer.l" +#line 313 "src/lexer.l" {/* skip whitespace */} YY_BREAK -case 145: +case 229: YY_RULE_SETUP -#line 230 "src/lexer.l" +#line 315 "src/lexer.l" { struct src_issue issue; issue.loc = to_src_loc(yylloc); @@ -1841,12 +2385,12 @@ YY_RULE_SETUP parser->failed = true; } YY_BREAK -case 146: +case 230: YY_RULE_SETUP -#line 238 "src/lexer.l" +#line 323 "src/lexer.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 1850 "gen/gen_lexer.inc" +#line 2394 "gen/gen_lexer.inc" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(SC_COMMENT): yyterminate(); @@ -2146,7 +2690,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 >= 235 ) + if ( yy_current_state >= 322 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; @@ -2175,11 +2719,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 >= 235 ) + if ( yy_current_state >= 322 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; - yy_is_jam = (yy_current_state == 234); + yy_is_jam = (yy_current_state == 321); (void)yyg; return yy_is_jam ? 0 : yy_current_state; @@ -2978,6 +3522,6 @@ void yyfree (void * ptr , yyscan_t yyscanner) #define YYTABLES_NAME "yytables" -#line 238 "src/lexer.l" +#line 323 "src/lexer.l" diff --git a/tasm/gen/gen_parser.c b/tasm/gen/gen_parser.c index 1123544..ea9289c 100644 --- a/tasm/gen/gen_parser.c +++ b/tasm/gen/gen_parser.c @@ -251,16 +251,20 @@ extern int yydebug; 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 */ + call = 383, /* call */ + ret = 384, /* ret */ + ble = 385, /* ble */ + bgt = 386, /* bgt */ + mul = 387, /* mul */ + diV = 388, /* diV */ + rem = 389, /* rem */ + stt = 390, /* stt */ + cst = 391, /* cst */ + ent = 392, /* ent */ + cat = 393, /* cat */ + csrrw = 394, /* csrrw */ + csrrs = 395, /* csrrs */ + csrrc = 396 /* csrrc */ }; typedef enum yytokentype yytoken_kind_t; #endif @@ -275,7 +279,7 @@ union YYSTYPE enum gpr_num gpr; tri_t tri; -#line 279 "gen/gen_parser.c" +#line 283 "gen/gen_parser.c" }; typedef union YYSTYPE YYSTYPE; @@ -436,30 +440,34 @@ enum yysymbol_kind_t 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 */ + YYSYMBOL_call = 128, /* call */ + YYSYMBOL_ret = 129, /* ret */ + YYSYMBOL_ble = 130, /* ble */ + YYSYMBOL_bgt = 131, /* bgt */ + YYSYMBOL_mul = 132, /* mul */ + YYSYMBOL_diV = 133, /* diV */ + YYSYMBOL_rem = 134, /* rem */ + YYSYMBOL_stt = 135, /* stt */ + YYSYMBOL_cst = 136, /* cst */ + YYSYMBOL_ent = 137, /* ent */ + YYSYMBOL_cat = 138, /* cat */ + YYSYMBOL_csrrw = 139, /* csrrw */ + YYSYMBOL_csrrs = 140, /* csrrs */ + YYSYMBOL_csrrc = 141, /* csrrc */ + YYSYMBOL_YYACCEPT = 142, /* $accept */ + YYSYMBOL_width = 143, /* width */ + YYSYMBOL_addr = 144, /* addr */ + YYSYMBOL_gpr = 145, /* gpr */ + YYSYMBOL_i = 146, /* i */ + YYSYMBOL_m = 147, /* m */ + YYSYMBOL_a = 148, /* a */ + YYSYMBOL_Zcsr = 149, /* Zcsr */ + YYSYMBOL_csr = 150, /* csr */ + YYSYMBOL_statement = 151, /* statement */ + YYSYMBOL_directive = 152, /* directive */ + YYSYMBOL_top = 153, /* top */ + YYSYMBOL_unit = 154, /* unit */ + YYSYMBOL_input = 155 /* input */ }; typedef enum yysymbol_kind_t yysymbol_kind_t; @@ -522,7 +530,7 @@ static void yyerror(YYLTYPE *yylloc, void *lexer, struct parser *parser, struct asm_ctx *ctx, const char *msg); -#line 526 "gen/gen_parser.c" +#line 534 "gen/gen_parser.c" #ifdef short @@ -847,21 +855,21 @@ union yyalloc #endif /* !YYCOPY_NEEDED */ /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 182 +#define YYFINAL 188 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 401 +#define YYLAST 381 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 138 +#define YYNTOKENS 142 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 14 /* YYNRULES -- Number of rules. */ -#define YYNRULES 143 +#define YYNRULES 146 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 333 +#define YYNSTATES 343 /* YYMAXUTOK -- Last valid token kind. */ -#define YYMAXUTOK 392 +#define YYMAXUTOK 396 /* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM @@ -914,7 +922,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, 137 + 135, 136, 137, 138, 139, 140, 141 }; #if YYDEBUG @@ -933,9 +941,9 @@ static const yytype_int16 yyrline[] = 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, 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 + 355, 359, 361, 366, 369, 372, 376, 379, 382, 385, + 389, 392, 395, 399, 402, 403, 404, 405, 408, 409, + 412, 413, 414, 417, 418, 421, 422 }; #endif @@ -964,9 +972,10 @@ 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", - "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 + "mv", "li", "la", "nop", "call", "ret", "ble", "bgt", "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 }; static const char * @@ -976,7 +985,7 @@ yysymbol_name (yysymbol_kind_t yysymbol) } #endif -#define YYPACT_NINF (-190) +#define YYPACT_NINF (-64) #define yypact_value_is_default(Yyn) \ ((Yyn) == YYPACT_NINF) @@ -990,40 +999,41 @@ yysymbol_name (yysymbol_kind_t yysymbol) STATE-NUM. */ static const yytype_int16 yypact[] = { - 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, 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 + 240, -64, 21, 23, 31, 31, 31, 31, 31, 31, + 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, + 31, 31, 31, 31, 31, 31, 31, 31, 31, 27, + 27, -64, -64, -64, -64, 31, 31, 31, -64, 31, + 31, 31, 31, 31, 31, -64, 27, 31, -64, 35, + 35, 35, -64, -64, -64, -64, -64, -64, 240, -64, + 29, 121, -64, -64, -64, -64, -64, -64, -64, -64, + -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, + -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, + -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, + -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, + -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, + -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, + -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, + -64, -64, -64, -64, 118, 119, 120, 122, 123, 124, + 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, + 135, 136, 137, 138, 139, 140, 141, 142, 143, -64, + 31, 31, 144, 145, 146, 147, -64, 148, 151, 152, + 153, 154, -64, -64, 155, 156, 157, -64, -64, -64, + 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, + 31, 31, 31, 31, 31, 31, 31, 164, 165, 163, + 167, 31, 31, 31, 31, 166, 168, 31, 169, 163, + 163, 31, 31, 31, 31, 31, 31, 31, 31, 170, + 171, 172, 173, 174, 175, 176, 177, 195, 196, 197, + 198, 203, 204, 206, 207, 208, -64, -64, -64, -64, + 220, 222, 224, 225, 226, 231, 232, -64, -64, -64, + -64, 229, 230, 233, 234, 235, 236, 238, 239, 244, + 245, 246, 249, 250, 251, 31, 252, 254, 31, 31, + 31, 31, 31, 31, 31, 31, 31, 163, 163, 163, + 163, 253, 255, 163, 31, 31, 31, 256, 31, 31, + 31, -64, -64, -64, -64, -64, -64, 247, -64, -64, + -64, -64, -64, -64, -64, -64, -64, -64, 162, -64, + -64, -64, -64, 31, 31, -64, -64, -64, -64, 257, + -64, -64, -64, 259, -64, 258, 260, 31, -64, -64, + -64, 262, -64 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -1031,54 +1041,55 @@ static const yytype_int16 yypact[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 143, 137, 0, 0, 0, 0, 0, 0, 0, 0, + 146, 140, 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, 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, 126, 0, 0, 129, 0, + 0, 0, 134, 136, 135, 137, 141, 142, 143, 145, + 0, 0, 139, 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, 0, 2, + 0, 0, 0, 0, 0, 0, 121, 0, 0, 0, + 0, 0, 128, 133, 0, 0, 0, 144, 1, 138, 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, 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, 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, 100, 101, 3, 102, + 0, 0, 0, 0, 0, 0, 0, 116, 119, 118, + 120, 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, 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 + 0, 85, 86, 87, 88, 89, 114, 0, 90, 91, + 98, 99, 92, 93, 94, 95, 96, 97, 0, 104, + 105, 106, 107, 0, 0, 122, 123, 124, 125, 0, + 130, 131, 132, 0, 103, 0, 0, 0, 115, 108, + 109, 0, 127 }; /* YYPGOTO[NTERM-NUM]. */ -static const yytype_int16 yypgoto[] = +static const yytype_int8 yypgoto[] = { - -190, -3, -189, -5, -190, -190, -190, -190, -22, -190, - -190, -190, -7, -190 + -64, -6, -63, -5, -64, -64, -64, -64, -25, -64, + -64, -64, 70, -64 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_uint8 yydefgoto[] = { - 0, 167, 241, 141, 49, 50, 51, 52, 178, 53, - 54, 55, 56, 57 + 0, 170, 249, 144, 52, 53, 54, 55, 184, 56, + 57, 58, 59, 60 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -1086,92 +1097,88 @@ static const yytype_uint8 yydefgoto[] = number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_int16 yytable[] = { - 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, + 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, + 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, + 165, 166, 167, 168, 171, 185, 186, 61, 62, 188, + 172, 173, 174, 169, 175, 176, 177, 178, 179, 180, + 181, 183, 182, 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, 141, 142, 143, 189, 190, 191, 192, 187, 193, + 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, + 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, + 214, 217, 218, 219, 220, 221, 259, 260, 222, 223, + 224, 225, 226, 227, 228, 215, 216, 246, 247, 248, + 250, 334, 258, 255, 0, 256, 0, 269, 270, 271, + 272, 273, 274, 275, 276, 229, 230, 231, 232, 233, + 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, + 244, 245, 277, 278, 279, 280, 251, 252, 253, 254, + 281, 282, 257, 283, 284, 285, 261, 262, 263, 264, + 265, 266, 267, 268, 319, 320, 321, 322, 286, 287, + 325, 288, 289, 290, 291, 292, 293, 294, 0, 0, + 295, 296, 297, 298, 1, 299, 300, 301, 302, 303, + 2, 3, 304, 305, 333, 308, 306, 309, 0, 329, + 0, 323, 0, 324, 338, 337, 0, 339, 0, 340, + 307, 342, 0, 310, 311, 312, 313, 314, 315, 316, + 317, 318, 0, 0, 0, 0, 0, 0, 0, 326, + 327, 328, 0, 330, 331, 332, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 335, 336, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 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, 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 + 0, 0, 341, 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, 0, 42, 43, 44, 45, 46, 47, 48, 49, + 50, 51 }; 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, 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, + 25, 26, 27, 28, 30, 50, 51, 6, 5, 0, + 35, 36, 37, 6, 39, 40, 41, 42, 43, 44, + 46, 6, 47, 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, 3, 7, 7, 7, 58, 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, -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, 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, - 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, + 7, 7, 7, 7, 7, 7, 219, 220, 7, 7, + 7, 7, 7, 7, 7, 170, 171, 3, 3, 6, + 3, 9, 3, 7, -1, 7, -1, 7, 7, 7, + 7, 7, 7, 7, 7, 190, 191, 192, 193, 194, + 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, + 205, 206, 7, 7, 7, 7, 211, 212, 213, 214, + 7, 7, 217, 7, 7, 7, 221, 222, 223, 224, + 225, 226, 227, 228, 287, 288, 289, 290, 8, 7, + 293, 7, 7, 7, 3, 3, 7, 7, -1, -1, + 7, 7, 7, 7, 4, 7, 7, 3, 3, 3, + 10, 11, 3, 3, 7, 3, 5, 3, -1, 3, + -1, 8, -1, 8, 5, 8, -1, 9, -1, 9, + 275, 9, -1, 278, 279, 280, 281, 282, 283, 284, + 285, 286, -1, -1, -1, -1, -1, -1, -1, 294, + 295, 296, -1, 298, 299, 300, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -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 + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 337, 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, -1, 132, 133, 134, 135, 136, 137, 138, 139, + 140, 141 }; /* YYSTOS[STATE-NUM] -- The symbol kind of the accessing symbol of @@ -1182,56 +1189,57 @@ 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, 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, + 129, 130, 132, 133, 134, 135, 136, 137, 138, 139, + 140, 141, 146, 147, 148, 149, 151, 152, 153, 154, + 155, 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, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 6, + 143, 143, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 143, 145, 6, 150, 150, 150, 154, 0, 3, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 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, 145, 145, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 7, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 3, 3, 6, 144, + 3, 145, 145, 145, 145, 7, 7, 145, 3, 144, + 144, 145, 145, 145, 145, 145, 145, 145, 145, 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, - 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 + 7, 3, 3, 7, 7, 7, 7, 7, 7, 7, + 7, 3, 3, 3, 3, 3, 5, 145, 3, 3, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 144, + 144, 144, 144, 8, 8, 144, 145, 145, 145, 3, + 145, 145, 145, 7, 9, 145, 145, 8, 5, 9, + 9, 145, 9 }; /* YYR1[RULE-NUM] -- Symbol kind of the left-hand side of rule RULE-NUM. */ static const yytype_uint8 yyr1[] = { - 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, 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 + 0, 142, 143, 144, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 146, 146, 146, 146, 146, + 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, + 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, + 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, + 146, 146, 146, 147, 147, 147, 148, 148, 148, 148, + 149, 149, 149, 150, 151, 151, 151, 151, 152, 152, + 153, 153, 153, 154, 154, 155, 155 }; /* YYR2[RULE-NUM] -- Number of symbols on the right-hand side of rule RULE-NUM. */ @@ -1247,11 +1255,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, 7, 6, 6, 6, 6, 9, 9, + 4, 4, 4, 7, 6, 6, 6, 6, 8, 8, 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 + 4, 2, 6, 6, 6, 6, 1, 9, 2, 1, + 6, 6, 6, 1, 1, 1, 1, 1, 3, 2, + 1, 1, 1, 1, 2, 1, 0 }; @@ -2115,616 +2123,616 @@ yyreduce: case 4: /* gpr: x0 */ #line 157 "src/parser.y" {(yyval.gpr) = X0_NUM;} -#line 2119 "gen/gen_parser.c" +#line 2127 "gen/gen_parser.c" break; case 5: /* gpr: x1 */ #line 158 "src/parser.y" {(yyval.gpr) = X1_NUM;} -#line 2125 "gen/gen_parser.c" +#line 2133 "gen/gen_parser.c" break; case 6: /* gpr: x2 */ #line 159 "src/parser.y" {(yyval.gpr) = X2_NUM;} -#line 2131 "gen/gen_parser.c" +#line 2139 "gen/gen_parser.c" break; case 7: /* gpr: x3 */ #line 160 "src/parser.y" {(yyval.gpr) = X3_NUM;} -#line 2137 "gen/gen_parser.c" +#line 2145 "gen/gen_parser.c" break; case 8: /* gpr: x4 */ #line 161 "src/parser.y" {(yyval.gpr) = X4_NUM;} -#line 2143 "gen/gen_parser.c" +#line 2151 "gen/gen_parser.c" break; case 9: /* gpr: x5 */ #line 162 "src/parser.y" {(yyval.gpr) = X5_NUM;} -#line 2149 "gen/gen_parser.c" +#line 2157 "gen/gen_parser.c" break; case 10: /* gpr: x6 */ #line 163 "src/parser.y" {(yyval.gpr) = X6_NUM;} -#line 2155 "gen/gen_parser.c" +#line 2163 "gen/gen_parser.c" break; case 11: /* gpr: x7 */ #line 164 "src/parser.y" {(yyval.gpr) = X7_NUM;} -#line 2161 "gen/gen_parser.c" +#line 2169 "gen/gen_parser.c" break; case 12: /* gpr: x8 */ #line 165 "src/parser.y" {(yyval.gpr) = X8_NUM;} -#line 2167 "gen/gen_parser.c" +#line 2175 "gen/gen_parser.c" break; case 13: /* gpr: x9 */ #line 166 "src/parser.y" {(yyval.gpr) = X9_NUM;} -#line 2173 "gen/gen_parser.c" +#line 2181 "gen/gen_parser.c" break; case 14: /* gpr: x10 */ #line 167 "src/parser.y" {(yyval.gpr) = X10_NUM;} -#line 2179 "gen/gen_parser.c" +#line 2187 "gen/gen_parser.c" break; case 15: /* gpr: x11 */ #line 168 "src/parser.y" {(yyval.gpr) = X11_NUM;} -#line 2185 "gen/gen_parser.c" +#line 2193 "gen/gen_parser.c" break; case 16: /* gpr: x12 */ #line 169 "src/parser.y" {(yyval.gpr) = X12_NUM;} -#line 2191 "gen/gen_parser.c" +#line 2199 "gen/gen_parser.c" break; case 17: /* gpr: x13 */ #line 170 "src/parser.y" {(yyval.gpr) = X13_NUM;} -#line 2197 "gen/gen_parser.c" +#line 2205 "gen/gen_parser.c" break; case 18: /* gpr: x14 */ #line 171 "src/parser.y" {(yyval.gpr) = X14_NUM;} -#line 2203 "gen/gen_parser.c" +#line 2211 "gen/gen_parser.c" break; case 19: /* gpr: x15 */ #line 172 "src/parser.y" {(yyval.gpr) = X15_NUM;} -#line 2209 "gen/gen_parser.c" +#line 2217 "gen/gen_parser.c" break; case 20: /* gpr: x16 */ #line 173 "src/parser.y" {(yyval.gpr) = X16_NUM;} -#line 2215 "gen/gen_parser.c" +#line 2223 "gen/gen_parser.c" break; case 21: /* gpr: x17 */ #line 174 "src/parser.y" {(yyval.gpr) = X17_NUM;} -#line 2221 "gen/gen_parser.c" +#line 2229 "gen/gen_parser.c" break; case 22: /* gpr: x18 */ #line 175 "src/parser.y" {(yyval.gpr) = X18_NUM;} -#line 2227 "gen/gen_parser.c" +#line 2235 "gen/gen_parser.c" break; case 23: /* gpr: x19 */ #line 176 "src/parser.y" {(yyval.gpr) = X19_NUM;} -#line 2233 "gen/gen_parser.c" +#line 2241 "gen/gen_parser.c" break; case 24: /* gpr: x20 */ #line 177 "src/parser.y" {(yyval.gpr) = X20_NUM;} -#line 2239 "gen/gen_parser.c" +#line 2247 "gen/gen_parser.c" break; case 25: /* gpr: x21 */ #line 178 "src/parser.y" {(yyval.gpr) = X21_NUM;} -#line 2245 "gen/gen_parser.c" +#line 2253 "gen/gen_parser.c" break; case 26: /* gpr: x22 */ #line 179 "src/parser.y" {(yyval.gpr) = X22_NUM;} -#line 2251 "gen/gen_parser.c" +#line 2259 "gen/gen_parser.c" break; case 27: /* gpr: x23 */ #line 180 "src/parser.y" {(yyval.gpr) = X23_NUM;} -#line 2257 "gen/gen_parser.c" +#line 2265 "gen/gen_parser.c" break; case 28: /* gpr: x24 */ #line 181 "src/parser.y" {(yyval.gpr) = X24_NUM;} -#line 2263 "gen/gen_parser.c" +#line 2271 "gen/gen_parser.c" break; case 29: /* gpr: x25 */ #line 182 "src/parser.y" {(yyval.gpr) = X25_NUM;} -#line 2269 "gen/gen_parser.c" +#line 2277 "gen/gen_parser.c" break; case 30: /* gpr: x26 */ #line 183 "src/parser.y" {(yyval.gpr) = X26_NUM;} -#line 2275 "gen/gen_parser.c" +#line 2283 "gen/gen_parser.c" break; case 31: /* gpr: x27 */ #line 184 "src/parser.y" {(yyval.gpr) = X27_NUM;} -#line 2281 "gen/gen_parser.c" +#line 2289 "gen/gen_parser.c" break; case 32: /* gpr: x28 */ #line 185 "src/parser.y" {(yyval.gpr) = X28_NUM;} -#line 2287 "gen/gen_parser.c" +#line 2295 "gen/gen_parser.c" break; case 33: /* gpr: x29 */ #line 186 "src/parser.y" {(yyval.gpr) = X29_NUM;} -#line 2293 "gen/gen_parser.c" +#line 2301 "gen/gen_parser.c" break; case 34: /* gpr: x30 */ #line 187 "src/parser.y" {(yyval.gpr) = X30_NUM;} -#line 2299 "gen/gen_parser.c" +#line 2307 "gen/gen_parser.c" break; case 35: /* gpr: x31 */ #line 188 "src/parser.y" {(yyval.gpr) = X31_NUM;} -#line 2305 "gen/gen_parser.c" +#line 2313 "gen/gen_parser.c" break; case 36: /* gpr: x32 */ #line 189 "src/parser.y" {(yyval.gpr) = X32_NUM;} -#line 2311 "gen/gen_parser.c" +#line 2319 "gen/gen_parser.c" break; case 37: /* gpr: x33 */ #line 190 "src/parser.y" {(yyval.gpr) = X33_NUM;} -#line 2317 "gen/gen_parser.c" +#line 2325 "gen/gen_parser.c" break; case 38: /* gpr: x34 */ #line 191 "src/parser.y" {(yyval.gpr) = X34_NUM;} -#line 2323 "gen/gen_parser.c" +#line 2331 "gen/gen_parser.c" break; case 39: /* gpr: x35 */ #line 192 "src/parser.y" {(yyval.gpr) = X35_NUM;} -#line 2329 "gen/gen_parser.c" +#line 2337 "gen/gen_parser.c" break; case 40: /* gpr: x36 */ #line 193 "src/parser.y" {(yyval.gpr) = X36_NUM;} -#line 2335 "gen/gen_parser.c" +#line 2343 "gen/gen_parser.c" break; case 41: /* gpr: x37 */ #line 194 "src/parser.y" {(yyval.gpr) = X37_NUM;} -#line 2341 "gen/gen_parser.c" +#line 2349 "gen/gen_parser.c" break; case 42: /* gpr: x38 */ #line 195 "src/parser.y" {(yyval.gpr) = X38_NUM;} -#line 2347 "gen/gen_parser.c" +#line 2355 "gen/gen_parser.c" break; case 43: /* gpr: x39 */ #line 196 "src/parser.y" {(yyval.gpr) = X39_NUM;} -#line 2353 "gen/gen_parser.c" +#line 2361 "gen/gen_parser.c" break; case 44: /* gpr: x40 */ #line 197 "src/parser.y" {(yyval.gpr) = X40_NUM;} -#line 2359 "gen/gen_parser.c" +#line 2367 "gen/gen_parser.c" break; case 45: /* gpr: x41 */ #line 198 "src/parser.y" {(yyval.gpr) = X41_NUM;} -#line 2365 "gen/gen_parser.c" +#line 2373 "gen/gen_parser.c" break; case 46: /* gpr: x42 */ #line 199 "src/parser.y" {(yyval.gpr) = X42_NUM;} -#line 2371 "gen/gen_parser.c" +#line 2379 "gen/gen_parser.c" break; case 47: /* gpr: x43 */ #line 200 "src/parser.y" {(yyval.gpr) = X43_NUM;} -#line 2377 "gen/gen_parser.c" +#line 2385 "gen/gen_parser.c" break; case 48: /* gpr: x44 */ #line 201 "src/parser.y" {(yyval.gpr) = X44_NUM;} -#line 2383 "gen/gen_parser.c" +#line 2391 "gen/gen_parser.c" break; case 49: /* gpr: x45 */ #line 202 "src/parser.y" {(yyval.gpr) = X45_NUM;} -#line 2389 "gen/gen_parser.c" +#line 2397 "gen/gen_parser.c" break; case 50: /* gpr: x46 */ #line 203 "src/parser.y" {(yyval.gpr) = X46_NUM;} -#line 2395 "gen/gen_parser.c" +#line 2403 "gen/gen_parser.c" break; case 51: /* gpr: x47 */ #line 204 "src/parser.y" {(yyval.gpr) = X47_NUM;} -#line 2401 "gen/gen_parser.c" +#line 2409 "gen/gen_parser.c" break; case 52: /* gpr: x48 */ #line 205 "src/parser.y" {(yyval.gpr) = X48_NUM;} -#line 2407 "gen/gen_parser.c" +#line 2415 "gen/gen_parser.c" break; case 53: /* gpr: x49 */ #line 206 "src/parser.y" {(yyval.gpr) = X49_NUM;} -#line 2413 "gen/gen_parser.c" +#line 2421 "gen/gen_parser.c" break; case 54: /* gpr: x50 */ #line 207 "src/parser.y" {(yyval.gpr) = X50_NUM;} -#line 2419 "gen/gen_parser.c" +#line 2427 "gen/gen_parser.c" break; case 55: /* gpr: x51 */ #line 208 "src/parser.y" {(yyval.gpr) = X51_NUM;} -#line 2425 "gen/gen_parser.c" +#line 2433 "gen/gen_parser.c" break; case 56: /* gpr: x52 */ #line 209 "src/parser.y" {(yyval.gpr) = X52_NUM;} -#line 2431 "gen/gen_parser.c" +#line 2439 "gen/gen_parser.c" break; case 57: /* gpr: x53 */ #line 210 "src/parser.y" {(yyval.gpr) = X53_NUM;} -#line 2437 "gen/gen_parser.c" +#line 2445 "gen/gen_parser.c" break; case 58: /* gpr: x54 */ #line 211 "src/parser.y" {(yyval.gpr) = X54_NUM;} -#line 2443 "gen/gen_parser.c" +#line 2451 "gen/gen_parser.c" break; case 59: /* gpr: x55 */ #line 212 "src/parser.y" {(yyval.gpr) = X55_NUM;} -#line 2449 "gen/gen_parser.c" +#line 2457 "gen/gen_parser.c" break; case 60: /* gpr: x56 */ #line 213 "src/parser.y" {(yyval.gpr) = X56_NUM;} -#line 2455 "gen/gen_parser.c" +#line 2463 "gen/gen_parser.c" break; case 61: /* gpr: x57 */ #line 214 "src/parser.y" {(yyval.gpr) = X57_NUM;} -#line 2461 "gen/gen_parser.c" +#line 2469 "gen/gen_parser.c" break; case 62: /* gpr: x58 */ #line 215 "src/parser.y" {(yyval.gpr) = X58_NUM;} -#line 2467 "gen/gen_parser.c" +#line 2475 "gen/gen_parser.c" break; case 63: /* gpr: x59 */ #line 216 "src/parser.y" {(yyval.gpr) = X59_NUM;} -#line 2473 "gen/gen_parser.c" +#line 2481 "gen/gen_parser.c" break; case 64: /* gpr: x60 */ #line 217 "src/parser.y" {(yyval.gpr) = X60_NUM;} -#line 2479 "gen/gen_parser.c" +#line 2487 "gen/gen_parser.c" break; case 65: /* gpr: x61 */ #line 218 "src/parser.y" {(yyval.gpr) = X61_NUM;} -#line 2485 "gen/gen_parser.c" +#line 2493 "gen/gen_parser.c" break; case 66: /* gpr: x62 */ #line 219 "src/parser.y" {(yyval.gpr) = X62_NUM;} -#line 2491 "gen/gen_parser.c" +#line 2499 "gen/gen_parser.c" break; case 67: /* gpr: x63 */ #line 220 "src/parser.y" {(yyval.gpr) = X63_NUM;} -#line 2497 "gen/gen_parser.c" +#line 2505 "gen/gen_parser.c" break; case 68: /* gpr: x64 */ #line 221 "src/parser.y" {(yyval.gpr) = X64_NUM;} -#line 2503 "gen/gen_parser.c" +#line 2511 "gen/gen_parser.c" break; case 69: /* gpr: x65 */ #line 222 "src/parser.y" {(yyval.gpr) = X65_NUM;} -#line 2509 "gen/gen_parser.c" +#line 2517 "gen/gen_parser.c" break; case 70: /* gpr: x66 */ #line 223 "src/parser.y" {(yyval.gpr) = X66_NUM;} -#line 2515 "gen/gen_parser.c" +#line 2523 "gen/gen_parser.c" break; case 71: /* gpr: x67 */ #line 224 "src/parser.y" {(yyval.gpr) = X67_NUM;} -#line 2521 "gen/gen_parser.c" +#line 2529 "gen/gen_parser.c" break; case 72: /* gpr: x68 */ #line 225 "src/parser.y" {(yyval.gpr) = X68_NUM;} -#line 2527 "gen/gen_parser.c" +#line 2535 "gen/gen_parser.c" break; case 73: /* gpr: x69 */ #line 226 "src/parser.y" {(yyval.gpr) = X69_NUM;} -#line 2533 "gen/gen_parser.c" +#line 2541 "gen/gen_parser.c" break; case 74: /* gpr: x70 */ #line 227 "src/parser.y" {(yyval.gpr) = X70_NUM;} -#line 2539 "gen/gen_parser.c" +#line 2547 "gen/gen_parser.c" break; case 75: /* gpr: x71 */ #line 228 "src/parser.y" {(yyval.gpr) = X71_NUM;} -#line 2545 "gen/gen_parser.c" +#line 2553 "gen/gen_parser.c" break; case 76: /* gpr: x72 */ #line 229 "src/parser.y" {(yyval.gpr) = X72_NUM;} -#line 2551 "gen/gen_parser.c" +#line 2559 "gen/gen_parser.c" break; case 77: /* gpr: x73 */ #line 230 "src/parser.y" {(yyval.gpr) = X73_NUM;} -#line 2557 "gen/gen_parser.c" +#line 2565 "gen/gen_parser.c" break; case 78: /* gpr: x74 */ #line 231 "src/parser.y" {(yyval.gpr) = X74_NUM;} -#line 2563 "gen/gen_parser.c" +#line 2571 "gen/gen_parser.c" break; case 79: /* gpr: x75 */ #line 232 "src/parser.y" {(yyval.gpr) = X75_NUM;} -#line 2569 "gen/gen_parser.c" +#line 2577 "gen/gen_parser.c" break; case 80: /* gpr: x76 */ #line 233 "src/parser.y" {(yyval.gpr) = X76_NUM;} -#line 2575 "gen/gen_parser.c" +#line 2583 "gen/gen_parser.c" break; case 81: /* gpr: x77 */ #line 234 "src/parser.y" {(yyval.gpr) = X77_NUM;} -#line 2581 "gen/gen_parser.c" +#line 2589 "gen/gen_parser.c" break; case 82: /* gpr: x78 */ #line 235 "src/parser.y" {(yyval.gpr) = X78_NUM;} -#line 2587 "gen/gen_parser.c" +#line 2595 "gen/gen_parser.c" break; case 83: /* gpr: x79 */ #line 236 "src/parser.y" {(yyval.gpr) = X79_NUM;} -#line 2593 "gen/gen_parser.c" +#line 2601 "gen/gen_parser.c" break; case 84: /* gpr: x80 */ #line 237 "src/parser.y" {(yyval.gpr) = X80_NUM;} -#line 2599 "gen/gen_parser.c" +#line 2607 "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 2605 "gen/gen_parser.c" +#line 2613 "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 2611 "gen/gen_parser.c" +#line 2619 "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 2617 "gen/gen_parser.c" +#line 2625 "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 2623 "gen/gen_parser.c" +#line 2631 "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 2629 "gen/gen_parser.c" +#line 2637 "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 2635 "gen/gen_parser.c" +#line 2643 "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 2641 "gen/gen_parser.c" +#line 2649 "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 2647 "gen/gen_parser.c" +#line 2655 "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 2653 "gen/gen_parser.c" +#line 2661 "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 2659 "gen/gen_parser.c" +#line 2667 "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 2665 "gen/gen_parser.c" +#line 2673 "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 2671 "gen/gen_parser.c" +#line 2679 "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 2677 "gen/gen_parser.c" +#line 2685 "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 2683 "gen/gen_parser.c" +#line 2691 "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 2689 "gen/gen_parser.c" +#line 2697 "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 2695 "gen/gen_parser.c" +#line 2703 "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 2701 "gen/gen_parser.c" +#line 2709 "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 2708 "gen/gen_parser.c" +#line 2716 "gen/gen_parser.c" break; case 103: /* i: jalr gpr "," imm "(" gpr ")" */ #line 296 "src/parser.y" {emit_i(ctx, OPCODE_JALR, (yyvsp[-5].gpr), 0, (yyvsp[-1].gpr), (yyvsp[-3].tri));} -#line 2714 "gen/gen_parser.c" +#line 2722 "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 2721 "gen/gen_parser.c" +#line 2729 "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 2728 "gen/gen_parser.c" +#line 2736 "gen/gen_parser.c" break; case 106: /* i: blt gpr "," gpr "," addr */ @@ -2732,74 +2740,74 @@ yyreduce: {emit_reloc(ctx, RELOC_B, (yyvsp[0].str)); emit_s(ctx, OPCODE_BRANCH, BRANCH_BLT, (yyvsp[-4].gpr), (yyvsp[-2].gpr), 0); } -#line 2736 "gen/gen_parser.c" +#line 2744 "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 2743 "gen/gen_parser.c" +#line 2751 "gen/gen_parser.c" break; - case 108: /* i: ld width "," gpr "," imm "(" gpr ")" */ + 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 2749 "gen/gen_parser.c" + {emit_i(ctx, OPCODE_LOAD, (yyvsp[-5].gpr), check_width((yyvsp[-6].str)), (yyvsp[-1].gpr), (yyvsp[-3].tri));} +#line 2757 "gen/gen_parser.c" break; - case 109: /* i: st width "," gpr "," imm "(" gpr ")" */ + 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 2755 "gen/gen_parser.c" + {emit_s(ctx, OPCODE_STORE, check_width((yyvsp[-6].str)), (yyvsp[-5].gpr), (yyvsp[-1].gpr), (yyvsp[-3].tri));} +#line 2763 "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 2761 "gen/gen_parser.c" +#line 2769 "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 2767 "gen/gen_parser.c" +#line 2775 "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 2773 "gen/gen_parser.c" +#line 2781 "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 2779 "gen/gen_parser.c" +#line 2787 "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 2785 "gen/gen_parser.c" +#line 2793 "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 2791 "gen/gen_parser.c" +#line 2799 "gen/gen_parser.c" break; case 116: /* i: mv gpr "," gpr */ #line 341 "src/parser.y" {emit_i(ctx, OPCODE_OP_IMM, (yyvsp[-2].gpr), OP_IMM_ADDI, (yyvsp[0].gpr), 0);} -#line 2797 "gen/gen_parser.c" +#line 2805 "gen/gen_parser.c" break; 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" +#line 2811 "gen/gen_parser.c" break; case 118: /* i: la gpr "," addr */ @@ -2807,90 +2815,112 @@ yyreduce: {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 2811 "gen/gen_parser.c" +#line 2819 "gen/gen_parser.c" break; 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)); + {/** @todo skip lui if we can avoid it? */ + 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 2818 "gen/gen_parser.c" +#line 2827 "gen/gen_parser.c" break; - 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 2824 "gen/gen_parser.c" + case 120: /* i: call gpr "," addr */ +#line 356 "src/parser.y" + {emit_reloc(ctx, RELOC_CALL, (yyvsp[0].str)); + emit_u(ctx, OPCODE_AUIPC, (yyvsp[-2].gpr), 0); + emit_i(ctx, OPCODE_JALR, (yyvsp[-2].gpr), 0, (yyvsp[-2].gpr), 0);} +#line 2835 "gen/gen_parser.c" + break; + + case 121: /* i: ret gpr */ +#line 360 "src/parser.y" + {emit_i(ctx, OPCODE_JALR, X0_NUM, 0, (yyvsp[0].gpr), 0);} +#line 2841 "gen/gen_parser.c" break; - case 121: /* m: diV gpr "," gpr "," gpr */ + case 122: /* i: ble gpr "," gpr "," addr */ #line 362 "src/parser.y" + {emit_reloc(ctx, RELOC_B, (yyvsp[0].str)); + emit_s(ctx, OPCODE_BRANCH, BRANCH_BGE, (yyvsp[-2].gpr), (yyvsp[-4].gpr), 0);} +#line 2848 "gen/gen_parser.c" + break; + + case 123: /* m: mul gpr "," gpr "," gpr */ +#line 367 "src/parser.y" + {emit_r(ctx, OPCODE_OP, (yyvsp[-4].gpr), OP_MUL, (yyvsp[-2].gpr), (yyvsp[0].gpr), 0);} +#line 2854 "gen/gen_parser.c" + break; + + case 124: /* m: diV gpr "," gpr "," gpr */ +#line 370 "src/parser.y" {emit_r(ctx, OPCODE_OP, (yyvsp[-4].gpr), OP_DIV, (yyvsp[-2].gpr), (yyvsp[0].gpr), 0);} -#line 2830 "gen/gen_parser.c" +#line 2860 "gen/gen_parser.c" break; - case 122: /* m: rem gpr "," gpr "," gpr */ -#line 365 "src/parser.y" + case 125: /* m: rem gpr "," gpr "," gpr */ +#line 373 "src/parser.y" {emit_r(ctx, OPCODE_OP, (yyvsp[-4].gpr), OP_DIV, (yyvsp[-2].gpr), (yyvsp[0].gpr), 0);} -#line 2836 "gen/gen_parser.c" +#line 2866 "gen/gen_parser.c" break; - case 123: /* a: stt */ -#line 369 "src/parser.y" + case 126: /* a: stt */ +#line 377 "src/parser.y" {emit_i(ctx, OPCODE_MEM, X0_NUM, MEM_STT, X0_NUM, 0);} -#line 2842 "gen/gen_parser.c" +#line 2872 "gen/gen_parser.c" break; - case 124: /* a: cst width "," gpr "," imm "(" gpr ")" */ -#line 372 "src/parser.y" + case 127: /* a: cst width "," gpr "," imm "(" gpr ")" */ +#line 380 "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 2848 "gen/gen_parser.c" +#line 2878 "gen/gen_parser.c" break; - case 125: /* a: ent gpr */ -#line 375 "src/parser.y" + case 128: /* a: ent gpr */ +#line 383 "src/parser.y" {emit_i(ctx, OPCODE_MEM, (yyvsp[0].gpr), MEM_ENT, X0_NUM, 0);} -#line 2854 "gen/gen_parser.c" +#line 2884 "gen/gen_parser.c" break; - case 126: /* a: cat */ -#line 378 "src/parser.y" + case 129: /* a: cat */ +#line 386 "src/parser.y" {emit_i(ctx, OPCODE_MEM, X0_NUM, MEM_CAT, X0_NUM, 0);} -#line 2860 "gen/gen_parser.c" +#line 2890 "gen/gen_parser.c" break; - case 127: /* Zcsr: csrrw csr "," gpr "," gpr */ -#line 382 "src/parser.y" + case 130: /* Zcsr: csrrw csr "," gpr "," gpr */ +#line 390 "src/parser.y" {emit_i(ctx, OPCODE_SYSTEM, (yyvsp[-2].gpr), SYSTEM_CSRRW, (yyvsp[0].gpr), check_csr((yyvsp[-4].str)));} -#line 2866 "gen/gen_parser.c" +#line 2896 "gen/gen_parser.c" break; - case 128: /* Zcsr: csrrs csr "," gpr "," gpr */ -#line 385 "src/parser.y" + case 131: /* Zcsr: csrrs csr "," gpr "," gpr */ +#line 393 "src/parser.y" {emit_i(ctx, OPCODE_SYSTEM, (yyvsp[-2].gpr), SYSTEM_CSRRS, (yyvsp[0].gpr), check_csr((yyvsp[-4].str)));} -#line 2872 "gen/gen_parser.c" +#line 2902 "gen/gen_parser.c" break; - case 129: /* Zcsr: csrrc csr "," gpr "," gpr */ -#line 388 "src/parser.y" + case 132: /* Zcsr: csrrc csr "," gpr "," gpr */ +#line 396 "src/parser.y" {emit_i(ctx, OPCODE_SYSTEM, (yyvsp[-2].gpr), SYSTEM_CSRRC, (yyvsp[0].gpr), check_csr((yyvsp[-4].str)));} -#line 2878 "gen/gen_parser.c" +#line 2908 "gen/gen_parser.c" break; - case 136: /* directive: include str */ -#line 401 "src/parser.y" + case 139: /* directive: include str */ +#line 409 "src/parser.y" {process_file(ctx, (yyvsp[0].str));} -#line 2884 "gen/gen_parser.c" +#line 2914 "gen/gen_parser.c" break; - case 137: /* top: label */ -#line 404 "src/parser.y" + case 140: /* top: label */ +#line 412 "src/parser.y" {emit_label(ctx, (yyvsp[0].str));} -#line 2890 "gen/gen_parser.c" +#line 2920 "gen/gen_parser.c" break; -#line 2894 "gen/gen_parser.c" +#line 2924 "gen/gen_parser.c" default: break; } @@ -3119,7 +3149,7 @@ yyreturnlab: return yyresult; } -#line 416 "src/parser.y" +#line 424 "src/parser.y" static const char *find_lineno(const char *buf, size_t no) diff --git a/tasm/include/tasm/assembler.h b/tasm/include/tasm/assembler.h index 6941186..61a2a3b 100644 --- a/tasm/include/tasm/assembler.h +++ b/tasm/include/tasm/assembler.h @@ -11,8 +11,12 @@ enum asm_reloc_kind { RELOC_LA, /* relative AUIPC + ADDI (currently unimplemented) */ RELOC_LR, + /* branch */ RELOC_B, + /* jal */ RELOC_J, + /* call */ + RELOC_CALL, }; tri_t parse_imm(const char *imm); diff --git a/tasm/os.tasm b/tasm/os.tasm new file mode 100644 index 0000000..164f9fe --- /dev/null +++ b/tasm/os.tasm @@ -0,0 +1,17 @@ +// trivial stuff to make sure simulator exits once test program is run and +// making sure our _start is the first thing in the object file +_start: + // random starting stack location + li sp, 13122 + mv fp, sp + call ra, main + li t0, 3 + csrrw mpower, x0, t0 + +// simple I/O +_putchar: + li t0, 19683 + st t a0, 0(t0) + ret ra + +// include the rest of the test program here, doesn't really matter how diff --git a/tasm/src/assembler.c b/tasm/src/assembler.c index 0e06a1e..896ce74 100644 --- a/tasm/src/assembler.c +++ b/tasm/src/assembler.c @@ -121,8 +121,11 @@ void emit_s(struct asm_ctx *ctx, tri_t opcode, abort(); return; } - tri_t imm4 = tri_mask(imm9, 4); - tri_t imm5 = tri_mask(tri_sr(imm9, 4), 5); + + /* low five */ + tri_t imm5 = tri_mask(imm9, 5); + /* high four */ + tri_t imm4 = tri_mask(tri_sr(imm9, 5), 4); tri_t i = build_s(opcode, imm4, fn0, xrs1, xrs2, imm5); emit(ctx, i); @@ -326,6 +329,12 @@ static void asm_ctx_destroy(struct asm_ctx *ctx) free(ctx); } +/* 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_la(struct asm_ctx *ctx, size_t ro, size_t so) { tri_t t = tri_from(so); @@ -354,7 +363,7 @@ static void fix_reloc_la(struct asm_ctx *ctx, size_t ro, size_t so) static void fix_reloc_b(struct asm_ctx *ctx, size_t ro, size_t so) { - int64_t off = so - ctx->idx; + int64_t off = asm_addr(so) - asm_addr(ro); tri_t t = tri_from(off); if (tri_mask(t, 9) != t) { /* should really be line based rather than offset, but good @@ -379,12 +388,6 @@ 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) { /* internal offsets are instruction indexes, so convert to address */ @@ -406,6 +409,27 @@ static void fix_reloc_j(struct asm_ctx *ctx, size_t ro, size_t so) ctx->buf[ro] = build_u(OPCODE_JAL, rd, t); } +static void fix_reloc_call(struct asm_ctx *ctx, size_t ro, size_t so) +{ + int64_t off = asm_addr(so) - asm_addr(ro); + tri_t t = tri_from(off); + + tri_t a = ctx->buf[ro]; + assert(parse_opcode(a) == OPCODE_AUIPC); + + tri_t rd, imm18; + parse_u(a, &rd, &imm18); + assert(imm18 == 0); + + ctx->buf[ro] = build_u(OPCODE_AUIPC, rd, tri_sr(t, 9)); + + tri_t j = ctx->buf[ro + 1]; + assert(parse_opcode(j) == OPCODE_JALR); + tri_t fn0, rs1, imm; + parse_i(j, &rd, &fn0, &rs1, &imm); + ctx->buf[ro + 1] = build_i(OPCODE_JALR, rd, fn0, rs1, tri_mask(t, 9)); +} + static int try_fix_reloc(struct asm_ctx *ctx, struct asm_reloc r) { /* ideally this would probably be a hashmap, but good enough for now */ @@ -421,6 +445,7 @@ static int try_fix_reloc(struct asm_ctx *ctx, struct asm_reloc r) case RELOC_LA: fix_reloc_la(ctx, ro, so); break; case RELOC_B: fix_reloc_b(ctx, ro, so); break; case RELOC_J: fix_reloc_j(ctx, ro, so); break; + case RELOC_CALL: fix_reloc_call(ctx, ro, so); break; default: fprintf(stderr, "unimplemented reloc: %d\n", r.kind); abort(); } diff --git a/tasm/src/lexer.l b/tasm/src/lexer.l index cf63cfe..a10021b 100644 --- a/tasm/src/lexer.l +++ b/tasm/src/lexer.l @@ -29,7 +29,7 @@ static void update_yylloc(struct parser *parser, YYLTYPE *lloc, const char *text %x SC_COMMENT -id [_a-zA-Z][_a-zA-Z0-9]* +id [._a-zA-Z][._a-zA-Z0-9]* label {id}[[:space:]]*: dec -?[0-9]+ @@ -149,6 +149,87 @@ str \"(\\.|[^"\\])*\" "x79" {return x79;} "x80" {return x80;} +"sp" {return x1;} +"fp" {return x2;} +"gp" {return x3;} +"a0" {return x4;} +"a1" {return x5;} +"a2" {return x6;} +"a3" {return x7;} +"a4" {return x8;} +"a5" {return x9;} +"a6" {return x10;} +"t0" {return x11;} +"t1" {return x12;} +"t2" {return x13;} +"t3" {return x14;} +"t4" {return x15;} +"t5" {return x16;} +"t6" {return x17;} +"s0" {return x18;} +"s1" {return x19;} +"s2" {return x20;} +"s3" {return x21;} +"s4" {return x22;} +"s5" {return x23;} +"s6" {return x24;} +"tp" {return x25;} +"ra" {return x26;} +"a7" {return x27;} +"a8" {return x28;} +"a9" {return x29;} +"a10" {return x30;} +"a11" {return x31;} +"a12" {return x32;} +"a13" {return x33;} +"a14" {return x34;} +"a15" {return x35;} +"a16" {return x36;} +"a17" {return x37;} +"a18" {return x38;} +"a19" {return x39;} +"a20" {return x40;} +"a21" {return x41;} +"a22" {return x42;} +"a23" {return x43;} +"a24" {return x44;} +"t7" {return x45;} +"t8" {return x46;} +"t9" {return x47;} +"t10" {return x48;} +"t11" {return x49;} +"t12" {return x50;} +"t13" {return x51;} +"t14" {return x52;} +"t15" {return x53;} +"t16" {return x54;} +"t17" {return x55;} +"t18" {return x56;} +"t19" {return x57;} +"t20" {return x58;} +"t21" {return x59;} +"t22" {return x60;} +"t23" {return x61;} +"t24" {return x62;} +"s7" {return x63;} +"s8" {return x64;} +"s9" {return x65;} +"s10" {return x66;} +"s11" {return x67;} +"s12" {return x68;} +"s13" {return x69;} +"s14" {return x70;} +"s15" {return x71;} +"s16" {return x72;} +"s17" {return x73;} +"s18" {return x74;} +"s19" {return x75;} +"s20" {return x76;} +"s21" {return x77;} +"s22" {return x78;} +"s23" {return x79;} +"s24" {return x80;} + "addi" {return addi; /* i */} "slti" {return slti;} "sgei" {return sgei;} @@ -184,6 +265,10 @@ str \"(\\.|[^"\\])*\" "mv" {return mv;} "li" {return li;} "la" {return la;} +"call" {return call;} +"ret" {return ret;} +"ble" {return ble;} +"bgt" {return bgt;} "mul" {return mul; /* m */} "div" {return diV;} diff --git a/tasm/src/parser.y b/tasm/src/parser.y index 204fe0a..bb3090f 100644 --- a/tasm/src/parser.y +++ b/tasm/src/parser.y @@ -73,7 +73,7 @@ %token ecall ebreak pcall %token fence /* meta */ -%token mv li la nop +%token mv li la nop call ret ble bgt /* m (avoid name clash with stdlib div) */ %token mul diV rem @@ -312,11 +312,11 @@ i {emit_reloc(ctx, RELOC_B, $6); emit_s(ctx, OPCODE_BRANCH, BRANCH_BGE, $2, $4, 0);} - | ld width "," gpr "," imm "(" gpr ")" - {emit_i(ctx, OPCODE_LOAD, check_width($2), $4, $8, $6);} + | ld width gpr "," imm "(" gpr ")" + {emit_i(ctx, OPCODE_LOAD, $3, check_width($2), $7, $5);} - | st width "," gpr "," imm "(" gpr ")" - {emit_s(ctx, OPCODE_STORE, check_width($2), $4, $8, $6);} + | st width gpr "," imm "(" gpr ")" + {emit_s(ctx, OPCODE_STORE, check_width($2), $3, $7, $5);} | ecall {emit_i(ctx, OPCODE_SYSTEM, X0_NUM, SYSTEM_ECALL, X0_NUM, 0);} @@ -349,10 +349,18 @@ i emit_i(ctx, OPCODE_OP_IMM, $2, OP_IMM_ADDI, $2, 0);} | li gpr "," imm - {emit_u(ctx, OPCODE_LUI, $2, tri_sr($4, 9)); + {/** @todo skip lui if we can avoid it? */ + emit_u(ctx, OPCODE_LUI, $2, tri_sr($4, 9)); emit_i(ctx, OPCODE_OP_IMM, $2, OP_IMM_ADDI, $2, tri_mask($4, 9));} - /* stuff like call and ret TBD once I've come up with a proper register - * calling convention so we know which register to use as ra */ + | call gpr "," addr + {emit_reloc(ctx, RELOC_CALL, $4); + emit_u(ctx, OPCODE_AUIPC, $2, 0); + emit_i(ctx, OPCODE_JALR, $2, 0, $2, 0);} + | ret gpr + {emit_i(ctx, OPCODE_JALR, X0_NUM, 0, $2, 0);} + | ble gpr "," gpr "," addr + {emit_reloc(ctx, RELOC_B, $6); + emit_s(ctx, OPCODE_BRANCH, BRANCH_BGE, $4, $2, 0);} m : mul gpr "," gpr "," gpr diff --git a/tdump/src/disassembler.c b/tdump/src/disassembler.c index 63c8d9d..e9383ca 100644 --- a/tdump/src/disassembler.c +++ b/tdump/src/disassembler.c @@ -12,86 +12,86 @@ static const char *get_gpr(tri_t x) { switch (x) { case X0: return "x0"; - case X1: return "x1"; - case X2: return "x2"; - case X3: return "x3"; - case X4: return "x4"; - case X5: return "x5"; - case X6: return "x6"; - case X7: return "x7"; - case X8: return "x8"; - case X9: return "x9"; - case X10: return "x10"; - case X11: return "x11"; - case X12: return "x12"; - case X13: return "x13"; - case X14: return "x14"; - case X15: return "x15"; - case X16: return "x16"; - case X17: return "x17"; - case X18: return "x18"; - case X19: return "x19"; - case X20: return "x20"; - case X21: return "x21"; - case X22: return "x22"; - case X23: return "x23"; - case X24: return "x24"; - case X25: return "x25"; - case X26: return "x26"; - case X27: return "x27"; - case X28: return "x28"; - case X29: return "x29"; - case X30: return "x30"; - case X31: return "x31"; - case X32: return "x32"; - case X33: return "x33"; - case X34: return "x34"; - case X35: return "x35"; - case X36: return "x36"; - case X37: return "x37"; - case X38: return "x38"; - case X39: return "x39"; - case X40: return "x40"; - case X41: return "x41"; - case X42: return "x42"; - case X43: return "x43"; - case X44: return "x44"; - case X45: return "x45"; - case X46: return "x46"; - case X47: return "x47"; - case X48: return "x48"; - case X49: return "x49"; - case X50: return "x50"; - case X51: return "x51"; - case X52: return "x52"; - case X53: return "x53"; - case X54: return "x54"; - case X55: return "x55"; - case X56: return "x56"; - case X57: return "x57"; - case X58: return "x58"; - case X59: return "x59"; - case X60: return "x60"; - case X61: return "x61"; - case X62: return "x62"; - case X63: return "x63"; - case X64: return "x64"; - case X65: return "x65"; - case X66: return "x66"; - case X67: return "x67"; - case X68: return "x68"; - case X69: return "x69"; - case X70: return "x70"; - case X71: return "x71"; - case X72: return "x72"; - case X73: return "x73"; - case X74: return "x74"; - case X75: return "x75"; - case X76: return "x76"; - case X77: return "x77"; - case X78: return "x78"; - case X79: return "x79"; - case X80: return "x80"; + case X1: return "sp"; + case X2: return "fp"; + case X3: return "gp"; + case X4: return "a0"; + case X5: return "a1"; + case X6: return "a2"; + case X7: return "a3"; + case X8: return "a4"; + case X9: return "a5"; + case X10: return "a6"; + case X11: return "t0"; + case X12: return "t1"; + case X13: return "t2"; + case X14: return "t3"; + case X15: return "t4"; + case X16: return "t5"; + case X17: return "t6"; + case X18: return "s0"; + case X19: return "s1"; + case X20: return "s2"; + case X21: return "s3"; + case X22: return "s4"; + case X23: return "s5"; + case X24: return "s6"; + case X25: return "tp"; + case X26: return "ra"; + case X27: return "a7"; + case X28: return "a8"; + case X29: return "a9"; + case X30: return "a10"; + case X31: return "a11"; + case X32: return "a12"; + case X33: return "a13"; + case X34: return "a14"; + case X35: return "a15"; + case X36: return "a16"; + case X37: return "a17"; + case X38: return "a18"; + case X39: return "a19"; + case X40: return "a20"; + case X41: return "a21"; + case X42: return "a22"; + case X43: return "a23"; + case X44: return "a24"; + case X45: return "t7"; + case X46: return "t8"; + case X47: return "t9"; + case X48: return "t10"; + case X49: return "t11"; + case X50: return "t12"; + case X51: return "t13"; + case X52: return "t14"; + case X53: return "t15"; + case X54: return "t16"; + case X55: return "t17"; + case X56: return "t18"; + case X57: return "t19"; + case X58: return "t20"; + case X59: return "t21"; + case X60: return "t22"; + case X61: return "t23"; + case X62: return "t24"; + case X63: return "s7"; + case X64: return "s8"; + case X65: return "s9"; + case X66: return "s10"; + case X67: return "s11"; + case X68: return "s12"; + case X69: return "s13"; + case X70: return "s14"; + case X71: return "s15"; + case X72: return "s16"; + case X73: return "s17"; + case X74: return "s18"; + case X75: return "s19"; + case X76: return "s20"; + case X77: return "s21"; + case X78: return "s22"; + case X79: return "s23"; + case X80: return "s24"; default: return "ill"; } } @@ -161,6 +161,26 @@ static void disasm_store(struct disasm_ctx *ctx, tri_t i) ctx->pc, width, get_gpr(rs1), imm, get_gpr(rs2)); } +static void disasm_load(struct disasm_ctx *ctx, tri_t i) +{ + tri_t rd, fn0, rs1, imm9; + parse_i(i, &rd, &fn0, &rs1, &imm9); + + int w = tri_get_trit(fn0, 4); + char *width = NULL; + switch (w) { + case 0: width = "t"; break; + case 1: width = "w"; break; + default: width = "ill"; break; + } + + char imm[256]; + size_t l = tri_fmt_default(imm, 256, imm9); + imm[l] = '\0'; + printf(DEFAULT_PREFIX "ld %s, %s, %s(%s)\n", + ctx->pc, width, get_gpr(rd), imm, get_gpr(rs1)); +} + static void disasm_op_imm(struct disasm_ctx *ctx, tri_t i) { tri_t rd, fn0, rs1, imm9; @@ -182,6 +202,92 @@ static void disasm_op_imm(struct disasm_ctx *ctx, tri_t i) } } +static void disasm_op(struct disasm_ctx *ctx, tri_t i) +{ + tri_t rd, fn0, rs1, rs2, fn5; + parse_r(i, &rd, &fn0, &rs1, &rs2, &fn5); + + switch (fn5) { + case 0: + switch (fn0) { + case OP_ADD: + printf(DEFAULT_PREFIX "add %s, %s, %s\n", + ctx->pc, + get_gpr(rd), + get_gpr(rs1), + get_gpr(rs2)); + break; + + case OP_SUB: + printf(DEFAULT_PREFIX "sub %s, %s, %s\n", + ctx->pc, + get_gpr(rd), + get_gpr(rs1), + get_gpr(rs2)); + break; + + default: + printf(DEFAULT_PREFIX "unknown/unimp op\n", + ctx->pc); + } + break; + + default: printf(DEFAULT_PREFIX "unknown/unimp op metaclass\n", + ctx->pc); + } +} + +static void disasm_jalr(struct disasm_ctx *ctx, tri_t i) +{ + tri_t rd, fn0, rs1, imm9; + parse_i(i, &rd, &fn0, &rs1, &imm9); + + char imm[256]; + size_t l = tri_fmt_default(imm, 256, imm9); + imm[l] = '\0'; + + switch (fn0) { + case 0: + printf(DEFAULT_PREFIX "jalr %s, %s(%s)\n", + ctx->pc, get_gpr(rd), imm, get_gpr(rs1)); + break; + default: printf(DEFAULT_PREFIX "unknown/unimp jalr\n", ctx->pc); + } +} + +static void disasm_branch(struct disasm_ctx *ctx, tri_t i) +{ + tri_t imm4, fn0, rs1, rs2, imm5; + parse_s(i, &imm4, &fn0, &rs1, &rs2, &imm5); + + tri_t imm9 = tri_sl(imm4, 5) | imm5; + + char imm[256]; + size_t l = tri_fmt_default(imm, 256, imm9); + imm[l] = '\0'; + + switch (fn0) { + case BRANCH_BLT: + printf(DEFAULT_PREFIX "blt %s, %s, %s\n", + ctx->pc, get_gpr(rs1), get_gpr(rs2), imm); + break; + default: printf(DEFAULT_PREFIX "unknown/unimp branch\n", ctx->pc); + } +} + +static void disasm_auipc(struct disasm_ctx *ctx, tri_t i) +{ + tri_t rd, imm18; + parse_u(i, &rd, &imm18); + + char imm[256]; + size_t l = tri_fmt_default(imm, 256, imm18); + imm[l] = '\0'; + + printf(DEFAULT_PREFIX "auipc %s, %s\n", + ctx->pc, get_gpr(rd), imm); +} + static tri_t read1(struct disasm_ctx *ctx, size_t off) { tri_t t = (tri_t)ctx->buf[off]; @@ -208,8 +314,13 @@ int disassemble(const char *file) switch (parse_opcode(i)) { case OPCODE_LUI: disasm_lui(&ctx, i); break; case OPCODE_STORE: disasm_store(&ctx, i); break; + case OPCODE_LOAD: disasm_load(&ctx, i); break; //case OPCODE_SYSTEM: disasm_system(&ctx, i); break; case OPCODE_OP_IMM: disasm_op_imm(&ctx, i); break; + case OPCODE_OP: disasm_op(&ctx, i); break; + case OPCODE_JALR: disasm_jalr(&ctx, i); break; + case OPCODE_BRANCH: disasm_branch(&ctx, i); break; + case OPCODE_AUIPC: disasm_auipc(&ctx, i); break; default: printf(DEFAULT_PREFIX "unimp/illegal\n", ctx.pc); break; diff --git a/triscv/README.md b/triscv/README.md index 3b8beeb..62ad4b6 100644 --- a/triscv/README.md +++ b/triscv/README.md @@ -146,12 +146,12 @@ slli, srli (shifts work differently in balanced forms, have to be careful) lui |-----------------------------------------------------| -| imm9 | rd | LUI | U-type +| imm18 | rd | LUI | U-type |-----------------------------------------------------| auipc |-----------------------------------------------------| -| imm9 | rd | AUIPC | U-type +| imm18 | rd | AUIPC | U-type |-----------------------------------------------------| add, slt, sge, seq, sne, sll, srl, sub diff --git a/triscv/src/cpu.c b/triscv/src/cpu.c index a47ec78..a2bc9fb 100644 --- a/triscv/src/cpu.c +++ b/triscv/src/cpu.c @@ -106,14 +106,50 @@ static void do_op_imm(struct cpu *cpu, tri_t i) set_gpr(cpu, rd, r); break; } - default: fprintf(stderr, "illegal/unimplemented OP_IMM at %lx," - "aborting\n", cpu->pc); + default: fprintf(stderr, "illegal/unimplemented OP_IMM at %lli, " + "aborting\n", (long long int)cpu->pc); abort(); } cpu->pc += 3; } +static void do_op(struct cpu *cpu, tri_t i) +{ + tri_t rd, fn0, rs1, rs2, fn5; + parse_r(i, &rd, &fn0, &rs1, &rs2, &fn5); + + tri_t src1 = get_gpr(cpu, rs1); + tri_t src2 = get_gpr(cpu, rs2); + + switch (fn5) { + case 0: + switch (fn0) { + case OP_ADD: { + tri_t r = tri_add(src1, src2); + set_gpr(cpu, rd, r); + break; + } + + case OP_SUB: { + tri_t r = tri_sub(src1, src2); + set_gpr(cpu, rd, r); + break; + } + default: fprintf(stderr, "illegal/unimplemented OP at %lli, " + "aborting\n", (long long int)cpu->pc); + abort(); + } + break; + + default: fprintf(stderr, "illegal/unimplemented OP at %lli, " + "aborting\n", (long long int)cpu->pc); + abort(); + } + + cpu->pc += 3; +} + static void do_system(struct cpu *cpu, tri_t i) { tri_t rd, fn0, rs1, imm9; @@ -131,8 +167,8 @@ static void do_system(struct cpu *cpu, tri_t i) break; } - default: fprintf(stderr, "illegal/unimplemented SYSTEM at %lx," - "aborting\n", cpu->pc); + default: fprintf(stderr, "illegal/unimplemented SYSTEM at %lli," + "aborting\n", (long long int)cpu->pc); abort(); } @@ -167,6 +203,34 @@ static void do_store(struct cpu *cpu, tri_t i) cpu->pc += 3; } +static void do_load(struct cpu *cpu, tri_t i) +{ + tri_t rd, fn0, rs1, imm9; + parse_i(i, &rd, &fn0, &rs1, &imm9); + + tri_t base = get_gpr(cpu, rs1); + + /* should maybe check that there's zeroes in other trits in fn0? */ + int w = tri_get_trit(fn0, 4); + + /* somewhat unsure if mmu should function in trinary or binary at this + * point */ + tri_t addr = tri_add(base, imm9); + vm_t a = tri_to(addr); + + tri_t r = 0; + switch (w) { + case 0: r = mmu_read1(cpu, cpu->mmu, a); break; + case 1: r = mmu_read3(cpu, cpu->mmu, a); break; + default: + /* illegal value */ + abort(); + } + + set_gpr(cpu, rd, r); + cpu->pc += 3; +} + static void do_lui(struct cpu *cpu, tri_t i) { tri_t rd, imm18; @@ -175,6 +239,16 @@ static void do_lui(struct cpu *cpu, tri_t i) cpu->pc += 3; } +static void do_auipc(struct cpu *cpu, tri_t i) +{ + tri_t rd, imm18; + parse_u(i, &rd, &imm18); + tri_t pc = tri_from(cpu->pc); + tri_t sum = tri_add(pc, tri_sl(imm18, 9)); + set_gpr(cpu, rd, sum); + cpu->pc += 3; +} + static void do_jal(struct cpu *cpu, tri_t i) { tri_t rd, imm9; @@ -192,16 +266,41 @@ 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); + tri_t p = tri_from(cpu->pc + 3); + set_gpr(cpu, rd, p); + cpu->pc = j; } +static void do_branch(struct cpu *cpu, tri_t i) +{ + tri_t imm4, fn0, rs1, rs2, imm5; + parse_s(i, &imm4, &fn0, &rs1, &rs2, &imm5); + + tri_t imm9 = tri_sl(imm4, 5) | imm5; + + tri_t c0 = get_gpr(cpu, rs1); + tri_t c1 = get_gpr(cpu, rs2); + + long long t = tri_to(imm9) + cpu->pc; + long long f = cpu->pc + 3; + + bool take = false; + switch (fn0) { + case BRANCH_BLT: take = tri_lt(c0, c1); break; + case BRANCH_BGE: take = tri_ge(c0, c1); break; + default: fprintf(stderr, "illegal/unimplemented BRANCH at %lli," + "aborting\n", (long long int)cpu->pc); + abort(); + } + + cpu->pc = take ? t : f; +} + void cpu_reset(struct cpu *cpu) { csr_init(cpu); @@ -220,14 +319,18 @@ void cpu_run(struct cpu *cpu, vm_t start) switch (parse_opcode(i)) { case OPCODE_LUI: do_lui(cpu, i); break; case OPCODE_STORE: do_store(cpu, i); break; + case OPCODE_LOAD: do_load(cpu, i); break; case OPCODE_SYSTEM: do_system(cpu, i); break; case OPCODE_OP_IMM: do_op_imm(cpu, i); break; + case OPCODE_OP: do_op(cpu, i); break; + case OPCODE_AUIPC: do_auipc(cpu, i); break; case OPCODE_JAL: do_jal(cpu, i); break; case OPCODE_JALR: do_jalr(cpu, i); break; + case OPCODE_BRANCH: do_branch(cpu, i); break; default: /** @todo raise illegal instruction exception */ fprintf(stderr, "illegal/unimplemented " - "instruction at %lx, aborting\n", - cpu->pc); + "instruction at %lli, aborting\n", + (long long int)cpu->pc); abort(); break; } diff --git a/triscv/src/mem.c b/triscv/src/mem.c index 84bd71f..1bcecfc 100644 --- a/triscv/src/mem.c +++ b/triscv/src/mem.c @@ -26,17 +26,18 @@ void mem_init(struct mem *mem, const void *buf, size_t len) static void mem_write1(struct cpu *cpu, struct mem *mem, pm_t addr, tri_t t) { (void)cpu; - (void)mem; - (void)addr; - (void)t; + mem->buf[addr] = tri_mask(t, 9); } static void mem_write3(struct cpu *cpu, struct mem *mem, pm_t addr, tri_t t) { (void)cpu; - (void)mem; - (void)addr; - (void)t; + tri_t t0 = tri_mask(t, 9); + tri_t t1 = tri_mask(tri_sr(t, 9), 9); + tri_t t2 = tri_mask(tri_sr(t, 18), 9); + mem_write1(cpu, mem, addr + 0, t0); + mem_write1(cpu, mem, addr + 1, t1); + mem_write1(cpu, mem, addr + 2, t2); } static tri_t mem_read1(struct cpu *cpu, struct mem *mem, pm_t addr) -- cgit v1.3