From 03eb45c1491c6de0a7857fe2cac08c4bcd9a33f2 Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Wed, 27 Apr 2005 16:48:18 +0000 Subject: [PATCH] pa.h (PRINT_OPERAND_ADDRESS): Use gcc_assert, remove unnecessary noncanonical RTL handling. * config/pa/pa.h (PRINT_OPERAND_ADDRESS): Use gcc_assert, remove unnecessary noncanonical RTL handling. * config/pa/pa64-linux.h (INITIAL_ELIMINATION_OFFSET): Use gcc_assert and gcc_unreachable. From-SVN: r98852 --- gcc/ChangeLog | 5 +++++ gcc/config/pa/pa.h | 14 ++++---------- gcc/config/pa/pa64-linux.h | 5 ++--- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index fdc72d288af..01947cd5544 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ 2005-04-27 Nathan Sidwell + * config/pa/pa.h (PRINT_OPERAND_ADDRESS): Use gcc_assert, remove + unnecessary noncanonical RTL handling. + * config/pa/pa64-linux.h (INITIAL_ELIMINATION_OFFSET): Use + gcc_assert and gcc_unreachable. + * config/arm/arm.h (ARM_PRINT_OPERAND_ADDRESS): Use gcc_assert and gcc_unreachable as appropriate. (THUMB_PRINT_OPERAND_ADDRESS): Likewise. diff --git a/gcc/config/pa/pa.h b/gcc/config/pa/pa.h index 0738b494623..f94d5316475 100644 --- a/gcc/config/pa/pa.h +++ b/gcc/config/pa/pa.h @@ -1870,22 +1870,16 @@ forget_section (void) \ /* Print a memory address as an operand to reference that memory location. */ #define PRINT_OPERAND_ADDRESS(FILE, ADDR) \ -{ register rtx addr = ADDR; \ - register rtx base; \ - int offset; \ +{ rtx addr = ADDR; \ switch (GET_CODE (addr)) \ { \ case REG: \ fprintf (FILE, "0(%s)", reg_names [REGNO (addr)]); \ break; \ case PLUS: \ - if (GET_CODE (XEXP (addr, 0)) == CONST_INT) \ - offset = INTVAL (XEXP (addr, 0)), base = XEXP (addr, 1); \ - else if (GET_CODE (XEXP (addr, 1)) == CONST_INT) \ - offset = INTVAL (XEXP (addr, 1)), base = XEXP (addr, 0); \ - else \ - abort (); \ - fprintf (FILE, "%d(%s)", offset, reg_names [REGNO (base)]); \ + gcc_assert (GET_CODE (XEXP (addr, 1)) == CONST_INT); \ + fprintf (FILE, "%d(%s)", (int)INTVAL (XEXP (addr, 1)), \ + reg_names [REGNO (XEXP (addr, 0))]); \ break; \ case LO_SUM: \ if (!symbolic_operand (XEXP (addr, 1), VOIDmode)) \ diff --git a/gcc/config/pa/pa64-linux.h b/gcc/config/pa/pa64-linux.h index 5d7fdbee181..908cb6c19b5 100644 --- a/gcc/config/pa/pa64-linux.h +++ b/gcc/config/pa/pa64-linux.h @@ -52,8 +52,7 @@ Boston, MA 02111-1307, USA. */ break; \ } \ \ - if ((TO) != STACK_POINTER_REGNUM) \ - abort (); \ + gcc_assert ((TO) == STACK_POINTER_REGNUM); \ \ switch (FROM) \ { \ @@ -66,7 +65,7 @@ Boston, MA 02111-1307, USA. */ break; \ \ default: \ - abort (); \ + gcc_unreachable (); \ } \ } while (0) #endif -- 2.30.2