OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import some interworking support code from devo.

Browse Source 
From-SVN: r22721
This commit is contained in:
Nick Clifton 1998-10-01 17:58:46 +00:00 committed by Nick Clifton
parent 470cdb8b54
commit da6558fd77
2 changed files with 51 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/ChangeLog
View File

@ -1,3 +1,7 @@
Thu Oct 1 17:57:14 1998 Nick Clifton <nickc@cygnus.com>
* config/arm/arm.c: Improve interworking support.
Thu Oct 1 18:43:35 1998 J"orn Rennecke <amylaar@cygnus.co.uk> Thu Oct 1 18:43:35 1998 J"orn Rennecke <amylaar@cygnus.co.uk>
* reload1.c (choose_reload_regs): Fix test if reload_reg_rtx[r] was * reload1.c (choose_reload_regs): Fix test if reload_reg_rtx[r] was

64
gcc/config/arm/arm.c
View File

@ -3458,12 +3458,13 @@ static HOST_WIDE_INT
add_constant (x, mode, address_only) add_constant (x, mode, address_only)
rtx x; rtx x;
enum machine_mode mode; enum machine_mode mode;
int *address_only; int * address_only;
{ {
int i; int i;
HOST_WIDE_INT offset; HOST_WIDE_INT offset;
*address_only = 0; * address_only = 0;
if (mode == SImode && GET_CODE (x) == MEM && CONSTANT_P (XEXP (x, 0)) if (mode == SImode && GET_CODE (x) == MEM && CONSTANT_P (XEXP (x, 0))
&& CONSTANT_POOL_ADDRESS_P (XEXP (x, 0))) && CONSTANT_POOL_ADDRESS_P (XEXP (x, 0)))
x = get_pool_constant (XEXP (x, 0)); x = get_pool_constant (XEXP (x, 0));
@ -3593,7 +3594,7 @@ find_barrier (from, max_count)
while (from && count < max_count) while (from && count < max_count)
{ {
rtx tmp; rtx tmp;
if (GET_CODE (from) == BARRIER) if (GET_CODE (from) == BARRIER)
found_barrier = from; found_barrier = from;
@ -3628,28 +3629,27 @@ find_barrier (from, max_count)
from = NEXT_INSN (from); from = NEXT_INSN (from);
} }
if (!found_barrier) if (! found_barrier)
{ {
/* We didn't find a barrier in time to /* We didn't find a barrier in time to
dump our stuff, so we'll make one */ dump our stuff, so we'll make one. */
rtx label = gen_label_rtx (); rtx label = gen_label_rtx ();
if (from) if (from)
from = PREV_INSN (last); from = PREV_INSN (last);
else else
from = get_last_insn (); from = get_last_insn ();
/* Walk back to be just before any jump */ /* Walk back to be just before any jump. */
while (GET_CODE (from) == JUMP_INSN while (GET_CODE (from) == JUMP_INSN
|| GET_CODE (from) == NOTE || GET_CODE (from) == NOTE
|| GET_CODE (from) == CODE_LABEL) || GET_CODE (from) == CODE_LABEL)
from = PREV_INSN (from); from = PREV_INSN (from);
from = emit_jump_insn_after (gen_jump (label), from); from = emit_jump_insn_after (gen_jump (label), from);
JUMP_LABEL (from) = label; JUMP_LABEL (from) = label;
found_barrier = emit_barrier_after (from); found_barrier = emit_barrier_after (from);
emit_label_after (label, found_barrier); emit_label_after (label, found_barrier);
return found_barrier;
} }
return found_barrier; return found_barrier;
@ -3897,7 +3897,12 @@ output_call (operands)
output_asm_insn ("mov%?\t%0, %|lr", operands); output_asm_insn ("mov%?\t%0, %|lr", operands);
} }
output_asm_insn ("mov%?\t%|lr, %|pc", operands); output_asm_insn ("mov%?\t%|lr, %|pc", operands);
output_asm_insn ("mov%?\t%|pc, %0", operands);
if (TARGET_THUMB_INTERWORK)
output_asm_insn ("bx%?\t%0", operands);
else
output_asm_insn ("mov%?\t%|pc, %0", operands);
return ""; return "";
} }
@ -3945,8 +3950,18 @@ output_call_mem (operands)
if (eliminate_lr2ip (&operands[0])) if (eliminate_lr2ip (&operands[0]))
output_asm_insn ("mov%?\t%|ip, %|lr", operands); output_asm_insn ("mov%?\t%|ip, %|lr", operands);
output_asm_insn ("mov%?\t%|lr, %|pc", operands); if (TARGET_THUMB_INTERWORK)
output_asm_insn ("ldr%?\t%|pc, %0", operands); {
output_asm_insn ("ldr%?\t%|ip, %0", operands);
output_asm_insn ("mov%?\t%|lr, %|pc", operands);
output_asm_insn ("bx%?\t%|ip", operands);
}
else
{
output_asm_insn ("mov%?\t%|lr, %|pc", operands);
output_asm_insn ("ldr%?\t%|pc, %0", operands);
}
return ""; return "";
} }
@ -4815,15 +4830,29 @@ output_return_instruction (operand, really_return, reverse)
strcat (instr, reg_names[13]); strcat (instr, reg_names[13]);
strcat (instr, ", "); strcat (instr, ", ");
strcat (instr, "%|"); strcat (instr, "%|");
strcat (instr, really_return ? reg_names[15] : reg_names[14]); strcat (instr, TARGET_THUMB_INTERWORK || (! really_return)
? reg_names[14] : reg_names[15] );
} }
else else
{ {
strcat (instr, "%|"); strcat (instr, "%|");
strcat (instr, really_return ? reg_names[15] : reg_names[14]); if (TARGET_THUMB_INTERWORK && really_return)
strcat (instr, reg_names[12]);
else
strcat (instr, really_return ? reg_names[15] : reg_names[14]);
} }
strcat (instr, (TARGET_APCS_32 || !really_return) ? "}" : "}^"); strcat (instr, (TARGET_APCS_32 || !really_return) ? "}" : "}^");
output_asm_insn (instr, &operand); output_asm_insn (instr, &operand);
if (TARGET_THUMB_INTERWORK && really_return)
{
strcpy (instr, "bx%?");
strcat (instr, reverse ? "%D0" : "%d0");
strcat (instr, "\t%|");
strcat (instr, frame_pointer_needed ? "lr" : "ip");
output_asm_insn (instr, & operand);
}
} }
else if (really_return) else if (really_return)
{ {
@ -4832,7 +4861,8 @@ output_return_instruction (operand, really_return, reverse)
else else
sprintf (instr, "mov%%?%%%s0%s\t%%|pc, %%|lr", sprintf (instr, "mov%%?%%%s0%s\t%%|pc, %%|lr",
reverse ? "D" : "d", TARGET_APCS_32 ? "" : "s"); reverse ? "D" : "d", TARGET_APCS_32 ? "" : "s");
output_asm_insn (instr, &operand);
output_asm_insn (instr, & operand);
} }
return ""; return "";
@ -5020,7 +5050,7 @@ output_func_epilogue (f, frame_size)
REGISTER_PREFIX, reg_names[reg + 1], REGISTER_PREFIX, reg_names[reg + 1],
start_reg - reg, REGISTER_PREFIX, floats_offset); start_reg - reg, REGISTER_PREFIX, floats_offset);
} }
if (TARGET_THUMB_INTERWORK) if (TARGET_THUMB_INTERWORK)
{ {
live_regs_mask |= 0x6800; live_regs_mask |= 0x6800;