/
sparc.up
843 lines (757 loc) · 37.1 KB
/
sparc.up
1
2
3
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
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
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
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
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
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
Newsgroups: gnu.utils.bug
From: gordoni@chook.cs.adelaide.edu.au (Gordon Irlam)
Subject: GAS 1.38 (sparc) patches
Organization: GNUs Not Usenet
Distribution: gnu
Date: Sat, 7 Sep 1991 02:26:04 GMT
The following patches fix a few small problems with the SPARC version
of gas 1.38.
1) A .empty directive has been added. This is for compatibility with
SunOS. It is needed sometimes for code fed to the SunOS assembler
to prevent the Sun assembler adding illegal nops to perfectly good
code. Adding it to the sparc version of gas allows gas to assemble
the same file.
2) In gas 1.38 the code for handling the RELOC_32 type was commented out
and the result set to zero. I can't see any reason why this was done.
The resulting code is wrong. The following small program illustrates
this: start will have the value 0 instead of 4.
.text
start: .word finish - start
finish:
3) Copy the version of sparc-opcode.h from gdb-4.0. The version of
sparc-opcode.h in gas 1.38 does not include the dec, deccc, or
cb01 instructions.
Gordon Irlam
(gordoni@cs.adelaide.edu.au)
diff -c old/sparc.c new/sparc.c
*** old/sparc.c Tue Oct 23 03:34:04 1990
--- new/sparc.c Fri Sep 6 16:10:08 1991
***************
*** 55,66 ****
/* handle of the OPCODE hash table */
static struct hash_control *op_hash = NULL;
! static void s_seg(), s_proc(), s_data1(), s_reserve(), s_common();
extern void s_globl(), s_long(), s_short(), s_space(), cons();
const pseudo_typeS
md_pseudo_table[] = {
{ "common", s_common, 0 },
{ "global", s_globl, 0 },
{ "half", cons, 2 },
{ "proc", s_proc, 0 },
--- 55,67 ----
/* handle of the OPCODE hash table */
static struct hash_control *op_hash = NULL;
! static void s_seg(), s_proc(), s_data1(), s_reserve(), s_common(), s_empty();
extern void s_globl(), s_long(), s_short(), s_space(), cons();
const pseudo_typeS
md_pseudo_table[] = {
{ "common", s_common, 0 },
+ { "empty", s_empty, 0 }, /* GI: For SunOS compatability */
{ "global", s_globl, 0 },
{ "half", cons, 2 },
{ "proc", s_proc, 0 },
***************
*** 106,116 ****
#define isoctal(c) octal[c]
static unsigned char toHex[256];
- /*
- * anull bit - causes the branch delay slot instructions to not be executed
- */
- #define ANNUL (1 << 29)
-
struct sparc_it {
char *error;
unsigned long opcode;
--- 107,112 ----
***************
*** 251,257 ****
--- 247,267 ----
return;
}
+ /*
+ * GI: This is needed for compatability with Sun's assembler - which
+ * otherwise generates a warning when certain "suspect" instructions
+ * appear in the delay slot of a branch. And more seriously without
+ * this directive in certain cases Sun's assembler will rearrange
+ * code thinking it knows how to alter things when it doesn't.
+ */
static void
+ s_empty()
+ {
+ demand_empty_rest_of_line();
+ return;
+ }
+
+ static void
s_seg()
{
***************
*** 999,1008 ****
switch (fixP->fx_r_type) {
case RELOC_32:
! buf[0] = 0; /* val >> 24; */
! buf[1] = 0; /* val >> 16; */
! buf[2] = 0; /* val >> 8; */
! buf[3] = 0; /* val; */
break;
#if 0
--- 1009,1021 ----
switch (fixP->fx_r_type) {
case RELOC_32:
! /*
! * GI: This was commented out. Why? It is needed.
! */
! buf[0] = val >> 24;
! buf[1] = val >> 16;
! buf[2] = val >> 8;
! buf[3] = val;
break;
#if 0
diff -c old/sparc-opcode.h new/sparc-opcode.h
*** old/sparc-opcode.h Fri Jun 8 05:52:10 1990
--- new/sparc-opcode.h Fri Sep 6 16:10:08 1991
***************
*** 3,21 ****
This file is part of GAS, the GNU Assembler, and GDB, the GNU disassembler.
! GAS/GDB is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
! the Free Software Foundation; either version 1, or (at your option)
! any later version.
! GAS/GDB is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
! along with GAS or GDB; see the file COPYING. If not, write to
! the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#if !defined(__STDC__) && !defined(const)
#define const
--- 3,21 ----
This file is part of GAS, the GNU Assembler, and GDB, the GNU disassembler.
! This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
! the Free Software Foundation; either version 2 of the License, or
! (at your option) any later version.
! This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
! along with this program; if not, write to the Free Software
! Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#if !defined(__STDC__) && !defined(const)
#define const
***************
*** 30,39 ****
unsigned long int match; /* Bits that must be set. */
unsigned long int lose; /* Bits that must not be set. */
const char *args;
! /* Nonzero if this is a delayed branch instruction. */
! char delayed;
};
/*
All sparc opcodes are 32 bits, except for the `set' instruction (really
a macro), which is 64 bits. It is handled as a special case.
--- 30,41 ----
unsigned long int match; /* Bits that must be set. */
unsigned long int lose; /* Bits that must not be set. */
const char *args;
! char flags;
};
+ #define F_DELAYED 1 /* Delayed branch */
+ #define F_ALIAS 2 /* Alias for a "real" instruction */
+
/*
All sparc opcodes are 32 bits, except for the `set' instruction (really
a macro), which is 64 bits. It is handled as a special case.
***************
*** 174,184 ****
{ "st", 0xc1202000, 0x00d80000, "g,[1+i]", 0 },
{ "st", 0xc1202000, 0x00d80000, "g,[i+1]", 0 },
{ "st", 0xc1200000, 0x00d82000, "g,[1+2]", 0 },
! { "st", 0xc1280000, 0x00c0d01f, "F,[1]", 0 }, /* st d,[rs1+%g0] */
! { "st", 0xc1282000, 0x00c0dfff, "F,[1]", 0 }, /* st d,[rs1+0] */
! { "st", 0xc1282000, 0x00c0d000, "F,[1+i]", 0 },
! { "st", 0xc1282000, 0x00c0d000, "F,[i+1]", 0 },
! { "st", 0xc1280000, 0x00c0d000, "F,[1+2]", 0 },
{ "st", 0xc1a00000, 0x0058201f, "D,[1]", 0 }, /* st d,[rs1+%g0] */
{ "st", 0xc1a02000, 0x00581fff, "D,[1]", 0 }, /* st d,[rs1+0] */
{ "st", 0xc1a02000, 0x00580000, "D,[1+i]", 0 },
--- 176,186 ----
{ "st", 0xc1202000, 0x00d80000, "g,[1+i]", 0 },
{ "st", 0xc1202000, 0x00d80000, "g,[i+1]", 0 },
{ "st", 0xc1200000, 0x00d82000, "g,[1+2]", 0 },
! { "st", 0xc1280000, 0x00d0201f, "F,[1]", 0 }, /* st %fsr,[rs1+%g0] */
! { "st", 0xc1282000, 0x00d01fff, "F,[1]", 0 }, /* st %fsr,[rs1+0] */
! { "st", 0xc1282000, 0x00d00000, "F,[1+i]", 0 },
! { "st", 0xc1282000, 0x00d00000, "F,[i+1]", 0 },
! { "st", 0xc1280000, 0x00d02000, "F,[1+2]", 0 },
{ "st", 0xc1a00000, 0x0058201f, "D,[1]", 0 }, /* st d,[rs1+%g0] */
{ "st", 0xc1a02000, 0x00581fff, "D,[1]", 0 }, /* st d,[rs1+0] */
{ "st", 0xc1a02000, 0x00580000, "D,[1+i]", 0 },
***************
*** 248,268 ****
{ "restore", 0x81e82000, 0x7e14dfff, "", 0 }, /* restore %g0,0,%g0 */
{ "restore", 0x81e82000, 0x00000000, "1,i,d", 0 },
{ "restore", 0x81e80000, 0x00000000, "1,2,d", 0 },
! { "rett", 0x81c82000, 0x40300000, "1+i", 1 },
! { "rett", 0x81c82000, 0x40300000, "i+1", 1 },
! { "rett", 0x81c80000, 0x40302000, "1+2", 1 },
! { "rett", 0x81c82000, 0x40300000, "1", 1},
{ "save", 0x81e02000, 0x40180000, "1,i,d", 0 },
{ "save", 0x81e00000, 0x40180000, "1,2,d", 0 },
! { "ret", 0x81c7e008, 0x00001ff7, "", 1 }, /* jmpl %i7+8,%g0 */
! { "retl", 0x81c3e008, 0x00001ff7, "", 1 }, /* jmpl %o7+8,%g0 */
! { "jmpl", 0x81c00000, 0x4038201f, "1,d", 1 }, /* jmpl rs1+%g0,d */
! { "jmpl", 0x81c02000, 0x4037c000, "i,d", 1 }, /* jmpl %g0+i,d */
! { "jmpl", 0x81c02000, 0x40380000, "1+i,d", 1 },
! { "jmpl", 0x81c02000, 0x40380000, "i+1,d", 1 },
! { "jmpl", 0x81c00000, 0x40382000, "1+2,d", 1 },
{ "wr", 0x81982000, 0x40600000, "1,i,t", 0 },
{ "wr", 0x81980000, 0x40600000, "1,2,t", 0 },
{ "wr", 0x81902000, 0x40680000, "1,i,w", 0 },
--- 250,271 ----
{ "restore", 0x81e82000, 0x7e14dfff, "", 0 }, /* restore %g0,0,%g0 */
{ "restore", 0x81e82000, 0x00000000, "1,i,d", 0 },
{ "restore", 0x81e80000, 0x00000000, "1,2,d", 0 },
! { "rett", 0x81c82000, 0x40300000, "1+i", F_DELAYED },
! { "rett", 0x81c82000, 0x40300000, "i+1", F_DELAYED },
! { "rett", 0x81c80000, 0x40302000, "1+2", F_DELAYED },
! { "rett", 0x81c82000, 0x40301fff, "1", F_DELAYED}, /* rett X,0 */
! { "rett", 0x81c80000, 0x4030201f, "1", F_DELAYED}, /* rett X,%g0 */
{ "save", 0x81e02000, 0x40180000, "1,i,d", 0 },
{ "save", 0x81e00000, 0x40180000, "1,2,d", 0 },
! { "ret", 0x81c7e008, 0x00001ff7, "", F_DELAYED }, /* jmpl %i7+8,%g0 */
! { "retl", 0x81c3e008, 0x00001ff7, "", F_DELAYED }, /* jmpl %o7+8,%g0 */
! { "jmpl", 0x81c00000, 0x4038201f, "1,d", F_DELAYED }, /* jmpl rs1+%g0,d */
! { "jmpl", 0x81c02000, 0x4037c000, "i,d", F_DELAYED }, /* jmpl %g0+i,d */
! { "jmpl", 0x81c02000, 0x40380000, "1+i,d", F_DELAYED },
! { "jmpl", 0x81c02000, 0x40380000, "i+1,d", F_DELAYED },
! { "jmpl", 0x81c00000, 0x40382000, "1+2,d", F_DELAYED },
{ "wr", 0x81982000, 0x40600000, "1,i,t", 0 },
{ "wr", 0x81980000, 0x40600000, "1,2,t", 0 },
{ "wr", 0x81902000, 0x40680000, "1,i,w", 0 },
***************
*** 287,297 ****
{ "mulscc", 0x81202000, 0x40d80000, "1,i,d", 0 },
{ "mulscc", 0x81200000, 0x40d80000, "1,2,d", 0 },
! { "clr", 0x80100000, 0x4e87e01f, "d", 0 }, /* or %g0,%g0,d */
! { "clr", 0x80102000, 0x41efdfff, "d", 0 }, /* or %g0,0,d */
{ "orncc", 0x80b02000, 0x04048000, "1,i,d", 0 },
- { "orncc", 0x80b02000, 0x04048000, "i,1,d", 0 },
{ "orncc", 0x80b00000, 0x04048000, "1,2,d", 0 },
{ "tst", 0x80900000, 0x7f6fe000, "2", 0 }, /* orcc %g0, rs2, %g0 */
--- 290,314 ----
{ "mulscc", 0x81202000, 0x40d80000, "1,i,d", 0 },
{ "mulscc", 0x81200000, 0x40d80000, "1,2,d", 0 },
! { "clr", 0x80100000, 0x4e87e01f, "d", F_ALIAS }, /* or %g0,%g0,d */
! { "clr", 0x80102000, 0x41efdfff, "d", F_ALIAS }, /* or %g0,0,d */
! { "clr", 0xc0200000, 0x3fd8001f, "[1]", F_ALIAS }, /* st %g0,[rs1+%g0] */
! { "clr", 0xc0202000, 0x3fd81fff, "[1]", F_ALIAS }, /* st %g0,[rs1+0] */
! { "clr", 0xc0202000, 0x3fd80000, "[1+i]", F_ALIAS },
! { "clr", 0xc0202000, 0x3fd80000, "[i+1]", F_ALIAS },
! { "clr", 0xc0200000, 0x3fd80000, "[1+2]", F_ALIAS },
+ { "clrb", 0xc0280000, 0x3fd0001f, "[1]", F_ALIAS },/* stb %g0,[rs1+%g0] */
+ { "clrb", 0xc0282000, 0x3fd00000, "[1+i]", F_ALIAS },
+ { "clrb", 0xc0282000, 0x3fd00000, "[i+1]", F_ALIAS },
+ { "clrb", 0xc0280000, 0x3fd00000, "[1+2]", F_ALIAS },
+
+ { "clrh", 0xc0300000, 0x3fc8001f, "[1]", F_ALIAS },/* sth %g0,[rs1+%g0] */
+ { "clrh", 0xc0300000, 0x3fc80000, "[1+2]", F_ALIAS },
+ { "clrh", 0xc0302000, 0x3fc80000, "[1+i]", F_ALIAS },
+ { "clrh", 0xc0302000, 0x3fc80000, "[i+1]", F_ALIAS },
+
{ "orncc", 0x80b02000, 0x04048000, "1,i,d", 0 },
{ "orncc", 0x80b00000, 0x04048000, "1,2,d", 0 },
{ "tst", 0x80900000, 0x7f6fe000, "2", 0 }, /* orcc %g0, rs2, %g0 */
***************
*** 302,337 ****
{ "orcc", 0x80902000, 0x41680000, "i,1,d", 0 },
{ "orcc", 0x80900000, 0x41680000, "1,2,d", 0 },
{ "orn", 0x80302000, 0x41c80000, "1,i,d", 0 },
- { "orn", 0x80302000, 0x41c80000, "i,1,d", 0 },
{ "orn", 0x80300000, 0x41c80000, "1,2,d", 0 },
! { "mov", 0x81800000, 0x4078201f, "1,y", 0 }, /* wr rs1,%g0,%y */
! { "mov", 0x81802000, 0x40781fff, "1,y", 0 }, /* wr rs1,0,%y */
! { "mov", 0x81400000, 0x40b80000, "y,d", 0 }, /* rd %y,d */
! { "mov", 0x81980000, 0x4060201f, "1,t", 0 }, /* wr rs1,%g0,%tbr */
! { "mov", 0x81982000, 0x40601fff, "1,t", 0 }, /* wr rs1,0,%tbr */
! { "mov", 0x81580000, 0x40a00000, "t,d", 0 }, /* rd %tbr,d */
! { "mov", 0x81900000, 0x4068201f, "1,w", 0 }, /* wr rs1,%g0,%wim */
! { "mov", 0x81902000, 0x40681fff, "1,w", 0 }, /* wr rs1,0,%wim */
! { "mov", 0x81500000, 0x40a80000, "w,d", 0 }, /* rd %wim,d */
! { "mov", 0x81880000, 0x4070201f, "1,p", 0 }, /* wr rs1,%g0,%psr */
! { "mov", 0x81882000, 0x40701fff, "1,p", 0 }, /* wr rs1,0,%psr */
! { "mov", 0x81480000, 0x40b00000, "p,d", 0 }, /* rd %psr,d */
{ "mov", 0x80102000, 0x41efc000, "i,d", 0 }, /* or %g0,i,d */
{ "mov", 0x80100000, 0x41efe000, "2,d", 0 }, /* or %g0,rs2,d */
{ "or", 0x80102000, 0x40800000, "1,i,d", 0 },
{ "or", 0x80102000, 0x40800000, "i,1,d", 0 },
{ "or", 0x80100000, 0x40800000, "1,2,d", 0 },
{ "andncc", 0x80a82000, 0x41500000, "1,i,d", 0 },
- { "andncc", 0x80a82000, 0x41500000, "i,1,d", 0 },
{ "andncc", 0x80a80000, 0x41500000, "1,2,d", 0 },
{ "andn", 0x80282000, 0x41d00000, "1,i,d", 0 },
- { "andn", 0x80282000, 0x41d00000, "i,1,d", 0 },
{ "andn", 0x80280000, 0x41d00000, "1,2,d", 0 },
{ "cmp", 0x80a02000, 0x7d580000, "1,i", 0 }, /* subcc rs1,i,%g0 */
{ "cmp", 0x80a00000, 0x7d580000, "1,2", 0 }, /* subcc rs1,rs2,%g0 */
--- 319,363 ----
{ "orcc", 0x80902000, 0x41680000, "i,1,d", 0 },
{ "orcc", 0x80900000, 0x41680000, "1,2,d", 0 },
{ "orn", 0x80302000, 0x41c80000, "1,i,d", 0 },
{ "orn", 0x80300000, 0x41c80000, "1,2,d", 0 },
! { "mov", 0x81800000, 0x4078201f, "1,y", F_ALIAS }, /* wr rs1,%g0,%y */
! { "mov", 0x81802000, 0x40781fff, "1,y", F_ALIAS }, /* wr rs1,0,%y */
! { "mov", 0x81802000, 0x40780000, "i,y", F_ALIAS },
! { "mov", 0x81400000, 0x40b80000, "y,d", F_ALIAS }, /* rd %y,d */
! { "mov", 0x81980000, 0x4060201f, "1,t", F_ALIAS }, /* wr rs1,%g0,%tbr */
! { "mov", 0x81982000, 0x40601fff, "1,t", F_ALIAS }, /* wr rs1,0,%tbr */
! { "mov", 0x81982000, 0x40600000, "i,t", F_ALIAS },
! { "mov", 0x81580000, 0x40a00000, "t,d", F_ALIAS }, /* rd %tbr,d */
! { "mov", 0x81900000, 0x4068201f, "1,w", F_ALIAS }, /* wr rs1,%g0,%wim */
! { "mov", 0x81902000, 0x40681fff, "1,w", F_ALIAS }, /* wr rs1,0,%wim */
! { "mov", 0x81902000, 0x40680000, "i,w", F_ALIAS },
! { "mov", 0x81500000, 0x40a80000, "w,d", F_ALIAS }, /* rd %wim,d */
! { "mov", 0x81880000, 0x4070201f, "1,p", F_ALIAS }, /* wr rs1,%g0,%psr */
! { "mov", 0x81882000, 0x40701fff, "1,p", F_ALIAS }, /* wr rs1,0,%psr */
! { "mov", 0x81882000, 0x40700000, "i,p", F_ALIAS },
! { "mov", 0x81480000, 0x40b00000, "p,d", F_ALIAS }, /* rd %psr,d */
{ "mov", 0x80102000, 0x41efc000, "i,d", 0 }, /* or %g0,i,d */
{ "mov", 0x80100000, 0x41efe000, "2,d", 0 }, /* or %g0,rs2,d */
+ { "mov", 0x80102000, 0x41e81fff, "1,d", 0 }, /* or rs1,0,d */
+ { "mov", 0x80100000, 0x41e8201f, "1,d", 0 }, /* or rs1,%g0,d */
{ "or", 0x80102000, 0x40800000, "1,i,d", 0 },
{ "or", 0x80102000, 0x40800000, "i,1,d", 0 },
{ "or", 0x80100000, 0x40800000, "1,2,d", 0 },
+ { "bset", 0x80102000, 0x40800000, "i,r", F_ALIAS },/* or rd,i,rd */
+ { "bset", 0x80100000, 0x40800000, "2,r", F_ALIAS },/* or rd,rs2,rd */
+
{ "andncc", 0x80a82000, 0x41500000, "1,i,d", 0 },
{ "andncc", 0x80a80000, 0x41500000, "1,2,d", 0 },
{ "andn", 0x80282000, 0x41d00000, "1,i,d", 0 },
{ "andn", 0x80280000, 0x41d00000, "1,2,d", 0 },
+ { "bclr", 0x80282000, 0x41d00000, "i,r", F_ALIAS },/* andn rd,i,rd */
+ { "bclr", 0x80280000, 0x41d00000, "2,r", F_ALIAS },/* andn rd,rs2,rd */
+
{ "cmp", 0x80a02000, 0x7d580000, "1,i", 0 }, /* subcc rs1,i,%g0 */
{ "cmp", 0x80a00000, 0x7d580000, "1,2", 0 }, /* subcc rs1,rs2,%g0 */
***************
*** 351,358 ****
{ "and", 0x80082000, 0x41f00000, "i,1,d", 0 },
{ "and", 0x80080000, 0x41f00000, "1,2,d", 0 },
! { "inc", 0x80002001, 0x41f81ffe, "r", 0 }, /* add rs1,1,rsd */
{ "addxcc", 0x80c02000, 0x41380000, "1,i,d", 0 },
{ "addxcc", 0x80c02000, 0x41380000, "i,1,d", 0 },
{ "addxcc", 0x80c00000, 0x41380000, "1,2,d", 0 },
--- 377,393 ----
{ "and", 0x80082000, 0x41f00000, "i,1,d", 0 },
{ "and", 0x80080000, 0x41f00000, "1,2,d", 0 },
! { "inc", 0x80002001, 0x41f81ffe, "r", F_ALIAS }, /* add rs1,1,rsd */
! { "inccc", 0x80802001, 0x41781ffe, "r", F_ALIAS }, /* addcc rd,1,rd */
! { "dec", 0x80202001, 0x41d81ffe, "r", F_ALIAS }, /* sub rd,1,rd */
! { "deccc", 0x80a02001, 0x41581ffe, "r", F_ALIAS }, /* subcc rd,1,rd */
+ { "btst", 0x80882000, 0x41700000, "i,1", F_ALIAS },/* andcc rs1,i,%g0 */
+ { "btst", 0x80880000, 0x41700000, "1,2", F_ALIAS },/* andcc rs1,rs2,%0 */
+
+ { "neg", 0x80200000, 0x41d80000, "r", F_ALIAS }, /* sub %0,rd,rd */
+ { "neg", 0x80200000, 0x41d80000, "2,d", F_ALIAS }, /* sub %0,rs2,rd */
+
{ "addxcc", 0x80c02000, 0x41380000, "1,i,d", 0 },
{ "addxcc", 0x80c02000, 0x41380000, "i,1,d", 0 },
{ "addxcc", 0x80c00000, 0x41380000, "1,2,d", 0 },
***************
*** 366,425 ****
{ "add", 0x80002000, 0x41f80000, "i,1,d", 0 },
{ "add", 0x80000000, 0x41f80000, "1,2,d", 0 },
! { "call", 0x9fc00000, 0x4038201f, "1", 1 }, /* jmpl rs1+%g0, %o7 */
! { "call", 0x9fc00000, 0x4038201f, "1,#", 1 },
! { "call", 0x40000000, 0x80000000, "L", 1 },
! { "call", 0x40000000, 0x80000000, "L,#", 1 },
! { "bvc", 0x3e800000, 0xc1400000, ",al", 1 },
! { "bvc", 0x1e800000, 0xc1400000, "l", 1 },
! { "bvs", 0x2e800000, 0xc1400000, ",al", 1 },
! { "bvs", 0x0e800000, 0xc1400000, "l", 1 },
! { "bpos", 0x3c800000, 0xc1400000, ",al", 1 },
! { "bpos", 0x1c800000, 0xc1400000, "l", 1 },
! { "bneg", 0x2c800000, 0xc1400000, ",al", 1 },
! { "bneg", 0x0c800000, 0xc1400000, "l", 1 },
! { "bcc", 0x3a800000, 0xc1400000, ",al", 1 },
! { "bcc", 0x1a800000, 0xc1400000, "l", 1 },
! { "bcs", 0x2a800000, 0xc1400000, ",al", 1 },
! { "bcs", 0x0a800000, 0xc1400000, "l", 1 },
! { "blu", 0x2a800000, 0xc1400000, ",al", 1 },
! { "blu", 0x0a800000, 0xc1400000, "l", 1 }, /* same as bcs */
! { "bgeu", 0x3a800000, 0xc1400000, ",al", 1 },
! { "bgeu", 0x1a800000, 0xc1400000, "l", 1 }, /* same as bcc */
! { "bgu", 0x38800000, 0xc1400000, ",al", 1 },
! { "bgu", 0x18800000, 0xc1400000, "l", 1 },
! { "bleu", 0x28800000, 0xc1400000, ",al", 1 },
! { "bleu", 0x08800000, 0xc1400000, "l", 1 },
! { "bge", 0x36800000, 0xc1400000, ",al", 1 },
! { "bge", 0x16800000, 0xc1400000, "l", 1 },
! { "bl", 0x26800000, 0xc1400000, ",al", 1 },
! { "bl", 0x06800000, 0xc1400000, "l", 1 },
! { "bg", 0x34800000, 0xc1400000, ",al", 1 },
! { "bg", 0x14800000, 0xc1400000, "l", 1 },
! { "ble", 0x24800000, 0xc1400000, ",al", 1 },
! { "ble", 0x04800000, 0xc1400000, "l", 1 },
! { "be", 0x22800000, 0xc1400000, ",al", 1 },
! { "be", 0x02800000, 0xc1400000, "l", 1 },
! { "bne", 0x32800000, 0xc1400000, ",al", 1 },
! { "bne", 0x12800000, 0xc1400000, "l", 1 },
! { "b", 0x30800000, 0xc1400000, ",al", 1 },
! { "b", 0x10800000, 0xc1400000, "l", 1 },
! { "ba", 0x30800000, 0xc1400000, ",al", 1 },
! { "ba", 0x10800000, 0xc1400000, "l", 1 },
! { "bn", 0x20800000, 0xc1400000, ",al", 1 },
! { "bn", 0x00800000, 0xc1400000, "l", 1 },
! { "jmp", 0x81c00000, 0x7e38201f, "1", 1 }, /* jmpl rs1+%g0,%g0 */
! { "jmp", 0x81c02000, 0x7e3fc000, "i", 1 }, /* jmpl %g0+i,%g0 */
! { "jmp", 0x81c00000, 0x7e382000, "1+2", 1 }, /* jmpl rs1+rs2,%g0 */
! { "jmp", 0x81c02000, 0x7e380000, "1+i", 1 }, /* jmpl rs1+i,%g0 */
! { "jmp", 0x81c02000, 0x7e380000, "i+1", 1 }, /* jmpl i+rs1,%g0 */
! { "nop", 0x01000000, 0xfe3fffff, "", 0 }, /* sethi 0, %g0 */
- { "set", 0x01000000, 0xc0c00000, "Sh,d", 0 },
-
{ "sethi", 0x01000000, 0xc0c00000, "h,d", 0 },
{ "taddcctv", 0x81102000, 0x40e00000, "1,i,d", 0 },
--- 401,421 ----
{ "add", 0x80002000, 0x41f80000, "i,1,d", 0 },
{ "add", 0x80000000, 0x41f80000, "1,2,d", 0 },
! { "call", 0x9fc00000, 0x4038201f, "1", F_DELAYED }, /* jmpl rs1+%g0, %o7 */
! { "call", 0x9fc00000, 0x4038201f, "1,#", F_DELAYED },
! { "call", 0x40000000, 0x80000000, "L", F_DELAYED },
! { "call", 0x40000000, 0x80000000, "L,#", F_DELAYED },
! { "jmp", 0x81c00000, 0x7e38201f, "1", F_DELAYED }, /* jmpl rs1+%g0,%g0 */
! { "jmp", 0x81c02000, 0x7e3fc000, "i", F_DELAYED }, /* jmpl %g0+i,%g0 */
! { "jmp", 0x81c00000, 0x7e382000, "1+2", F_DELAYED }, /* jmpl rs1+rs2,%g0 */
! { "jmp", 0x81c02000, 0x7e380000, "1+i", F_DELAYED }, /* jmpl rs1+i,%g0 */
! { "jmp", 0x81c02000, 0x7e380000, "i+1", F_DELAYED }, /* jmpl i+rs1,%g0 */
! { "nop", 0x01000000, 0xfeffffff, "", 0 }, /* sethi 0, %g0 */
! { "set", 0x01000000, 0xc0c00000, "Sh,d", F_ALIAS },
{ "sethi", 0x01000000, 0xc0c00000, "h,d", 0 },
{ "taddcctv", 0x81102000, 0x40e00000, "1,i,d", 0 },
***************
*** 427,503 ****
{ "taddcc", 0x81002000, 0x40f80000, "1,i,d", 0 },
{ "taddcc", 0x81000000, 0x40f80000, "1,2,d", 0 },
! { "tvc", 0x9fd02000, 0x402fc000, "i", 0 }, /* tvc %g0+i */
! { "tvc", 0x9fd02000, 0x40280000, "1+i", 0 },
! { "tvc", 0x9fd00000, 0x40282000, "1+2", 0 },
! { "tvc", 0x9fd00000, 0x4028201f, "1", 0 }, /* tvc rs1+%g0 */
! { "tpos", 0x9dd02000, 0x402fc000, "i", 0 }, /* tpos %g0+i */
! { "tpos", 0x9dd02000, 0x40280000, "1+i", 0 },
! { "tpos", 0x9dd00000, 0x40282000, "1+2", 0 },
! { "tpos", 0x9dd00000, 0x4028201f, "1", 0 }, /* tpos rs1+%g0 */
! { "tcc", 0x9bd02000, 0x402fc000, "i", 0 }, /* tcc %g0+i */
! { "tcc", 0x9bd02000, 0x40280000, "1+i", 0 },
! { "tcc", 0x9bd00000, 0x40282000, "1+2", 0 },
! { "tcc", 0x9bd00000, 0x4028201f, "1", 0 }, /* tcc rs1+%g0 */
! { "tgu", 0x99d02000, 0x402fc000, "i", 0 }, /* tgu %g0+i */
! { "tgu", 0x99d02000, 0x40280000, "1+i", 0 },
! { "tgu", 0x99d00000, 0x40282000, "1+2", 0 },
! { "tgu", 0x99d00000, 0x4028201f, "1", 0 }, /* tgu rs1+%g0 */
! { "tge", 0x97d02000, 0x402fc000, "i", 0 }, /* tge %g0+i */
! { "tge", 0x97d02000, 0x40280000, "1+i", 0 },
! { "tge", 0x97d00000, 0x40282000, "1+2", 0 },
! { "tge", 0x97d00000, 0x4028201f, "1", 0 }, /* tge rs1+%g0 */
! { "tg", 0x95d02000, 0x402fc000, "i", 0 }, /* tg %g0+i */
! { "tg", 0x95d02000, 0x40280000, "1+i", 0 },
! { "tg", 0x95d00000, 0x40282000, "1+2", 0 },
! { "tg", 0x95d00000, 0x4028201f, "1", 0 }, /* tg rs1+%g0 */
! { "tne", 0x93d02000, 0x402fc000, "i", 0 }, /* tne %g0+i */
! { "tne", 0x93d02000, 0x40280000, "1+i", 0 },
! { "tne", 0x93d00000, 0x40282000, "1+2", 0 },
! { "tne", 0x93d00000, 0x4028201f, "1", 0 }, /* tne rs1+%g0 */
! { "tleu", 0x8bd02000, 0x502fc000, "i", 0 }, /* tleu %g0+i */
! { "tleu", 0x8bd02000, 0x50280000, "1+i", 0 },
! { "tleu", 0x8bd00000, 0x50282000, "1+2", 0 },
! { "tleu", 0x8bd00000, 0x5028201f, "1", 0 }, /* tleu rs1+%g0 */
! { "ta", 0x91d02000, 0x402fc000, "i", 0 }, /* ta %g0+i */
! { "ta", 0x91d02000, 0x402d0000, "1+i", 0 },
! { "ta", 0x91d00000, 0x40282000, "1+2", 0 },
! { "ta", 0x91d00000, 0x4028201f, "1", 0 }, /* ta rs1+%g0 */
! { "tvs", 0x8fd02000, 0x502fc000, "i", 0 }, /* tvs %g0+i */
! { "tvs", 0x8fd02000, 0x50280000, "1+i", 0 },
! { "tvs", 0x8fd00000, 0x50282000, "1+2", 0 },
! { "tvs", 0x8fd00000, 0x5028201f, "1", 0 }, /* tvs rs1+%g0 */
! { "tneg", 0x8dd02000, 0x502fc000, "i", 0 }, /* tneg %g0+i */
! { "tneg", 0x8dd02000, 0x50280000, "1+i", 0 },
! { "tneg", 0x8dd00000, 0x50282000, "1+2", 0 },
! { "tneg", 0x8dd00000, 0x5028201f, "1", 0 }, /* tneg rs1+%g0 */
! { "tcs", 0x8bd02000, 0x502fc000, "i", 0 }, /* tcs %g0+i */
! { "tcs", 0x8bd02000, 0x50280000, "1+i", 0 },
! { "tcs", 0x8bd00000, 0x50282000, "1+2", 0 },
! { "tcs", 0x8bd00000, 0x5028201f, "1", 0 }, /* tcs rs1+%g0 */
! { "tl", 0x87d02000, 0x502fc000, "i", 0 }, /* tl %g0+i */
! { "tl", 0x87d02000, 0x50280000, "1+i", 0 },
! { "tl", 0x87d00000, 0x50282000, "1+2", 0 },
! { "tl", 0x87d00000, 0x5028201f, "1", 0 }, /* tl rs1+%g0 */
! { "tle", 0x85d02000, 0x502fc000, "i", 0 }, /* tle %g0+i */
! { "tle", 0x85d02000, 0x50280000, "1+i", 0 },
! { "tle", 0x85d00000, 0x50282000, "1+2", 0 },
! { "tle", 0x85d00000, 0x5028201f, "1", 0 }, /* tle rs1+%g0 */
! { "te", 0x83d02000, 0x502fc000, "i", 0 }, /* te %g0+i */
! { "te", 0x83d02000, 0x50280000, "1+i", 0 },
! { "te", 0x83d00000, 0x50282000, "1+2", 0 },
! { "te", 0x83d00000, 0x5028201f, "1", 0 }, /* te rs1+%g0 */
! { "tn", 0x81d02000, 0x502fc000, "i", 0 }, /* tn %g0+i */
! { "tn", 0x81d02000, 0x50280000, "1+i", 0 },
! { "tn", 0x81d00000, 0x50282000, "1+2", 0 },
! { "tn", 0x81d00000, 0x5028201f, "1", 0 }, /* tn rs1+%g0 */
{ "tsubcc", 0x81080000, 0x40f00000, "1,2,d", 0 },
{ "tsubcc", 0x81082000, 0x40f00000, "1,i,d", 0 },
{ "tsubcctv", 0x80580000, 0x40a00000, "1,2,d", 0 },
{ "tsubcctv", 0x80582000, 0x40a00000, "1,i,d", 0 },
! { "unimp", 0x00000000, 0x00000000, "l", 0 },
{ "iflush", 0x81d80000, 0x40202000, "1+2", 0 },
{ "iflush", 0x81d82000, 0x40200000, "1+i", 0 },
--- 423,497 ----
{ "taddcc", 0x81002000, 0x40f80000, "1,i,d", 0 },
{ "taddcc", 0x81000000, 0x40f80000, "1,2,d", 0 },
! /* Conditional instructions.
+ Because this part of the table was such a mess earlier, I have
+ macrofied it so that all the branches and traps are generated from
+ a single-line description of each condition value. */
+
+ #define ANNUL 0x20000000
+ #define IMMED 0x00002000
+ #define RS1_G0 0x0007C000
+ #define RS2_G0 0x0000001F
+
+ /* Define two branches -- one annulled, one without */
+ #define br(opcode, mask, lose, flags) \
+ { opcode, mask+ANNUL, lose, ",al", flags }, \
+ { opcode, mask , lose, "l", flags }
+
+ /* Define four traps: reg+reg, reg + immediate, immediate alone, reg alone. */
+ #define tr(opcode, mask, lose, flags) \
+ {opcode, mask+IMMED, lose+RS1_G0 , "i", flags }, /* %g0 + imm */ \
+ {opcode, mask+IMMED, lose , "1+i", flags }, /* rs1 + imm */ \
+ {opcode, mask , lose+IMMED , "1+2", flags }, /* rs1 + rs2 */ \
+ {opcode, mask , lose+IMMED+RS2_G0, "1", flags } /* rs1 + %g0 */
+
+ /* Define both branches and traps based on condition mask */
+ #ifdef __STDC__
+ #define cond(bop, top, mask, flags) \
+ br(#bop, 0x00800000+(mask << 25), 0xC1400000, F_DELAYED|flags), \
+ tr(#top, 0x81d00000+(mask << 25), 0x40280000, flags)
+ #else
+ #define cond(bop, top, mask, flags) \
+ br("bop", 0x00800000+(mask << 25), 0xC1400000, F_DELAYED|flags), \
+ tr("top", 0x81d00000+(mask << 25), 0x40280000, flags)
+ #endif
+
+ /* Define all the conditions, all the branches, all the traps. */
+ /* Use no extra spaces or tabs around the first two args, since cpp
+ will include them in the printed strings. */
+ cond (bvc,tvc, 0xF, 0),
+ cond (bvs,tvs, 0x7, 0),
+ cond (bpos,tpos, 0xE, 0),
+ cond (bneg,tneg, 0x6, 0),
+ cond (bcc,tcc, 0xD, 0),
+ cond (bcs,tcs, 0x5, 0),
+ cond (blu,tlu, 0x5, F_ALIAS), /* for cs */
+ cond (bgeu,tgeu, 0xD, F_ALIAS), /* for cc */
+ cond (bgu,tgu, 0xC, 0),
+ cond (bleu,tleu, 0x4, 0),
+ cond (bge,tge, 0xB, 0),
+ cond (bl,tl, 0x3, 0),
+ cond (bg,tg, 0xA, 0),
+ cond (ble,tle, 0x2, 0),
+ cond (be,te, 0x1, 0),
+ cond (bz,tz, 0x1, F_ALIAS), /* for e */
+ cond (bne,tne, 0x9, 0),
+ cond (bnz,tnz, 0x9, F_ALIAS), /* for ne */
+ cond (b,t, 0x8, 0),
+ cond (ba,ta, 0x8, F_ALIAS), /* for nothing */
+ cond (bn,tn, 0x0, 0),
+
+ #undef cond
+ #undef br
+ #undef tr
+
{ "tsubcc", 0x81080000, 0x40f00000, "1,2,d", 0 },
{ "tsubcc", 0x81082000, 0x40f00000, "1,i,d", 0 },
{ "tsubcctv", 0x80580000, 0x40a00000, "1,2,d", 0 },
{ "tsubcctv", 0x80582000, 0x40a00000, "1,i,d", 0 },
! { "unimp", 0x00000000, 0xFFFFFFFF, "l", 0 },
{ "iflush", 0x81d80000, 0x40202000, "1+2", 0 },
{ "iflush", 0x81d82000, 0x40200000, "1+i", 0 },
***************
*** 515,589 ****
{ "xor", 0x80182000, 0x41e00000, "1,i,d", 0 },
{ "xor", 0x80182000, 0x41e00000, "i,1,d", 0 },
{ "fpop1", 0x81a00000, 0x40580000, "[1+2],d", 0 },
{ "fpop2", 0x81a80000, 0x40500000, "[1+2],d", 0 },
! { "fb", 0x31800000, 0xc0400000, ",al", 1 },
! { "fb", 0x11800000, 0xc0400000, "l", 1 },
! { "fba", 0x31800000, 0xc0400000, ",al", 1 },
! { "fba", 0x11800000, 0xc0400000, "l", 1 },
! { "fbn", 0x21800000, 0xc0400000, ",al", 1 },
! { "fbn", 0x01800000, 0xc0400000, "l", 1 },
! { "fbu", 0x2f800000, 0xc0400000, ",al", 1 },
! { "fbu", 0x0f800000, 0xc0400000, "l", 1 },
! { "fbg", 0x2d800000, 0xc0400000, ",al", 1 },
! { "fbg", 0x0d800000, 0xc0400000, "l", 1 },
! { "fbug", 0x2b800000, 0xc0400000, ",al", 1 },
! { "fbug", 0x0b800000, 0xc0400000, "l", 1 },
! { "fbl", 0x29800000, 0xc0400000, ",al", 1 },
! { "fbl", 0x09800000, 0xc0400000, "l", 1 },
! { "fbul", 0x27800000, 0xc0400000, ",al", 1 },
! { "fbul", 0x07800000, 0xc0400000, "l", 1 },
! { "fblg", 0x25800000, 0xc0400000, ",al", 1 },
! { "fblg", 0x05800000, 0xc0400000, "l", 1 },
! { "fbne", 0x23800000, 0xc0400000, ",al", 1 },
! { "fbne", 0x03800000, 0xc0400000, "l", 1 },
! { "fbe", 0x33800000, 0xc0400000, ",al", 1 },
! { "fbe", 0x13800000, 0xc0400000, "l", 1 },
! { "fbue", 0x35800000, 0xc0400000, ",al", 1 },
! { "fbue", 0x15800000, 0xc0400000, "l", 1 },
! { "fbge", 0x37800000, 0xc0400000, ",al", 1 },
! { "fbge", 0x17800000, 0xc0400000, "l", 1 },
! { "fbuge", 0x39800000, 0xc0400000, ",al", 1 },
! { "fbuge", 0x19800000, 0xc0400000, "l", 1 },
! { "fble", 0x3b800000, 0xc0400000, ",al", 1 },
! { "fble", 0x1b800000, 0xc0400000, "l", 1 },
! { "fbule", 0x3d800000, 0xc0400000, ",al", 1 },
! { "fbule", 0x1d800000, 0xc0400000, "l", 1 },
! { "fbo", 0x3f800000, 0xc0400000, ",al", 1 },
! { "fbo", 0x1f800000, 0xc0400000, "l", 1 },
! { "cba", 0x31c00000, 0xce000000, ",al", 1 },
! { "cba", 0x11c00000, 0xce000000, "l", 1 },
! { "cbn", 0x21c00000, 0xde000000, ",al", 1 },
! { "cbn", 0x01c00000, 0xde000000, "l", 1 },
! { "cb3", 0x2fc00000, 0xc0000000, ",al", 1 },
! { "cb3", 0x0fc00000, 0xc0000000, "l", 1 },
! { "cb2", 0x2dc00000, 0xc0000000, ",al", 1 },
! { "cb2", 0x0dc00000, 0xc0000000, "l", 1 },
! { "cb23", 0x2bc00000, 0xc0000000, ",al", 1 },
! { "cb23", 0x0bc00000, 0xc0000000, "l", 1 },
! { "cb1", 0x29c00000, 0xc0000000, ",al", 1 },
! { "cb1", 0x09c00000, 0xc0000000, "l", 1 },
! { "cb13", 0x27c00000, 0xc0000000, ",al", 1 },
! { "cb13", 0x07c00000, 0xc0000000, "l", 1 },
! { "cb12", 0x25c00000, 0xc0000000, ",al", 1 },
! { "cb12", 0x05c00000, 0xc0000000, "l", 1 },
! { "cb123", 0x23c00000, 0xc0000000, ",al", 1 },
! { "cb123", 0x03c00000, 0xc0000000, "l", 1 },
! { "cb0", 0x33c00000, 0xc0000000, ",al", 1 },
! { "cb0", 0x13c00000, 0xc0000000, "l", 1 },
! { "cb03", 0x35c00000, 0xc0000000, ",al", 1 },
! { "cb03", 0x15c00000, 0xc0000000, "l", 1 },
! { "cb02", 0x37c00000, 0xc0000000, ",al", 1 },
! { "cb02", 0x17c00000, 0xc0000000, "l", 1 },
! { "cb023", 0x39c00000, 0xc0000000, ",al", 1 },
! { "cb023", 0x19c00000, 0xc0000000, "l", 1 },
! { "cb013", 0x3dc00000, 0xc0000000, ",al", 1 },
! { "cb013", 0x1dc00000, 0xc0000000, "l", 1 },
! { "cb012", 0x3fc00000, 0xc0000000, ",al", 1 },
! { "cb012", 0x1fc00000, 0xc0000000, "l", 1 },
{ "fstoi", 0x81a01a20, 0x400025c0, "f,g", 0 },
{ "fdtoi", 0x81a01a40, 0x400025a0, "f,g", 0 },
{ "fxtoi", 0x81a01a60, 0x40002580, "f,g", 0 },
--- 509,594 ----
{ "xor", 0x80182000, 0x41e00000, "1,i,d", 0 },
{ "xor", 0x80182000, 0x41e00000, "i,1,d", 0 },
+ { "not", 0x80380000, 0x41c00000, "r", F_ALIAS }, /* xnor rd,%0,rd */
+ { "not", 0x80380000, 0x41c00000, "1,d", F_ALIAS }, /* xnor rs1,%0,rd */
+
+ { "btog", 0x80180000, 0x41e02000, "2,r", F_ALIAS }, /* xor rd,rs2,rd */
+ { "btog", 0x80182000, 0x41e00000, "i,r", F_ALIAS }, /* xor rd,i,rd */
+
{ "fpop1", 0x81a00000, 0x40580000, "[1+2],d", 0 },
{ "fpop2", 0x81a80000, 0x40500000, "[1+2],d", 0 },
! /* Someday somebody should give these the same treatment as the branches
! above. FIXME someday. */
! { "fb", 0x31800000, 0xc0400000, ",al", F_DELAYED },
! { "fb", 0x11800000, 0xc0400000, "l", F_DELAYED },
! { "fba", 0x31800000, 0xc0400000, ",al", F_DELAYED|F_ALIAS },
! { "fba", 0x11800000, 0xc0400000, "l", F_DELAYED|F_ALIAS },
! { "fbn", 0x21800000, 0xc0400000, ",al", F_DELAYED },
! { "fbn", 0x01800000, 0xc0400000, "l", F_DELAYED },
! { "fbu", 0x2f800000, 0xc0400000, ",al", F_DELAYED },
! { "fbu", 0x0f800000, 0xc0400000, "l", F_DELAYED },
! { "fbg", 0x2d800000, 0xc0400000, ",al", F_DELAYED },
! { "fbg", 0x0d800000, 0xc0400000, "l", F_DELAYED },
! { "fbug", 0x2b800000, 0xc0400000, ",al", F_DELAYED },
! { "fbug", 0x0b800000, 0xc0400000, "l", F_DELAYED },
! { "fbl", 0x29800000, 0xc0400000, ",al", F_DELAYED },
! { "fbl", 0x09800000, 0xc0400000, "l", F_DELAYED },
! { "fbul", 0x27800000, 0xc0400000, ",al", F_DELAYED },
! { "fbul", 0x07800000, 0xc0400000, "l", F_DELAYED },
! { "fblg", 0x25800000, 0xc0400000, ",al", F_DELAYED },
! { "fblg", 0x05800000, 0xc0400000, "l", F_DELAYED },
! { "fbne", 0x23800000, 0xc0400000, ",al", F_DELAYED },
! { "fbne", 0x03800000, 0xc0400000, "l", F_DELAYED },
! { "fbe", 0x33800000, 0xc0400000, ",al", F_DELAYED },
! { "fbe", 0x13800000, 0xc0400000, "l", F_DELAYED },
! { "fbue", 0x35800000, 0xc0400000, ",al", F_DELAYED },
! { "fbue", 0x15800000, 0xc0400000, "l", F_DELAYED },
! { "fbge", 0x37800000, 0xc0400000, ",al", F_DELAYED },
! { "fbge", 0x17800000, 0xc0400000, "l", F_DELAYED },
! { "fbuge", 0x39800000, 0xc0400000, ",al", F_DELAYED },
! { "fbuge", 0x19800000, 0xc0400000, "l", F_DELAYED },
! { "fble", 0x3b800000, 0xc0400000, ",al", F_DELAYED },
! { "fble", 0x1b800000, 0xc0400000, "l", F_DELAYED },
! { "fbule", 0x3d800000, 0xc0400000, ",al", F_DELAYED },
! { "fbule", 0x1d800000, 0xc0400000, "l", F_DELAYED },
! { "fbo", 0x3f800000, 0xc0400000, ",al", F_DELAYED },
! { "fbo", 0x1f800000, 0xc0400000, "l", F_DELAYED },
+ { "cba", 0x31c00000, 0xce000000, ",al", F_DELAYED },
+ { "cba", 0x11c00000, 0xce000000, "l", F_DELAYED },
+ { "cbn", 0x21c00000, 0xde000000, ",al", F_DELAYED },
+ { "cbn", 0x01c00000, 0xde000000, "l", F_DELAYED },
+ { "cb3", 0x2fc00000, 0xc0000000, ",al", F_DELAYED },
+ { "cb3", 0x0fc00000, 0xc0000000, "l", F_DELAYED },
+ { "cb2", 0x2dc00000, 0xc0000000, ",al", F_DELAYED },
+ { "cb2", 0x0dc00000, 0xc0000000, "l", F_DELAYED },
+ { "cb23", 0x2bc00000, 0xc0000000, ",al", F_DELAYED },
+ { "cb23", 0x0bc00000, 0xc0000000, "l", F_DELAYED },
+ { "cb1", 0x29c00000, 0xc0000000, ",al", F_DELAYED },
+ { "cb1", 0x09c00000, 0xc0000000, "l", F_DELAYED },
+ { "cb13", 0x27c00000, 0xc0000000, ",al", F_DELAYED },
+ { "cb13", 0x07c00000, 0xc0000000, "l", F_DELAYED },
+ { "cb12", 0x25c00000, 0xc0000000, ",al", F_DELAYED },
+ { "cb12", 0x05c00000, 0xc0000000, "l", F_DELAYED },
+ { "cb123", 0x23c00000, 0xc0000000, ",al", F_DELAYED },
+ { "cb123", 0x03c00000, 0xc0000000, "l", F_DELAYED },
+ { "cb0", 0x33c00000, 0xc0000000, ",al", F_DELAYED },
+ { "cb0", 0x13c00000, 0xc0000000, "l", F_DELAYED },
+ { "cb03", 0x35c00000, 0xc0000000, ",al", F_DELAYED },
+ { "cb03", 0x15c00000, 0xc0000000, "l", F_DELAYED },
+ { "cb02", 0x37c00000, 0xc0000000, ",al", F_DELAYED },
+ { "cb02", 0x17c00000, 0xc0000000, "l", F_DELAYED },
+ { "cb023", 0x39c00000, 0xc0000000, ",al", F_DELAYED },
+ { "cb023", 0x19c00000, 0xc0000000, "l", F_DELAYED },
+ { "cb01", 0x3bc00000, 0xc0000000, ",al", F_DELAYED },
+ { "cb01", 0x1bc00000, 0xc0000000, "l", F_DELAYED },
+ { "cb013", 0x3dc00000, 0xc0000000, ",al", F_DELAYED },
+ { "cb013", 0x1dc00000, 0xc0000000, "l", F_DELAYED },
+ { "cb012", 0x3fc00000, 0xc0000000, ",al", F_DELAYED },
+ { "cb012", 0x1fc00000, 0xc0000000, "l", F_DELAYED },
+
{ "fstoi", 0x81a01a20, 0x400025c0, "f,g", 0 },
{ "fdtoi", 0x81a01a40, 0x400025a0, "f,g", 0 },
{ "fxtoi", 0x81a01a60, 0x40002580, "f,g", 0 },
***************
*** 602,607 ****
--- 607,613 ----
{ "fdivx", 0x81a009e0, 0x40083600, "e,f,g", 0 },
{ "fdivd", 0x81a009c0, 0x40003620, "e,f,g", 0 },
{ "fdivs", 0x81a009a0, 0x40003640, "e,f,g", 0 },
+
{ "fmuls", 0x81a00920, 0x400036c0, "e,f,g", 0 },
{ "fmuld", 0x81a00940, 0x400036a0, "e,f,g", 0 },
{ "fmulx", 0x81a00960, 0x40003680, "e,f,g", 0 },
***************
*** 617,622 ****
--- 623,629 ----
{ "fsubx", 0x81a008e0, 0x40003700, "e,f,g", 0 },
{ "fsubd", 0x81a008c0, 0x40003720, "e,f,g", 0 },
{ "fsubs", 0x81a008a0, 0x40003740, "e,f,g", 0 },
+
{ "faddx", 0x81a00860, 0x40003780, "e,f,g", 0 },
{ "faddd", 0x81a00840, 0x400037a0, "e,f,g", 0 },
{ "fadds", 0x81a00820, 0x400037c0, "e,f,g", 0 },