Skip to content

Commit a094c17

Browse files
memo33memo33
committed
add extra rotations for orthogonal GLR in MiscResolver
for better compatibility with old handwritten GLR code
1 parent c2164b1 commit a094c17

2 files changed

Lines changed: 48 additions & 4 deletions

File tree

‎Controller/RUL2/10_GLR/Sec10e_GlrMetaGenerated_MANAGED.txt‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1283,6 +1283,8 @@
12831283
0x572A7700,2,0,0x57007720,0,0=0x572A7700,2,0,0x57007700,0,0
12841284
0x572AA700,2,0,0x5700A720,0,0=0x572AA700,2,0,0x5700A700,0,0
12851285
0x5F880000,1,0,0x51001600,1,0=0x5F880000,1,0,0x51001800,1,0
1286+
0x5F880000,1,0,0x51001600,3,0=0x5F880000,1,0,0x51001800,3,0
1287+
0x5F880000,3,0,0x51001600,1,0=0x5F880000,3,0,0x51001800,1,0
12861288
0x5F880000,3,0,0x51001600,3,0=0x5F880000,3,0,0x51001800,3,0
12871289
0x5F880000,1,0,0x51007600,0,0=0x5F880000,1,0,0x51007800,0,0
12881290
0x5F880000,3,0,0x51007600,0,0=0x5F880000,3,0,0x51007800,0,0
@@ -1312,6 +1314,8 @@
13121314
0x5F881D00,1,0,0x51005600,1,0=0x51005800,3,0,0x51005800,1,0
13131315
0x5F882200,1,0,0x51008600,1,0=0x51008800,3,0,0x51008800,1,0
13141316
0x5F880000,1,0,0x51011600,1,0=0x5F880000,1,0,0x51011800,1,0
1317+
0x5F880000,1,0,0x51011600,3,0=0x5F880000,1,0,0x51011800,3,0
1318+
0x5F880000,3,0,0x51011600,1,0=0x5F880000,3,0,0x51011800,1,0
13151319
0x5F880000,3,0,0x51011600,3,0=0x5F880000,3,0,0x51011800,3,0
13161320
0x5F880000,1,0,0x51017600,0,0=0x5F880000,1,0,0x51017800,0,0
13171321
0x5F880000,3,0,0x51017600,0,0=0x5F880000,3,0,0x51017800,0,0
@@ -1399,6 +1403,8 @@
13991403
0x5F882200,1,0,0x51028680,1,0=0x51028800,3,0,0x51028880,1,0
14001404
0x5F882200,1,0,0x51028600,1,0=0x51028880,3,0,0x51028800,1,0
14011405
0x5F880000,1,0,0x51031600,1,0=0x5F880000,1,0,0x51031800,1,0
1406+
0x5F880000,1,0,0x51031600,3,0=0x5F880000,1,0,0x51031800,3,0
1407+
0x5F880000,3,0,0x51031600,1,0=0x5F880000,3,0,0x51031800,1,0
14021408
0x5F880000,3,0,0x51031600,3,0=0x5F880000,3,0,0x51031800,3,0
14031409
0x5F880000,1,0,0x51037600,0,0=0x5F880000,1,0,0x51037800,0,0
14041410
0x5F880000,3,0,0x51037600,0,0=0x5F880000,3,0,0x51037800,0,0
@@ -1428,6 +1434,8 @@
14281434
0x5F881E00,1,0,0x51035600,1,0=0x51035800,3,0,0x51035800,1,0
14291435
0x5F882300,1,0,0x51038600,1,0=0x51038800,3,0,0x51038800,1,0
14301436
0x5F880000,1,0,0x51041600,1,0=0x5F880000,1,0,0x51041800,1,0
1437+
0x5F880000,1,0,0x51041600,3,0=0x5F880000,1,0,0x51041800,3,0
1438+
0x5F880000,3,0,0x51041600,1,0=0x5F880000,3,0,0x51041800,1,0
14311439
0x5F880000,3,0,0x51041600,3,0=0x5F880000,3,0,0x51041800,3,0
14321440
0x5F880000,1,0,0x51047600,0,0=0x5F880000,1,0,0x51047800,0,0
14331441
0x5F880000,3,0,0x51047600,0,0=0x5F880000,3,0,0x51047800,0,0
@@ -1457,6 +1465,8 @@
14571465
0x5F881E00,1,0,0x51045600,1,0=0x51045800,3,0,0x51045800,1,0
14581466
0x5F882300,1,0,0x51048600,1,0=0x51048800,3,0,0x51048800,1,0
14591467
0x5F880000,1,0,0x51051600,1,0=0x5F880000,1,0,0x51051800,1,0
1468+
0x5F880000,1,0,0x51051600,3,0=0x5F880000,1,0,0x51051800,3,0
1469+
0x5F880000,3,0,0x51051600,1,0=0x5F880000,3,0,0x51051800,1,0
14601470
0x5F880000,3,0,0x51051600,3,0=0x5F880000,3,0,0x51051800,3,0
14611471
0x5F880000,1,0,0x51057600,0,0=0x5F880000,1,0,0x51057800,0,0
14621472
0x5F880000,3,0,0x51057600,0,0=0x5F880000,3,0,0x51057800,0,0
@@ -3210,6 +3220,8 @@
32103220
0x572A7800,2,0,0x57007720,0,0=0x572A7800,2,0,0x57007800,0,0
32113221
0x572AA800,2,0,0x5700A720,0,0=0x572AA800,2,0,0x5700A800,0,0
32123222
0x5F884000,1,0,0x51001600,1,0=0x5F884000,1,0,0x51001900,1,0
3223+
0x5F884000,1,0,0x51001600,3,0=0x5F884000,1,0,0x51001900,3,0
3224+
0x5F884000,3,0,0x51001600,1,0=0x5F884000,3,0,0x51001900,1,0
32133225
0x5F884000,3,0,0x51001600,3,0=0x5F884000,3,0,0x51001900,3,0
32143226
0x5F884000,1,0,0x51007600,0,0=0x5F884000,1,0,0x51007900,0,0
32153227
0x5F884000,3,0,0x51007600,0,0=0x5F884000,3,0,0x51007900,0,0
@@ -3239,6 +3251,8 @@
32393251
0x5F885D00,1,0,0x51005600,1,0=0x51005900,3,0,0x51005900,1,0
32403252
0x5F886200,1,0,0x51008600,1,0=0x51008900,3,0,0x51008900,1,0
32413253
0x5F884000,1,0,0x51011600,1,0=0x5F884000,1,0,0x51011900,1,0
3254+
0x5F884000,1,0,0x51011600,3,0=0x5F884000,1,0,0x51011900,3,0
3255+
0x5F884000,3,0,0x51011600,1,0=0x5F884000,3,0,0x51011900,1,0
32423256
0x5F884000,3,0,0x51011600,3,0=0x5F884000,3,0,0x51011900,3,0
32433257
0x5F884000,1,0,0x51017600,0,0=0x5F884000,1,0,0x51017900,0,0
32443258
0x5F884000,3,0,0x51017600,0,0=0x5F884000,3,0,0x51017900,0,0
@@ -3326,6 +3340,8 @@
33263340
0x5F886200,1,0,0x51028680,1,0=0x51028900,3,0,0x51028980,1,0
33273341
0x5F886200,1,0,0x51028600,1,0=0x51028980,3,0,0x51028900,1,0
33283342
0x5F884000,1,0,0x51031600,1,0=0x5F884000,1,0,0x51031900,1,0
3343+
0x5F884000,1,0,0x51031600,3,0=0x5F884000,1,0,0x51031900,3,0
3344+
0x5F884000,3,0,0x51031600,1,0=0x5F884000,3,0,0x51031900,1,0
33293345
0x5F884000,3,0,0x51031600,3,0=0x5F884000,3,0,0x51031900,3,0
33303346
0x5F884000,1,0,0x51037600,0,0=0x5F884000,1,0,0x51037900,0,0
33313347
0x5F884000,3,0,0x51037600,0,0=0x5F884000,3,0,0x51037900,0,0
@@ -3355,6 +3371,8 @@
33553371
0x5F885E00,1,0,0x51035600,1,0=0x51035900,3,0,0x51035900,1,0
33563372
0x5F886300,1,0,0x51038600,1,0=0x51038900,3,0,0x51038900,1,0
33573373
0x5F884000,1,0,0x51041600,1,0=0x5F884000,1,0,0x51041900,1,0
3374+
0x5F884000,1,0,0x51041600,3,0=0x5F884000,1,0,0x51041900,3,0
3375+
0x5F884000,3,0,0x51041600,1,0=0x5F884000,3,0,0x51041900,1,0
33583376
0x5F884000,3,0,0x51041600,3,0=0x5F884000,3,0,0x51041900,3,0
33593377
0x5F884000,1,0,0x51047600,0,0=0x5F884000,1,0,0x51047900,0,0
33603378
0x5F884000,3,0,0x51047600,0,0=0x5F884000,3,0,0x51047900,0,0
@@ -3384,6 +3402,8 @@
33843402
0x5F885E00,1,0,0x51045600,1,0=0x51045900,3,0,0x51045900,1,0
33853403
0x5F886300,1,0,0x51048600,1,0=0x51048900,3,0,0x51048900,1,0
33863404
0x5F884000,1,0,0x51051600,1,0=0x5F884000,1,0,0x51051900,1,0
3405+
0x5F884000,1,0,0x51051600,3,0=0x5F884000,1,0,0x51051900,3,0
3406+
0x5F884000,3,0,0x51051600,1,0=0x5F884000,3,0,0x51051900,1,0
33873407
0x5F884000,3,0,0x51051600,3,0=0x5F884000,3,0,0x51051900,3,0
33883408
0x5F884000,1,0,0x51057600,0,0=0x5F884000,1,0,0x51057900,0,0
33893409
0x5F884000,3,0,0x51057600,0,0=0x5F884000,3,0,0x51057900,0,0
@@ -5137,6 +5157,8 @@
51375157
0x572A7705,2,0,0x57007720,0,0=0x572A7705,2,0,0x57007705,0,0
51385158
0x572AA705,2,0,0x5700A720,0,0=0x572AA705,2,0,0x5700A705,0,0
51395159
0x5F888000,1,0,0x51001600,1,0=0x5F888000,1,0,0x51001809,1,0
5160+
0x5F888000,1,0,0x51001600,3,0=0x5F888000,1,0,0x51001809,3,0
5161+
0x5F888000,3,0,0x51001600,1,0=0x5F888000,3,0,0x51001809,1,0
51405162
0x5F888000,3,0,0x51001600,3,0=0x5F888000,3,0,0x51001809,3,0
51415163
0x5F888000,1,0,0x51007600,0,0=0x5F888000,1,0,0x51007809,0,0
51425164
0x5F888000,3,0,0x51007600,0,0=0x5F888000,3,0,0x51007809,0,0
@@ -5166,6 +5188,8 @@
51665188
0x5F889D00,1,0,0x51005600,1,0=0x51005809,3,0,0x51005809,1,0
51675189
0x5F88A200,1,0,0x51008600,1,0=0x51008809,3,0,0x51008809,1,0
51685190
0x5F888000,1,0,0x51011600,1,0=0x5F888000,1,0,0x51011809,1,0
5191+
0x5F888000,1,0,0x51011600,3,0=0x5F888000,1,0,0x51011809,3,0
5192+
0x5F888000,3,0,0x51011600,1,0=0x5F888000,3,0,0x51011809,1,0
51695193
0x5F888000,3,0,0x51011600,3,0=0x5F888000,3,0,0x51011809,3,0
51705194
0x5F888000,1,0,0x51017600,0,0=0x5F888000,1,0,0x51017809,0,0
51715195
0x5F888000,3,0,0x51017600,0,0=0x5F888000,3,0,0x51017809,0,0
@@ -5253,6 +5277,8 @@
52535277
0x5F88A200,1,0,0x51028680,1,0=0x51028809,3,0,0x51028889,1,0
52545278
0x5F88A200,1,0,0x51028600,1,0=0x51028889,3,0,0x51028809,1,0
52555279
0x5F888000,1,0,0x51031600,1,0=0x5F888000,1,0,0x51031809,1,0
5280+
0x5F888000,1,0,0x51031600,3,0=0x5F888000,1,0,0x51031809,3,0
5281+
0x5F888000,3,0,0x51031600,1,0=0x5F888000,3,0,0x51031809,1,0
52565282
0x5F888000,3,0,0x51031600,3,0=0x5F888000,3,0,0x51031809,3,0
52575283
0x5F888000,1,0,0x51037600,0,0=0x5F888000,1,0,0x51037809,0,0
52585284
0x5F888000,3,0,0x51037600,0,0=0x5F888000,3,0,0x51037809,0,0
@@ -5282,6 +5308,8 @@
52825308
0x5F889E00,1,0,0x51035600,1,0=0x51035809,3,0,0x51035809,1,0
52835309
0x5F88A300,1,0,0x51038600,1,0=0x51038809,3,0,0x51038809,1,0
52845310
0x5F888000,1,0,0x51041600,1,0=0x5F888000,1,0,0x51041809,1,0
5311+
0x5F888000,1,0,0x51041600,3,0=0x5F888000,1,0,0x51041809,3,0
5312+
0x5F888000,3,0,0x51041600,1,0=0x5F888000,3,0,0x51041809,1,0
52855313
0x5F888000,3,0,0x51041600,3,0=0x5F888000,3,0,0x51041809,3,0
52865314
0x5F888000,1,0,0x51047600,0,0=0x5F888000,1,0,0x51047809,0,0
52875315
0x5F888000,3,0,0x51047600,0,0=0x5F888000,3,0,0x51047809,0,0
@@ -5311,6 +5339,8 @@
53115339
0x5F889E00,1,0,0x51045600,1,0=0x51045809,3,0,0x51045809,1,0
53125340
0x5F88A300,1,0,0x51048600,1,0=0x51048809,3,0,0x51048809,1,0
53135341
0x5F888000,1,0,0x51051600,1,0=0x5F888000,1,0,0x51051809,1,0
5342+
0x5F888000,1,0,0x51051600,3,0=0x5F888000,1,0,0x51051809,3,0
5343+
0x5F888000,3,0,0x51051600,1,0=0x5F888000,3,0,0x51051809,1,0
53145344
0x5F888000,3,0,0x51051600,3,0=0x5F888000,3,0,0x51051809,3,0
53155345
0x5F888000,1,0,0x51057600,0,0=0x5F888000,1,0,0x51057809,0,0
53165346
0x5F888000,3,0,0x51057600,0,0=0x5F888000,3,0,0x51057809,0,0
@@ -7064,6 +7094,8 @@
70647094
0x572A7805,2,0,0x57007720,0,0=0x572A7805,2,0,0x57007805,0,0
70657095
0x572AA805,2,0,0x5700A720,0,0=0x572AA805,2,0,0x5700A805,0,0
70667096
0x5F88C000,1,0,0x51001600,1,0=0x5F88C000,1,0,0x51001909,1,0
7097+
0x5F88C000,1,0,0x51001600,3,0=0x5F88C000,1,0,0x51001909,3,0
7098+
0x5F88C000,3,0,0x51001600,1,0=0x5F88C000,3,0,0x51001909,1,0
70677099
0x5F88C000,3,0,0x51001600,3,0=0x5F88C000,3,0,0x51001909,3,0
70687100
0x5F88C000,1,0,0x51007600,0,0=0x5F88C000,1,0,0x51007909,0,0
70697101
0x5F88C000,3,0,0x51007600,0,0=0x5F88C000,3,0,0x51007909,0,0
@@ -7093,6 +7125,8 @@
70937125
0x5F88DD00,1,0,0x51005600,1,0=0x51005909,3,0,0x51005909,1,0
70947126
0x5F88E200,1,0,0x51008600,1,0=0x51008909,3,0,0x51008909,1,0
70957127
0x5F88C000,1,0,0x51011600,1,0=0x5F88C000,1,0,0x51011909,1,0
7128+
0x5F88C000,1,0,0x51011600,3,0=0x5F88C000,1,0,0x51011909,3,0
7129+
0x5F88C000,3,0,0x51011600,1,0=0x5F88C000,3,0,0x51011909,1,0
70967130
0x5F88C000,3,0,0x51011600,3,0=0x5F88C000,3,0,0x51011909,3,0
70977131
0x5F88C000,1,0,0x51017600,0,0=0x5F88C000,1,0,0x51017909,0,0
70987132
0x5F88C000,3,0,0x51017600,0,0=0x5F88C000,3,0,0x51017909,0,0
@@ -7180,6 +7214,8 @@
71807214
0x5F88E200,1,0,0x51028680,1,0=0x51028909,3,0,0x51028989,1,0
71817215
0x5F88E200,1,0,0x51028600,1,0=0x51028989,3,0,0x51028909,1,0
71827216
0x5F88C000,1,0,0x51031600,1,0=0x5F88C000,1,0,0x51031909,1,0
7217+
0x5F88C000,1,0,0x51031600,3,0=0x5F88C000,1,0,0x51031909,3,0
7218+
0x5F88C000,3,0,0x51031600,1,0=0x5F88C000,3,0,0x51031909,1,0
71837219
0x5F88C000,3,0,0x51031600,3,0=0x5F88C000,3,0,0x51031909,3,0
71847220
0x5F88C000,1,0,0x51037600,0,0=0x5F88C000,1,0,0x51037909,0,0
71857221
0x5F88C000,3,0,0x51037600,0,0=0x5F88C000,3,0,0x51037909,0,0
@@ -7209,6 +7245,8 @@
72097245
0x5F88DE00,1,0,0x51035600,1,0=0x51035909,3,0,0x51035909,1,0
72107246
0x5F88E300,1,0,0x51038600,1,0=0x51038909,3,0,0x51038909,1,0
72117247
0x5F88C000,1,0,0x51041600,1,0=0x5F88C000,1,0,0x51041909,1,0
7248+
0x5F88C000,1,0,0x51041600,3,0=0x5F88C000,1,0,0x51041909,3,0
7249+
0x5F88C000,3,0,0x51041600,1,0=0x5F88C000,3,0,0x51041909,1,0
72127250
0x5F88C000,3,0,0x51041600,3,0=0x5F88C000,3,0,0x51041909,3,0
72137251
0x5F88C000,1,0,0x51047600,0,0=0x5F88C000,1,0,0x51047909,0,0
72147252
0x5F88C000,3,0,0x51047600,0,0=0x5F88C000,3,0,0x51047909,0,0
@@ -7238,6 +7276,8 @@
72387276
0x5F88DE00,1,0,0x51045600,1,0=0x51045909,3,0,0x51045909,1,0
72397277
0x5F88E300,1,0,0x51048600,1,0=0x51048909,3,0,0x51048909,1,0
72407278
0x5F88C000,1,0,0x51051600,1,0=0x5F88C000,1,0,0x51051909,1,0
7279+
0x5F88C000,1,0,0x51051600,3,0=0x5F88C000,1,0,0x51051909,3,0
7280+
0x5F88C000,3,0,0x51051600,1,0=0x5F88C000,3,0,0x51051909,1,0
72417281
0x5F88C000,3,0,0x51051600,3,0=0x5F88C000,3,0,0x51051909,3,0
72427282
0x5F88C000,1,0,0x51057600,0,0=0x5F88C000,1,0,0x51057909,0,0
72437283
0x5F88C000,3,0,0x51057600,0,0=0x5F88C000,3,0,0x51057909,0,0

