* src/mm/dumpmemory.c: Moved to .cpp.

[cacao.git] / src / vm / jit / trace.cpp

diff --git a/src/vm/jit/trace.cpp b/src/vm/jit/trace.cpp
index 86a6e0a613b0ea08fca5dfb3b24e1c14ffaef4cd..ebd26a390290ac29c11b2033f5ca7af2bf180230 100644 (file)
--- a/src/vm/jit/trace.cpp
+++ b/src/vm/jit/trace.cpp
@@ -135,7 +135,7 @@ static char *trace_java_call_print_argument(methodinfo *m, char *logtext, s4 *lo
 
                                /* realloc memory for string length */
 
-                               logtext = DMREALLOC(logtext, char, *logtextlen, *logtextlen + len);
+                               logtext = (char*) DumpMemory::reallocate(logtext, *logtextlen, *logtextlen + len);
                                *logtextlen += len;
 
                                /* convert to utf8 string and strcat it to the logtext */
@@ -165,7 +165,7 @@ static char *trace_java_call_print_argument(methodinfo *m, char *logtext, s4 *lo
 
                                /* realloc memory for string length */
 
-                               logtext = DMREALLOC(logtext, char, *logtextlen, *logtextlen + len);
+                               logtext = (char*) DumpMemory::reallocate(logtext, *logtextlen, *logtextlen + len);
                                *logtextlen += len;
 
                                /* strcat to the logtext */
@@ -201,7 +201,6 @@ void trace_java_call_enter(methodinfo *m, uint64_t *arg_regs, uint64_t *stack)
        s4          logtextlen;
        s4          i;
        s4          pos;
-       int32_t     dumpmarker;
 
        /* We don't trace builtin functions here because the argument
           passing happens via the native ABI and does not fit these
@@ -259,11 +258,11 @@ void trace_java_call_enter(methodinfo *m, uint64_t *arg_regs, uint64_t *stack)
                strlen("...(255)") +
                strlen(")");
 
-       /* allocate memory */
+       // Create new dump memory area.
+       DumpMemoryArea dma();
 
-       DMARKER;
-
-       logtext = DMNEW(char, logtextlen);
+       // TODO Use a std::string here.
+       logtext = (char*) DumpMemory::allocate(sizeof(char) * logtextlen);
 
        TRACEJAVACALLCOUNT++;
 
@@ -312,12 +311,7 @@ void trace_java_call_enter(methodinfo *m, uint64_t *arg_regs, uint64_t *stack)
 
        log_text(logtext);
 
-       /* release memory */
-
-       DRELEASE;
-
        TRACEJAVACALLINDENT++;
-
 }
 
 /* trace_java_call_exit ********************************************************
@@ -338,7 +332,6 @@ void trace_java_call_exit(methodinfo *m, uint64_t *return_regs)
        s4          i;
        s4          pos;
        imm_union   val;
-       int32_t     dumpmarker;
 
        /* We don't trace builtin functions here because the argument
           passing happens via the native ABI and does not fit these
@@ -383,11 +376,11 @@ void trace_java_call_exit(methodinfo *m, uint64_t *return_regs)
 
        logtextlen += strlen("->0.4872328470301428 (0x0123456789abcdef)");
 
-       /* allocate memory */
+       // Create new dump memory area.
+       DumpMemoryArea dma();
 
-       DMARKER;
-
-       logtext = DMNEW(char, logtextlen);
+       // TODO Use a std::string here.
+       logtext = (char*) DumpMemory::allocate(sizeof(char) * logtextlen);
 
        /* generate the message */
 
@@ -418,10 +411,6 @@ void trace_java_call_exit(methodinfo *m, uint64_t *return_regs)
        }
 
        log_text(logtext);
-
-       /* release memory */
-
-       DRELEASE;
 }
 
 
@@ -436,7 +425,6 @@ void trace_exception(java_object_t *xptr, methodinfo *m, void *pos)
        char *logtext;
        s4    logtextlen;
        codeinfo *code;
-       int32_t   dumpmarker;
 
        /* calculate message length */
 
@@ -479,11 +467,11 @@ void trace_exception(java_object_t *xptr, methodinfo *m, void *pos)
 
        logtextlen += strlen("0");
 
-       /* allocate memory */
+       // Create new dump memory area.
+       DumpMemoryArea dma();
 
-       DMARKER;
-
-       logtext = DMNEW(char, logtextlen);
+       // TODO Use a std::string here.
+       logtext = (char*) DumpMemory::allocate(sizeof(char) * logtextlen);
 
        if (xptr) {
                strcpy(logtext, "Exception ");
@@ -549,10 +537,6 @@ void trace_exception(java_object_t *xptr, methodinfo *m, void *pos)
                strcat(logtext, "call_java_method");
 
        log_text(logtext);
-
-       /* release memory */
-
-       DRELEASE;
 }
 
 
@@ -566,7 +550,6 @@ void trace_exception_builtin(java_handle_t* h)
 {
        char                *logtext;
        s4                   logtextlen;
-       int32_t              dumpmarker;
 
        java_lang_Throwable jlt(h);
 
@@ -595,11 +578,10 @@ void trace_exception_builtin(java_handle_t* h)
                logtextlen += strlen("(nil)");
        }
 
-       /* allocate memory */
+       // Create new dump memory area.
+       DumpMemoryArea dma();
 
-       DMARKER;
-
-       logtext = DMNEW(char, logtextlen);
+       logtext = (char*) DumpMemory::allocate(sizeof(char) * logtextlen);
 
        strcpy(logtext, "Builtin exception thrown: ");
 
@@ -620,10 +602,6 @@ void trace_exception_builtin(java_handle_t* h)
        }
 
        log_text(logtext);
-
-       /* release memory */
-
-       DRELEASE;
 }
 
 } // extern "C"