Clean merge -> gc7-branch

[cacao.git] / src / vm / access.h

diff --git a/src/vm/access.h b/src/vm/access.h
index 7eadfc2310b36a2b99ef5a0845eaba96fb6b2a5e..2b8a10c173e93251be7fcfac22854e49a6c16f0a 100644 (file)
--- a/src/vm/access.h
+++ b/src/vm/access.h
@@ -1,9 +1,7 @@
 /* src/vm/access.h - checking access rights
 
-   Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates,
-   R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner,
-   C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger,
-   Institut f. Computersprachen - TU Wien
+   Copyright (C) 1996-2005, 2006, 2007, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -19,23 +17,24 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
-   Contact: cacao@complang.tuwien.ac.at
+*/
 
-   Authors: Edwin Steiner
 
-   Changes:
+#ifndef _ACCESS_H
+#define _ACCESS_H
 
-   $Id: access.h 2181 2005-04-01 16:53:33Z edwin $
+#include "config.h"
 
-*/
+#include <stdint.h>
 
-#ifndef _ACCESS_H
-#define _ACCESS_H
+#include "vm/global.h"
 
-#include "vm/references.h"
+#include "vmcore/class.h"
+#include "vmcore/field.h"
+#include "vmcore/method.h"
 
 
 /* macros *********************************************************************/
@@ -44,59 +43,22 @@
                        ((a)->classloader == (b)->classloader &&       \
                         (a)->packagename == (b)->packagename)
 
+
 /* function prototypes ********************************************************/
 
-/* is_accessible_class *********************************************************
- 
-   Check if a class is accessible from another class
-  
-   IN:
-       referer..........the class containing the reference
-       cls..............the result of resolving the reference
-  
-   RETURN VALUE:
-       true.............access permitted
-       false............access denied
-   
-   NOTE:
-       This function performs the checks listed in section 5.4.4.
-          "Access Control" of "The Java(TM) Virtual Machine Specification,
-          Second Edition".
-
-*******************************************************************************/
-
-bool
-is_accessible_class(classinfo *referer,classinfo *cls);
-
-/* is_accessible_member ********************************************************
- 
-   Check if a field or method is accessible from a given class
-  
-   IN:
-       referer..........the class containing the reference
-       cls..............the class declaring the member
-       memberflags......the access flags of the member
-  
-   RETURN VALUE:
-       true.............access permitted
-       false............access denied
-
-   NOTE:
-       This function only performs the checks listed in section 5.4.4.
-          "Access Control" of "The Java(TM) Virtual Machine Specification,
-          Second Edition".
-
-          In particular a special condition for protected access with is
-          part of the verification process according to the spec is not
-          checked in this function.
-   
-*******************************************************************************/
-
-bool
-is_accessible_member(classinfo *referer,classinfo *declarer,s4 memberflags);
+bool access_is_accessible_class(classinfo *referer, classinfo *cls);
+
+bool access_is_accessible_member(classinfo *referer, classinfo *declarer,
+                                                                int32_t memberflags);
+
+#if defined(ENABLE_JAVASE)
+bool access_check_field(fieldinfo *f, int callerdepth);
+bool access_check_method(methodinfo *m, int callerdepth);
+#endif
 
 #endif /* _ACCESS_H */
 
+
 /*
  * These are local overrides for various environment variables in Emacs.
  * Please do not remove this and leave it at the end of the file, where