* src/mm/dumpmemory.c (dump_release): Renamed to dumpmemory_release.

(dump_size): Renamed to dumpmemory_marker.

* src/mm/dumpmemory.h: Likewise.
(DMARKER, DRELEASE): New macros.

* src/cacaoh/dummy.c,
src/mm/cacao-gc/gc.c,
src/mm/memory.h,
src/native/native.c,
src/native/vm/gnu/java_lang_VMRuntime.c,
src/vm/builtin.c,
src/vm/jit/codegen-common.c,
src/vm/jit/intrp/codegen.c,
src/vm/jit/jit.c,
src/vm/jit/replace.c,
src/vm/jit/show.c,
src/vm/jit/trace.c,
src/vm/vm.c,
src/vmcore/class.c,
src/vmcore/loader.c: Use new macros.

diff --git a/src/cacaoh/dummy.c b/src/cacaoh/dummy.c
index 905237ab69cf50a89342f25be71b711f08378b92..69d548882592cee76d29ac478e23076e0853654e 100644 (file)
--- a/src/cacaoh/dummy.c
+++ b/src/cacaoh/dummy.c
@@ -562,13 +562,13 @@ void *dumpmemory_get(size_t size)
        return malloc(size);
 }
 
-void dump_release(int32_t size)
+int32_t dumpmemory_marker(void)
 {
+       return 0;
 }
 
-int32_t dump_size(void)
+void dumpmemory_release(int32_t size)
 {
-       return 0;
 }
 
 

diff --git a/src/mm/cacao-gc/gc.c b/src/mm/cacao-gc/gc.c
index 6a4ef9f93a78be45104a854828afc02500b78934..f2739cbdbf6307cd498fe5ec8efe334dc81e8c20 100644 (file)
--- a/src/mm/cacao-gc/gc.c
+++ b/src/mm/cacao-gc/gc.c
@@ -1,9 +1,7 @@
 /* src/mm/cacao-gc/gc.c - main garbage collector methods
 
-   Copyright (C) 2006 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) 2006, 2007, 2008
+   CACAOVM - Verein zu Foerderung der freien virtuellen Machine CACAO
 
    This file is part of CACAO.
 
@@ -26,7 +24,10 @@
 
 
 #include "config.h"
+
 #include <signal.h>
+#include <stdint.h>
+
 #include "vm/types.h"
 
 #include "threads/lock-common.h"
@@ -231,7 +232,7 @@ void gc_weakreference_unregister(java_object_t **ref)
 void gc_collect(s4 level)
 {
        rootset_t    *rs;
-       s4            dumpsize;
+       int32_t       dumpmarker;
 #if !defined(NDEBUG)
        stackframeinfo_t *sfi;
        stacktracebuffer *stb;
@@ -244,7 +245,7 @@ void gc_collect(s4 level)
        GC_MUTEX_LOCK;
 
        /* remember start of dump memory area */
-       dumpsize = dump_size();
+       DMARKER;
 
        GCSTAT_COUNT(gcstat_collections);
 
@@ -382,7 +383,7 @@ void gc_collect(s4 level)
        RT_TIMING_TIME_DIFF(time_start  , time_end    , RT_TIMING_GC_TOTAL);
 
     /* free dump memory area */
-    dump_release(dumpsize);
+    DRELEASE;
 
        /* leave the global gc lock */
        GC_MUTEX_UNLOCK;

diff --git a/src/mm/dumpmemory.c b/src/mm/dumpmemory.c
index db650c887f14db561051224504265404ed9ec084..9d6623f92a43c8419b78a3b7b031bf03301f5d96 100644 (file)
--- a/src/mm/dumpmemory.c
+++ b/src/mm/dumpmemory.c
@@ -203,11 +203,12 @@ void dumpmemory_alloc(dumpinfo_t *di, size_t size)
          NULL iff `size` was zero
 
    ERROR HANDLING:
-      XXX This function uses `memory_checked_alloc`, which *exits* if no 
-         memory could be allocated.
+      XXX This function uses `memory_checked_alloc`, which *exits* if
+         no memory could be allocated.
 
    THREADS:
-      dump_alloc is thread safe. Each thread has its own dump memory area.
+      dumpmemory_get is thread safe. Each thread has its own dump
+      memory area.
 
    This function is a fast allocator suitable for scratch memory that
    can be collectively freed when the current activity (eg. compiling)
@@ -215,9 +216,10 @@ void dumpmemory_alloc(dumpinfo_t *di, size_t size)
 
    You cannot selectively free dump memory. Before you start
    allocating it, you remember the current size returned by
