aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorAndreas Krebbel <Andreas.Krebbel@de.ibm.com>2011-05-06 11:12:27 +0000
committerAndreas Krebbel <krebbel@gcc.gnu.org>2011-05-06 11:12:27 +0000
commitcab78b151c8a2dda4934a51cd081cce9938ab0cf (patch)
treebdb53f771a744a9b51eb91562aff2c927ea69f60 /gcc
parentee6824ae01132c0175ad8db0e58e19ee661fe5cb (diff)
downloadgcc-cab78b151c8a2dda4934a51cd081cce9938ab0cf.zip
gcc-cab78b151c8a2dda4934a51cd081cce9938ab0cf.tar.gz
gcc-cab78b151c8a2dda4934a51cd081cce9938ab0cf.tar.bz2
s390.c (s390_asm_trampoline_template): Comment instruction sizes.
2011-05-06 Andreas Krebbel <Andreas.Krebbel@de.ibm.com> * config/s390/s390.c (s390_asm_trampoline_template): Comment instruction sizes. (s390_trampoline_init): Replace UNITS_PER_WORD with UNITS_PER_LONG. From-SVN: r173483
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/config/s390/s390.c18
2 files changed, 16 insertions, 9 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9927119..0124dc7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-06 Andreas Krebbel <Andreas.Krebbel@de.ibm.com>
+
+ * config/s390/s390.c (s390_asm_trampoline_template): Comment
+ instruction sizes.
+ (s390_trampoline_init): Replace UNITS_PER_WORD with
+ UNITS_PER_LONG.
+
2011-05-06 Ramana Radhakrishnan <ramana.radhakrishnan@linaro.org>
PR target/47930
diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index 932ad31..de1c326 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -9287,16 +9287,16 @@ s390_asm_trampoline_template (FILE *file)
if (TARGET_64BIT)
{
- output_asm_insn ("basr\t%1,0", op);
- output_asm_insn ("lmg\t%0,%1,14(%1)", op);
- output_asm_insn ("br\t%1", op);
+ output_asm_insn ("basr\t%1,0", op); /* 2 byte */
+ output_asm_insn ("lmg\t%0,%1,14(%1)", op); /* 6 byte */
+ output_asm_insn ("br\t%1", op); /* 2 byte */
ASM_OUTPUT_SKIP (file, (HOST_WIDE_INT)(TRAMPOLINE_SIZE - 10));
}
else
{
- output_asm_insn ("basr\t%1,0", op);
- output_asm_insn ("lm\t%0,%1,6(%1)", op);
- output_asm_insn ("br\t%1", op);
+ output_asm_insn ("basr\t%1,0", op); /* 2 byte */
+ output_asm_insn ("lm\t%0,%1,6(%1)", op); /* 4 byte */
+ output_asm_insn ("br\t%1", op); /* 2 byte */
ASM_OUTPUT_SKIP (file, (HOST_WIDE_INT)(TRAMPOLINE_SIZE - 8));
}
}
@@ -9312,11 +9312,11 @@ s390_trampoline_init (rtx m_tramp, tree fndecl, rtx cxt)
rtx mem;
emit_block_move (m_tramp, assemble_trampoline_template (),
- GEN_INT (2*UNITS_PER_WORD), BLOCK_OP_NORMAL);
+ GEN_INT (2 * UNITS_PER_LONG), BLOCK_OP_NORMAL);
- mem = adjust_address (m_tramp, Pmode, 2*UNITS_PER_WORD);
+ mem = adjust_address (m_tramp, Pmode, 2 * UNITS_PER_LONG);
emit_move_insn (mem, cxt);
- mem = adjust_address (m_tramp, Pmode, 3*UNITS_PER_WORD);
+ mem = adjust_address (m_tramp, Pmode, 3 * UNITS_PER_LONG);
emit_move_insn (mem, fnaddr);
}