This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[BC] Patch: FYI: make verifier build
- From: Tom Tromey <tromey at redhat dot com>
- To: Gcc Patch List <gcc-patches at gcc dot gnu dot org>
- Cc: Java Patch List <java-patches at gcc dot gnu dot org>
- Date: 15 Oct 2004 10:32:09 -0600
- Subject: [BC] Patch: FYI: make verifier build
- Reply-to: tromey at redhat dot com
I'm checking this in on the BC branch.
This makes the new verifier compile again. It also removes a couple
of unneeded things.
Tom
Index: ChangeLog
from Tom Tromey <tromey@redhat.com>
* verify.h (VFY_IN_GCC): Removed.
(VFY_WANT_TYPEMAP): Removed.
* verify-impl.c (verify_instructions_0): Removed useless "\".
(struct state) <next>: Uncomment.
Index: verify-impl.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/Attic/verify-impl.c,v
retrieving revision 1.1.2.3
diff -u -r1.1.2.3 verify-impl.c
--- verify-impl.c 13 Oct 2004 19:06:10 -0000 1.1.2.3
+++ verify-impl.c 15 Oct 2004 16:31:40 -0000
@@ -1015,8 +1015,8 @@
int pc;
/* We keep a linked list of all states requiring reverification.
If this is the special value INVALID_STATE then this state is
- not on the list. NULL marks the end of the linked list.
- state *next; */
+ not on the list. NULL marks the end of the linked list. */
+ state *next;
};
/* NO_NEXT is the PC value meaning that a new state must be
@@ -3096,7 +3096,7 @@
case op_new:
{
type t = check_class_constant (get_ushort ());
- if (type_isarray (&t) || type_isinterface (&t) \
+ if (type_isarray (&t) || type_isinterface (&t)
|| type_isabstract (&t))
verify_fail ("type is array, interface, or abstract");
type_set_uninitialized (&t, vfr->start_PC);
Index: verify.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/Attic/verify.h,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 verify.h
--- verify.h 6 Oct 2004 23:29:25 -0000 1.1.2.2
+++ verify.h 15 Oct 2004 16:31:40 -0000
@@ -1,5 +1,5 @@
/* Declarations to interface gcj with bytecode verifier.
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004 Free Software Foundation, Inc.
This file is part of GCC.
@@ -38,9 +38,6 @@
#include "tree.h"
#include "java-tree.h"
-#define VFY_IN_GCC
-#define VFY_WANT_TYPEMAP
-
typedef JCF vfy_constants;
/* For our purposes a string is the same as an identifier. */