-   `dump_size`. Later, when you no longer need the memory, call
-   `dump_release` with the remembered size and all dump memory
-   allocated since the call to `dump_size` will be freed.
+   `dumpmemory_marker`. Later, when you no longer need the memory,
+   call `dumpmemory_release` with the remembered size and all dump
+   memory allocated since the call to `dumpmemory_marker` will be
+   freed.
 
 *******************************************************************************/
 
@@ -345,14 +347,14 @@ void *dumpmemory_realloc(void *src, s4 len1, s4 len2)
 }
 
 
-/* dump_release ****************************************************************
+/* dumpmemory_release **********************************************************
 
    Release dump memory above the given size.
 
    IN:
        size........All dump memory above this mark will be freed. Usually
-                      `size` will be the return value of a `dump_size` call
-                                  made earlier.
+                      `size` will be the return value of a `dumpmemory_marker`
+                                  call made earlier.
 
        ERROR HANDLING:
           XXX If the given size is invalid, this function *exits* with an
@@ -362,7 +364,7 @@ void *dumpmemory_realloc(void *src, s4 len1, s4 len2)
 
 *******************************************************************************/
 
-void dump_release(s4 size)
+void dumpmemory_release(s4 size)
 {
 #if defined(DISABLE_DUMP)
 
@@ -433,13 +435,17 @@ void dump_release(s4 size)
 }
 
 
-/* dump_size *******************************************************************
+/* dumpmemory_marker ***********************************************************
 
-   Return the current size of the dump memory area. See `dump_alloc`.
+   Returns a marker of the dump memory area.  This marker is actually
+   the used size of the dump memory area.
+
+   RETURN VALUE:
+       marker of the current dump memory status
 
 *******************************************************************************/
 
