You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ar...@apache.org on 2006/06/16 20:07:48 UTC
svn commit: r414874 - in /incubator/harmony/enhanced/jchevm:
include/jc_defs.h libjc/cf_parse.c
Author: archie
Date: Fri Jun 16 11:07:47 2006
New Revision: 414874
URL: http://svn.apache.org/viewvc?rev=414874&view=rev
Log:
Apply patch from HARMONY-585, plus a bug fix.
Modified:
incubator/harmony/enhanced/jchevm/include/jc_defs.h
incubator/harmony/enhanced/jchevm/libjc/cf_parse.c
Modified: incubator/harmony/enhanced/jchevm/include/jc_defs.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/jchevm/include/jc_defs.h?rev=414874&r1=414873&r2=414874&view=diff
==============================================================================
--- incubator/harmony/enhanced/jchevm/include/jc_defs.h (original)
+++ incubator/harmony/enhanced/jchevm/include/jc_defs.h Fri Jun 16 11:07:47 2006
@@ -50,10 +50,13 @@
#define _JC_ACC_INTERFACE 0x0200
#define _JC_ACC_ABSTRACT 0x0400
#define _JC_ACC_STRICT 0x0800
-#define _JC_ACC_MASK 0x0fff
+#define _JC_ACC_SYNTHETIC 0x1000
+#define _JC_ACC_ANNOTATION 0x2000
+#define _JC_ACC_ENUM 0x4000
+#define _JC_ACC_MASK 0x7fff
/* Additional flags stored with access flags */
-#define _JC_ACC_JCNI 0x1000 /* JCNI native method (!JNI) */
+#define _JC_ACC_JCNI 0x8000 /* JCNI native method (!JNI) */
/*
* Flags for 'flags' field of the '_jc_type' structure,
Modified: incubator/harmony/enhanced/jchevm/libjc/cf_parse.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/jchevm/libjc/cf_parse.c?rev=414874&r1=414873&r2=414874&view=diff
==============================================================================
--- incubator/harmony/enhanced/jchevm/libjc/cf_parse.c (original)
+++ incubator/harmony/enhanced/jchevm/libjc/cf_parse.c Fri Jun 16 11:07:47 2006
@@ -664,7 +664,7 @@
/* Check stuff */
if (strcmp(method->name, "<init>") == 0
&& (method->access_flags & ~(_JC_ACC_PRIVATE|_JC_ACC_PROTECTED
- |_JC_ACC_PUBLIC|_JC_ACC_STRICT)) != 0) {
+ |_JC_ACC_PUBLIC|_JC_ACC_STRICT|_JC_ACC_SYNTHETIC)) != 0) {
_JC_EX_STORE(s->env, ClassFormatError,
"invalid access flags 0x%04x for method `%s%s'",
method->access_flags, method->name, method->descriptor);