diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/addb.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/addb.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/addb.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/addb.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,17 @@
+	.section .text
+	.global _fun
+xc16x_add:
+
+	addb rl0,rl1
+	addb rl0,[r1]
+	addb rl0,[r1+]
+	addb rl0,#0x2
+	addb rl0,#0x33
+	addb rl0,0x2387
+	addb 0x2387,rl0
+	
+
+	
+	
+
+	
\ No newline at end of file
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/addcb.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/addcb.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/addcb.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/addcb.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,17 @@
+	.section .text
+	.global _fun
+xc16x_add:
+
+	addcb rl0,rl1
+	addcb rl0,[r1]
+	addcb rl0,[r1+]
+	addcb rl0,#0x02
+	addcb rl0,#0x23
+	addcb 0x2387,rl0
+	
+	
+
+	
+	
+
+	
\ No newline at end of file
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/addc.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/addc.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/addc.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/addc.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,17 @@
+	.section .text
+	.global _fun
+xc16x_add:
+
+	addc r0,r1
+	addc r0,[r1]
+	addc r0,[r1+]
+	addc r0,#0x34
+	addc r0,#0x3456
+	addc r0,0x2387
+	addc 0x2387,r0
+	
+
+	
+	
+
+	
\ No newline at end of file
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/add.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/add.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/add.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/add.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,17 @@
+.text
+xc16x_add:
+add r0,r1
+add r0,[r1]
+add r0,[r1+]
+add r0,#3
+add r0,#1234
+add r0,0xffed
+add 0xffed,r0
+
+	
+	
+
+	
+	
+
+	
\ No newline at end of file
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/add_test.exp binutils-2.15.96patched/gas/testsuite/gas/xc16x/add_test.exp
--- binutils-2.15.96/gas/testsuite/gas/xc16x/add_test.exp	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/add_test.exp	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,191 @@
+
+####################################################
+#add test
+#
+####################################################
+
+proc do_add_test {} {
+    set testname "add_test.s -- xc16x tests"
+
+    gas_start "add_test.s" "-al"
+
+    # Check each instruction bit pattern to verify it got assembled correctly.
+
+    set x 0
+    expect {
+	-re ".*   7 0000 0001" { set x [expr $x+1]; exp_continue; }
+	-re ".*   8 0002 0002" { set x [expr $x+1]; exp_continue; }
+	-re ".*   9 0004 0003" { set x [expr $x+1]; exp_continue; }
+	-re ".*  10 0006 0004" { set x [expr $x+1]; exp_continue; }
+	-re ".*  11 0008 0005" { set x [expr $x+1]; exp_continue; }
+	-re ".*  12 000a 0006" { set x [expr $x+1]; exp_continue; }
+	-re ".*  13 000c 0007" { set x [expr $x+1]; exp_continue; }
+	-re ".*  14 000e 0008" { set x [expr $x+1]; exp_continue; }
+	-re ".*  15 0010 0009" { set x [expr $x+1]; exp_continue; }
+	-re ".*  16 0012 000A" { set x [expr $x+1]; exp_continue; }
+	-re ".*  17 0014 000B" { set x [expr $x+1]; exp_continue; }
+	-re ".*  18 0016 000C" { set x [expr $x+1]; exp_continue; }
+	-re ".*  19 0018 000D" { set x [expr $x+1]; exp_continue; }
+	-re ".*  20 001a 000E" { set x [expr $x+1]; exp_continue; }
+	-re ".*  21 001c 000F" { set x [expr $x+1]; exp_continue; }
+	-re ".*	 22 		"{
+	    if [expr $x == 15] then {
+	    pass "$testname: add R0, ..."
+	    } else {
+	    fail "$testname: add R0, ... ($x)"
+	    }
+    	}
+            default { fail "$testname: add R0, ... ($x)" }
+    	}
+    
+    set x 0
+    expect {
+	-re ".*  23 001e 0010" { set x [expr $x+1]; exp_continue; }
+	-re ".*  24 0020 0012" { set x [expr $x+1]; exp_continue; }
+	-re ".*  25 0022 0013" { set x [expr $x+1]; exp_continue; }
+	-re ".*  26 0024 0014" { set x [expr $x+1]; exp_continue; }
+	-re ".*  27 0026 0015" { set x [expr $x+1]; exp_continue; }
+	-re ".*  28 0028 0016" { set x [expr $x+1]; exp_continue; }
+	-re ".*  29 002a 0017" { set x [expr $x+1]; exp_continue; }
+	-re ".*  30 002c 0018" { set x [expr $x+1]; exp_continue; }
+	-re ".*  31 002e 0019" { set x [expr $x+1]; exp_continue; }
+	-re ".*  32 0030 001A" { set x [expr $x+1]; exp_continue; }
+	-re ".*  33 0032 001B" { set x [expr $x+1]; exp_continue; }
+	-re ".*  34 0034 001C" { set x [expr $x+1]; exp_continue; }
+	-re ".*  35 0036 001D" { set x [expr $x+1]; exp_continue; }
+	-re ".*  36 0038 001E" { set x [expr $x+1]; exp_continue; }
+	-re ".*  37 003a 001F" { set x [expr $x+1]; exp_continue; }
+	-re ".*  38		"{
+	    if [expr $x == 15] then {
+	    pass "$testname: add R1, ..."
+	    } else {
+	   fail "$testname: add R1, ... ($x)"
+	    }
+    	}
+   	   default { fail "$testname: add R1, ... ($x)" }      
+   	}
+   	
+    set x 0
+    expect {
+	-re ".*  39 003c 0020" { set x [expr $x+1]; exp_continue; }
+	-re ".*  40 003e 0021" { set x [expr $x+1]; exp_continue; }
+	-re ".*  41 0040 0023" { set x [expr $x+1]; exp_continue; }
+	-re ".*  42 0042 0024" { set x [expr $x+1]; exp_continue; }
+	-re ".*  43 0044 0025" { set x [expr $x+1]; exp_continue; }
+	-re ".*  44 0046 0026" { set x [expr $x+1]; exp_continue; }
+	-re ".*  45 0048 0027" { set x [expr $x+1]; exp_continue; }
+	-re ".*  46 004a 0028" { set x [expr $x+1]; exp_continue; }
+	-re ".*  47 004c 0029" { set x [expr $x+1]; exp_continue; }
+	-re ".*  48 004e 002A" { set x [expr $x+1]; exp_continue; }
+	-re ".*  49 0050 002B" { set x [expr $x+1]; exp_continue; }
+	-re ".*  50 0052 002C" { set x [expr $x+1]; exp_continue; }
+	-re ".*  51 0054 002D" { set x [expr $x+1]; exp_continue; }
+	-re ".*  52 0056 002E" { set x [expr $x+1]; exp_continue; }
+	-re ".*  53 0058 002F" { set x [expr $x+1]; exp_continue; }
+	-re ".*  54 		 "{
+	    if [expr $x == 15] then {
+	    pass "$testname: add R2, ..."
+	    } else {
+	    fail "$testname: add R2, ... ($x)"
+	    }
+    	}
+            default { fail "$testname: add R2, ... ($x)" }
+    	}   
+
+    set x 0
+    expect {
+	-re ".*  55 005a 0030" { set x [expr $x+1]; exp_continue; }
+	-re ".*  56 005c 0031" { set x [expr $x+1]; exp_continue; }
+	-re ".*  57 005e 0033" { set x [expr $x+1]; exp_continue; }
+	-re ".*  58 0060 0034" { set x [expr $x+1]; exp_continue; }
+	-re ".*  59 0062 0035" { set x [expr $x+1]; exp_continue; }
+	-re ".*  60 0064 0036" { set x [expr $x+1]; exp_continue; }
+	-re ".*  61 0066 0037" { set x [expr $x+1]; exp_continue; }
+	-re ".*  62 0068 0038" { set x [expr $x+1]; exp_continue; }
+	-re ".*  63 006a 0039" { set x [expr $x+1]; exp_continue; }
+	-re ".*  64 006c 003A" { set x [expr $x+1]; exp_continue; }
+	-re ".*  65 006e 003B" { set x [expr $x+1]; exp_continue; }
+	-re ".*  66 0070 003C" { set x [expr $x+1]; exp_continue; }
+	-re ".*  67 0072 003D" { set x [expr $x+1]; exp_continue; }
+	-re ".*  68 0074 003E" { set x [expr $x+1]; exp_continue; }
+	-re ".*  69 0076 003F" { set x [expr $x+1]; exp_continue; }
+	-re ".*  70 		 "{
+	    if [expr $x == 15] then {
+	    pass "$testname: add R3, ..."
+	    } else {
+	    fail "$testname: add R3, ... ($x)"
+	    }
+    	}
+            default { fail "$testname: add R3, ... ($x)" }
+    	}   
+    	
+    set x 0
+    expect {
+ 	-re ".*  71 0078 0809" { set x [expr $x+1]; exp_continue; }
+ 	-re ".*  72 007a 080D" { set x [expr $x+1]; exp_continue; }
+ 	-re ".*  73 007c 0803" { set x [expr $x+1]; exp_continue; }
+ 	-re ".*  74 007e 06F0FFFF" { set x [expr $x+1]; exp_continue; }
+ 	-re ".*  75 0082 02F0FFFF" { set x [expr $x+1]; exp_continue; }
+ 	-re ".*  76 0086 04F0FFFF" { set x [expr $x+1]; exp_continue; }
+ 	-re ".*  77 		 "{
+ 	    if [expr $x == 6] then {
+ 	    pass "$testname: add r0,[r1] ..."
+ 	    } else {
+ 	    fail "$testname: add r0, ... ($x)"
+ 	    }
+     	}
+             default { fail "$testname: add r0, ... ($x)" }
+    	}   
+    	
+     set x 0
+     expect {
+    	-re ".*  78 008a 0101" { set x [expr $x+1]; exp_continue; }
+    	-re ".*  79 008c 0908" { set x [expr $x+1]; exp_continue; }
+    	-re ".*  80 008e 0903" { set x [expr $x+1]; exp_continue; }
+    	-re ".*  81 0090 07F0FF00" { set x [expr $x+1]; exp_continue; }
+    	-re ".*  82 0094 03F010FF" { set x [expr $x+1]; exp_continue; }
+    	-re ".*  83 0098 05F010FF" { set x [expr $x+1]; exp_continue; }
+    	-re ".*  84 		 "{
+    	    if [expr $x == 6] then {
+    	    pass "$testname: addb r0,[r1] ..."
+    	    } else {
+    	    fail "$testname: addb r0, ... ($x)"
+    	    }
+        	}
+                default { fail "$testname: addb r0, ... ($x)" }
+       		}   
+      set x 0
+      expect {
+       	-re ".*  85 009c 1001" { set x [expr $x+1]; exp_continue; }
+       	-re ".*  86 009e 1809" { set x [expr $x+1]; exp_continue; }
+       	-re ".*  87 00a0 1803" { set x [expr $x+1]; exp_continue; }
+       	-re ".*  88 00a2 16F012FF" { set x [expr $x+1]; exp_continue; }
+       	-re ".*  89 00a6 16F012FF" { set x [expr $x+1]; exp_continue; }
+       	-re ".*  90 00aa 12F012FF" { set x [expr $x+1]; exp_continue; }
+       	-re ".*  91 		 "{
+       	    if [expr $x == 6] then {
+       	    pass "$testname: addb r0,[r1] ..."
+       	    } else {
+       	    fail "$testname: addb r0, ... ($x)"
+       	    }
+           	}
+                   default { fail "$testname: addb r0, ... ($x)" }
+       	}   
+   
+       set x 0
+       expect {
+       	-re ".*  92 00b2 1903" { set x [expr $x+1]; exp_continue; }
+       	-re ".*  93 00b4 17F0FF00" { set x [expr $x+1]; exp_continue; }
+       	-re ".*  94 00b8 13F010FF" { set x [expr $x+1]; exp_continue; }
+       	-re ".*  95 00bc 15F010FF" { set x [expr $x+1]; exp_continue; }
+       	-re ".*  96 		 "{
+       	    if [expr $x == 4] then {
+       	    pass "$testname: addb r0,[r1] ..."
+       	    } else {
+       	    fail "$testname: addb r0, ... ($x)"
+       	    }
+           	}
+                   default { fail "$testname: addb r0, ... ($x)" }
+       	}   
+      }
+      
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/add_test.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/add_test.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/add_test.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/add_test.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,92 @@
+.text
+_start:
+	add r0,r1
+	add r0,r2
+	add r0,r3
+	add r0,r4
+	add r0,r5
+	add r0,r6
+	add r0,r7
+	add r0,r8
+	add r0,r9
+	add r0,r10
+	add r0,r11
+	add r0,r12
+	add r0,r13
+	add r0,r14
+	add r0,r15
+
+	add r1,r0
+	add r1,r2
+	add r1,r3
+	add r1,r4
+	add r1,r5
+	add r1,r6
+	add r1,r7
+	add r1,r8
+	add r1,r9
+	add r1,r10
+	add r1,r11
+	add r1,r12
+	add r1,r13
+	add r1,r14
+	add r1,r15
+	
+   	add r2,r0
+	add r2,r1
+	add r2,r3
+	add r2,r4
+	add r2,r5
+	add r2,r6
+	add r2,r7
+	add r2,r8
+	add r2,r9
+	add r2,r10
+	add r2,r11
+	add r2,r12
+	add r2,r13
+	add r2,r14
+	add r2,r15
+	
+	add r3,r0
+	add r3,r1
+	add r3,r2
+	add r3,r4
+	add r3,r5
+	add r3,r6
+	add r3,r7
+	add r3,r8
+	add r3,r9
+	add r3,r10
+	add r3,r11
+	add r3,r12
+	add r3,r13
+	add r3,r14
+	add r3,r15
+	
+	add r0,[r1]
+	add r0,[r1+]
+	add r0,#3
+	add r0,#0xffff
+	add r0,0xffff
+	add 0xffff,r0
+	
+	addb rl0,rh0
+	addb rl0[r0]
+	addb rl0,#3
+	addb rl0,#0xff
+	addb r0,0xff10
+	addb 0xff10,r0
+	
+	addc r0,r1
+	addc r0,[r1]
+	addc r0,#3
+	addc r0,#0xff12
+	addc r0,#0xff12
+	addc r0,0xff12
+	addc 0xff12,r0
+	
+	addcb rl0,#3
+	addcb rl0,#0xff
+	addcb r0,0xff10
+	addcb 0xff10,r0
\ No newline at end of file
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/andb.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/andb.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/andb.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/andb.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,10 @@
+        .section .text
+        .global _fun
+xc16x_andb:
+		andb rl0,rl1
+		andb rl0,[r1]
+		andb rl0,[r1+]
+		andb rl0,#3
+		andb rl0,#0xbe
+		andb rl0,0x0230
+		andb 0x320,rl0
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/and.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/and.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/and.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/and.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,14 @@
+.section .text
+.global  _fun
+
+xc16x_and:
+
+	and r0,r1
+	and r0,[r1]
+	and r0,[r1+]
+	and r0,#3
+	and r0,#0xfcbe
+	and r0,0x0230
+	and 0x320,r0
+	
+	
\ No newline at end of file
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/bfldl.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/bfldl.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/bfldl.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/bfldl.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,4 @@
+  .text
+ xc16x_bfldl:
+   BFLDL r0,#0x87,#0x0e
+   BFLDH r0,#0xff,#0x0e
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/bit.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/bit.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/bit.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/bit.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,11 @@
+.text
+xc16x_bit:
+bclr  r0.1
+bset  r0.1
+bmov  r0.2,r0.1
+bmovn r0.3,r0.2 
+band  r0.1,r0.4
+bor   r0.1,r0.2
+bxor  r0.1,r0.2
+bcmp  r0.1,r0.2
+	
\ No newline at end of file
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/calla.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/calla.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/calla.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/calla.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,24 @@
+.text
+xc16x_calla:
+calla cc_uc,0xaaaa
+calla cc_z,0xaaaa
+calla cc_nz,0xaaaa
+calla cc_v,0xaaaa
+calla cc_nv,0xaaaa
+calla cc_n,0xaaaa
+calla cc_nn,0xaaaa
+calla cc_c,0xaaaa
+calla cc_nc,0xaaaa
+calla cc_eq,0xaaaa
+calla cc_ne,0xaaaa
+calla cc_ult,0xaaaa
+calla cc_ule,0xaaaa
+calla cc_uge,0xaaaa
+calla cc_ugt,0xaaaa
+calla cc_sle,0xaaaa
+calla cc_sge,0xaaaa
+calla cc_sgt,0xaaaa
+calla cc_net,0xaaaa
+calla cc_slt,0xaaaa	
+
+	
\ No newline at end of file
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/calli.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/calli.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/calli.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/calli.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,21 @@
+.text
+xc16x_calli:
+calli cc_uc,[r1]
+calli cc_z,[r1]
+calli cc_nz,[r1]
+calli cc_v,[r1]
+calli cc_nv,[r1]
+calli cc_n,[r1]
+calli cc_nn,[r1]
+calli cc_c,[r1]
+calli cc_nc,[r1]
+calli cc_eq,[r1]
+calli cc_ne,[r1]
+calli cc_ult,[r1]
+calli cc_ule,[r1]
+calli cc_uge,[r1]
+calli cc_ugt,[r1]
+calli cc_sle,[r1]
+calli cc_sge,[r1]
+calli cc_net,[r1]
+calli cc_slt,[r1]
\ No newline at end of file
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/cmpb.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/cmpb.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/cmpb.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/cmpb.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,8 @@
+.text
+xc16x_cmpb:
+cmpb  rl0,rl1
+cmpb  rl0,[r1]
+cmpb  rl0,[r1+]
+cmpb  rl0,#3
+cmpb  rl0,#34
+cmpb  rl0,0x0234
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/cmpi.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/cmpi.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/cmpi.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/cmpi.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,18 @@
+.section  .text
+.global	 _fun
+
+xc16x_cmpd:
+
+	cmpd1	r0,#0x0f
+	cmpd1 	r0,#0x0fccb
+	cmpd1	r0,0xffcb
+	cmpd2	r0,#0x0f
+	cmpd2 	r0,#0x0fccb
+	cmpd2	r0,0xffcb
+	cmpi1	r0,#0x0f
+	cmpi1 	r0,#0x0fccb
+	cmpi1	r0,0xffcb
+	cmpi2	r0,#0x0f
+	cmpi2 	r0,#0x0fccb
+	cmpi2	r0,0xffcb
+	
\ No newline at end of file
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/cmp.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/cmp.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/cmp.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/cmp.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,9 @@
+.text
+xc16x_cmp:
+cmp   r0,r1
+cmp   r0,[r1]
+cmp   r0,[r1+]
+cmp   r0,#3
+cmp   r0,#0x0234
+cmp   r0,0x3452
+	
\ No newline at end of file
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/cmp_test.exp binutils-2.15.96patched/gas/testsuite/gas/xc16x/cmp_test.exp
--- binutils-2.15.96/gas/testsuite/gas/xc16x/cmp_test.exp	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/cmp_test.exp	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,50 @@
+proc do_cmp_test {} {
+    set testname "mov_test.s -- xc16x tests"
+
+    gas_start "mov_test.s" "-al"
+
+    # Check each instruction bit pattern to verify it got assembled correctly.
+
+    set x 0
+    expect {
+	-re ".*   7 0000 4001" { set x [expr $x+1]; exp_continue; }
+	-re ".*   8 0002 4809" { set x [expr $x+1]; exp_continue; }
+	-re ".*   9 0004 480D" { set x [expr $x+1]; exp_continue; }
+	-re ".*  10 0006 4803" { set x [expr $x+1]; exp_continue; }
+	-re ".*  11 0008 46F03402" { set x [expr $x+1]; exp_continue; }
+	-re ".*  12 000c 42F05234" { set x [expr $x+1]; exp_continue; }
+	-re ".*  13 0010 4001" { set x [expr $x+1]; exp_continue; }
+	-re ".*  14 0012 4809" { set x [expr $x+1]; exp_continue; }
+	-re ".*  15 0014 480D" { set x [expr $x+1]; exp_continue; }
+	-re ".*  16 0016 4803" { set x [expr $x+1]; exp_continue; }
+	-re ".*  17 0018 46F03402" { set x [expr $x+1]; exp_continue; }
+	-re ".*  18 001c 42F05234" { set x [expr $x+1]; exp_continue; }
+	-re ".*  19 0020 4102" { set x [expr $x+1]; exp_continue; }
+	-re ".*  20 0022 4909" { set x [expr $x+1]; exp_continue; }
+	-re ".*  21 0024 490D" { set x [expr $x+1]; exp_continue; }
+	-re ".*  22 0026 4903" { set x [expr $x+1]; exp_continue; }
+	-re ".*  23 0028 47F02200" { set x [expr $x+1]; exp_continue; }
+	-re ".*  24 002c 43F03402" { set x [expr $x+1]; exp_continue; }
+	-re ".*  25 0030 A0F0" { set x [expr $x+1]; exp_continue; }
+	-re ".*  26 0032 A6F0CBFC" { set x [expr $x+1]; exp_continue; }
+	-re ".*  27 0036 A2F0CBFF" { set x [expr $x+1]; exp_continue; }
+	-re ".*  28 003a B0F0" { set x [expr $x+1]; exp_continue; }
+	-re ".*  29 003c B6F0CBFC" { set x [expr $x+1]; exp_continue; }
+	-re ".*  30 0040 B2F0CBFF" { set x [expr $x+1]; exp_continue; }
+	-re ".*  31 0044 80F0" { set x [expr $x+1]; exp_continue; }
+	-re ".*  32 0046 86F0CBFC" { set x [expr $x+1]; exp_continue; }
+	-re ".*  33 004a 82F0CBFF" { set x [expr $x+1]; exp_continue; }
+	-re ".*  34 004e 90F0" { set x [expr $x+1]; exp_continue; }
+	-re ".*  35 0050 96F0CBFC" { set x [expr $x+1]; exp_continue; }
+	-re ".*  36 0054 92F0CBFC" { set x [expr $x+1]; exp_continue; }
+	-re ".*	 39 		"{
+	    if [expr $x == 30] then {
+	    pass "$testname: cmp R0, ..."
+	    } else {
+	    fail "$testname: cmp R0, ... ($x)"
+	    }
+    	}
+            default { fail "$testname: cmp R0, ... ($x)" }
+    	}
+    	
+}
\ No newline at end of file
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/cmp_test.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/cmp_test.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/cmp_test.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/cmp_test.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,45 @@
+.text
+cmp   r0,r1
+cmp   r0,[r1]
+cmp   r0,[r1+]
+cmp   r0,#3
+cmp   r0,#0x0234
+cmp   r0,0x3452
+
+cmp   r0,r1
+cmp   r0,[r1]
+cmp   r0,[r1+]
+cmp   r0,#3
+cmp   r0,#0xcdef
+cmp   r0,0xcdef
+
+cmpb  rl0,rl1
+cmpb  rl0,[r1]
+cmpb  rl0,[r1+]
+cmpb  rl0,#3
+cmpb  rl0,#cd
+cmpb  rl0,0x0234
+
+cmpb  rl0,rl1
+cmpb  rl0,[r1]
+cmpb  rl0,[r1+]
+cmpb  rl0,#3
+cmpb  rl0,#cd
+cmpb  rl0,0xcdef
+
+cmpd1	r0,#0x0f
+cmpd1 	r0,#0x0fccb
+cmpd1	r0,0xffcb
+cmpd2	r0,#0x0f
+cmpd2 	r0,#0x0fccb
+cmpd2	r0,0xffcb
+
+cmpi1	r0,#0x0f
+cmpi1 	r0,#0x0fccb
+cmpi1	r0,0xffcb
+cmpi2	r0,#0x0f
+cmpi2 	r0,#0x0fccb
+cmpi2	r0,0xffcb
+
+
+
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/cpl.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/cpl.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/cpl.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/cpl.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,7 @@
+       .section .text
+       .global _fun
+
+xc16x_cpl_cplb:
+
+	cpl   r0
+	cplb rl0
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/div.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/div.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/div.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/div.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,8 @@
+       .section .text
+       .global _fun
+xc16x_div:
+
+	div     r0
+	divl    r0
+	divlu  r0
+	divu   r0
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/jmpa.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/jmpa.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/jmpa.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/jmpa.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,23 @@
+.text
+xc16x_jmpa:
+	jmpa cc_UC,0xaaaa
+	jmpa cc_Z,0xaaaa
+	jmpa cc_NZ,0xaaaa
+	jmpa cc_V,0xaaaa
+	jmpa cc_NV,0xaaaa
+	jmpa cc_N,0xaaaa
+	jmpa cc_NN,0xaaaa
+	jmpa cc_ULT,0xaaaa
+	jmpa cc_UGE,0xaaaa
+	jmpa cc_Z,0xaaaa
+	jmpa cc_NZ,0xaaaa
+	jmpa cc_ULT,0xaaaa
+	jmpa cc_ULE,0xaaaa
+	jmpa cc_UGE,0xaaaa
+	jmpa cc_UGT,0xaaaa
+	jmpa cc_SLE,0xaaaa
+	jmpa cc_SGE,0xaaaa
+	jmpa cc_SGT,0xaaaa
+	jmpa cc_NET,0xaaaa
+
+		
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/jmpi.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/jmpi.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/jmpi.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/jmpi.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,24 @@
+.section  .text
+.global   _fun
+
+xc16x_jmpi:
+
+	jmpi cc_UC, [r7]
+	jmpi cc_z,  [r7]
+	jmpi cc_NZ, [r7]
+	jmpi cc_V,  [r7]
+	jmpi cc_NV, [r7]
+	jmpi cc_N,  [r7]
+	jmpi cc_NN, [r7]
+	jmpi cc_C,  [r7]
+	jmpi cc_NC, [r7]
+	jmpi cc_EQ, [r7]
+	jmpi cc_NE, [r7]
+	jmpi cc_ULT,[r7]
+	jmpi cc_ULE,[r7]
+	jmpi cc_UGE,[r7]
+	jmpi cc_UGT,[r7]
+	jmpi cc_SLE,[r7]
+	jmpi cc_SGE,[r7]
+	jmpi cc_SGT,[r7]
+	jmpi cc_NET,[r7]
\ No newline at end of file
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/jmpr.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/jmpr.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/jmpr.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/jmpr.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,25 @@
+        .section  .text
+        .global _fun
+
+xc16x_jmpr:
+
+	jmpr cc_uc, xc16x_jmpr
+	jmpr cc_z,  xc16x_jmpr
+	jmpr cc_nz, xc16x_jmpr
+	jmpr cc_v,  xc16x_jmpr
+	jmpr cc_nv, xc16x_jmpr
+	jmpr cc_n,  xc16x_jmpr
+	jmpr cc_nn, xc16x_jmpr
+	jmpr cc_c,  xc16x_jmpr
+	jmpr cc_nc, xc16x_jmpr
+	jmpr cc_eq, xc16x_jmpr
+	jmpr cc_ne, xc16x_jmpr
+	jmpr cc_ult,xc16x_jmpr
+	jmpr cc_ule,xc16x_jmpr
+	jmpr cc_uge,xc16x_jmpr
+	jmpr cc_ugt,xc16x_jmpr
+	jmpr cc_sle,xc16x_jmpr
+	jmpr cc_sge,xc16x_jmpr
+	jmpr cc_sgt,xc16x_jmpr
+	jmpr cc_net,xc16x_jmpr
+	jmpr cc_slt,xc16x_jmpr	
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/movb.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/movb.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/movb.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/movb.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,26 @@
+	.section .text
+	.global _fun
+xc16x_movb:
+
+	movb rl0,r2
+	movb rl0,#0x12
+	movb r3,[r2]
+	movb rl0,[r2+]
+	movb [-r2],rl0
+	movb [r3],[r2+]
+	movb [r3],[r2]
+	movb [r2+],[r3]
+	movb [r2],[r3+]
+	movb rl0,[r3+#0x1234]
+	movb [r3+#0x1234],rl0
+	movb [r3],0x1234
+	movb [r3],0xeeff
+	movb 0x1234,[r3]
+	movb rl0,0x12
+	movb 0x12,rl0
+	
+	
+	
+
+	
+	
\ No newline at end of file
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/movbs.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/movbs.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/movbs.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/movbs.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,8 @@
+        .section .text
+        .global  _fun
+
+xc16x_movbs:
+
+	movbs  r0,rl1
+	movbs  r0,0xff
+	movbs  0xffcb,rl0
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/movbz.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/movbz.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/movbz.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/movbz.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,9 @@
+	.section .text
+	.global _fun
+xc16x_movbz:
+
+	movbz r2,rl0
+	movbz r0,0x23dd
+	movbz 0x23,rl0
+
+	
\ No newline at end of file
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/mov.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/mov.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/mov.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/mov.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,20 @@
+        .section .text
+        .global _fun
+xc16x_mov:
+
+	mov r0,r1
+	mov r0,#02
+	mov r0,#0xfcbe
+	mov r0,[r1]
+	mov r0,[r1+]
+	mov [r0],r1
+	mov [-r0],r1
+	mov [r0],[r1]
+	mov [r0+],[r1]
+	mov [r0],[r1+]
+	mov r0,[r0+#0xffcb]
+	mov [r0+#0xffcb],r0
+	mov [r0],0xffcb
+	mov 0xffcb,[r0]
+	mov r0,0xffcb
+	mov 0xffcb,r0
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/mov_test.exp binutils-2.15.96patched/gas/testsuite/gas/xc16x/mov_test.exp
--- binutils-2.15.96/gas/testsuite/gas/xc16x/mov_test.exp	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/mov_test.exp	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,143 @@
+####################################################
+#mov test
+#
+####################################################
+
+proc do_mov_test {} {
+    set testname "mov_test.s -- xc16x tests"
+
+    gas_start "mov_test.s" "-al"
+
+    # Check each instruction bit pattern to verify it got assembled correctly.
+
+    set x 0
+    expect {
+	-re ".*   7 0000 F001" { set x [expr $x+1]; exp_continue; }
+	-re ".*   8 0002 E6F00200" { set x [expr $x+1]; exp_continue; }
+	-re ".*   9 0006 E6F00100" { set x [expr $x+1]; exp_continue; }
+	-re ".*  10 000a A801" { set x [expr $x+1]; exp_continue; }
+	-re ".*  11 000c 9801" { set x [expr $x+1]; exp_continue; }
+	-re ".*  12 000e B810" { set x [expr $x+1]; exp_continue; }
+	-re ".*  13 0010 8810" { set x [expr $x+1]; exp_continue; }
+	-re ".*  14 0012 C801" { set x [expr $x+1]; exp_continue; }
+	-re ".*  15 0014 D801" { set x [expr $x+1]; exp_continue; }
+	-re ".*  16 0016 E801" { set x [expr $x+1]; exp_continue; }
+	-re ".*  17 0018 D4000100" { set x [expr $x+1]; exp_continue; }
+	-re ".*  18 001c C4000100" { set x [expr $x+1]; exp_continue; }
+	-re ".*  19 0020 84000100" { set x [expr $x+1]; exp_continue; }
+	-re ".*  20 0024 94000100" { set x [expr $x+1]; exp_continue; }
+	-re ".*  21 0028 F2F00100" { set x [expr $x+1]; exp_continue; }
+	-re ".*  22 002c F6F00100" { set x [expr $x+1]; exp_continue; }
+	-re ".*  23 0030 F001" { set x [expr $x+1]; exp_continue; }
+	-re ".*  24 0032 E6F00200" { set x [expr $x+1]; exp_continue; }
+	-re ".*  25 0036 E6F0FFFF" { set x [expr $x+1]; exp_continue; }
+	-re ".*  26 003a A801" { set x [expr $x+1]; exp_continue; }
+	-re ".*  27 003c 9801" { set x [expr $x+1]; exp_continue; }
+	-re ".*  28 003e B810" { set x [expr $x+1]; exp_continue; }
+	-re ".*  29 0040 8810" { set x [expr $x+1]; exp_continue; }
+	-re ".*  30 0042 C801" { set x [expr $x+1]; exp_continue; }
+	-re ".*  31 0044 D801" { set x [expr $x+1]; exp_continue; }
+	-re ".*  32 0046 E801" { set x [expr $x+1]; exp_continue; }
+	-re ".*  33 0048 D400FFFF" { set x [expr $x+1]; exp_continue; }
+	-re ".*  34 004c C400FFFF" { set x [expr $x+1]; exp_continue; }
+	-re ".*  35 0050 8400FFFF" { set x [expr $x+1]; exp_continue; }
+	-re ".*  36 0054 9400FFFF" { set x [expr $x+1]; exp_continue; }
+	-re ".*  37 0058 F2F0FFFF" { set x [expr $x+1]; exp_continue; }
+
+	-re ".*  38 005c F6F0FFFF" { set x [expr $x+1]; exp_continue; }	
+
+	-re ".*	 39 		"{
+	    if [expr $x == 32] then {
+	    pass "$testname: mov R0, ..."
+	    } else {
+	    fail "$testname: mov R0, ... ($x)"
+	    }
+    	}
+            default { fail "$testname: mov R0, ... ($x)" }
+    	}
+    
+    set x 0
+    expect {
+	-re ".*  40 0060 F3F0000" { set x [expr $x+1]; exp_continue; }
+	-re ".*  41 0064 E7F01200" { set x [expr $x+1]; exp_continue; }
+	-re ".*  42 0068 B4020000" { set x [expr $x+1]; exp_continue; }
+	-re ".*  43 006c 9902" { set x [expr $x+1]; exp_continue; }
+	-re ".*  44 006e 8902" { set x [expr $x+1]; exp_continue; }
+	-re ".*  45 0070 E932" { set x [expr $x+1]; exp_continue; }
+	-re ".*  46 0072 C932" { set x [expr $x+1]; exp_continue; }
+
+	-re ".*  46 0074 D923" { set x [expr $x+1]; exp_continue; }
+	-re ".*  47 0076 E923" { set x [expr $x+1]; exp_continue; }
+	-re ".*  48 0078 F4033412" { set x [expr $x+1]; exp_continue; }
+	-re ".*  49 007c E4033412" { set x [expr $x+1]; exp_continue; }
+	-re ".*  50 0080 A4033412" { set x [expr $x+1]; exp_continue; }
+	-re ".*  51 0084 A4033412" { set x [expr $x+1]; exp_continue; }
+	-re ".*  52 0088 B4033412" { set x [expr $x+1]; exp_continue; }
+	-re ".*  53 008c F3F01200" { set x [expr $x+1]; exp_continue; }
+	-re ".*  54 0090 F7F01200" { set x [expr $x+1]; exp_continue; }
+	-re ".*  55 0094 F3F00000" { set x [expr $x+1]; exp_continue; }
+	-re ".*  56 0098 E7F0FF00" { set x [expr $x+1]; exp_continue; }
+	-re ".*  56 009c B4020000" { set x [expr $x+1]; exp_continue; }
+
+	-re ".*  57 00a0 9902" { set x [expr $x+1]; exp_continue; }
+	-re ".*  58 00a2 8902" { set x [expr $x+1]; exp_continue; }
+	-re ".*  59 00a4 E902" { set x [expr $x+1]; exp_continue; }
+	-re ".*  60 00a6 C932" { set x [expr $x+1]; exp_continue; }
+	-re ".*  61 00a8 D923" { set x [expr $x+1]; exp_continue; }
+	-re ".*  62 00aa E923" { set x [expr $x+1]; exp_continue; }
+	-re ".*  63 00ac F403FFFF" { set x [expr $x+1]; exp_continue; }
+	-re ".*  64 00b0 E403FFFF" { set x [expr $x+1]; exp_continue; }
+	-re ".*  65 00b4 A403FFFF" { set x [expr $x+1]; exp_continue; }
+	-re ".*  66 00b8 A403FFFF" { set x [expr $x+1]; exp_continue; }
+	-re ".*  67 00bc B403FFFF" { set x [expr $x+1]; exp_continue; }
+	-re ".*  68 00c0 F3F0FF00" { set x [expr $x+1]; exp_continue; }
+	-re ".*  69 00c4 F7F0FF00" { set x [expr $x+1]; exp_continue; }
+	-re ".*	 72 		"{
+	    if [expr $x == 32] then {
+	    pass "$testname: movb R0, ..."
+	    } else {
+	    fail "$testname: movb R0, ... ($x)"
+	    }
+    	}
+            default { fail "$testname: movb R0, ... ($x)" }
+    	}
+      
+    set x 0
+    expect {
+	-re ".*  73 00c8 D020" { set x [expr $x+1]; exp_continue; }
+	-re ".*  74 00ca D2F01200" { set x [expr $x+1]; exp_continue; }
+	-re ".*  75 00ce D5F03412" { set x [expr $x+1]; exp_continue; }
+	-re ".*  76 00d2 D020" { set x [expr $x+1]; exp_continue; }
+	-re ".*  77 00d4 D2F0FF00" { set x [expr $x+1]; exp_continue; }
+	-re ".*  78 00d8 D5F0FFFF" { set x [expr $x+1]; exp_continue; }
+	-re ".*	 79 		"{
+	    if [expr $x == 6] then {
+	    pass "$testname: movbs R0, ..."
+	    } else {
+	    fail "$testname: movbs R0, ... ($x)"
+	    }
+    	}
+            default { fail "$testname: movbs R0, ... ($x)" }
+    	}
+
+    set x 0
+    expect {
+	-re ".*  80 00dc C020" { set x [expr $x+1]; exp_continue; }
+	-re ".*  81 00de C2F03412" { set x [expr $x+1]; exp_continue; }
+	-re ".*  82 00e2 C5F03412" { set x [expr $x+1]; exp_continue; }
+	-re ".*  83 00e6 C002" { set x [expr $x+1]; exp_continue; }
+	-re ".*  84 00e8 C2F0FF00" { set x [expr $x+1]; exp_continue; }
+	-re ".*  85 00ec C5F0FFFF" { set x [expr $x+1]; exp_continue; }
+	-re ".*	 86 		"{
+	    if [expr $x == 6] then {
+	    pass "$testname: movbz R0, ..."
+	    } else {
+	    fail "$testname: movbz R0, ... ($x)"
+	    }
+    	}
+            default { fail "$testname: movbz R0, ... ($x)" }
+    	}
+}
+
+
+
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/mov_test.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/mov_test.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/mov_test.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/mov_test.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,85 @@
+	.xc16x
+	mov r0,r1
+	mov r0,#02
+	mov r0,#0x0001
+	mov r0,[r1]
+	mov r0,[r1+]
+	mov [r0],r1
+	mov [-r0],r1
+	mov [r0],[r1]
+	mov [r0+],[r1]
+	mov [r0],[r1+]
+	mov r0,[r0+#0x0001]
+	mov [r0+#0x0001],r0
+	mov [r0],0x0001
+	mov 0x0001,[r0]
+	mov r0,0x0001
+	mov 0x0001,r0
+ 
+ 	mov r0,r1
+ 	mov r0,#02
+ 	mov r0,#0xffff
+ 	mov r0,[r1]
+ 	mov r0,[r1+]
+ 	mov [r0],r1
+ 	mov [-r0],r1
+ 	mov [r0],[r1]
+ 	mov [r0+],[r1]
+ 	mov [r0],[r1+]
+ 	mov r0,[r0+#0xffff]
+ 	mov [r0+#0xffff],r0
+ 	mov [r0],0xffff
+ 	mov 0xffff,[r0]
+ 	mov r0,0xffff
+	mov 0xffff,r0
+ 
+ 	movb rl0,r2
+ 	movb rl0,#0x12
+ 	movb r3,[r2]
+ 	movb rl0,[r2+]
+ 	movb [-r2],rl0
+ 	movb [r3],[r2+]
+ 	movb [r3],[r2]
+ 	movb [r2+],[r3]
+ 	movb [r2],[r3+]
+ 	movb rl0,[r3+#0x1234]
+ 	movb [r3+#0x1234],rl0
+ 	movb [r3],0x1234
+ 	movb [r3],0x1234
+ 	movb 0x1234,[r3]
+ 	movb rl0,0x12
+ 	movb 0x12,rl0
+ 	
+ 	movb rl0,r2
+ 	movb rl0,#0xff
+ 	movb r3,[r2]
+ 	movb rl0,[r2+]
+ 	movb [-r2],rl0
+ 	movb [r3],[r2+]
+ 	movb [r3],[r2]
+ 	movb [r2+],[r3]
+ 	movb [r2],[r3+]
+ 	movb rl0,[r3+#0xffff]
+ 	movb [r3+#0xffff],rl0
+ 	movb [r3],0xffff
+ 	movb [r3],0xffff
+ 	movb 0xffff,[r3]
+ 	movb rl0,0xff
+ 	movb 0xff,rl0	
+ 	
+ 	movbs  r0,rl1
+	movbs  r0,0x12
+	movbs  0x1234,rl0
+	
+	movbs  r0,rl1
+	movbs  r0,0xff
+	movbs  0xffff,rl0
+
+	movbz r2,rl0
+	movbz r0,0x1234
+	movbz 0x1234,rl0
+ 	
+	movbz r2,rl0
+	movbz r0,0xffff
+	movbz 0xffff,rl0
+	
\ No newline at end of file
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/mul.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/mul.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/mul.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/mul.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,6 @@
+	.section .text
+	.global _fun
+xc16x_mul:
+
+	mul    r0,r1
+	mulu  r0,r1
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/neg.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/neg.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/neg.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/neg.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,6 @@
+       .section .text
+       .global  _fun
+xc16x_neg:
+
+	neg   r0
+	negb rl0
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/nop.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/nop.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/nop.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/nop.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,6 @@
+        .section .text
+        .global _fun
+xc16x_nop:
+        nop
+        nop
+
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/orb.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/orb.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/orb.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/orb.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,10 @@
+       .section .text
+       .global _fun
+xc16x_or:
+	orb  rl0,rl1
+	orb  rl0,[r1]
+	orb  rl0,[r1+]
+	orb  rl0,#3
+	orb  rl0,#0x23
+	orb  rl0,0x0234
+	orb  0x0234,rl0
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/or.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/or.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/or.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/or.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,11 @@
+       .section .text
+       .global _fun
+xc16x_or:
+
+	or  r0,r1
+	or  r0,[r1]
+	or  r0,[r1+]
+	or  r0,#3
+	or  r0,#0x0234
+	or  r0,0x4536
+	or  0x4536,r0
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/prior.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/prior.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/prior.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/prior.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,5 @@
+        .section .text
+        .global _fun
+xc16x_prior:
+
+        prior r0,r1
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/pushpop.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/pushpop.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/pushpop.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/pushpop.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,5 @@
+       .section .text
+       .global _fun
+xc16x_pushpop:
+	pop   r0
+	push  r0
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/ret.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/ret.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/ret.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/ret.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,9 @@
+        .section .text
+        .global  _fun
+
+xc16x_ret:
+        ret
+        reti
+        rets
+        retp  r5
+        
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/scxt.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/scxt.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/scxt.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/scxt.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,6 @@
+        .section .text
+        .global _fun
+xc16x_scxt:
+        scxt r0,#0xffff
+        scxt r0,0xffff
+
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/shlrol.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/shlrol.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/shlrol.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/shlrol.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,14 @@
+       .section .text
+       .global _fun
+xc16x_shlrol:	
+
+	shl   r0,r1
+	shl   r0,#a
+	shr   r0,r1
+	shr   r0,#a
+	rol    r0,r1
+	rol    r0,#a
+	ror    r0,r1
+	ror    r0,#a
+	ashr r0,r1
+	ashr r0,#a
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/subb.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/subb.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/subb.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/subb.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,19 @@
+	.section .text
+	.global _fun
+xc16x_subb:
+
+	subb rl0,rl1
+	subb rl0,[r1]
+	subb rl0,[r1+]
+	subb rl0,#0x1
+	subb rl0,#0x43
+	subb rl0,0x7643
+	subb 0x7643,rl0
+	
+	
+	
+
+	
+	
+
+	
\ No newline at end of file
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/subcb.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/subcb.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/subcb.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/subcb.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,20 @@
+	.section .text
+	.global _fun
+xc16x_subcb:
+
+	subcb rl0,rl1
+	subcb rl0,[r1]
+	subcb rl0,[r1+]
+	subcb rl0,#0x2
+	subcb rl0,#0x43
+	subcb rl0,0x7643
+	subcb 0x7643,rl0
+	
+	
+	
+	
+
+	
+	
+
+	
\ No newline at end of file
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/subc.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/subc.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/subc.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/subc.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,19 @@
+	.section .text
+	.global _fun
+xc16x_subc:
+
+	subc r0,r1
+	subc r0,[r1]
+	subc r0,[r1+]
+	subc r0,#0x2
+	subc r0,#0x43
+	subc r0,0x7643
+	subc 0x7643,r0
+	
+	
+	
+
+	
+	
+
+	
\ No newline at end of file
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/sub.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/sub.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/sub.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/sub.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,19 @@
+	.section .text
+	.global _fun
+xc16x_sub:
+
+	sub r0,r1
+	sub r0,[r1]
+	sub r0,[r1+]
+	sub r0,#0x1
+	sub r0,#0x7643
+	sub r0,0x7643
+	sub 0x7643,r0
+	
+	
+	
+
+	
+	
+
+	
\ No newline at end of file
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/sub_test.exp binutils-2.15.96patched/gas/testsuite/gas/xc16x/sub_test.exp
--- binutils-2.15.96/gas/testsuite/gas/xc16x/sub_test.exp	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/sub_test.exp	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,117 @@
+####################################################
+#sub test
+#
+####################################################
+
+proc do_mov_test {} {
+    set testname "mov_test.s -- xc16x tests"
+
+    gas_start "mov_test.s" "-al"
+
+    # Check each instruction bit pattern to verify it got assembled correctly.
+
+    set x 0
+    expect {
+	-re ".*   7 0000 2001" { set x [expr $x+1]; exp_continue; }
+	-re ".*   8 0002 2809" { set x [expr $x+1]; exp_continue; }
+	-re ".*   9 0004 280D" { set x [expr $x+1]; exp_continue; }
+	-re ".*  10 0006 2801" { set x [expr $x+1]; exp_continue; }
+	-re ".*  11 0008 26F04376" { set x [expr $x+1]; exp_continue; }
+	-re ".*  12 000c 22F04376" { set x [expr $x+1]; exp_continue; }
+	-re ".*  13 0010 24F04376" { set x [expr $x+1]; exp_continue; }
+	-re ".*  14 0014 2010" { set x [expr $x+1]; exp_continue; }
+	-re ".*  15 0016 2818" { set x [expr $x+1]; exp_continue; }
+	-re ".*  16 0018 281C" { set x [expr $x+1]; exp_continue; }
+	-re ".*  17 001a 2811" { set x [expr $x+1]; exp_continue; }
+	-re ".*  18 001c 26F1EFCD" { set x [expr $x+1]; exp_continue; }
+	-re ".*  19 0020 22F1EFCD" { set x [expr $x+1]; exp_continue; }
+	-re ".*  20 0024 24F1EFCD" { set x [expr $x+1]; exp_continue; }
+	-re ".*	 21 		"{
+	    if [expr $x == 14] then {
+	    pass "$testname: sub R0, ..."
+	    } else {
+	    fail "$testname: sub R0, ... ($x)"
+	    }
+    	}
+            default { fail "$testname: sub R0, ... ($x)" }
+    	}
+    
+    set x 0
+    expect {
+	-re ".*  22 0028 2102" { set x [expr $x+1]; exp_continue; }
+	-re ".*  23 002a 2909" { set x [expr $x+1]; exp_continue; }
+	-re ".*  24 002c 290D" { set x [expr $x+1]; exp_continue; }
+	-re ".*  25 002e 2901" { set x [expr $x+1]; exp_continue; }
+	-re ".*  26 0030 27F04300" { set x [expr $x+1]; exp_continue; }
+	-re ".*  27 0034 23F04376" { set x [expr $x+1]; exp_continue; }
+	-re ".*  28 0038 25F04376" { set x [expr $x+1]; exp_continue; }
+	-re ".*  29 003c 2120" { set x [expr $x+1]; exp_continue; }
+	-re ".*  30 003e 2928" { set x [expr $x+1]; exp_continue; }
+	-re ".*  31 0040 292C" { set x [expr $x+1]; exp_continue; }
+	-re ".*  32 0042 2921" { set x [expr $x+1]; exp_continue; }
+	-re ".*  33 0044 27F2CD00" { set x [expr $x+1]; exp_continue; }
+	-re ".*  34 0048 23F2EFCD" { set x [expr $x+1]; exp_continue; }
+	-re ".*  35 004c 25F2EFCD" { set x [expr $x+1]; exp_continue; }
+	-re ".*	 36 		"{
+	    if [expr $x == 14] then {
+	    pass "$testname: subb R0, ..."
+	    } else {
+	    fail "$testname: subb R0, ... ($x)"
+	    }
+    	}
+            default { fail "$testname: subb R0, ... ($x)" }
+    	}
+    
+     set x 0
+        expect {
+    	-re ".*  37 0050 3001" { set x [expr $x+1]; exp_continue; }
+    	-re ".*  38 0052 3809" { set x [expr $x+1]; exp_continue; }
+    	-re ".*  39 0054 380D" { set x [expr $x+1]; exp_continue; }
+    	-re ".*  40 0056 3802" { set x [expr $x+1]; exp_continue; }
+    	-re ".*  41 0058 36F04300" { set x [expr $x+1]; exp_continue; }
+    	-re ".*  42 005c 32F04376" { set x [expr $x+1]; exp_continue; }
+    	-re ".*  43 0060 34F04376" { set x [expr $x+1]; exp_continue; }
+    	-re ".*  44 0064 3010" { set x [expr $x+1]; exp_continue; }
+    	-re ".*  45 0066 3808" { set x [expr $x+1]; exp_continue; }
+    	-re ".*  46 0068 381C" { set x [expr $x+1]; exp_continue; }
+    	-re ".*  47 006a 36F10C00" { set x [expr $x+1]; exp_continue; }
+    	-re ".*  48 006e 36F1CD00" { set x [expr $x+1]; exp_continue; }
+    	-re ".*  49 0072 32F1EFCD" { set x [expr $x+1]; exp_continue; }
+    	-re ".*  50 0076 34F1EFCD" { set x [expr $x+1]; exp_continue; }
+    	-re ".*	 51 		"{
+    	    if [expr $x == 14] then {
+    	    pass "$testname: subb R0, ..."
+    	    } else {
+    	    fail "$testname: subb R0, ... ($x)"
+    	    }
+        	}
+                default { fail "$testname: subb R0, ... ($x)" }
+    	}
+    
+	set x 0
+        expect {
+    	-re ".*  52 007a 3100" { set x [expr $x+1]; exp_continue; }
+    	-re ".*  53 007c 3909" { set x [expr $x+1]; exp_continue; }
+    	-re ".*  54 007e 390D" { set x [expr $x+1]; exp_continue; }
+    	-re ".*  55 0080 3902" { set x [expr $x+1]; exp_continue; }
+    	-re ".*  56 0082 37F04300" { set x [expr $x+1]; exp_continue; }
+    	-re ".*  57 0086 33F04376" { set x [expr $x+1]; exp_continue; }
+    	-re ".*  58 008a 35F04376" { set x [expr $x+1]; exp_continue; }
+    	-re ".*  59 008e 3102" { set x [expr $x+1]; exp_continue; }
+    	-re ".*  60 0090 3909" { set x [expr $x+1]; exp_continue; }
+    	-re ".*  61 0092 390D" { set x [expr $x+1]; exp_continue; }
+    	-re ".*  62 0094 3902" { set x [expr $x+1]; exp_continue; }
+    	-re ".*  63 0096 37F04300" { set x [expr $x+1]; exp_continue; }
+    	-re ".*  64 009a 33F04376" { set x [expr $x+1]; exp_continue; }
+    	-re ".*  65 009e 35F04376" { set x [expr $x+1]; exp_continue; }
+    	-re ".*	 66 		"{
+    	    if [expr $x == 14] then {
+    	    pass "$testname: subb R0, ..."
+    	    } else {
+    	    fail "$testname: subb R0, ... ($x)"
+    	    }
+        	}
+                default { fail "$testname: subb R0, ... ($x)" }
+    	    }
+   
+}
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/sub_test.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/sub_test.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/sub_test.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/sub_test.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,70 @@
+	.text
+_start:
+	sub r0,r1
+	sub r0,[r1]
+	sub r0,[r1+]
+	sub r0,#0x1
+	sub r0,#0x7643
+	sub r0,0x7643
+	sub 0x7643,r0
+	
+	sub r1,r0
+	sub r1,[r0]
+	sub r1,[r0+]
+	sub r1,#0x1
+	sub r1,#0xCDEF
+	sub r1,0xCDEF
+	sub 0xCDEF,r1
+
+
+	subb rl0,rl1
+	subb rl0,[r1]
+	subb rl0,[r1+]
+	subb rl0,#0x1
+	subb rl0,#0x43
+	subb rl0,0x7643
+	subb 0x7643,rl0
+	
+	subb rl1,rl0
+	subb rl1,[r0]
+	subb rl1,[r0+]
+	subb rl1,#0x1
+	subb rl1,#0xCD
+	subb rl1,0xCDEF
+	subb 0xCDEF,rl1
+	
+
+
+	subc r0,r1
+	subc r0,[r1]
+	subc r0,[r1+]
+	subc r0,#0x2
+	subc r0,#0x43
+	subc r0,0x7643
+	subc 0x7643,r0
+	
+	subc r1,r0
+	subc r1,[r0]
+	subc r1,[r0+]
+	subc r1,#0xC
+	subc r1,#0xCD
+	subc r1,0xCDEF
+	subc 0xCDEF,r1
+
+	subcb rl0,rl1
+	subcb rl0,[r1]
+	subcb rl0,[r1+]
+	subcb rl0,#0x2
+	subcb rl0,#0x43
+	subcb rl0,0x7643
+	subcb 0x7643,rl0
+
+	subcb rl0,rl1
+	subcb rl0,[r1]
+	subcb rl0,[r1+]
+	subcb rl0,#0x2
+	subcb rl0,#0x43
+	subcb rl0,0x7643
+	subcb 0x7643,rl0
+	
+	
\ No newline at end of file
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/syscontrol1.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/syscontrol1.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/syscontrol1.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/syscontrol1.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,12 @@
+        .section .text
+        .global _fun
+xc16x_syscontrol:
+        srst
+        sbrk
+        idle
+        pwrdn
+        srvwdt
+        diswdt
+        enwdt
+        einit
+
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/syscontrol2.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/syscontrol2.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/syscontrol2.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/syscontrol2.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,26 @@
+.text
+xc16x_syscontrol2:
+        extr #0x4
+        extr #0x3
+        extr #0x2
+        extr #0x1
+
+        atomic #0x4
+        atomic #0x3
+        atomic #0x2
+        atomic #0x1
+
+        extp r5,#0x4
+        extp #0x3ff,#0x4
+        extpr r5,#0x4
+        extpr #0x3ff,#0x4
+
+        exts r5,#0x4
+        exts #0x1,#0x4
+
+        extsr r5,#0x4
+        extsr #0x1,#0x4
+
+
+
+
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/trap.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/trap.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/trap.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/trap.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,6 @@
+        .section .text
+        .global  _fun
+
+xc16x_trap:
+
+	trap #0x02
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/xc16x.exp binutils-2.15.96patched/gas/testsuite/gas/xc16x/xc16x.exp
--- binutils-2.15.96/gas/testsuite/gas/xc16x/xc16x.exp	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/xc16x.exp	2005-03-17 14:39:24.000000000 +0530
@@ -0,0 +1,1317 @@
+#
+# Some xc16x tests
+#
+proc do_xc16x_add {} {
+    set testname "add.s: xc16x add word tests"
+    set x 0
+
+    gas_start "add.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 0001\[^\n\]*\n"  { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0002 0809\[^\n\]*\n"  { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0004 080D\[^\n\]*\n"  { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0006 0803\[^\n\]*\n"  { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0008 06F0D204\[^\n\]*\n"  { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000c 02F0EDFF\[^\n\]*\n"  { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0010 04F0EDFF\[^\n\]*\n"  { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof				    { break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 7] then { pass $testname } else { fail $testname }
+}
+
+proc do_xc16x_addb {} {
+    set testname "addb.s: xc16x add byte tests"
+    set x 0
+
+    gas_start "addb.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 0102\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0002 0909\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0004 090D\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0006 0902\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0008 07F03300\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000c 03F08723\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0010 05F08723\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 7] then { pass $testname } else { fail $testname }
+}
+
+proc do_xc16x_addc {} {
+    set testname "addc.s: xc16x add with carry tests"
+    set x 0
+
+    gas_start "addc.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 1001\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0002 1809\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0004 180D\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0006 16F03400\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000a 16F05634\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000e 12F08723\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0012 14F08723\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 7] then { pass $testname } else { fail $testname }
+}
+
+proc do_xc16x_addcb {} {
+    set testname "addcb.s: xc16x add byte with carry tests"
+    set x 0
+
+    gas_start "addcb.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 1102\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0002 1909\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0004 190D\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0006 17F00200\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000a 17F02300\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000e 15F08723\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 6] then { pass $testname } else { fail $testname }
+}
+
+proc do_xc16x_sub {} {
+    set testname "sub.s: xc16x sub tests"
+    set x 0
+
+    gas_start "sub.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 2001\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0002 2809\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0004 280D\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0006 2801\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0008 26F04376\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000c 22F04376\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0010 24F04376\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 7] then { pass $testname } else { fail $testname }
+}
+
+proc do_xc16x_subb {} {
+    set testname "subb.s: xc16x sub byte tests"
+    set x 0
+
+    gas_start "subb.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 2102\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0002 2909\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0004 290D\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0006 2901\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0008 27F04300\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000c 23F04376\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0010 25F04376\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 7] then { pass $testname } else { fail $testname }
+}
+
+proc do_xc16x_subc {} {
+    set testname "subc.s: xc16x sub with carry tests"
+    set x 0
+
+    gas_start "subc.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 3001\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0002 3809\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0004 380D\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0006 3802\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0008 36F04300\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000c 32F04376\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0010 34F04376\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 7] then { pass $testname } else { fail $testname }
+}
+
+proc do_xc16x_subcb {} {
+    set testname "subcb.s: xc16x sub byte with carry tests"
+    set x 0
+
+    gas_start "subcb.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 3102\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0002 3909\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0004 390D\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0006 3902\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0008 37F04300\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000c 33F04376\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0010 35F04376\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 7] then { pass $testname } else { fail $testname }
+}
+
+proc do_xc16x_and {} {
+    set testname "and.s: xc16x and tests"
+    set x 0
+
+    gas_start "and.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 6001\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0002 6809\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0004 680D\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0006 6803\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0008 66F0BEFC\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000c 62F03002\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0010 64F02003\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 7] then { pass $testname } else { fail $testname }
+}
+
+proc do_xc16x_andb {} {
+    set testname "andb.s: xc16x and byte tests"
+    set x 0
+
+    gas_start "andb.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 6102\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0002 6909\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0004 690D\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0006 6903\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0008 67F0BE00\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000c 63F03002\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0010 65F02003\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 7] then { pass $testname } else { fail $testname }
+}
+
+proc do_xc16x_or {} {
+    set testname "or.s: xc16x or tests"
+    set x 0
+
+    gas_start "or.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 7001\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0002 7809\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0004 780D\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0006 7803\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0008 76F03402\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000c 72F03645\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0010 74F03645\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 7] then { pass $testname } else { fail $testname }
+}
+
+proc do_xc16x_xor {} {
+    set testname "xor.s: xc16x xor tests"
+    set x 0
+
+    gas_start "xor.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 5001\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0002 5809\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0004 580D\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0006 5803\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0008 56F03402\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000c 52F03402\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0010 54F03402\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 7] then { pass $testname } else { fail $testname }
+}
+
+proc do_xc16x_xorb {} {
+    set testname "xorb.s: xc16x xorb tests"
+    set x 0
+
+    gas_start "xorb.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 5102\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0002 5909\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0004 590D\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0006 5903\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0008 57F03400\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000c 53F00324\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0010 55F00324\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 7] then { pass $testname } else { fail $testname }
+    
+}
+
+proc do_xc16x_mov {} {
+    set testname "mov.s: xc16x mov tests"
+    set x 0
+
+    gas_start "mov.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 F001\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0002 E6F00200\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0006 E6F0BEFC\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000a A801\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000c 9801\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000e B810\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0010 8810\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0012 C801\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0014 D801\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0016 E801\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0018 D400CBFF\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 001c C400CBFF\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0020 8400CBFF\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0024 9400CBFF\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0028 F2F0CBFF\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 002c F6F0CBFF\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 16] then { pass $testname } else { fail $testname }
+}
+
+proc do_xc16x_movb {} {
+    set testname "movb.s: xc16x movb tests"
+    set x 0
+
+    gas_start "movb.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 F3F00000\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0004 E7F01200\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0008 B4020000\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000c 9902\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000e 8902\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0010 E932\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0012 C932\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0014 D923\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0016 E923\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0018 F4033412\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 001c E4033412\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0020 A4033412\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0024 A403FFEE\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0028 B4033412\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 002c F3F01200\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0030 F7F01200\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 16] then { pass $testname } else { fail $testname }
+}
+
+proc do_xc16x_movbs {} {
+    set testname "movbs.s: xc16x mov byte tests"
+    set x 0
+
+    gas_start "movbs.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 D020\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0002 D2F0FF00\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0006 D5F0CBFF\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 3] then { pass $testname } else { fail $testname }
+}
+
+proc do_xc16x_movbz {} {
+    set testname "movbz.s: xc16x movbz tests"
+    set x 0
+
+    gas_start "movbz.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 C002\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0002 C2F0DD23\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0006 C5F02300\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 3] then { pass $testname } else { fail $testname }
+}
+
+proc do_xc16x_pushpop {} {
+    set testname "pushpop.s: xc16x push/pop tests"
+    set x 0
+
+    gas_start "pushpop.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 FCF0\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0002 ECF0\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 2] then { pass $testname } else { fail $testname }
+}
+
+proc do_xc16x_shlrol {} {
+    set testname "shlrol.s: xc16x shift and rotate tests"
+    set x 0
+
+    gas_start "shlrol.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 4C01\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0002 5C00\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0004 6C01\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0006 7C00\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0008 0C01\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000a 1C00\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000c 2C01\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000e 3C00\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0010 AC01\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0012 BC00\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 10] then { pass $testname } else { fail $testname }
+}
+
+proc do_xc16x_neg {} {
+    set testname "neg.s: xc16x neg tests"
+    set x 0
+
+    gas_start "neg.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 8100\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0002 A100\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 2] then { pass $testname } else { fail $testname }
+}
+proc do_xc16x_mul {} {
+    set testname "mul.s: xc16x multiply tests"
+    set x 0
+
+    gas_start "mul.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 0B01\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0002 1B01\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 2] then { pass $testname } else { fail $testname }
+}
+
+proc do_xc16x_div {} {
+    set testname "div.s: xc16x division tests"
+    set x 0
+
+    gas_start "div.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 4B00\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0002 6B00\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0004 7B00\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0006 5B00\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 4] then { pass $testname } else { fail $testname }
+}
+
+proc do_xc16x_jmpa {} {
+    set testname "jmpa.s: xc16x jump absolute test"
+    set x 0
+
+    gas_start "jmpa.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 EA00AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0004 EA20AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0008 EA30AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000c EA40AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0010 EA50AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0014 EA60AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0018 EA70AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 001c EA80AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0020 EA90AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0024 EA20AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0028 EA30AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 002c EA80AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0030 EAF0AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0034 EA90AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0038 EAE0AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 003c EAB0AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0040 EAD0AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0044 EAA0AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0048 EA10AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 19] then { pass $testname } else { fail $testname }
+}
+
+proc do_xc16x_jmpi {} {
+    set testname "jmpi.s: xc16x jmp immidiate tests "
+    set x 0
+
+    gas_start "jmpi.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 9C07\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0002 9C27\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0004 9C37\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0006 9C47\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0008 9C57\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000a 9C67\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000c 9C77\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000e 9C87\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0010 9C97\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0012 9C27\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0014 9C37\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0016 9C87\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0018 9CF7\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 001a 9C97\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 001c 9CE7\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 001e 9CB7\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0020 9CD7\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0022 9CA7\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0024 9C17\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 19] then { pass $testname } else { fail $testname }
+}
+
+
+proc do_xc16x_jmpr {} {
+    set testname "jmpr.s: xc16x jump relative tests"
+    set x 0
+
+    gas_start "jmpr.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 0DFF\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0002 2DFE\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0004 3DFD\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0006 4DFC\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0008 5DFB\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000a 6DFA\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000c 7DF9\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000e 8DF8\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0010 9DF7\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0012 2DF6\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0014 3DF5\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0016 8DF4\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0018 FDF3\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 001a 9DF2\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 001c EDF1\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 001e BDF0\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0020 DDEF\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0022 ADEE\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0024 1DED\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0026 CDEC\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 20] then { pass $testname } else { fail $testname }
+}
+
+proc do_xc16x_syscontrol1 {} {
+    set testname "syscontrol1.s: xc16x system control insrutions tests"
+    set x 0
+
+    gas_start "syscontrol1.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 B748B7B7\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0004 8C00\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0006 87788787\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000a 97689797\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000e A758A7A7\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0012 A55AA5A5\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0016 857A8585\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 001a B54AB5B5\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 8] then { pass $testname } else { fail $testname }
+}
+
+proc do_xc16x_syscontrol2 {} {
+    set testname "syscontrol2.s: xc16x syscontrol2 tests"
+    set x 0
+
+    gas_start "syscontrol2.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 D1B0\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0002 D1A0\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0004 D190\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0006 D180\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0008 D130\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000a D120\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000c D110\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000e D100\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0010 DC75\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0012 D770FF03\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0016 DCF5\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0018 D7F0FF03\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 001c DC35\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 001e D7300100\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0022 DCB5\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0024 D7B00100\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 16] then { pass $testname } else { fail $testname }
+}
+
+proc do_xc16x_cpl {} {
+    set testname "cpl.s: xc16x compliment tests"
+    set x 0
+
+    gas_start "cpl.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 9100\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0002 B100\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 2] then { pass $testname } else { fail $testname }
+}
+
+proc do_xc16x_cmp {} {
+    set testname "cmp.s: xc16x misc tests"
+    set x 0
+
+    gas_start "cmp.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 4001\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0002 4809\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0004 480D\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0006 4803\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0008 46F03402\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000c 42F05234\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 6] then { pass $testname } else { fail $testname }
+}
+
+proc do_xc16x_cmpb {} {
+    set testname "cmpb.s: xc16x cmp byte tests"
+    set x 0
+
+    gas_start "cmpb.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 4102\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0002 4909\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0004 490D\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0006 4903\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0008 47F02200\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000c 43F03402\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 6] then { pass $testname } else { fail $testname }
+}
+
+proc do_xc16x_cmpi {} {
+    set testname "cmpi.s: xc16x cmpi tests"
+    set x 0
+
+    gas_start "cmpi.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 A0F0\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0002 A6F0CBFC\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0006 A2F0CBFF\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000a B0F0\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000c B6F0CBFC\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0010 B2F0CBFF\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0014 80F0\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0016 86F0CBFC\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 001a 82F0CBFF\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 001e 90F0\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0020 96F0CBFC\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0024 92F0CBFF\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 12] then { pass $testname } else { fail $testname }
+}
+
+proc do_xc16x_calli {} {
+    set testname "calli.s: xc16x call tests"
+    set x 0
+
+    gas_start "calli.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 AB01\[^\n\]*\n"   { set x [expr $x+1] }
+    	    -re " +\[0-9\]+ 0002 AB21\[^\n\]*\n"   { set x [expr $x+1] }
+    	    -re " +\[0-9\]+ 0004 AB31\[^\n\]*\n"   { set x [expr $x+1] }
+    	    -re " +\[0-9\]+ 0006 AB41\[^\n\]*\n"   { set x [expr $x+1] }
+    	    -re " +\[0-9\]+ 0008 AB51\[^\n\]*\n"   { set x [expr $x+1] }
+    	    -re " +\[0-9\]+ 000a AB61\[^\n\]*\n"   { set x [expr $x+1] }
+    	    -re " +\[0-9\]+ 000c AB71\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000e AB81\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0010 AB91\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0012 AB21\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0014 AB31\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0016 AB81\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0018 ABF1\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 001a AB91\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 001c ABE1\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 001e ABB1\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0020 ABD1\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0022 AB11\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0024 ABC1\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 19] then { pass $testname } else { fail $testname }
+}
+
+proc do_xc16x_calla {} {
+    set testname "calla.s: xc16x call tests"
+    set x 0
+
+    gas_start "calla.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 CA00AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0004 CA20AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0008 CA30AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000c CA40AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0010 CA50AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0014 CA60AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0018 CA70AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 001c CA80AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0020 CA90AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0024 CA20AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0028 CA30AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 002c CA80AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0030 CAF0AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0034 CA90AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0038 CAE0AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 003c CAB0AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0040 CAD0AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+    	    -re " +\[0-9\]+ 0044 CAA0AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+    	    -re " +\[0-9\]+ 0048 CA10AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+    	    -re " +\[0-9\]+ 004c CAC0AAAA\[^\n\]*\n"   { set x [expr $x+1] }
+    	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 20] then { pass $testname } else { fail $testname }
+}
+
+
+proc do_xc16x_bit {} {
+    set testname "bit.s: xc16x bit manipulation tests"
+    set x 0
+
+    gas_start "bit.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 1EF0\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0002 1FF0\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0004 4AF0F012\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0008 3AF0F023\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000c 6AF0F041\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0010 5AF0F021\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0014 7AF0F021\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0018 2AF0F021\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 8] then { pass $testname } else { fail $testname }
+}
+
+proc do_xc16x_bfldl {} {
+    set testname "bfldl.s: xc16x bitwise modify masked data tests"
+    set x 0
+
+    gas_start "bfldl.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 0AF0870E\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0004 1AF00EFF\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 2] then { pass $testname } else { fail $testname }
+}
+
+proc do_xc16x_ret {} {
+    set testname "ret.s: xc16x ret tests"
+    set x 0
+
+    gas_start "ret.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 CB00\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0002 FB88\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0004 DB00\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0006 EBF5\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 4] then { pass $testname } else { fail $testname }
+}
+
+proc do_xc16x_trap {} {
+    set testname "trap.s: xc16x add/sub tests"
+    set x 0
+
+    gas_start "trap.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 9B04\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 1] then { pass $testname } else { fail $testname }
+}
+
+proc do_xc16x_orb {} {
+    set testname "orb.s: xc16x or byte instructions tests"
+    set x 0
+
+    gas_start "orb.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 7102\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0002 7909\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0004 790D\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0006 7903\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0008 77F02300\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 000c 73F03402\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0010 75F03402\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 7] then { pass $testname } else { fail $testname }
+}
+
+
+proc do_xc16x_prior {} {
+    set testname "prior.s: Determine no shift cycles tests"
+    set x 0
+
+    gas_start "prior.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 2B01\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 1] then { pass $testname } else { fail $testname }
+}
+
+proc do_xc16x_nop {} {
+    set testname "nop.s: no operation nop tests"
+    set x 0
+
+    gas_start "nop.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 CC00\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0002 CC00\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 2] then { pass $testname } else { fail $testname }
+}
+
+
+proc do_xc16x_scxt {} {
+    set testname "scxt.s: push direct word to system stack tests"
+    set x 0
+
+    gas_start "scxt.s" "-al"
+
+    # Check each instruction bit pattern to verify it got
+    # assembled correctly.
+    while 1 {
+	expect {
+	    -re " +\[0-9\]+ 0000 C6F0FFFF\[^\n\]*\n"   { set x [expr $x+1] }
+	    -re " +\[0-9\]+ 0004 D6F0FFFF\[^\n\]*\n"   { set x [expr $x+1] }
+	    timeout 				{ perror "timeout\n; break }
+	    eof					{ break }
+	}
+    }
+
+    # This was intended to do any cleanup necessary.  It kinda looks like it
+    # isn't needed, but just in case, please keep it in for now.
+    gas_finish
+
+    # Did we find what we were looking for?  If not, flunk it.
+    if [expr $x == 2] then { pass $testname } else { fail $testname }
+}
+
+
+if [istarget xc16x*-*-*] then {
+    # Test the basic xc16x instruction parser
+    do_xc16x_add
+    do_xc16x_addb
+    do_xc16x_addc
+    do_xc16x_addcb
+    do_xc16x_sub
+    do_xc16x_subb
+    do_xc16x_subc
+    do_xc16x_subcb
+    do_xc16x_and
+    do_xc16x_andb
+    do_xc16x_or
+    do_xc16x_xor
+    do_xc16x_xorb
+    do_xc16x_mov
+    do_xc16x_movb
+    do_xc16x_movbs
+    do_xc16x_movbz
+    do_xc16x_shlrol
+    do_xc16x_neg
+    do_xc16x_mul
+    do_xc16x_div
+    do_xc16x_jmpa
+    do_xc16x_jmpi
+    do_xc16x_jmpr
+    do_xc16x_syscontrol1
+    do_xc16x_syscontrol2
+    do_xc16x_cpl
+    do_xc16x_cmp
+    do_xc16x_cmpb
+    do_xc16x_cmpi
+    do_xc16x_calla
+    do_xc16x_calli
+    do_xc16x_bit
+    do_xc16x_bfldl
+    do_xc16x_ret
+    do_xc16x_trap
+    do_xc16x_orb
+    do_xc16x_prior
+    do_xc16x_nop
+    do_xc16x_scxt
+    
+}
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/xorb.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/xorb.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/xorb.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/xorb.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,10 @@
+       .section .text
+       .global _fun
+xc16x_xorb:
+	xorb  rl0,rl1
+	xorb  rl0,[r1]
+	xorb  rl0,[r1+]
+	xorb  rl0,#3
+	xorb  rl0,#0x34
+	xorb  rl0,0x2403
+	xorb  0x2403,rl0
diff -Naur binutils-2.15.96/gas/testsuite/gas/xc16x/xor.s binutils-2.15.96patched/gas/testsuite/gas/xc16x/xor.s
--- binutils-2.15.96/gas/testsuite/gas/xc16x/xor.s	1970-01-01 05:30:00.000000000 +0530
+++ binutils-2.15.96patched/gas/testsuite/gas/xc16x/xor.s	2005-03-16 15:51:30.000000000 +0530
@@ -0,0 +1,10 @@
+       .section .text
+       .global _fun
+xc16x_or:
+	xor  r0,r1
+	xor  r0,[r1]
+	xor  r0,[r1+]
+	xor  r0,#3
+	xor  r0,#0x0234
+	xor  r0,0x0234
+	xor  0x0234,r0