-s4 dump_size(void)
+int32_t dumpmemory_marker(void)
 {
 #if defined(DISABLE_DUMP)
        /* use malloc memory for dump memory (for debugging only!) */

diff --git a/src/mm/dumpmemory.h b/src/mm/dumpmemory.h
index f08bdf9d08cc43f3cef00edb74a60af8b2f088f3..3688ccd2de7b2a4de1c26c911ccb725380523b94 100644 (file)
--- a/src/mm/dumpmemory.h
+++ b/src/mm/dumpmemory.h
@@ -85,6 +85,9 @@ struct dumpinfo_t {
 
 /* convenience macros *********************************************************/
 
+#define DMARKER               dumpmarker = dumpmemory_marker()
+#define DRELEASE              dumpmemory_release(dumpmarker)
+
 #define DNEW(type)            ((type *) dumpmemory_get(sizeof(type)))
 #define DMNEW(type,num)       ((type *) dumpmemory_get(sizeof(type) * (num)))
 #define DMREALLOC(ptr,type,num1,num2) dumpmemory_realloc((ptr), sizeof(type) * (num1), \
@@ -94,8 +97,8 @@ struct dumpinfo_t {
 
 void    *dumpmemory_get(size_t size);
 void    *dumpmemory_realloc(void *src, int32_t len1, int32_t len2);
-int32_t  dump_size(void);
-void     dump_release(int32_t size);
+int32_t  dumpmemory_marker(void);
+void     dumpmemory_release(int32_t size);
 
 #endif /* _DUMPMEMORY_H */
 

diff --git a/src/mm/memory.h b/src/mm/memory.h
index e9c6dbb4a1bf8d40ec7a382c812ca37dfcbb2598..b2796d9e340d198316186607a3e5361f15b5ed1f 100644 (file)
--- a/src/mm/memory.h
+++ b/src/mm/memory.h
@@ -63,15 +63,6 @@ There are two possible choices for allocating memory:
                        mem_realloc ... change size of a memory block (position may change)
                        mem_usage ..... amount of allocated memory
 
-
-       2.   explicit allocating, automatic deallocating
-       
-                       dump_alloc .... allocate a memory block in the dump area
-                       dump_realloc .. change size of a memory block (position may change)
-                       dump_size ..... marks the current top of dump
-                       dump_release .. free all memory requested after the mark
-                                       
-       
 There are some useful macros:
 
        NEW (type) ....... allocate memory for an element of type `type`
@@ -82,11 +73,6 @@ There are some useful macros:
        
        MREALLOC (ptr,type,num1,num2) .. enlarge the array to size num2
                                         
-These macros do the same except they operate on the dump area:
-       
-       DNEW,  DMNEW, DMREALLOC   (there is no DFREE)
-
-
 -------------------------------------------------------------------------------
 
 Some more macros:

diff --git a/src/native/native.c b/src/native/native.c
index dacc6dfcb4f80cd3b4d01e05e447a2e047237b7f..6d0f4097383a0b9a9c068dee0a3fdcfdd05951c4 100644 (file)
--- a/src/native/native.c
+++ b/src/native/native.c
@@ -1,9 +1,7 @@
 /* src/native/native.c - table of native functions
 
-   Copyright (C) 1996-2005, 2006, 2007 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 zu Foerderung der freien virtuellen Machine CACAO
 
    This file is part of CACAO.
 
@@ -171,12 +169,12 @@ static utf *native_make_overloaded_function(utf *name, utf *descriptor)
        char *utf_ptr;
        u2    c;
        s4    i;
-       s4    dumpsize;
        utf  *u;
+       int32_t dumpmarker;
 
        /* mark memory */
 
-       dumpsize = dump_size();
+       DMARKER;
 
        utf_ptr = descriptor->text;
        namelen = strlen(name->text) + strlen("__") + strlen("0");
@@ -268,7 +266,7 @@ static utf *native_make_overloaded_function(utf *name, utf *descriptor)
 
        /* release memory */
 
-       dump_release(dumpsize);
+       DRELEASE;
 
        return u;
 }
@@ -351,12 +349,12 @@ static utf *native_method_symbol(utf *classname, utf *methodname)
        char *utf_endptr;
        u2    c;
        u4    pos;
-       s4    dumpsize;
        utf  *u;
+       int32_t dumpmarker;
 
        /* mark memory */
 
-       dumpsize = dump_size();
+       DMARKER;
 
        /* Calculate length of native function name.  We multiply the
           class and method name length by 6 as this is the maxium
@@ -412,7 +410,7 @@ static utf *native_method_symbol(utf *classname, utf *methodname)
 
        /* release memory */
 
-       dump_release(dumpsize);
+       DRELEASE;
 
        return u;
 }

diff --git a/src/native/vm/gnu/java_lang_VMRuntime.c b/src/native/vm/gnu/java_lang_VMRuntime.c
index a48cc03e0fbf013eebf43722479fb8dcae6ba9f9..179ec616ff4c4bb64685e7e5f60c27744d9d1682 100644 (file)
--- a/src/native/vm/gnu/java_lang_VMRuntime.c
+++ b/src/native/vm/gnu/java_lang_VMRuntime.c
@@ -1,9 +1,7 @@
 /* src/native/vm/gnu/java_lang_VMRuntime.c
 
-   Copyright (C) 1996-2005, 2006, 2007 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 zu Foerderung der freien virtuellen Machine CACAO
 
    This file is part of CACAO.
 
@@ -39,8 +37,8 @@
 # include <mach/mach.h>
 #endif
 
+#include "mm/dumpmemory.h"
 #include "mm/gc-common.h"
-#include "mm/memory.h"
 
 #include "native/jni.h"
 #include "native/native.h"
@@ -255,8 +253,8 @@ JNIEXPORT java_lang_String* JNICALL Java_java_lang_VMRuntime_mapLibraryName(JNIE
        utf           *u;
        char          *buffer;
        int32_t        buffer_len;
-       int32_t        dumpsize;
        java_handle_t *o;
+       int32_t        dumpmarker;
 
        if (libname == NULL) {
                exceptions_throw_nullpointerexception();
@@ -279,7 +277,8 @@ JNIEXPORT java_lang_String* JNICALL Java_java_lang_VMRuntime_mapLibraryName(JNIE
 
        buffer_len += strlen("0");
 
-       dumpsize = dump_size();
+       DMARKER;
+
        buffer = DMNEW(char, buffer_len);
 
        /* generate library name */
@@ -297,7 +296,7 @@ JNIEXPORT java_lang_String* JNICALL Java_java_lang_VMRuntime_mapLibraryName(JNIE
 
        /* release memory */
 
-       dump_release(dumpsize);
+       DRELEASE;
 
        return (java_lang_String *) o;
 }

diff --git a/src/vm/builtin.c b/src/vm/builtin.c
index 0c4f1b50da7ecda5bd5cde5bf5e1d1f8b3c8ad99..812e0467b9cb5cbce1968fa04b6901ea70d8dc42 100644 (file)
--- a/src/vm/builtin.c
+++ b/src/vm/builtin.c
@@ -1,9 +1,7 @@
 /* src/vm/builtin.c - functions for unsupported operations
 
-   Copyright (C) 1996-2005, 2006, 2007 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 zu Foerderung der freien virtuellen Machine CACAO
 
    This file is part of CACAO.
 
@@ -107,13 +105,13 @@ CYCLES_STATS_DECLARE(builtin_overhead    , 80,1)
 static bool builtintable_init(void)
 {
        descriptor_pool    *descpool;
-       s4                  dumpsize;
        builtintable_entry *bte;
        methodinfo         *m;
+       int32_t             dumpmarker;
 
        /* mark start of dump memory area */
 
-       dumpsize = dump_size();
+       DMARKER;
 
        /* create a new descriptor pool */
 
@@ -136,7 +134,7 @@ static bool builtintable_init(void)
                if (!descriptor_pool_add(descpool, bte->descriptor, NULL)) {
                        /* release dump area */
 
-                       dump_release(dumpsize);
+                       DRELEASE;
 
                        return false;
                }
@@ -146,7 +144,7 @@ static bool builtintable_init(void)
                bte->descriptor = utf_new_char(bte->cdescriptor);
 
                if (!descriptor_pool_add(descpool, bte->descriptor, NULL)) {
-                       dump_release(dumpsize);
+                       DRELEASE;
                        return false;
                }
        }
