2013-03-12 Sebastian Huber <sebastian.huber@embedded-brains.de>

	include/
	* opcode/nios2.h: Edit comment.

	gas/
	* config/tc-nios2.c (nios2_consume_arg): Delete 'k' case.  Add 'o'
	case.  Add default BAD_CASE to switch.

	gas/testsuite/
	* gas/nios2/break.d: Check instruction values.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 92ad5df1e30dfc744734533f86e98abb700d55fe..b2c90ea33774c314ed3d7328234604023c1104e3 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-12  Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+       * config/tc-nios2.c (nios2_consume_arg): Delete 'k' case.  Add 'o'
+       case.  Add default BAD_CASE to switch.
+
 2013-03-11  Sebastian Huber <sebastian.huber@embedded-brains.de>
 
        * config/tc-nios2.c (nios2_assemble_args_ds): New function.

diff --git a/gas/config/tc-nios2.c b/gas/config/tc-nios2.c
index d669c604aaf893b1a25c7e5b20a53c3c22e18bf1..81caf8618fca7cafb6dc3f3686386ec432c59c96 100644 (file)
--- a/gas/config/tc-nios2.c
+++ b/gas/config/tc-nios2.c
@@ -1981,14 +1981,16 @@ nios2_consume_arg (nios2_insn_infoS *insn, char *argstr, const char *parsestr)
       break;
     case 'm':
     case 'j':
-    case 'k':
     case 'l':
     case 'b':
       /* We can't have %hi, %lo or %hiadj here.  */
       if (*argstr == '%')
        as_bad (_("badly formed expression near %s"), argstr);
       break;
+    case 'o':
+      break;
     default:
+      BAD_CASE (*parsestr);
       break;
     }
 

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index a672651d9b71b8760accaf88fc6137a0cf58707e..9af9fa89ba3493147b1974ca860a8cd5ee39011f 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-12  Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+       * gas/nios2/break.d: Check instruction values.
+
 2013-03-11  Sebastian Huber <sebastian.huber@embedded-brains.de>
 
        * gas/nios2/nios2.exp: Run wrprs.

diff --git a/gas/testsuite/gas/nios2/break.d b/gas/testsuite/gas/nios2/break.d
index be487bb3d4f9809aee36adf1af7d6d9426e01cc0..8d4853b1a5b543745e1cfea69a7ce814bac3915b 100644 (file)
--- a/gas/testsuite/gas/nios2/break.d
+++ b/gas/testsuite/gas/nios2/break.d
@@ -1,12 +1,12 @@
-#objdump: -dr --prefix-addresses
+#objdump: -dr --prefix-addresses --show-raw-insn
 #name: NIOS2 break
 
 .*: +file format elf32-littlenios2
 
 Disassembly of section .text:
-0+0000 <[^>]*> break   0
-0+0004 <[^>]*> break   0
-0+0008 <[^>]*> break   31
-0+000c <[^>]*> break   14
+0+0000 <[^>]*> 003da03a        break   0
+0+0004 <[^>]*> 003da03a        break   0
+0+0008 <[^>]*> 003da7fa        break   31
+0+000c <[^>]*> 003da3ba        break   14
 
 

diff --git a/include/ChangeLog b/include/ChangeLog
index a6722b693bf71bb43e18e9836a83a7743c2ed6f0..200771d8dac789c4490aaa657cdfad77aa9e4fb8 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-12  Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+       * opcode/nios2.h: Edit comment.
+
 2013-03-11  Sebastian Huber <sebastian.huber@embedded-brains.de>
 
        * opcode/nios2.h (OPX_WRPRS): New define.

diff --git a/include/opcode/nios2.h b/include/opcode/nios2.h
index 3405f55f8bd1ed370f884ed39b0072a122970bba..5f6cf6e26c9a2f584768616748be1e7f761326a5 100644 (file)
--- a/include/opcode/nios2.h
+++ b/include/opcode/nios2.h
@@ -48,15 +48,16 @@ enum overflow_type
 
    The args field is a string describing the operands.  The following
    letters can appear in the args:
-     c - a 5-bit control register index or break opcode
+     c - a 5-bit control register index
      d - a 5-bit destination register index
      s - a 5-bit left source register index
      t - a 5-bit right source register index
      i - a 16-bit signed immediate
      u - a 16-bit unsigned immediate
+     o - a 16-bit signed program counter relative offset
      j - a 5-bit unsigned immediate
-     k - a 6-bit unsigned immediate
-     l - an 8-bit unsigned immediate
+     b - a 5-bit break instruction constant
+     l - a 8-bit custom instruction constant
      m - a 26-bit unsigned immediate
    Literal ',', '(', and ')' characters may also appear in the args as
    delimiters.