‎src/main/scala/module/MiscResolver.scala‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,14 @@ class MiscResolver extends IdResolver {
2121
add(0x0a001500, Groundhighway~EW); add(0x0a002200, Groundhighway~ES); add(0x0a002100, Groundhighway~SharedDiagRight)
2222

2323
add(0x5d300000, Str ~NS); add(0x5d302000, Str ~ES)
24-
add(0x5f880000, Glr1 ~NS); add(0x5f880600, Glr1 ~NW)
25-
add(0x5f884000, Glr2 ~NS); add(0x5f884600, Glr2 ~NW)
26-
add(0x5f888000, Glr3 ~NS); add(0x5f888600, Glr3 ~NW)
27-
add(0x5f88c000, Glr4 ~NS); add(0x5f88c600, Glr4 ~NW)
24+
builder.addOne(Glr1~NS, IdTile(0x5f880000, R0F0, mappedRepr = _.flatMap(rf => Set(rf, rf * R2F0)))) // temporary bandaid: extra rotations for better compatibility with old handwritten GLR code
25+
builder.addOne(Glr2~NS, IdTile(0x5f884000, R0F0, mappedRepr = _.flatMap(rf => Set(rf, rf * R2F0))))
26+
builder.addOne(Glr3~NS, IdTile(0x5f888000, R0F0, mappedRepr = _.flatMap(rf => Set(rf, rf * R2F0))))
27+
builder.addOne(Glr4~NS, IdTile(0x5f88c000, R0F0, mappedRepr = _.flatMap(rf => Set(rf, rf * R2F0))))
28+
add(0x5f880600, Glr1 ~NW)
29+
add(0x5f884600, Glr2 ~NW)
30+
add(0x5f888600, Glr3 ~NW)
31+
add(0x5f88c600, Glr4 ~NW)
2832
add(0x5dc31500, Hsr ~NS); add(0x5dc01a00, Hsr ~NW)
2933
add(0x5dd31500, L2Hsr~NS); add(0x5dd01a00, L2Hsr~NW)
3034
add(0x51000000, Tla3 ~NS); add(0x51000200, Tla3 ~ES)

0 commit comments

Comments
 (0)