@@ -157,7 +155,7 @@ static bool builtintable_init(void)
                bte->descriptor = utf_new_char(bte->cdescriptor);
 
                if (!descriptor_pool_add(descpool, bte->descriptor, NULL)) {
-                       dump_release(dumpsize);
+                       DRELEASE;
                        return false;
                }
        }
@@ -217,7 +215,7 @@ static bool builtintable_init(void)
 
        /* release dump area */
 
-       dump_release(dumpsize);
+       DRELEASE;
 
        return true;
 }

diff --git a/src/vm/jit/codegen-common.c b/src/vm/jit/codegen-common.c
index 4240945f7baad874603aaab1955d83584172aca7..d344d15327085397f456dd892b6727fa5d5c7157 100644 (file)
--- a/src/vm/jit/codegen-common.c
+++ b/src/vm/jit/codegen-common.c
@@ -1,9 +1,7 @@
 /* src/vm/jit/codegen-common.c - architecture independent code generator stuff
 
-   Copyright (C) 1996-2005, 2006, 2007 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 zu Foerderung der freien virtuellen Machine CACAO
 
    This file is part of CACAO.
 
@@ -1067,11 +1065,11 @@ u1 *codegen_generate_stub_compiler(methodinfo *m)
        codegendata *cd;
        ptrint      *d;                     /* pointer to data memory             */
        u1          *c;                     /* pointer to code memory             */
-       s4           dumpsize;
+       int32_t      dumpmarker;
 
        /* mark dump memory */
 
-       dumpsize = dump_size();
+       DMARKER;
 
        /* allocate required data structures */
 
@@ -1154,7 +1152,7 @@ u1 *codegen_generate_stub_compiler(methodinfo *m)
 
        /* release dump memory */
 
-       dump_release(dumpsize);
+       DRELEASE;
 
        /* return native stub code */
 
@@ -1173,11 +1171,11 @@ void codegen_generate_stub_builtin(methodinfo *m, builtintable_entry *bte)
        jitdata  *jd;
        codeinfo *code;
        int       skipparams;
-       s4        dumpsize;
+       int32_t   dumpmarker;
 
        /* mark dump memory */
 
-       dumpsize = dump_size();
+       DMARKER;
 
        /* Create JIT data structure. */
 
@@ -1242,7 +1240,7 @@ void codegen_generate_stub_builtin(methodinfo *m, builtintable_entry *bte)
 
        /* release memory */
 
-       dump_release(dumpsize);
+       DRELEASE;
 }
 
 
@@ -1259,14 +1257,14 @@ codeinfo *codegen_generate_stub_native(methodinfo *m, functionptr f)
 {
        jitdata     *jd;
        codeinfo    *code;
-       s4           dumpsize;
        methoddesc  *md;
        methoddesc  *nmd;       
        int          skipparams;
+       int32_t      dumpmarker;
 
        /* mark dump memory */
 
-       dumpsize = dump_size();
+       DMARKER;
 
        /* Create JIT data structure. */
 
@@ -1383,7 +1381,7 @@ codeinfo *codegen_generate_stub_native(methodinfo *m, functionptr f)
 
        /* release memory */
 
-       dump_release(dumpsize);
+       DRELEASE;
 
        /* return native stub code */
 

diff --git a/src/vm/jit/intrp/codegen.c b/src/vm/jit/intrp/codegen.c
index ea45d60c61d6a69b5bf6ca7fe56a56804032388f..9149375311d8eea91b759dd6e1b2112ff94df142 100644 (file)
--- a/src/vm/jit/intrp/codegen.c
+++ b/src/vm/jit/intrp/codegen.c
@@ -1,9 +1,7 @@
 /* src/vm/jit/intrp/codegen.c - code generator for Interpreter
 
-   Copyright (C) 1996-2005, 2006, 2007 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 zu Foerderung der freien virtuellen Machine CACAO
 
    This file is part of CACAO.
 
@@ -1838,8 +1836,8 @@ u1 *intrp_createcompilerstub(methodinfo *m)
        Inst        *s;
        Inst        *d;
        codegendata *cd;
-       s4           dumpsize;
        s4           stackframesize;
+       int32_t      dumpmarker;
 
        s = CNEW(Inst, COMPILERSTUB_SIZE);
 
@@ -1856,7 +1854,7 @@ u1 *intrp_createcompilerstub(methodinfo *m)
 
        /* mark start of dump memory area */
 
-       dumpsize = dump_size();
+       DMARKER;
        
        cd = DNEW(codegendata);
     cd->mcodeptr = (u1 *) s;
@@ -1894,7 +1892,7 @@ u1 *intrp_createcompilerstub(methodinfo *m)
 
        /* release dump area */
 
-       dump_release(dumpsize);
+       DRELEASE;
        
        return (u1 *) s;
 }
