diff options
| author | Georg-Johann Lay <avr@gjlay.de> | 2011-10-21 15:46:32 +0000 |
|---|---|---|
| committer | Georg-Johann Lay <gjl@gcc.gnu.org> | 2011-10-21 15:46:32 +0000 |
| commit | c1a330ef7f8c77e4cd064f0008d4b735ff9d621b (patch) | |
| tree | 8ed3283a266fd187e6cf4b77d36819590385d8dc /gcc/config/avr | |
| parent | 9200b30225ee5a65aff650ce166735f04501abea (diff) | |
| download | gcc-c1a330ef7f8c77e4cd064f0008d4b735ff9d621b.zip gcc-c1a330ef7f8c77e4cd064f0008d4b735ff9d621b.tar.gz gcc-c1a330ef7f8c77e4cd064f0008d4b735ff9d621b.tar.bz2 | |
avr.h (LEGITIMIZE_RELOAD_ADDRESS): Pass address of X instead of X to avr_legitimize_reload_address.
* config/avr/avr.h (LEGITIMIZE_RELOAD_ADDRESS): Pass address of X
instead of X to avr_legitimize_reload_address.
* config/avr/avr-protos.h (avr_legitimize_reload_address): Change
first argument's type from rtx to rtx*.
* config/avr/avr.c (avr_legitimize_reload_address): Ditto.
Pass PX to push_reload instead of &X. Change log messages for
better distinction.
From-SVN: r180308
Diffstat (limited to 'gcc/config/avr')
| -rw-r--r-- | gcc/config/avr/avr-protos.h | 2 | ||||
| -rw-r--r-- | gcc/config/avr/avr.c | 14 | ||||
| -rw-r--r-- | gcc/config/avr/avr.h | 2 |
3 files changed, 10 insertions, 8 deletions
diff --git a/gcc/config/avr/avr-protos.h b/gcc/config/avr/avr-protos.h index dd8ba3a..817169e 100644 --- a/gcc/config/avr/avr-protos.h +++ b/gcc/config/avr/avr-protos.h @@ -110,7 +110,7 @@ extern void out_shift_with_cnt (const char *templ, rtx insn, extern reg_class_t avr_mode_code_base_reg_class (enum machine_mode, RTX_CODE, RTX_CODE); extern bool avr_regno_mode_code_ok_for_base_p (int, enum machine_mode, RTX_CODE, RTX_CODE); extern rtx avr_incoming_return_addr_rtx (void); -extern rtx avr_legitimize_reload_address (rtx, enum machine_mode, int, int, int, int, rtx (*)(rtx,int)); +extern rtx avr_legitimize_reload_address (rtx*, enum machine_mode, int, int, int, int, rtx (*)(rtx,int)); #endif /* RTX_CODE */ #ifdef REAL_VALUE_TYPE diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c index 94bc30a..1d4c32a 100644 --- a/gcc/config/avr/avr.c +++ b/gcc/config/avr/avr.c @@ -1356,11 +1356,13 @@ avr_legitimize_address (rtx x, rtx oldx, enum machine_mode mode) than 63 bytes or for R++ or --R addressing. */ rtx -avr_legitimize_reload_address (rtx x, enum machine_mode mode, +avr_legitimize_reload_address (rtx *px, enum machine_mode mode, int opnum, int type, int addr_type, int ind_levels ATTRIBUTE_UNUSED, rtx (*mk_memloc)(rtx,int)) { + rtx x = *px; + if (avr_log.legitimize_reload_address) avr_edump ("\n%?:%m %r\n", mode, x); @@ -1372,7 +1374,7 @@ avr_legitimize_reload_address (rtx x, enum machine_mode mode, opnum, RELOAD_OTHER); if (avr_log.legitimize_reload_address) - avr_edump (" RCLASS = %R\n IN = %r\n OUT = %r\n", + avr_edump (" RCLASS.1 = %R\n IN = %r\n OUT = %r\n", POINTER_REGS, XEXP (x, 0), XEXP (x, 0)); return x; @@ -1398,7 +1400,7 @@ avr_legitimize_reload_address (rtx x, enum machine_mode mode, 1, addr_type); if (avr_log.legitimize_reload_address) - avr_edump (" RCLASS = %R\n IN = %r\n OUT = %r\n", + avr_edump (" RCLASS.2 = %R\n IN = %r\n OUT = %r\n", POINTER_REGS, XEXP (mem, 0), NULL_RTX); push_reload (mem, NULL_RTX, &XEXP (x, 0), NULL, @@ -1406,7 +1408,7 @@ avr_legitimize_reload_address (rtx x, enum machine_mode mode, opnum, type); if (avr_log.legitimize_reload_address) - avr_edump (" RCLASS = %R\n IN = %r\n OUT = %r\n", + avr_edump (" RCLASS.2 = %R\n IN = %r\n OUT = %r\n", BASE_POINTER_REGS, mem, NULL_RTX); return x; @@ -1415,12 +1417,12 @@ avr_legitimize_reload_address (rtx x, enum machine_mode mode, else if (! (frame_pointer_needed && XEXP (x, 0) == frame_pointer_rtx)) { - push_reload (x, NULL_RTX, &x, NULL, + push_reload (x, NULL_RTX, px, NULL, POINTER_REGS, GET_MODE (x), VOIDmode, 0, 0, opnum, type); if (avr_log.legitimize_reload_address) - avr_edump (" RCLASS = %R\n IN = %r\n OUT = %r\n", + avr_edump (" RCLASS.3 = %R\n IN = %r\n OUT = %r\n", POINTER_REGS, x, NULL_RTX); return x; diff --git a/gcc/config/avr/avr.h b/gcc/config/avr/avr.h index 1a5f20a..b9ce56f 100644 --- a/gcc/config/avr/avr.h +++ b/gcc/config/avr/avr.h @@ -375,7 +375,7 @@ typedef struct avr_args { #define LEGITIMIZE_RELOAD_ADDRESS(X,MODE,OPNUM,TYPE,IND_L,WIN) \ do { \ - rtx new_x = avr_legitimize_reload_address (X, MODE, OPNUM, TYPE, \ + rtx new_x = avr_legitimize_reload_address (&(X), MODE, OPNUM, TYPE, \ ADDR_TYPE (TYPE), \ IND_L, make_memloc); \ if (new_x) \ |