summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4>2001-08-30 19:42:36 +0000
committerbothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4>2001-08-30 19:42:36 +0000
commite025bbe7bf73c4adaa7edeec9158db8f8438295f (patch)
treee6528e4c2ce9e6eab3a1fdb170886090ee7e590d
parent15b659324f4e0bd3b2cf0d64596de70ac8dfea17 (diff)
downloadppe42-gcc-e025bbe7bf73c4adaa7edeec9158db8f8438295f.tar.gz
ppe42-gcc-e025bbe7bf73c4adaa7edeec9158db8f8438295f.zip
* jcf-dump.c (print_constant): Fix fencepost error so "Float" and
"Double" are printed at verbosity 1. * jcf-dump.c (main): Disable flag_print_attributes if --javap. * jcf-dump.c (SPECIAL_IINC): Remove unneeded casts to long. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@45296 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/java/ChangeLog9
-rw-r--r--gcc/java/jcf-dump.c11
2 files changed, 15 insertions, 5 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 1bfc028c154..ea4f35b884b 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,12 @@
+2001-08-30 Per Bothner <per@bothner.com>
+
+ * jcf-dump.c (print_constant): Fix fencepost error so "Float" and
+ "Double" are printed at verbosity 1.
+
+ * jcf-dump.c (main): Disable flag_print_attributes if --javap.
+
+ * jcf-dump.c (SPECIAL_IINC): Remove unneeded casts to long.
+
2001-08-28 Per Bothner <per@bothner.com>
* jcf-write.c (generate_bytecode_insns): For increments and
diff --git a/gcc/java/jcf-dump.c b/gcc/java/jcf-dump.c
index 0f28ce94033..6a537de1ef8 100644
--- a/gcc/java/jcf-dump.c
+++ b/gcc/java/jcf-dump.c
@@ -504,7 +504,7 @@ DEFUN(print_constant, (out, jcf, index, verbosity),
case CONSTANT_Float:
{
jfloat fnum = JPOOL_FLOAT (jcf, index);
- fprintf (out, "%s%.10g", verbosity > 1 ? "Float " : "", (double) fnum);
+ fprintf (out, "%s%.10g", verbosity > 0 ? "Float " : "", (double) fnum);
if (verbosity > 1)
fprintf (out, ", bits = 0x%08lx", (long) (* (int32 *) &fnum));
break;
@@ -512,7 +512,7 @@ DEFUN(print_constant, (out, jcf, index, verbosity),
case CONSTANT_Double:
{
jdouble dnum = JPOOL_DOUBLE (jcf, index);
- fprintf (out, "%s%.20g", verbosity > 1 ? "Double " : "", dnum);
+ fprintf (out, "%s%.20g", verbosity > 0 ? "Double " : "", dnum);
if (verbosity > 1)
{
int32 hi, lo;
@@ -889,6 +889,7 @@ DEFUN(main, (argc, argv),
case OPT_JAVAP:
flag_javap_compatible++;
flag_print_constant_pool = 0;
+ flag_print_attributes = 0;
break;
default:
@@ -1201,10 +1202,10 @@ DEFUN(disassemble_method, (jcf, byte_ops, len),
#define SPECIAL_IINC(OPERAND_TYPE) \
i = saw_wide ? IMMEDIATE_u2 : IMMEDIATE_u1; \
- fprintf (out, " %ld", (long) i); \
- INT_temp = saw_wide ? IMMEDIATE_s2 : IMMEDIATE_s1; \
+ fprintf (out, " %d", i); \
+ i = saw_wide ? IMMEDIATE_s2 : IMMEDIATE_s1; \
saw_wide = 0; \
- fprintf (out, " %ld", (long) INT_temp)
+ fprintf (out, " %d", i)
#define SPECIAL_WIDE(OPERAND_TYPE) \
saw_wide = 1;
OpenPOWER on IntegriCloud