@@ -2203,12 +2201,12 @@ u1 *createcalljavafunction(methodinfo *m)
        jitdata            *jd;
        codegendata        *cd;
        registerdata       *rd;
-       s4                  dumpsize;
        methoddesc         *md;
+       int32_t             dumpmarker;
 
        /* mark dump memory */
 
-       dumpsize = dump_size();
+       DMARKER;
 
        /* allocate memory */
 
@@ -2264,7 +2262,7 @@ u1 *createcalljavafunction(methodinfo *m)
 
        /* release memory */
 
-       dump_release(dumpsize);
+       DRELEASE;
 
        return entrypoint;
 }

diff --git a/src/vm/jit/jit.c b/src/vm/jit/jit.c
index ae68ce20ba6fac6a452581c5b622eee761545cd7..178884e6142bdf7b2af7ebcb76a1cbc5553c9b28 100644 (file)
--- a/src/vm/jit/jit.c
+++ b/src/vm/jit/jit.c
@@ -1,9 +1,7 @@
 /* src/vm/jit/jit.c - calls the code generation functions
 
-   Copyright (C) 1996-2005, 2006, 2007 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 zu Foerderung der freien virtuellen Machine CACAO
 
    This file is part of CACAO.
 
@@ -1031,7 +1029,7 @@ u1 *jit_compile(methodinfo *m)
 {
        u1      *r;
        jitdata *jd;
-       s4       dumpsize;
+       int32_t  dumpmarker;
 
        STATISTICS(count_jit_calls++);
 
@@ -1082,7 +1080,7 @@ u1 *jit_compile(methodinfo *m)
 
        /* mark start of dump memory area */
 
-       dumpsize = dump_size();
+       DMARKER;
 
        /* create jitdata structure */
 
@@ -1165,7 +1163,7 @@ u1 *jit_compile(methodinfo *m)
 
        /* release dump area */
 
-       dump_release(dumpsize);
+       DRELEASE;
 
 #if defined(ENABLE_STATISTICS)
        /* measure time */
@@ -1195,7 +1193,7 @@ u1 *jit_recompile(methodinfo *m)
        u1      *r;
        jitdata *jd;
        u1       optlevel;
-       s4       dumpsize;
+       int32_t  dumpmarker;
 
        /* check for max. optimization level */
 
@@ -1221,7 +1219,7 @@ u1 *jit_recompile(methodinfo *m)
 
        /* mark start of dump memory area */
 
-       dumpsize = dump_size();
+       DMARKER;
 
        /* create jitdata structure */
 
@@ -1277,7 +1275,7 @@ u1 *jit_recompile(methodinfo *m)
 
        /* release dump area */
 
-       dump_release(dumpsize);
+       DRELEASE;
 
 #if defined(ENABLE_STATISTICS)
        /* measure time */

diff --git a/src/vm/jit/replace.c b/src/vm/jit/replace.c
index c0c7ea52adb38d855d5dc5bed3cc6a20bdc92a68..3740347f3bc06c2be9ccb42c7ab3ceba10390361 100644 (file)
--- a/src/vm/jit/replace.c
+++ b/src/vm/jit/replace.c
@@ -1,9 +1,7 @@
 /* src/vm/jit/replace.c - on-stack replacement of methods
 
-   Copyright (C) 1996-2005, 2006, 2007 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 zu Foerderung der freien virtuellen Machine CACAO
 
    This file is part of CACAO.
 
@@ -2754,12 +2752,12 @@ static void replace_me(rplpoint *rp, executionstate_t *es)
        stackframeinfo_t    *sfi;
        sourcestate_t       *ss;
        sourceframe_t       *frame;
-       s4                   dumpsize;
        codeinfo            *origcode;
        rplpoint            *origrp;
 #if defined(ENABLE_THREADS) && defined(ENABLE_GC_CACAO)
        threadobject        *thread;
 #endif
+       int32_t              dumpmarker;
 
        origcode = es->code;
        origrp   = rp;
@@ -2775,7 +2773,7 @@ static void replace_me(rplpoint *rp, executionstate_t *es)
 
        /* mark start of dump memory area */
 
