diff options
-rw-r--r-- | gas/testsuite/ChangeLog | 6 | ||||
-rw-r--r-- | gas/testsuite/gas/xstormy16/allinsn.d | 383 | ||||
-rw-r--r-- | gas/testsuite/gas/xstormy16/allinsn.s | 100 | ||||
-rw-r--r-- | gas/testsuite/gas/xstormy16/allinsn.sh | 148 | ||||
-rw-r--r-- | opcodes/ChangeLog | 9 | ||||
-rw-r--r-- | opcodes/xstormy16-asm.c | 4 | ||||
-rw-r--r-- | opcodes/xstormy16-desc.c | 38 | ||||
-rw-r--r-- | opcodes/xstormy16-desc.h | 21 | ||||
-rw-r--r-- | opcodes/xstormy16-dis.c | 10 | ||||
-rw-r--r-- | opcodes/xstormy16-ibld.c | 4 | ||||
-rw-r--r-- | opcodes/xstormy16-opc.c | 8 | ||||
-rw-r--r-- | opcodes/xstormy16-opc.h | 5 |
12 files changed, 395 insertions, 341 deletions
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 85820c6..6052257 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2002-01-10 matthew green <mrg@redhat.com> + + * gas/xstormy16/allinsn.sh (movf, jmp, call, icall): Update. + * gas/xstormy16/allinsn.d: Regenerate. + * gas/xstormy16/allinsn.s: Regenerate. + 2002-01-09 Richard Earnshaw <rearnsha@arm.com> * gas/arm/float.s: Don't use VFP register names in fpa instructions. diff --git a/gas/testsuite/gas/xstormy16/allinsn.d b/gas/testsuite/gas/xstormy16/allinsn.d index e566a9a..e36853b 100644 --- a/gas/testsuite/gas/xstormy16/allinsn.d +++ b/gas/testsuite/gas/xstormy16/allinsn.d @@ -337,64 +337,64 @@ Disassembly of section \.text: 2a6: a5 6e movf\.b \(--r10\),r5 000002a8 <movfgrgrii>: - 2a8: 08 74 00 00 movf\.b r0,\(r0,r0,0\) - 2ac: ff 75 ff 7f movf\.w r7,\(r7,r15,-1\) - 2b0: 8c 75 00 48 movf\.w r4,\(r4,r8,-2048\) - 2b4: 7b 74 ff 37 movf\.b r3,\(r3,r7,2047\) - 2b8: 19 75 01 10 movf\.w r1,\(r1,r1,1\) - 2bc: 0f 74 c1 75 movf\.b r7,\(r7,r0,1473\) - 2c0: 9a 75 0e 0a movf\.w r2,\(r0,r9,-1522\) - 2c4: 1a 75 e0 51 movf\.w r2,\(r5,r1,480\) + 2a8: 08 74 00 00 movf\.b r0,\(r8,r0,0\) + 2ac: ff 75 ff 7f movf\.w r7,\(r15,r15,-1\) + 2b0: 8c 75 00 48 movf\.w r4,\(r12,r8,-2048\) + 2b4: 7b 74 ff 37 movf\.b r3,\(r11,r7,2047\) + 2b8: 19 75 01 10 movf\.w r1,\(r9,r1,1\) + 2bc: 0f 74 c1 75 movf\.b r7,\(r15,r0,1473\) + 2c0: 9a 75 0e 0a movf\.w r2,\(r8,r9,-1522\) + 2c4: 1a 75 e0 51 movf\.w r2,\(r13,r1,480\) 000002c8 <movfgrgriipostinc>: - 2c8: 08 64 00 00 movf\.b r0,\(r0,r0\+\+,0\) - 2cc: ff 65 ff 7f movf\.w r7,\(r7,r15\+\+,-1\) - 2d0: 8c 65 00 48 movf\.w r4,\(r4,r8\+\+,-2048\) - 2d4: 7b 64 ff 37 movf\.b r3,\(r3,r7\+\+,2047\) - 2d8: 19 65 01 10 movf\.w r1,\(r1,r1\+\+,1\) - 2dc: 29 64 76 05 movf\.b r1,\(r0,r2\+\+,1398\) - 2e0: 9c 65 f6 0c movf\.w r4,\(r0,r9\+\+,-778\) - 2e4: e9 65 1c 56 movf\.w r1,\(r5,r14\+\+,1564\) + 2c8: 08 64 00 00 movf\.b r0,\(r8,r0\+\+,0\) + 2cc: ff 65 ff 7f movf\.w r7,\(r15,r15\+\+,-1\) + 2d0: 8c 65 00 48 movf\.w r4,\(r12,r8\+\+,-2048\) + 2d4: 7b 64 ff 37 movf\.b r3,\(r11,r7\+\+,2047\) + 2d8: 19 65 01 10 movf\.w r1,\(r9,r1\+\+,1\) + 2dc: 29 64 76 05 movf\.b r1,\(r8,r2\+\+,1398\) + 2e0: 9c 65 f6 0c movf\.w r4,\(r8,r9\+\+,-778\) + 2e4: e9 65 1c 56 movf\.w r1,\(r13,r14\+\+,1564\) 000002e8 <movfgrgriipredec>: - 2e8: 08 6c 00 00 movf\.b r0,\(r0,--r0,0\) - 2ec: ff 6d ff 7f movf\.w r7,\(r7,--r15,-1\) - 2f0: 8c 6d 00 48 movf\.w r4,\(r4,--r8,-2048\) - 2f4: 7b 6c ff 37 movf\.b r3,\(r3,--r7,2047\) - 2f8: 19 6d 01 10 movf\.w r1,\(r1,--r1,1\) - 2fc: 7e 6c fe 00 movf\.b r6,\(r0,--r7,254\) - 300: cd 6d 89 46 movf\.w r5,\(r4,--r12,1673\) - 304: a8 6c da 0f movf\.b r0,\(r0,--r10,-38\) + 2e8: 08 6c 00 00 movf\.b r0,\(r8,--r0,0\) + 2ec: ff 6d ff 7f movf\.w r7,\(r15,--r15,-1\) + 2f0: 8c 6d 00 48 movf\.w r4,\(r12,--r8,-2048\) + 2f4: 7b 6c ff 37 movf\.b r3,\(r11,--r7,2047\) + 2f8: 19 6d 01 10 movf\.w r1,\(r9,--r1,1\) + 2fc: 7e 6c fe 00 movf\.b r6,\(r8,--r7,254\) + 300: cd 6d 89 46 movf\.w r5,\(r12,--r12,1673\) + 304: a8 6c da 0f movf\.b r0,\(r8,--r10,-38\) 00000308 <movfgriigr>: - 308: 08 76 00 00 movf\.b \(r0,r0,0\),r0 - 30c: ff 77 ff 7f movf\.w \(r7,r15,-1\),r7 - 310: 8c 77 00 48 movf\.w \(r4,r8,-2048\),r4 - 314: 7b 76 ff 37 movf\.b \(r3,r7,2047\),r3 - 318: 19 77 01 10 movf\.w \(r1,r1,1\),r1 - 31c: 2b 77 9c 79 movf\.w \(r7,r2,-1636\),r3 - 320: c9 77 5a 66 movf\.w \(r6,r12,1626\),r1 - 324: e8 76 04 36 movf\.b \(r3,r14,1540\),r0 + 308: 08 76 00 00 movf\.b \(r8,r0,0\),r0 + 30c: ff 77 ff 7f movf\.w \(r15,r15,-1\),r7 + 310: 8c 77 00 48 movf\.w \(r12,r8,-2048\),r4 + 314: 7b 76 ff 37 movf\.b \(r11,r7,2047\),r3 + 318: 19 77 01 10 movf\.w \(r9,r1,1\),r1 + 31c: 2b 77 9c 79 movf\.w \(r15,r2,-1636\),r3 + 320: c9 77 5a 66 movf\.w \(r14,r12,1626\),r1 + 324: e8 76 04 36 movf\.b \(r11,r14,1540\),r0 00000328 <movfgriipostincgr>: - 328: 08 66 00 00 movf\.b \(r0,r0\+\+,0\),r0 - 32c: ff 67 ff 7f movf\.w \(r7,r15\+\+,-1\),r7 - 330: 8c 67 00 48 movf\.w \(r4,r8\+\+,-2048\),r4 - 334: 7b 66 ff 37 movf\.b \(r3,r7\+\+,2047\),r3 - 338: 19 67 01 10 movf\.w \(r1,r1\+\+,1\),r1 - 33c: db 66 d2 71 movf\.b \(r7,r13\+\+,466\),r3 - 340: bc 66 fa 30 movf\.b \(r3,r11\+\+,250\),r4 - 344: af 66 38 2a movf\.b \(r2,r10\+\+,-1480\),r7 + 328: 08 66 00 00 movf\.b \(r8,r0\+\+,0\),r0 + 32c: ff 67 ff 7f movf\.w \(r15,r15\+\+,-1\),r7 + 330: 8c 67 00 48 movf\.w \(r12,r8\+\+,-2048\),r4 + 334: 7b 66 ff 37 movf\.b \(r11,r7\+\+,2047\),r3 + 338: 19 67 01 10 movf\.w \(r9,r1\+\+,1\),r1 + 33c: db 66 d2 71 movf\.b \(r15,r13\+\+,466\),r3 + 340: bc 66 fa 30 movf\.b \(r11,r11\+\+,250\),r4 + 344: af 66 38 2a movf\.b \(r10,r10\+\+,-1480\),r7 00000348 <movfgriipredecgr>: - 348: 08 6e 00 00 movf\.b \(r0,--r0,0\),r0 - 34c: ff 6f ff 7f movf\.w \(r7,--r15,-1\),r7 - 350: 8c 6f 00 48 movf\.w \(r4,--r8,-2048\),r4 - 354: 7b 6e ff 37 movf\.b \(r3,--r7,2047\),r3 - 358: 19 6f 01 10 movf\.w \(r1,--r1,1\),r1 - 35c: a8 6e a0 5d movf\.b \(r5,--r10,-608\),r0 - 360: bf 6e 3f 13 movf\.b \(r1,--r11,831\),r7 - 364: fe 6f 0c 78 movf\.w \(r7,--r15,-2036\),r6 + 348: 08 6e 00 00 movf\.b \(r8,--r0,0\),r0 + 34c: ff 6f ff 7f movf\.w \(r15,--r15,-1\),r7 + 350: 8c 6f 00 48 movf\.w \(r12,--r8,-2048\),r4 + 354: 7b 6e ff 37 movf\.b \(r11,--r7,2047\),r3 + 358: 19 6f 01 10 movf\.w \(r9,--r1,1\),r1 + 35c: a8 6e a0 5d movf\.b \(r13,--r10,-608\),r0 + 360: bf 6e 3f 13 movf\.b \(r9,--r11,831\),r7 + 364: fe 6f 0c 78 movf\.w \(r15,--r15,-2036\),r6 00000368 <maskgrgr>: 368: 00 33 mask r0,r0 @@ -1078,145 +1078,148 @@ Disassembly of section \.text: 00000834 <hold>: 834: 0a 00 hold -00000836 <brk>: - 836: 05 00 brk - -00000838 <bccgrgr>: - 838: 00 0d 00 00 bge r0,r0,0x83c - 83c: ff 0d ff ff bz r15,r15,0x83f - 840: 88 0d 00 88 bpl r8,r8,0x44 - 844: 77 0d ff 77 bls r7,r7,0x1047 - 848: 11 0d 01 10 bnc r1,r1,0x84d - 84c: d3 0d 07 37 bc r3,r13,0xf57 - 850: a1 0d 1d 08 bge r1,r10,0x71 - 854: 50 0d 94 fb bz r0,r5,0x3ec - -00000858 <bccgrimm8>: - 858: 00 20 00 00 bge r0,#0x0,0x85c - 85c: ff 2e ff ff bz r7,#0xff,0x85f - 860: 80 28 00 88 bpl r4,#0x80,0x64 - 864: 7f 26 ff 77 bls r3,#0x7f,0x1067 - 868: 01 22 01 10 bnc r1,#0x1,0x86d - 86c: 08 26 c1 15 bnc r3,#0x8,0xe31 - 870: cb 2a 53 c6 bnz\.b r5,#0xcb,0xec7 - 874: e1 2e d2 33 bc r7,#0xe1,0xc4a - -00000878 <bccimm16>: - 878: 00 c0 00 00 bge Rx,#0x0,0x87c - 87c: ff cf ff ff bz Rx,#0xffff,0x87f - 880: 80 c8 00 80 bpl Rx,#0x8000,0x804 - 884: 7f c7 ff 7f bls Rx,#0x7fff,0x907 - 888: 01 c1 01 00 bnc Rx,#0x1,0x88d - 88c: 04 ce fb 77 bz\.b Rx,#0x77fb,0x894 - 890: f3 c9 3a f3 bnv Rx,#0xf33a,0x887 - 894: 6c c9 32 bc bnv Rx,#0xbc32,0x904 - -00000898 <bngrimm4>: - 898: 00 04 00 00 bn r0,#0x0,0x89c - 89c: ff 04 ff 0f bn r15,#0xf,0x89f - 8a0: 88 04 00 08 bn r8,#0x8,0xa4 - 8a4: 77 04 ff 07 bn r7,#0x7,0x10a7 - 8a8: 11 04 01 00 bn r1,#0x1,0x8ad - 8ac: 3b 04 49 08 bn r11,#0x3,0xf9 - 8b0: 4f 04 4b 0b bn r15,#0x4,0x3ff - 8b4: 8a 04 9b 06 bn r10,#0x8,0xf53 - -000008b8 <bngrgr>: - 8b8: 00 06 00 00 bn r0,r0,0x8bc - 8bc: ff 06 ff 0f bn r15,r15,0x8bf - 8c0: 88 06 00 08 bn r8,r8,0xc4 - 8c4: 77 06 ff 07 bn r7,r7,0x10c7 - 8c8: 11 06 01 00 bn r1,r1,0x8cd - 8cc: 34 06 9d 04 bn r4,r3,0xd6d - 8d0: 25 06 4d 00 bn r5,r2,0x921 - 8d4: 73 06 77 02 bn r3,r7,0xb4f - -000008d8 <bnlmemimm>: - 8d8: 00 7c 00 00 bn 0x0,#0x0,0x8dc - 8dc: ff 7c ff 7f bn 0xff,#0x7,0x8df - 8e0: 80 7c 00 48 bn 0x80,#0x4,0xe4 - 8e4: 7f 7c ff 37 bn 0x7f,#0x3,0x10e7 - 8e8: 01 7c 01 10 bn 0x1,#0x1,0x8ed - 8ec: 99 7c b1 7c bn 0x99,#0x7,0x5a1 - 8f0: cc 7c a7 08 bn 0xcc,#0x0,0x19b - 8f4: f2 7c 74 75 bn 0xf2,#0x7,0xe6c - -000008f8 <bnhmemimm>: - 8f8: 00 7e 00 00 bn 0x7f00,#0x0,0x8fc - 8fc: ff 7e ff 7f bn 0x7fff,#0x7,0x8ff - 900: 80 7e 00 48 bn 0x7f80,#0x4,0x104 - 904: 7f 7e ff 37 bn 0x7f7f,#0x3,0x1107 - 908: 01 7e 01 10 bn 0x7f01,#0x1,0x90d - 90c: b9 7e 9a 3d bn 0x7fb9,#0x3,0x6aa - 910: 69 7e 64 1d bn 0x7f69,#0x1,0x678 - 914: 4f 7e 20 75 bn 0x7f4f,#0x7,0xe38 - -00000918 <bpgrimm4>: - 918: 00 05 00 00 bp r0,#0x0,0x91c - 91c: ff 05 ff 0f bp r15,#0xf,0x91f - 920: 88 05 00 08 bp r8,#0x8,0x124 - 924: 77 05 ff 07 bp r7,#0x7,0x1127 - 928: 11 05 01 00 bp r1,#0x1,0x92d - 92c: c0 05 33 04 bp r0,#0xc,0xd63 - 930: 51 05 27 02 bp r1,#0x5,0xb5b - 934: 86 05 34 06 bp r6,#0x8,0xf6c - -00000938 <bpgrgr>: - 938: 00 07 00 00 bp r0,r0,0x93c - 93c: ff 07 ff 0f bp r15,r15,0x93f - 940: 88 07 00 08 bp r8,r8,0x144 - 944: 77 07 ff 07 bp r7,r7,0x1147 - 948: 11 07 01 00 bp r1,r1,0x94d - 94c: 94 07 9a 0d bp r4,r9,0x6ea - 950: a9 07 b0 0a bp r9,r10,0x404 - 954: 14 07 97 01 bp r4,r1,0xaef - -00000958 <bplmemimm>: - 958: 00 7d 00 00 bp 0x0,#0x0,0x95c - 95c: ff 7d ff 7f bp 0xff,#0x7,0x95f - 960: 80 7d 00 48 bp 0x80,#0x4,0x164 - 964: 7f 7d ff 37 bp 0x7f,#0x3,0x1167 - 968: 01 7d 01 10 bp 0x1,#0x1,0x96d - 96c: c1 7d 72 3e bp 0xc1,#0x3,0x7e2 - 970: fa 7d ef 29 bp 0xfa,#0x2,0x363 - 974: b4 7d 43 62 bp 0xb4,#0x6,0xbbb - -00000978 <bphmemimm>: - 978: 00 7f 00 00 bp 0x7f00,#0x0,0x97c - 97c: ff 7f ff 7f bp 0x7fff,#0x7,0x97f - 980: 80 7f 00 48 bp 0x7f80,#0x4,0x184 - 984: 7f 7f ff 37 bp 0x7f7f,#0x3,0x1187 - 988: 01 7f 01 10 bp 0x7f01,#0x1,0x98d - 98c: c3 7f 50 1e bp 0x7fc3,#0x1,0x7e0 - 990: 81 7f 1c 5a bp 0x7f81,#0x5,0x3b0 - 994: 38 7f bb 36 bp 0x7f38,#0x3,0x1053 - -00000998 <bcc>: - 998: 00 d0 bge 0x99a - 99a: ff df bz 0x99b - 99c: 80 d8 bpl 0x91e - 99e: 7f d7 bls 0xa1f - 9a0: 01 d1 bnc 0x9a3 - 9a2: 30 dc bnz\.b 0x9d4 - 9a4: f9 d1 bnc 0x99f - 9a6: 4a dc bnz\.b 0x9f2 - -000009a8 <br>: - 9a8: 00 10 br 0x9aa - 9aa: fe 1f br 0x9aa - 9ac: 00 18 br 0x1ae - 9ae: fe 17 br 0x11ae - 9b0: 00 10 br 0x9b2 - 9b2: c0 15 br 0xf74 - 9b4: 52 16 br 0x1008 - 9b6: d2 13 br 0xd8a - -000009b8 <callrimm>: - 9b8: 01 10 callr 0x9ba - 9ba: ff 1f callr 0x9ba - 9bc: 01 18 callr 0x1be - 9be: ff 17 callr 0x11be - 9c0: 01 10 callr 0x9c2 - 9c2: c1 15 callr 0xf84 - 9c4: 53 16 callr 0x1018 - 9c6: d3 13 callr 0xd9a +00000836 <holdx>: + 836: 0b 00 holdx + +00000838 <brk>: + 838: 05 00 brk + +0000083a <bccgrgr>: + 83a: 00 0d 00 00 bge r0,r0,0x83e + 83e: ff 0d ff ff bz r15,r15,0x841 + 842: 88 0d 00 88 bpl r8,r8,0x46 + 846: 77 0d ff 77 bls r7,r7,0x1049 + 84a: 11 0d 01 10 bnc r1,r1,0x84f + 84e: d3 0d 07 37 bc r3,r13,0xf59 + 852: a1 0d 1d 08 bge r1,r10,0x73 + 856: 50 0d 94 fb bz r0,r5,0x3ee + +0000085a <bccgrimm8>: + 85a: 00 20 00 00 bge r0,#0x0,0x85e + 85e: ff 2e ff ff bz r7,#0xff,0x861 + 862: 80 28 00 88 bpl r4,#0x80,0x66 + 866: 7f 26 ff 77 bls r3,#0x7f,0x1069 + 86a: 01 22 01 10 bnc r1,#0x1,0x86f + 86e: 08 26 c1 15 bnc r3,#0x8,0xe33 + 872: cb 2a 53 c6 bnz\.b r5,#0xcb,0xec9 + 876: e1 2e d2 33 bc r7,#0xe1,0xc4c + +0000087a <bccimm16>: + 87a: 00 c0 00 00 bge Rx,#0x0,0x87e + 87e: ff cf ff ff bz Rx,#0xffff,0x881 + 882: 80 c8 00 80 bpl Rx,#0x8000,0x806 + 886: 7f c7 ff 7f bls Rx,#0x7fff,0x909 + 88a: 01 c1 01 00 bnc Rx,#0x1,0x88f + 88e: 04 ce fb 77 bz\.b Rx,#0x77fb,0x896 + 892: f3 c9 3a f3 bnv Rx,#0xf33a,0x889 + 896: 6c c9 32 bc bnv Rx,#0xbc32,0x906 + +0000089a <bngrimm4>: + 89a: 00 04 00 00 bn r0,#0x0,0x89e + 89e: ff 04 ff 0f bn r15,#0xf,0x8a1 + 8a2: 88 04 00 08 bn r8,#0x8,0xa6 + 8a6: 77 04 ff 07 bn r7,#0x7,0x10a9 + 8aa: 11 04 01 00 bn r1,#0x1,0x8af + 8ae: 3b 04 49 08 bn r11,#0x3,0xfb + 8b2: 4f 04 4b 0b bn r15,#0x4,0x401 + 8b6: 8a 04 9b 06 bn r10,#0x8,0xf55 + +000008ba <bngrgr>: + 8ba: 00 06 00 00 bn r0,r0,0x8be + 8be: ff 06 ff 0f bn r15,r15,0x8c1 + 8c2: 88 06 00 08 bn r8,r8,0xc6 + 8c6: 77 06 ff 07 bn r7,r7,0x10c9 + 8ca: 11 06 01 00 bn r1,r1,0x8cf + 8ce: 34 06 9d 04 bn r4,r3,0xd6f + 8d2: 25 06 4d 00 bn r5,r2,0x923 + 8d6: 73 06 77 02 bn r3,r7,0xb51 + +000008da <bnlmemimm>: + 8da: 00 7c 00 00 bn 0x0,#0x0,0x8de + 8de: ff 7c ff 7f bn 0xff,#0x7,0x8e1 + 8e2: 80 7c 00 48 bn 0x80,#0x4,0xe6 + 8e6: 7f 7c ff 37 bn 0x7f,#0x3,0x10e9 + 8ea: 01 7c 01 10 bn 0x1,#0x1,0x8ef + 8ee: 99 7c b1 7c bn 0x99,#0x7,0x5a3 + 8f2: cc 7c a7 08 bn 0xcc,#0x0,0x19d + 8f6: f2 7c 74 75 bn 0xf2,#0x7,0xe6e + +000008fa <bnhmemimm>: + 8fa: 00 7e 00 00 bn 0x7f00,#0x0,0x8fe + 8fe: ff 7e ff 7f bn 0x7fff,#0x7,0x901 + 902: 80 7e 00 48 bn 0x7f80,#0x4,0x106 + 906: 7f 7e ff 37 bn 0x7f7f,#0x3,0x1109 + 90a: 01 7e 01 10 bn 0x7f01,#0x1,0x90f + 90e: b9 7e 9a 3d bn 0x7fb9,#0x3,0x6ac + 912: 69 7e 64 1d bn 0x7f69,#0x1,0x67a + 916: 4f 7e 20 75 bn 0x7f4f,#0x7,0xe3a + +0000091a <bpgrimm4>: + 91a: 00 05 00 00 bp r0,#0x0,0x91e + 91e: ff 05 ff 0f bp r15,#0xf,0x921 + 922: 88 05 00 08 bp r8,#0x8,0x126 + 926: 77 05 ff 07 bp r7,#0x7,0x1129 + 92a: 11 05 01 00 bp r1,#0x1,0x92f + 92e: c0 05 33 04 bp r0,#0xc,0xd65 + 932: 51 05 27 02 bp r1,#0x5,0xb5d + 936: 86 05 34 06 bp r6,#0x8,0xf6e + +0000093a <bpgrgr>: + 93a: 00 07 00 00 bp r0,r0,0x93e + 93e: ff 07 ff 0f bp r15,r15,0x941 + 942: 88 07 00 08 bp r8,r8,0x146 + 946: 77 07 ff 07 bp r7,r7,0x1149 + 94a: 11 07 01 00 bp r1,r1,0x94f + 94e: 94 07 9a 0d bp r4,r9,0x6ec + 952: a9 07 b0 0a bp r9,r10,0x406 + 956: 14 07 97 01 bp r4,r1,0xaf1 + +0000095a <bplmemimm>: + 95a: 00 7d 00 00 bp 0x0,#0x0,0x95e + 95e: ff 7d ff 7f bp 0xff,#0x7,0x961 + 962: 80 7d 00 48 bp 0x80,#0x4,0x166 + 966: 7f 7d ff 37 bp 0x7f,#0x3,0x1169 + 96a: 01 7d 01 10 bp 0x1,#0x1,0x96f + 96e: c1 7d 72 3e bp 0xc1,#0x3,0x7e4 + 972: fa 7d ef 29 bp 0xfa,#0x2,0x365 + 976: b4 7d 43 62 bp 0xb4,#0x6,0xbbd + +0000097a <bphmemimm>: + 97a: 00 7f 00 00 bp 0x7f00,#0x0,0x97e + 97e: ff 7f ff 7f bp 0x7fff,#0x7,0x981 + 982: 80 7f 00 48 bp 0x7f80,#0x4,0x186 + 986: 7f 7f ff 37 bp 0x7f7f,#0x3,0x1189 + 98a: 01 7f 01 10 bp 0x7f01,#0x1,0x98f + 98e: c3 7f 50 1e bp 0x7fc3,#0x1,0x7e2 + 992: 81 7f 1c 5a bp 0x7f81,#0x5,0x3b2 + 996: 38 7f bb 36 bp 0x7f38,#0x3,0x1055 + +0000099a <bcc>: + 99a: 00 d0 bge 0x99c + 99c: ff df bz 0x99d + 99e: 80 d8 bpl 0x920 + 9a0: 7f d7 bls 0xa21 + 9a2: 01 d1 bnc 0x9a5 + 9a4: 30 dc bnz\.b 0x9d6 + 9a6: f9 d1 bnc 0x9a1 + 9a8: 4a dc bnz\.b 0x9f4 + +000009aa <br>: + 9aa: 00 10 br 0x9ac + 9ac: fe 1f br 0x9ac + 9ae: 00 18 br 0x1b0 + 9b0: fe 17 br 0x11b0 + 9b2: 00 10 br 0x9b4 + 9b4: c0 15 br 0xf76 + 9b6: 52 16 br 0x100a + 9b8: d2 13 br 0xd8c + +000009ba <callrimm>: + 9ba: 01 10 callr 0x9bc + 9bc: ff 1f callr 0x9bc + 9be: 01 18 callr 0x1c0 + 9c0: ff 17 callr 0x11c0 + 9c2: 01 10 callr 0x9c4 + 9c4: c1 15 callr 0xf86 + 9c6: 53 16 callr 0x101a + 9c8: d3 13 callr 0xd9c diff --git a/gas/testsuite/gas/xstormy16/allinsn.s b/gas/testsuite/gas/xstormy16/allinsn.s index f00aa6f..5b38b6a 100644 --- a/gas/testsuite/gas/xstormy16/allinsn.s +++ b/gas/testsuite/gas/xstormy16/allinsn.s @@ -368,69 +368,69 @@ movfgripredecgr: .text .global movfgrgrii movfgrgrii: - movf.b r0,(r0,r0,0) - movf.w r7,(r7,r15,-1) - movf.w r4,(r4,r8,-2048) - movf.b r3,(r3,r7,2047) - movf.w r1,(r1,r1,1) - movf.b r7,(r7,r0,1473) - movf.w r2,(r0,r9,-1522) - movf.w r2,(r5,r1,480) + movf.b r0,(r8,r0,0) + movf.w r7,(r15,r15,-1) + movf.w r4,(r12,r8,-2048) + movf.b r3,(r11,r7,2047) + movf.w r1,(r9,r1,1) + movf.b r7,(r15,r0,1473) + movf.w r2,(r8,r9,-1522) + movf.w r2,(r13,r1,480) .text .global movfgrgriipostinc movfgrgriipostinc: - movf.b r0,(r0,r0++,0) - movf.w r7,(r7,r15++,-1) - movf.w r4,(r4,r8++,-2048) - movf.b r3,(r3,r7++,2047) - movf.w r1,(r1,r1++,1) - movf.b r1,(r0,r2++,1398) - movf.w r4,(r0,r9++,-778) - movf.w r1,(r5,r14++,1564) + movf.b r0,(r8,r0++,0) + movf.w r7,(r15,r15++,-1) + movf.w r4,(r12,r8++,-2048) + movf.b r3,(r11,r7++,2047) + movf.w r1,(r9,r1++,1) + movf.b r1,(r8,r2++,1398) + movf.w r4,(r8,r9++,-778) + movf.w r1,(r13,r14++,1564) .text .global movfgrgriipredec movfgrgriipredec: - movf.b r0,(r0,--r0,0) - movf.w r7,(r7,--r15,-1) - movf.w r4,(r4,--r8,-2048) - movf.b r3,(r3,--r7,2047) - movf.w r1,(r1,--r1,1) - movf.b r6,(r0,--r7,254) - movf.w r5,(r4,--r12,1673) - movf.b r0,(r0,--r10,-38) + movf.b r0,(r8,--r0,0) + movf.w r7,(r15,--r15,-1) + movf.w r4,(r12,--r8,-2048) + movf.b r3,(r11,--r7,2047) + movf.w r1,(r9,--r1,1) + movf.b r6,(r8,--r7,254) + movf.w r5,(r12,--r12,1673) + movf.b r0,(r8,--r10,-38) .text .global movfgriigr movfgriigr: - movf.b (r0,r0,0),r0 - movf.w (r7,r15,-1),r7 - movf.w (r4,r8,-2048),r4 - movf.b (r3,r7,2047),r3 - movf.w (r1,r1,1),r1 - movf.w (r7,r2,-1636),r3 - movf.w (r6,r12,1626),r1 - movf.b (r3,r14,1540),r0 + movf.b (r8,r0,0),r0 + movf.w (r15,r15,-1),r7 + movf.w (r12,r8,-2048),r4 + movf.b (r11,r7,2047),r3 + movf.w (r9,r1,1),r1 + movf.w (r15,r2,-1636),r3 + movf.w (r14,r12,1626),r1 + movf.b (r11,r14,1540),r0 .text .global movfgriipostincgr movfgriipostincgr: - movf.b (r0,r0++,0),r0 - movf.w (r7,r15++,-1),r7 - movf.w (r4,r8++,-2048),r4 - movf.b (r3,r7++,2047),r3 - movf.w (r1,r1++,1),r1 - movf.b (r7,r13++,466),r3 - movf.b (r3,r11++,250),r4 - movf.b (r2,r10++,-1480),r7 + movf.b (r8,r0++,0),r0 + movf.w (r15,r15++,-1),r7 + movf.w (r12,r8++,-2048),r4 + movf.b (r11,r7++,2047),r3 + movf.w (r9,r1++,1),r1 + movf.b (r15,r13++,466),r3 + movf.b (r11,r11++,250),r4 + movf.b (r10,r10++,-1480),r7 .text .global movfgriipredecgr movfgriipredecgr: - movf.b (r0,--r0,0),r0 - movf.w (r7,--r15,-1),r7 - movf.w (r4,--r8,-2048),r4 - movf.b (r3,--r7,2047),r3 - movf.w (r1,--r1,1),r1 - movf.b (r5,--r10,-608),r0 - movf.b (r1,--r11,831),r7 - movf.w (r7,--r15,-2036),r6 + movf.b (r8,--r0,0),r0 + movf.w (r15,--r15,-1),r7 + movf.w (r12,--r8,-2048),r4 + movf.b (r11,--r7,2047),r3 + movf.w (r9,--r1,1),r1 + movf.b (r13,--r10,-608),r0 + movf.b (r9,--r11,831),r7 + movf.w (r15,--r15,-2036),r6 .text .global maskgrgr maskgrgr: @@ -1187,6 +1187,10 @@ halt: hold: hold .text + .global holdx +holdx: + holdx + .text .global brk brk: brk diff --git a/gas/testsuite/gas/xstormy16/allinsn.sh b/gas/testsuite/gas/xstormy16/allinsn.sh index 466e44c..12454b7 100644 --- a/gas/testsuite/gas/xstormy16/allinsn.sh +++ b/gas/testsuite/gas/xstormy16/allinsn.sh @@ -407,69 +407,69 @@ movfgripredecgr: .text .global movfgrgrii movfgrgrii: - movf.b r0,(r0,r0,0) - movf.w r7,(r7,r15,-1) - movf.w r4,(r4,r8,-2048) - movf.b r3,(r3,r7,2047) - movf.w r1,(r1,r1,1) - movf.b r7,(r7,r0,1473) - movf.w r2,(r0,r9,-1522) - movf.w r2,(r5,r1,480) + movf.b r0,(r8,r0,0) + movf.w r7,(r15,r15,-1) + movf.w r4,(r12,r8,-2048) + movf.b r3,(r11,r7,2047) + movf.w r1,(r9,r1,1) + movf.b r7,(r15,r0,1473) + movf.w r2,(r8,r9,-1522) + movf.w r2,(r13,r1,480) .text .global movfgrgriipostinc movfgrgriipostinc: - movf.b r0,(r0,r0++,0) - movf.w r7,(r7,r15++,-1) - movf.w r4,(r4,r8++,-2048) - movf.b r3,(r3,r7++,2047) - movf.w r1,(r1,r1++,1) - movf.b r1,(r0,r2++,1398) - movf.w r4,(r0,r9++,-778) - movf.w r1,(r5,r14++,1564) + movf.b r0,(r8,r0++,0) + movf.w r7,(r15,r15++,-1) + movf.w r4,(r12,r8++,-2048) + movf.b r3,(r11,r7++,2047) + movf.w r1,(r9,r1++,1) + movf.b r1,(r8,r2++,1398) + movf.w r4,(r8,r9++,-778) + movf.w r1,(r13,r14++,1564) .text .global movfgrgriipredec movfgrgriipredec: - movf.b r0,(r0,--r0,0) - movf.w r7,(r7,--r15,-1) - movf.w r4,(r4,--r8,-2048) - movf.b r3,(r3,--r7,2047) - movf.w r1,(r1,--r1,1) - movf.b r6,(r0,--r7,254) - movf.w r5,(r4,--r12,1673) - movf.b r0,(r0,--r10,-38) + movf.b r0,(r8,--r0,0) + movf.w r7,(r15,--r15,-1) + movf.w r4,(r12,--r8,-2048) + movf.b r3,(r11,--r7,2047) + movf.w r1,(r9,--r1,1) + movf.b r6,(r8,--r7,254) + movf.w r5,(r12,--r12,1673) + movf.b r0,(r8,--r10,-38) .text .global movfgriigr movfgriigr: - movf.b (r0,r0,0),r0 - movf.w (r7,r15,-1),r7 - movf.w (r4,r8,-2048),r4 - movf.b (r3,r7,2047),r3 - movf.w (r1,r1,1),r1 - movf.w (r7,r2,-1636),r3 - movf.w (r6,r12,1626),r1 - movf.b (r3,r14,1540),r0 + movf.b (r8,r0,0),r0 + movf.w (r15,r15,-1),r7 + movf.w (r12,r8,-2048),r4 + movf.b (r11,r7,2047),r3 + movf.w (r9,r1,1),r1 + movf.w (r15,r2,-1636),r3 + movf.w (r14,r12,1626),r1 + movf.b (r11,r14,1540),r0 .text .global movfgriipostincgr movfgriipostincgr: - movf.b (r0,r0++,0),r0 - movf.w (r7,r15++,-1),r7 - movf.w (r4,r8++,-2048),r4 - movf.b (r3,r7++,2047),r3 - movf.w (r1,r1++,1),r1 - movf.b (r7,r13++,466),r3 - movf.b (r3,r11++,250),r4 - movf.b (r2,r10++,-1480),r7 + movf.b (r8,r0++,0),r0 + movf.w (r15,r15++,-1),r7 + movf.w (r12,r8++,-2048),r4 + movf.b (r11,r7++,2047),r3 + movf.w (r9,r1++,1),r1 + movf.b (r15,r13++,466),r3 + movf.b (r11,r11++,250),r4 + movf.b (r10,r10++,-1480),r7 .text .global movfgriipredecgr movfgriipredecgr: - movf.b (r0,--r0,0),r0 - movf.w (r7,--r15,-1),r7 - movf.w (r4,--r8,-2048),r4 - movf.b (r3,--r7,2047),r3 - movf.w (r1,--r1,1),r1 - movf.b (r5,--r10,-608),r0 - movf.b (r1,--r11,831),r7 - movf.w (r7,--r15,-2036),r6 + movf.b (r8,--r0,0),r0 + movf.w (r15,--r15,-1),r7 + movf.w (r12,--r8,-2048),r4 + movf.b (r11,--r7,2047),r3 + movf.w (r9,--r1,1),r1 + movf.b (r13,--r10,-608),r0 + movf.b (r9,--r11,831),r7 + movf.w (r15,--r15,-2036),r6 .text .global maskgrgr maskgrgr: @@ -1111,14 +1111,14 @@ bgr: .text .global jmp jmp: - jmp r0,r0 - jmp r1,r15 - jmp r1,r8 - jmp r0,r7 - jmp r1,r1 - jmp r1,r7 - jmp r1,r5 - jmp r0,r12 + jmp r8,r0 + jmp r9,r15 + jmp r9,r8 + jmp r8,r7 + jmp r9,r1 + jmp r9,r7 + jmp r9,r5 + jmp r8,r12 .text .global jmpf jmpf: @@ -1144,14 +1144,14 @@ callrgr: .text .global callgr callgr: - call r0,r0 - call r1,r15 - call r1,r8 - call r0,r7 - call r1,r1 - call r1,r6 - call r1,r14 - call r0,r12 + call r8,r0 + call r9,r15 + call r9,r8 + call r8,r7 + call r9,r1 + call r9,r6 + call r9,r14 + call r8,r12 .text .global callfimm callfimm: @@ -1177,14 +1177,14 @@ icallrgr: .text .global icallgr icallgr: - icall r0,r0 - icall r1,r15 - icall r1,r8 - icall r0,r7 - icall r1,r1 - icall r1,r10 - icall r0,r15 - icall r0,r10 + icall r8,r0 + icall r9,r15 + icall r9,r8 + icall r8,r7 + icall r9,r1 + icall r9,r10 + icall r8,r15 + icall r8,r10 .text .global icallfimm icallfimm: @@ -1226,6 +1226,10 @@ halt: hold: hold .text + .global holdx +holdx: + holdx + .text .global brk brk: brk diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 69da386..0fd1bdd 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,12 @@ +2002-01-10 matthew green <mrg@redhat.com> + + * xstormy16-asm.c: Regenerate. + * xstormy16-desc.c: Likewise. + * xstormy16-desc.h: Likewise. + * xstormy16-dis.c: Likewise. + * xstormy16-opc.c: Likewise. + * xstormy16-opc.h: Likewise. + 2002-01-07 Nick Clifton <nickc@cambridge.redhat.com> * po/es.po: New file: Spanish translation. diff --git a/opcodes/xstormy16-asm.c b/opcodes/xstormy16-asm.c index 5cb3921..3f26b18 100644 --- a/opcodes/xstormy16-asm.c +++ b/opcodes/xstormy16-asm.c @@ -154,10 +154,10 @@ xstormy16_cgen_parse_operand (cd, opindex, strp, fields) switch (opindex) { case XSTORMY16_OPERAND_RB : - errmsg = cgen_parse_keyword (cd, strp, & xstormy16_cgen_opval_gr_names, & fields->f_Rb); + errmsg = cgen_parse_keyword (cd, strp, & xstormy16_cgen_opval_gr_Rb_names, & fields->f_Rb); break; case XSTORMY16_OPERAND_RBJ : - errmsg = cgen_parse_keyword (cd, strp, & xstormy16_cgen_opval_gr_Rbj_names, & fields->f_Rbj); + errmsg = cgen_parse_keyword (cd, strp, & xstormy16_cgen_opval_gr_Rb_names, & fields->f_Rbj); break; case XSTORMY16_OPERAND_RD : errmsg = cgen_parse_keyword (cd, strp, & xstormy16_cgen_opval_gr_names, & fields->f_Rd); diff --git a/opcodes/xstormy16-desc.c b/opcodes/xstormy16-desc.c index 5d22acd..6586779 100644 --- a/opcodes/xstormy16-desc.c +++ b/opcodes/xstormy16-desc.c @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. +Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of the GNU Binutils and/or GDB, the GNU debugger. @@ -152,16 +152,24 @@ CGEN_KEYWORD xstormy16_cgen_opval_gr_names = 0, 0, 0, 0, "" }; -static CGEN_KEYWORD_ENTRY xstormy16_cgen_opval_gr_Rbj_names_entries[] = +static CGEN_KEYWORD_ENTRY xstormy16_cgen_opval_gr_Rb_names_entries[] = { { "r8", 0, {0, {0}}, 0, 0 }, - { "r9", 1, {0, {0}}, 0, 0 } + { "r9", 1, {0, {0}}, 0, 0 }, + { "r10", 2, {0, {0}}, 0, 0 }, + { "r11", 3, {0, {0}}, 0, 0 }, + { "r12", 4, {0, {0}}, 0, 0 }, + { "r13", 5, {0, {0}}, 0, 0 }, + { "r14", 6, {0, {0}}, 0, 0 }, + { "r15", 7, {0, {0}}, 0, 0 }, + { "psw", 6, {0, {0}}, 0, 0 }, + { "sp", 7, {0, {0}}, 0, 0 } }; -CGEN_KEYWORD xstormy16_cgen_opval_gr_Rbj_names = +CGEN_KEYWORD xstormy16_cgen_opval_gr_Rb_names = { - & xstormy16_cgen_opval_gr_Rbj_names_entries[0], - 2, + & xstormy16_cgen_opval_gr_Rb_names_entries[0], + 10, 0, 0, 0, 0, "" }; @@ -224,7 +232,8 @@ const CGEN_HW_ENTRY xstormy16_cgen_hw_table[] = { "h-iaddr", HW_H_IADDR, CGEN_ASM_NONE, 0, { 0, { (1<<MACH_BASE) } } }, { "h-pc", HW_H_PC, CGEN_ASM_NONE, 0, { 0|A(PC), { (1<<MACH_BASE) } } }, { "h-gr", HW_H_GR, CGEN_ASM_KEYWORD, (PTR) & xstormy16_cgen_opval_gr_names, { 0, { (1<<MACH_BASE) } } }, - { "h-Rbj", HW_H_RBJ, CGEN_ASM_KEYWORD, (PTR) & xstormy16_cgen_opval_gr_Rbj_names, { 0|A(VIRTUAL), { (1<<MACH_BASE) } } }, + { "h-Rb", HW_H_RB, CGEN_ASM_KEYWORD, (PTR) & xstormy16_cgen_opval_gr_Rb_names, { 0|A(VIRTUAL), { (1<<MACH_BASE) } } }, + { "h-Rbj", HW_H_RBJ, CGEN_ASM_KEYWORD, (PTR) & xstormy16_cgen_opval_gr_Rb_names, { 0|A(VIRTUAL), { (1<<MACH_BASE) } } }, { "h-Rpsw", HW_H_RPSW, CGEN_ASM_NONE, 0, { 0|A(VIRTUAL), { (1<<MACH_BASE) } } }, { "h-z8", HW_H_Z8, CGEN_ASM_NONE, 0, { 0|A(VIRTUAL), { (1<<MACH_BASE) } } }, { "h-z16", HW_H_Z16, CGEN_ASM_NONE, 0, { 0|A(VIRTUAL), { (1<<MACH_BASE) } } }, @@ -345,7 +354,7 @@ const CGEN_OPERAND xstormy16_cgen_operand_table[] = { "Rs", XSTORMY16_OPERAND_RS, HW_H_GR, 8, 4, { 0, { (1<<MACH_BASE) } } }, /* Rb: base register */ - { "Rb", XSTORMY16_OPERAND_RB, HW_H_GR, 17, 3, + { "Rb", XSTORMY16_OPERAND_RB, HW_H_RB, 17, 3, { 0, { (1<<MACH_BASE) } } }, /* Rbj: base register for jump */ { "Rbj", XSTORMY16_OPERAND_RBJ, HW_H_RBJ, 11, 1, @@ -1051,6 +1060,11 @@ static const CGEN_IBASE xstormy16_cgen_insn_table[MAX_INSNS] = XSTORMY16_INSN_HOLD, "hold", "hold", 16, { 0, { (1<<MACH_BASE) } } }, +/* holdx */ + { + XSTORMY16_INSN_HOLDX, "holdx", "holdx", 16, + { 0, { (1<<MACH_BASE) } } + }, /* brk */ { XSTORMY16_INSN_BRK, "brk", "brk", 16, @@ -1208,8 +1222,8 @@ xstormy16_cgen_rebuild_tables (cd) { const CGEN_ISA *isa = & xstormy16_cgen_isa_table[i]; - /* Default insn sizes of all selected isas must be - equal or we set the result to 0, meaning "unknown". */ + /* Default insn sizes of all selected isas must be equal or we set + the result to 0, meaning "unknown". */ if (cd->default_insn_bitsize == UNSET) cd->default_insn_bitsize = isa->default_insn_bitsize; else if (isa->default_insn_bitsize == cd->default_insn_bitsize) @@ -1217,8 +1231,8 @@ xstormy16_cgen_rebuild_tables (cd) else cd->default_insn_bitsize = CGEN_SIZE_UNKNOWN; - /* Base insn sizes of all selected isas must be equal - or we set the result to 0, meaning "unknown". */ + /* Base insn sizes of all selected isas must be equal or we set + the result to 0, meaning "unknown". */ if (cd->base_insn_bitsize == UNSET) cd->base_insn_bitsize = isa->base_insn_bitsize; else if (isa->base_insn_bitsize == cd->base_insn_bitsize) diff --git a/opcodes/xstormy16-desc.h b/opcodes/xstormy16-desc.h index c00ca79..fe18a13 100644 --- a/opcodes/xstormy16-desc.h +++ b/opcodes/xstormy16-desc.h @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. +Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of the GNU Binutils and/or GDB, the GNU debugger. @@ -71,9 +71,11 @@ typedef enum gr_names { } GR_NAMES; /* Enum declaration for . */ -typedef enum gr_rbj_names { - H_RBJ_R8, H_RBJ_R9 -} GR_RBJ_NAMES; +typedef enum gr_rb_names { + H_RBJ_R8 = 0, H_RBJ_R9 = 1, H_RBJ_R10 = 2, H_RBJ_R11 = 3 + , H_RBJ_R12 = 4, H_RBJ_R13 = 5, H_RBJ_R14 = 6, H_RBJ_R15 = 7 + , H_RBJ_PSW = 6, H_RBJ_SP = 7 +} GR_RB_NAMES; /* Enum declaration for insn op enums. */ typedef enum insn_op1 { @@ -214,10 +216,10 @@ typedef enum cgen_hw_attr { /* Enum declaration for xstormy16 hardware types. */ typedef enum cgen_hw_type { HW_H_MEMORY, HW_H_SINT, HW_H_UINT, HW_H_ADDR - , HW_H_IADDR, HW_H_PC, HW_H_GR, HW_H_RBJ - , HW_H_RPSW, HW_H_Z8, HW_H_Z16, HW_H_CY - , HW_H_HC, HW_H_OV, HW_H_PT, HW_H_S - , HW_H_BRANCHCOND, HW_H_WORDSIZE, HW_MAX + , HW_H_IADDR, HW_H_PC, HW_H_GR, HW_H_RB + , HW_H_RBJ, HW_H_RPSW, HW_H_Z8, HW_H_Z16 + , HW_H_CY, HW_H_HC, HW_H_OV, HW_H_PT + , HW_H_S, HW_H_BRANCHCOND, HW_H_WORDSIZE, HW_MAX } CGEN_HW_TYPE; #define MAX_HW ((int) HW_MAX) @@ -279,7 +281,8 @@ extern const CGEN_ATTR_TABLE xstormy16_cgen_insn_attr_table[]; /* Hardware decls. */ extern CGEN_KEYWORD xstormy16_cgen_opval_gr_names; -extern CGEN_KEYWORD xstormy16_cgen_opval_gr_Rbj_names; +extern CGEN_KEYWORD xstormy16_cgen_opval_gr_Rb_names; +extern CGEN_KEYWORD xstormy16_cgen_opval_gr_Rb_names; extern CGEN_KEYWORD xstormy16_cgen_opval_h_branchcond; extern CGEN_KEYWORD xstormy16_cgen_opval_h_wordsize; diff --git a/opcodes/xstormy16-dis.c b/opcodes/xstormy16-dis.c index 595ed2a..bd6c593 100644 --- a/opcodes/xstormy16-dis.c +++ b/opcodes/xstormy16-dis.c @@ -92,10 +92,10 @@ xstormy16_cgen_print_operand (cd, opindex, xinfo, fields, attrs, pc, length) switch (opindex) { case XSTORMY16_OPERAND_RB : - print_keyword (cd, info, & xstormy16_cgen_opval_gr_names, fields->f_Rb, 0); + print_keyword (cd, info, & xstormy16_cgen_opval_gr_Rb_names, fields->f_Rb, 0); break; case XSTORMY16_OPERAND_RBJ : - print_keyword (cd, info, & xstormy16_cgen_opval_gr_Rbj_names, fields->f_Rbj, 0); + print_keyword (cd, info, & xstormy16_cgen_opval_gr_Rb_names, fields->f_Rbj, 0); break; case XSTORMY16_OPERAND_RD : print_keyword (cd, info, & xstormy16_cgen_opval_gr_names, fields->f_Rd, 0); @@ -350,9 +350,13 @@ print_insn (cd, pc, info, buf, buflen) CGEN_INSN_INT insn_value; const CGEN_INSN_LIST *insn_list; CGEN_EXTRACT_INFO ex_info; + int basesize; /* Extract base part of instruction, just in case CGEN_DIS_* uses it. */ - insn_value = cgen_get_insn_value (cd, buf, buflen * 8); + basesize = cd->base_insn_bitsize < buflen * 8 ? + cd->base_insn_bitsize : buflen * 8; + insn_value = cgen_get_insn_value (cd, buf, basesize); + /* Fill in ex_info fields like read_insn would. Don't actually call read_insn, since the incoming buffer is already read (and possibly diff --git a/opcodes/xstormy16-ibld.c b/opcodes/xstormy16-ibld.c index 2304514..0e4876a 100644 --- a/opcodes/xstormy16-ibld.c +++ b/opcodes/xstormy16-ibld.c @@ -35,9 +35,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., #include "opintl.h" #include "safe-ctype.h" -#undef min +#undef min #define min(a,b) ((a) < (b) ? (a) : (b)) -#undef max +#undef max #define max(a,b) ((a) > (b) ? (a) : (b)) /* Used by the ifield rtx function. */ diff --git a/opcodes/xstormy16-opc.c b/opcodes/xstormy16-opc.c index c4dc9c0..8c6d7d3 100644 --- a/opcodes/xstormy16-opc.c +++ b/opcodes/xstormy16-opc.c @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. +Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of the GNU Binutils and/or GDB, the GNU debugger. @@ -910,6 +910,12 @@ static const CGEN_OPCODE xstormy16_cgen_insn_opcode_table[MAX_INSNS] = { { MNEM, 0 } }, & ifmt_iret, { 0xa } }, +/* holdx */ + { + { 0, 0, 0, 0 }, + { { MNEM, 0 } }, + & ifmt_iret, { 0xb } + }, /* brk */ { { 0, 0, 0, 0 }, diff --git a/opcodes/xstormy16-opc.h b/opcodes/xstormy16-opc.h index 551d266..337afec 100644 --- a/opcodes/xstormy16-opc.h +++ b/opcodes/xstormy16-opc.h @@ -2,7 +2,7 @@ THIS FILE IS MACHINE GENERATED WITH CGEN. -Copyright 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. +Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of the GNU Binutils and/or GDB, the GNU debugger. @@ -67,7 +67,8 @@ typedef enum cgen_insn_type { , XSTORMY16_INSN_CALLRGR, XSTORMY16_INSN_CALLRIMM, XSTORMY16_INSN_CALLGR, XSTORMY16_INSN_CALLFIMM , XSTORMY16_INSN_ICALLRGR, XSTORMY16_INSN_ICALLGR, XSTORMY16_INSN_ICALLFIMM, XSTORMY16_INSN_IRET , XSTORMY16_INSN_RET, XSTORMY16_INSN_MUL, XSTORMY16_INSN_DIV, XSTORMY16_INSN_NOP - , XSTORMY16_INSN_HALT, XSTORMY16_INSN_HOLD, XSTORMY16_INSN_BRK, XSTORMY16_INSN_SYSCALL + , XSTORMY16_INSN_HALT, XSTORMY16_INSN_HOLD, XSTORMY16_INSN_HOLDX, XSTORMY16_INSN_BRK + , XSTORMY16_INSN_SYSCALL } CGEN_INSN_TYPE; /* Index of `invalid' insn place holder. */ |