Fix gas 68HC12 indexed addressing code generation

3 files changed, 55 insertions, 14 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index ba4c11c..1c6cd51 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2001-01-11  Stephane Carrez  <Stephane.Carrez@worldnet.fr>
 
+	* gas/m68hc11/opers12.s: Add more tests for index post byte.
+	* gas/m68hc11/opers12.d: Likewise.
+
+2001-01-11  Stephane Carrez  <Stephane.Carrez@worldnet.fr>
+
 	* gas/m68hc11/all.exp: Add new tests for dwarf2.
 	* gas/m68hc11/lbranch-dwarf2.d: New file, test for dwarf2.
 	* gas/m68hc11/opers12-dwarf2.d: Likewise.
diff --git a/gas/testsuite/gas/m68hc11/opers12.d b/gas/testsuite/gas/m68hc11/opers12.d
index 2fbd3dd..e6cdce0 100644
--- a/gas/testsuite/gas/m68hc11/opers12.d
+++ b/gas/testsuite/gas/m68hc11/opers12.d
@@ -25,7 +25,7 @@ Disassembly of section .text:
 0+031 <L1\+0x28> ldaa	\[257,Y\]
 0+035 <L1\+0x2c> ldab	\[32767,SP\]
 0+039 <L1\+0x30> ldd	\[32768,PC\]
-0+03d <L1\+0x34> ldd	0,PC
+0+03d <L1\+0x34> ldd	9,PC
 0+040 <L1\+0x37> std	A,X
 0+042 <L1\+0x39> ldx	B,X
 0+044 <L1\+0x3b> stx	D,Y
@@ -68,9 +68,9 @@ Disassembly of section .text:
 0+0b8 <L1\+0xaf> trap	#128
 0+0ba <L1\+0xb1> trap	#255
 0+0bc <L2> movw	1,X, 2,X
-0+0c0 <L2\+0x4> movw	0+0ffff <L2\+0xff43>, 0000ffff <L2\+0xff43>
-0+0c6 <L2\+0xa> movw	0+0ffff <L2\+0xff43>, 1,X
-0+0cb <L2\+0xf> movw	#0+0ffff <L2\+0xff43>, 1,X
+0+0c0 <L2\+0x4> movw	0+0ffff <bb\+0xd7ff>, 0000ffff <bb\+0xd7ff>
+0+0c6 <L2\+0xa> movw	0+0ffff <bb\+0xd7ff>, 1,X
+0+0cb <L2\+0xf> movw	#0+0ffff <bb\+0xd7ff>, 1,X
 0+0d0 <L2\+0x14> movw	0+03 <start\+0x3>, 0+08 <start\+0x8>
 0+0d6 <L2\+0x1a> movw	#0+03 <start\+0x3>, 0+03 <start\+0x3>
 0+0dc <L2\+0x20> movw	#0+03 <start\+0x3>, 1,X
@@ -78,4 +78,13 @@ Disassembly of section .text:
 0+0e6 <L2\+0x2a> movw	0+03 <start\+0x3>, 2,X
 0+0eb <L2\+0x2f> movw	0+04 <start\+0x4>, -2,X
 0+0f0 <L2\+0x34> rts
-
+0+0f1 <post_indexed_pb> leas	0,X
+0+0f5 <t2> leax	4,Y
+0+0f7 <t2\+0x2> leax	100,X
+0+0fb <t2\+0x6> leas	110,SP
+0+0ff <t2\+0xa> leay	10,X
+0+103 <t2\+0xe> leas	10240,Y
+0+107 <t2\+0x12> leas	255,PC
+0+10b <t2\+0x16> leas	0,PC
+0+10f <t2\+0x1a> leas	255,PC
+0+113 <t2\+0x1e> leas	0,PC
diff --git a/gas/testsuite/gas/m68hc11/opers12.s b/gas/testsuite/gas/m68hc11/opers12.s
index b4a9c24..94f8912 100644
--- a/gas/testsuite/gas/m68hc11/opers12.s
+++ b/gas/testsuite/gas/m68hc11/opers12.s
@@ -6,11 +6,11 @@
 	globl start
 
 start:
-	anda	[12,x]
+	anda	[12,x]		; Indexed indirect
 	ldaa	#10
 	ldx	L1
 L1:	ldy	,x
-	addd	1,y
+	addd	1,y		; Offset from register
 	subd	-1,y
 	eora	15,y
 	eora	-16,y
@@ -22,33 +22,36 @@ L1:	ldy	,x
 	orab	-256,x
 	anda	256,x
 	andb	-257,x
-	anda	[12,x]
+	anda	[12,x]		; Indexed indirect (16-bit offset)
 	ldaa	[257,y]
 	ldab	[32767,sp]
 	ldd	[32768,pc]
 	ldd	L1,pc
-	std	a,x
+	std	a,x		; Two-reg index
 	ldx	b,x
 	stx	d,y
-	addd	1,+x
+	addd	1,+x		; Pre-Auto inc
 	addd	2,+x
 	addd	8,+x
-	addd	1,sp+
+	addd	1,sp+		; Post-Auto inc
 	addd	2,sp+
 	addd	8,sp+
-	subd	1,-y
+	subd	1,-y		; Pre-Auto dec
 	subd	2,-y
 	subd	8,-y
-	addd	1,y-
+	addd	1,y-		; Post-Auto dec
 	addd	2,y-
 	addd	8,y-
-	std	[d,x]
+	std	[d,x]		; Indexed indirect with two reg index
 	std	[d,y]
 	std	[d,sp]
 	std	[d,pc]
 	beq	L1
 	lbeq	start
 	lbcc	L2
+;;
+;; Move insn with various operands
+;; 
 	movb	start, 1,x
 	movw	1,x, start
 	movb	start, 1,+x
@@ -80,3 +83,27 @@ L2:
 	movw 3,+2,x
 	movw 4,-2,x
 	rts
+;;
+;; Post-index byte with relocation
+;; 
+post_indexed_pb:
+t1:
+	leas	abort,x
+t2:
+	leax	t2-t1,y
+	leax	toto,x
+	leas	toto+titi,sp
+	leay	titi,x
+	leas	bb,y
+	leas	min5b,pc
+	leas	max5b,pc
+	leas	min9b,pc
+	leas	max9b,pc
+
+titi = 10
+toto = 100
+min5b= -15
+max5b= 15
+min9b= -255
+max9b= 255
+bb = 10240