-       dumpsize = dump_size();
+       DMARKER;
 
        /* get the stackframeinfo for the current thread */
 
@@ -2858,7 +2856,7 @@ static void replace_me(rplpoint *rp, executionstate_t *es)
 
        /* release dump area */
 
-       dump_release(dumpsize);
+       DRELEASE;
 }
 
 

diff --git a/src/vm/jit/show.c b/src/vm/jit/show.c
index 61aadcbeb4e86a1b5dfb6ed79b9582cabc1d28c9..d8450409b451863697ae45bcee7608851e41967f 100644 (file)
--- a/src/vm/jit/show.c
+++ b/src/vm/jit/show.c
@@ -1,9 +1,7 @@
 /* src/vm/jit/show.c - showing the intermediate representation
 
-   Copyright (C) 1996-2005, 2006, 2007 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 zu Foerderung der freien virtuellen Machine CACAO
 
    This file is part of CACAO.
 
@@ -1526,7 +1524,7 @@ void show_filters_apply(methodinfo *m) {
        int res;
        char *method_name;
        s4 len;
-       s4 dumpsize;
+       int32_t dumpmarker;
 
        /* compose full name of method */
 
@@ -1537,7 +1535,7 @@ void show_filters_apply(methodinfo *m) {
                utf_bytes(m->descriptor) +
                1;
 
-       dumpsize = dump_size(); /* allocate memory */
+       DMARKER;
 
        method_name = DMNEW(char, len);
 
@@ -1566,8 +1564,7 @@ void show_filters_apply(methodinfo *m) {
 
        /* release memory */
 
-       dump_release(dumpsize); 
-
+       DRELEASE; 
 }
 
 #define STATE_IS_INITIAL() ((FILTERVERBOSECALLCTR[0] == 0) && (FILTERVERBOSECALLCTR[1] == 0))

diff --git a/src/vm/jit/trace.c b/src/vm/jit/trace.c
index b75299404d4b8e012d5267debea8c53fe9de9e99..a6476673b26f724bbffefbd3c86f9d392b4f805f 100644 (file)
--- a/src/vm/jit/trace.c
+++ b/src/vm/jit/trace.c
@@ -1,9 +1,7 @@
 /* src/vm/jit/trace.c - Functions for tracing from java code.
 
-   Copyright (C) 1996-2005, 2006, 2007 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 zu Foerderung der freien virtuellen Machine CACAO
 
    This file is part of CACAO.
 
@@ -192,9 +190,9 @@ void trace_java_call_enter(methodinfo *m, uint64_t *arg_regs, uint64_t *stack)
        imm_union   arg;
        char       *logtext;
        s4          logtextlen;
-       s4          dumpsize;
        s4          i;
        s4          pos;
+       int32_t     dumpmarker;
 
 #if defined(ENABLE_DEBUG_FILTER)
        if (!show_filters_test_verbosecall_enter(m))
@@ -247,7 +245,7 @@ void trace_java_call_enter(methodinfo *m, uint64_t *arg_regs, uint64_t *stack)
 
        /* allocate memory */
 
-       dumpsize = dump_size();
+       DMARKER;
 
        logtext = DMNEW(char, logtextlen);
 
@@ -302,7 +300,7 @@ void trace_java_call_enter(methodinfo *m, uint64_t *arg_regs, uint64_t *stack)
 
        /* release memory */
 
-       dump_release(dumpsize);
+       DRELEASE;
 
        TRACEJAVACALLINDENT++;
 
@@ -323,10 +321,10 @@ void trace_java_call_exit(methodinfo *m, uint64_t *return_regs)
        methoddesc *md;
        char       *logtext;
        s4          logtextlen;
-       s4          dumpsize;
        s4          i;
        s4          pos;
        imm_union   val;
+       int32_t     dumpmarker;
 
 #if defined(ENABLE_DEBUG_FILTER)
        if (!show_filters_test_verbosecall_exit(m))
@@ -366,7 +364,7 @@ void trace_java_call_exit(methodinfo *m, uint64_t *return_regs)
 
        /* allocate memory */
 
-       dumpsize = dump_size();
+       DMARKER;
 
        logtext = DMNEW(char, logtextlen);
 
@@ -401,8 +399,7 @@ void trace_java_call_exit(methodinfo *m, uint64_t *return_regs)
 
        /* release memory */
 
-       dump_release(dumpsize);
-
+       DRELEASE;
 }
 
 
