|
|
@@ -0,0 +1,103 @@
|
|
|
+From 920a898d2a04933c13eb808a513bc5822e91f70a Mon Sep 17 00:00:00 2001
|
|
|
+From: sandra <sandra@138bc75d-0d04-0410-961f-82ee72b054a4>
|
|
|
+Date: Tue, 12 May 2015 15:57:22 +0000
|
|
|
+Subject: [PATCH] gcc/nios2: Add IJMP_REGS enum
|
|
|
+
|
|
|
+2015-05-12 Chung-Lin Tang <cltang@codesourcery.com>
|
|
|
+ Sandra Loosemore <sandra@codesourcery.com>
|
|
|
+
|
|
|
+ gcc/
|
|
|
+ * config/nios2/nios2.h (enum reg_class): Add IJMP_REGS enum
|
|
|
+ value.
|
|
|
+ (REG_CLASS_NAMES): Add "IJMP_REGS".
|
|
|
+ (REG_CLASS_CONTENTS): Add new entry for IJMP_REGS.
|
|
|
+ * config/nios2/nios2.md (indirect_jump,*tablejump): Adjust to
|
|
|
+ use new "c" register constraint.
|
|
|
+ * config/nios2/constraint.md (c): New register constraint
|
|
|
+ corresponding to IJMP_REGS.
|
|
|
+
|
|
|
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223082 138bc75d-0d04-0410-961f-82ee72b054a4
|
|
|
+
|
|
|
+[Romain: rebase on gcc 5.4]
|
|
|
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
|
|
+---
|
|
|
+ gcc/config/nios2/constraints.md | 3 +++
|
|
|
+ gcc/config/nios2/nios2.h | 11 +++++++----
|
|
|
+ gcc/config/nios2/nios2.md | 4 ++--
|
|
|
+ 3 files changed, 12 insertions(+), 6 deletions(-)
|
|
|
+
|
|
|
+diff --git a/gcc/config/nios2/constraints.md b/gcc/config/nios2/constraints.md
|
|
|
+index f4bd9f7..735f892 100644
|
|
|
+--- a/gcc/config/nios2/constraints.md
|
|
|
++++ b/gcc/config/nios2/constraints.md
|
|
|
+@@ -39,6 +39,9 @@
|
|
|
+
|
|
|
+ ;; Register constraints
|
|
|
+
|
|
|
++(define_register_constraint "c" "IJMP_REGS"
|
|
|
++ "A register suitable for an indirect jump.")
|
|
|
++
|
|
|
+ (define_register_constraint "j" "SIB_REGS"
|
|
|
+ "A register suitable for an indirect sibcall.")
|
|
|
+
|
|
|
+diff --git a/gcc/config/nios2/nios2.h b/gcc/config/nios2/nios2.h
|
|
|
+index 117983d..7c329ae 100644
|
|
|
+--- a/gcc/config/nios2/nios2.h
|
|
|
++++ b/gcc/config/nios2/nios2.h
|
|
|
+@@ -173,6 +173,7 @@ enum reg_class
|
|
|
+ {
|
|
|
+ NO_REGS,
|
|
|
+ SIB_REGS,
|
|
|
++ IJMP_REGS,
|
|
|
+ GP_REGS,
|
|
|
+ ALL_REGS,
|
|
|
+ LIM_REG_CLASSES
|
|
|
+@@ -183,6 +184,7 @@ enum reg_class
|
|
|
+ #define REG_CLASS_NAMES \
|
|
|
+ { "NO_REGS", \
|
|
|
+ "SIB_REGS", \
|
|
|
++ "IJMP_REGS", \
|
|
|
+ "GP_REGS", \
|
|
|
+ "ALL_REGS" }
|
|
|
+
|
|
|
+@@ -190,10 +192,11 @@ enum reg_class
|
|
|
+
|
|
|
+ #define REG_CLASS_CONTENTS \
|
|
|
+ { \
|
|
|
+- /* NO_REGS */ { 0, 0}, \
|
|
|
+- /* SIB_REGS */ { 0xfe0c, 0}, \
|
|
|
+- /* GP_REGS */ {~0, 0}, \
|
|
|
+- /* ALL_REGS */ {~0,~0} \
|
|
|
++ /* NO_REGS */ { 0, 0}, \
|
|
|
++ /* SIB_REGS */ { 0xfe0c, 0}, \
|
|
|
++ /* IJMP_REGS */ { 0x7fffffff, 0}, \
|
|
|
++ /* GP_REGS */ {~0, 0}, \
|
|
|
++ /* ALL_REGS */ {~0,~0} \
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+diff --git a/gcc/config/nios2/nios2.md b/gcc/config/nios2/nios2.md
|
|
|
+index 7b35d269..36ef101 100644
|
|
|
+--- a/gcc/config/nios2/nios2.md
|
|
|
++++ b/gcc/config/nios2/nios2.md
|
|
|
+@@ -697,7 +697,7 @@
|
|
|
+ ; check or adjust for overflow.
|
|
|
+
|
|
|
+ (define_insn "indirect_jump"
|
|
|
+- [(set (pc) (match_operand:SI 0 "register_operand" "r"))]
|
|
|
++ [(set (pc) (match_operand:SI 0 "register_operand" "c"))]
|
|
|
+ ""
|
|
|
+ "jmp\\t%0"
|
|
|
+ [(set_attr "type" "control")])
|
|
|
+@@ -811,7 +811,7 @@
|
|
|
+
|
|
|
+ (define_insn "*tablejump"
|
|
|
+ [(set (pc)
|
|
|
+- (match_operand:SI 0 "register_operand" "r"))
|
|
|
++ (match_operand:SI 0 "register_operand" "c"))
|
|
|
+ (use (label_ref (match_operand 1 "" "")))]
|
|
|
+ ""
|
|
|
+ "jmp\\t%0"
|
|
|
+--
|
|
|
+2.5.5
|
|
|
+
|
Romain Naour