* src/vm/jit/code.h (codeinfo): Added synchronizedoffset

[cacao.git] / src / vm / jit / code.h

diff --git a/src/vm/jit/code.h b/src/vm/jit/code.h
index 302428c75060e197e33e21ec17e7509796a91901..05b5d28ad83cb4d7a12ff19c0dec8e2be4f4a0ef 100644 (file)
--- a/src/vm/jit/code.h
+++ b/src/vm/jit/code.h
@@ -22,19 +22,20 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id$
-
 */
 
 
 #ifndef _CODE_H
 #define _CODE_H
 
-/* forward typedefs ***********************************************************/
-
 #include "config.h"
+
+#include <stdint.h>
+
 #include "vm/types.h"
 
+#include "toolbox/list.h"
+
 #include "vm/global.h"
 
 #include "vm/jit/replace.h"
@@ -44,8 +45,9 @@
 
 /* constants ******************************************************************/
 
-#define CODE_FLAG_INVALID     0x0001
-#define CODE_FLAG_LEAFMETHOD  0x0002
+#define CODE_FLAG_INVALID         0x0001
+#define CODE_FLAG_LEAFMETHOD      0x0002
+#define CODE_FLAG_SYNCHRONIZED    0x0004
 
 
 /* codeinfo *******************************************************************
@@ -61,24 +63,27 @@
 
 struct codeinfo {
        methodinfo   *m;                    /* method this is a realization of    */
-       java_objectheader header;           /* we need this in JIT's monitorenter */
        codeinfo     *prev;                 /* previous codeinfo of this method   */
 
-       u4            codeflags;            /* or of CODE_FLAG_ constants         */
+       uint32_t      flags;                /* OR of CODE_FLAG_ constants         */
 
        u1            optlevel;             /* optimization level of this code    */
        s4            basicblockcount;      /* number of basic blocks             */
 
+       int32_t       synchronizedoffset;   /* stack offset of synchronized obj.  */
+
        /* machine code */
        u1           *mcode;                /* pointer to machine code            */
        u1           *entrypoint;           /* machine code entry point           */
        s4            mcodelength;          /* length of generated machine code   */
 
+       /* patcher list */
+       list_t       *patchers;
+
        /* replacement */                                   
 #if defined(ENABLE_REPLACEMENT)
        rplpoint     *rplpoints;            /* replacement points                 */
        rplalloc     *regalloc;             /* register allocation info           */
-       u1           *replacementstubs;     /* beginning of replacement stubs     */
        s4            rplpointcount;        /* number of replacement points       */
        s4            globalcount;          /* number of global allocations       */
        s4            regalloccount;        /* number of total allocations        */
@@ -86,6 +91,9 @@ struct codeinfo {
        s4            stackframesize;       /* size of the stackframe in slots    */
        u1            savedintcount;        /* number of callee saved int regs    */
        u1            savedfltcount;        /* number of callee saved flt regs    */
+# if defined(HAS_ADDRESS_REGISTER_FILE)
+       u1            savedadrcount;        /* number of callee saved adr regs    */
+# endif
        u1           *savedmcode;           /* saved code under patches           */
 #endif
 
@@ -97,16 +105,72 @@ struct codeinfo {
 };
 
 
-/* macros *********************************************************************/
+/* inline functions ***********************************************************/
+
+/* code_xxx_invalid ************************************************************
+
+   Functions for CODE_FLAG_INVALID.
+
+*******************************************************************************/
+
+inline static int code_is_invalid(codeinfo *code)
+{
+       return (code->flags & CODE_FLAG_INVALID);
+}
+
+inline static void code_flag_invalid(codeinfo *code)
+{
+       code->flags |= CODE_FLAG_INVALID;
+}
+
+inline static void code_unflag_invalid(codeinfo *code)
+{
+       code->flags &= ~CODE_FLAG_INVALID;
+}
+
+
+/* code_xxx_leafmethod *********************************************************
+
+   Functions for CODE_FLAG_LEAFMETHOD.
+
+*******************************************************************************/
+
+inline static int code_is_leafmethod(codeinfo *code)
+{
+       return (code->flags & CODE_FLAG_LEAFMETHOD);
+}
+
+inline static void code_flag_leafmethod(codeinfo *code)
+{
+       code->flags |= CODE_FLAG_LEAFMETHOD;
+}
+
+inline static void code_unflag_leafmethod(codeinfo *code)
+{
+       code->flags &= ~CODE_FLAG_LEAFMETHOD;
+}
+
+
+/* code_xxx_synchronized *******************************************************
+
+   Functions for CODE_FLAG_SYNCHRONIZED.
+
+*******************************************************************************/
+
+inline static int code_is_synchronized(codeinfo *code)
+{
+       return (code->flags & CODE_FLAG_SYNCHRONIZED);
+}
 
-#define CODE_IS_VALID(code)       (!((code)->codeflags & CODE_FLAG_INVALID))
-#define CODE_IS_INVALID(code)     ((code)->codeflags & CODE_FLAG_INVALID)
-#define CODE_IS_LEAFMETHOD(code)  ((code)->codeflags & CODE_FLAG_LEAFMETHOD)
+inline static void code_flag_synchronized(codeinfo *code)
+{
+       code->flags |= CODE_FLAG_SYNCHRONIZED;
+}
 
-#define CODE_SETFLAG_INVALID(code)                                   \
-            ((code)->codeflags |= CODE_FLAG_INVALID)
-#define CODE_SETFLAG_LEAFMETHOD(code)                                \
-            ((code)->codeflags |= CODE_FLAG_LEAFMETHOD)
+inline static void code_unflag_synchronized(codeinfo *code)
+{
+       code->flags &= ~CODE_FLAG_SYNCHRONIZED;
+}
 
 
 /* function prototypes ********************************************************/
@@ -119,11 +183,11 @@ void code_codeinfo_free(codeinfo *code);
 codeinfo *code_find_codeinfo_for_pc(u1 *pc);
 codeinfo *code_find_codeinfo_for_pc_nocheck(u1 *pc);
 
+codeinfo   *code_get_codeinfo_for_pv(u1 *pv);
 methodinfo *code_get_methodinfo_for_pv(u1 *pv);
 
 #if defined(ENABLE_REPLACEMENT)
 int code_get_sync_slot_count(codeinfo *code);
-int code_get_stack_frame_size(codeinfo *code);
 #endif /* defined(ENABLE_REPLACEMENT) */
 
 void code_free_code_of_method(methodinfo *m);