@@ -416,8 +413,8 @@ void trace_exception(java_object_t *xptr, methodinfo *m, void *pos)
 {
        char *logtext;
        s4    logtextlen;
-       s4    dumpsize;
        codeinfo *code;
+       int32_t   dumpmarker;
 
        /* calculate message length */
 
@@ -462,7 +459,7 @@ void trace_exception(java_object_t *xptr, methodinfo *m, void *pos)
 
        /* allocate memory */
 
-       dumpsize = dump_size();
+       DMARKER;
 
        logtext = DMNEW(char, logtextlen);
 
@@ -533,7 +530,7 @@ void trace_exception(java_object_t *xptr, methodinfo *m, void *pos)
 
        /* release memory */
 
-       dump_release(dumpsize);
+       DRELEASE;
 }
 
 
@@ -549,7 +546,7 @@ void trace_exception_builtin(java_object_t *xptr)
        java_lang_String    *s;
        char                *logtext;
        s4                   logtextlen;
-       s4                   dumpsize;
+       int32_t              dumpmarker;
 
        t = (java_lang_Throwable *) xptr;
 
@@ -577,7 +574,7 @@ void trace_exception_builtin(java_object_t *xptr)
 
        /* allocate memory */
 
-       dumpsize = dump_size();
+       DMARKER;
 
        logtext = DMNEW(char, logtextlen);
 
@@ -603,7 +600,7 @@ void trace_exception_builtin(java_object_t *xptr)
 
        /* release memory */
 
-       dump_release(dumpsize);
+       DRELEASE;
 }
 
 

diff --git a/src/vm/vm.c b/src/vm/vm.c
index 11b1123a8d4f6d0feb1b1f6d45ab6aca84e2d171..1e9b11d644fa132944d138c6f354623a45b45820 100644 (file)
--- a/src/vm/vm.c
+++ b/src/vm/vm.c
@@ -1,9 +1,7 @@
 /* src/vm/vm.c - VM startup and shutdown functions
 
-   Copyright (C) 1996-2005, 2006, 2007 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 zu Foerderung der freien virtuellen Machine CACAO
 
    This file is part of CACAO.
 
@@ -2387,21 +2385,21 @@ VM_CALL_METHOD(_double, double)
 type vm_call_method##name##_valist(methodinfo *m, java_handle_t *o,     \
                                                                   va_list ap)                          \
 {                                                                       \
-       int32_t   dumpsize;                                                 \
        uint64_t *array;                                                    \
        type      value;                                                    \
+       int32_t   dumpmarker;                                               \
                                                                         \
        if (m->code == NULL)                                                \
                if (!jit_compile(m))                                            \
                        return 0;                                                   \
                                                                         \
        THREAD_NATIVEWORLD_EXIT;                                            \
+       DMARKER;                                                            \
                                                                         \
-       dumpsize = dump_size();                                             \
        array = argument_vmarray_from_valist(m, o, ap);                     \
        value = vm_call##name##_array(m, array);                            \
-       dump_release(dumpsize);                                             \
                                                                         \
+       DRELEASE;                                                           \
        THREAD_NATIVEWORLD_ENTER;                                           \
                                                                         \
        return value;                                                       \
@@ -2425,21 +2423,21 @@ VM_CALL_METHOD_VALIST(_double, double)
 type vm_call_method##name##_jvalue(methodinfo *m, java_handle_t *o,     \
                                                           const jvalue *args)                  \
 {                                                                       \
-       int32_t   dumpsize;                                                 \
        uint64_t *array;                                                    \
        type      value;                                                    \
+       int32_t   dumpmarker;                                               \
                                                                         \
        if (m->code == NULL)                                                \
                if (!jit_compile(m))                                            \
                        return 0;                                                   \
                                                                         \
        THREAD_NATIVEWORLD_EXIT;                                            \
+       DMARKER;                                                            \
                                                                         \
-       dumpsize = dump_size();                                             \
        array = argument_vmarray_from_jvalue(m, o, args);                   \
        value = vm_call##name##_array(m, array);                            \
-       dump_release(dumpsize);                                             \
                                                                         \
+       DRELEASE;                                                           \
        THREAD_NATIVEWORLD_ENTER;                                           \
                                                                         \
        return value;                                                       \
@@ -2462,11 +2460,11 @@ VM_CALL_METHOD_JVALUE(_double, double)
 java_handle_t *vm_call_method_objectarray(methodinfo *m, java_handle_t *o,
                                                                                  java_handle_objectarray_t *params)
 {
-       int32_t        dumpsize;
        uint64_t      *array;
        java_handle_t *xptr;
        java_handle_t *ro;
        imm_union      value;
+       int32_t        dumpmarker;
 
        /* compile methods which are not yet compiled */
 
@@ -2480,7 +2478,7 @@ java_handle_t *vm_call_method_objectarray(methodinfo *m, java_handle_t *o,
 
        /* mark start of dump memory area */
 
-       dumpsize = dump_size();
+       DMARKER;
 
        /* Fill the argument array from a object-array. */
 
@@ -2489,7 +2487,7 @@ java_handle_t *vm_call_method_objectarray(methodinfo *m, java_handle_t *o,
        if (array == NULL) {
                /* release dump area */
 
-               dump_release(dumpsize);
+               DRELEASE;
 
                /* enter the nativeworld again */
 
@@ -2535,7 +2533,7 @@ java_handle_t *vm_call_method_objectarray(methodinfo *m, java_handle_t *o,
 
        /* release dump area */
 
-       dump_release(dumpsize);
+       DRELEASE;
 
        /* enter the nativeworld again */
 

diff --git a/src/vmcore/class.c b/src/vmcore/class.c
index c0b1c9e9f1082d2acfb225c25d34e10fc6c49037..c8b30e3ca39acbd1dd6b2dc1c68ac1241641e3c8 100644 (file)
--- a/src/vmcore/class.c
+++ b/src/vmcore/class.c
@@ -1,9 +1,8 @@
 /* src/vmcore/class.c - class related functions
 
-   Copyright (C) 1996-2005, 2006, 2007 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 zu Foerderung der freien virtuellen Machine CACAO
+
 
    This file is part of CACAO.
 
@@ -887,11 +886,11 @@ classinfo *class_array_of(classinfo *component, bool link)
     char              *namebuf;
        utf               *u;
        classinfo         *c;
-       s4                 dumpsize;
+       int32_t            dumpmarker;
 
        cl = component->classloader;
 
-       dumpsize = dump_size();
+       DMARKER;
 
     /* Assemble the array class name */
     namelen = component->name->blength;
@@ -917,7 +916,7 @@ classinfo *class_array_of(classinfo *component, bool link)
 
        c = get_array_class(u, cl, cl, link);
 
-       dump_release(dumpsize);
+       DRELEASE;
 
        return c;
 }
@@ -934,10 +933,10 @@ classinfo *class_multiarray_of(s4 dim, classinfo *element, bool link)
 {
     s4 namelen;
     char *namebuf;
-       s4 dumpsize;
        classinfo *c;
+       int32_t    dumpmarker;
 
-       dumpsize = dump_size();
+       DMARKER;
 
        if (dim < 1) {
                log_text("Invalid array dimension requested");
@@ -968,7 +967,7 @@ classinfo *class_multiarray_of(s4 dim, classinfo *element, bool link)
                                                element->classloader,
                                                link);
 
-       dump_release(dumpsize);
+       DRELEASE;
 
        return c;
 }
@@ -1096,13 +1095,13 @@ constant_classref *class_get_classref_multiarray_of(s4 dim, constant_classref *r
 {
     s4 namelen;
     char *namebuf;
-       s4 dumpsize;
        constant_classref *cr;
+       int32_t            dumpmarker;
 
        assert(ref);
        assert(dim >= 1 && dim <= 255);
 
-       dumpsize = dump_size();
+       DMARKER;
 
     /* Assemble the array class name */
     namelen = ref->name->blength;
@@ -1125,7 +1124,7 @@ constant_classref *class_get_classref_multiarray_of(s4 dim, constant_classref *r
 
     cr = class_get_classref(ref->referer,utf_new(namebuf, namelen));
 
-       dump_release(dumpsize);
+       DRELEASE;
 
        return cr;
 }

diff --git a/src/vmcore/loader.c b/src/vmcore/loader.c
index 24d2d8fb81a756663aad9649b9a13142c6a61f4c..de936139bbfa51a943763eb5a7f0919cf1c8ad63 100644 (file)
--- a/src/vmcore/loader.c
+++ b/src/vmcore/loader.c
@@ -1932,8 +1932,8 @@ static bool load_class_from_classbuffer_intern(classbuffer *cb)
 classinfo *load_class_from_classbuffer(classbuffer *cb)
 {
        classinfo *c;
-       int32_t    dumpsize;
        bool       result;
+       int32_t    dumpmarker;
 
        /* Get the classbuffer's class. */
 
@@ -1956,7 +1956,7 @@ classinfo *load_class_from_classbuffer(classbuffer *cb)
 
        /* Mark start of dump memory area. */
 
-       dumpsize = dump_size();
+       DMARKER;
 
        /* Class is currently loading. */
 
@@ -1968,7 +1968,7 @@ classinfo *load_class_from_classbuffer(classbuffer *cb)
 
        /* Release dump area. */
 
-       dump_release(dumpsize);
+       DRELEASE;
 
        /* An error occurred. */