* src/vm/jit/i386/codegen.c (codegen_emit): Commented out escape checks.

* src/vm/jit/i386/emit.h: Fixed typo.
* src/vm/jit/optimizing/bytecode_escape.c,
src/vm/jit/optimizing/escape.c,
src/vm/jit/optimizing/escape.h: Added copyright header.

diff --git a/src/vm/jit/i386/codegen.c b/src/vm/jit/i386/codegen.c
index 4f47e7d4ce7dad5636aac7cc1fab7d0aa405f161..3480eac59317076d0b88dda375c4fb2ce3d560f4 100644 (file)
--- a/src/vm/jit/i386/codegen.c
+++ b/src/vm/jit/i386/codegen.c
@@ -2304,7 +2304,7 @@ bool codegen_emit(jitdata *jd)
                        emit_nullpointer_check(cd, iptr, s1);
 
 #if defined(ENABLE_ESCAPE_CHECK)
-                       emit_escape_check(cd, s1);
+                       /*emit_escape_check(cd, s1);*/
 #endif
 
                        if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
@@ -2967,7 +2967,7 @@ gen_method:
 
 #if defined(ENABLE_ESCAPE_CHECK)
                                if (bte->opcode == ICMD_NEW || bte->opcode == ICMD_NEWARRAY) {
-                                       emit_esape_annotate_object(cd, m);
+                                       /*emit_escape_annotate_object(cd, m);*/
                                }
 #endif
                                break;

diff --git a/src/vm/jit/i386/emit.h b/src/vm/jit/i386/emit.h
index 5a0c26dd6e8d6f0f49453efef3b60c3851b88b1b..4a5fd13da4ec5f8a2718e55954e13201de819133 100644 (file)
--- a/src/vm/jit/i386/emit.h
+++ b/src/vm/jit/i386/emit.h
@@ -296,7 +296,7 @@ void emit_fincstp(codegendata *cd);
 
 #if defined(ENABLE_ESCAPE_CHECK)
 void emit_escape_check(codegendata *cd, s4 reg);
-void emit_esape_annotate_object(codegendata *cd, methodinfo *m);
+void emit_escape_annotate_object(codegendata *cd, methodinfo *m);
 #endif
 
 #endif /* _EMITFUNCS_H */

diff --git a/src/vm/jit/optimizing/bytecode_escape.c b/src/vm/jit/optimizing/bytecode_escape.c
index 4deae2c46a10664f969547c3bfbf182f67979ed2..22fb1f2810f7ec0d9abbef087a5d153d69564849 100644 (file)
--- a/src/vm/jit/optimizing/bytecode_escape.c
+++ b/src/vm/jit/optimizing/bytecode_escape.c
@@ -1,3 +1,26 @@
+/* src/vm/optimizing/bytecode_escape.c
+
+   Copyright (C) 2008
+   CACAOVM - Verein zu Foerderung der freien virtuellen Machine CACAO
+
+   This file is part of CACAO.
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2, or (at
+   your option) any later version.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   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., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
+*/
+
 #include "mm/dumpmemory.h"
 #include "mm/memory.h"
 

diff --git a/src/vm/jit/optimizing/escape.c b/src/vm/jit/optimizing/escape.c
index 93ad4ab08bad2cc81b2332eaf01afac357980b85..b1c0679d584720036e7d81704fc7d160c5d62cfd 100644 (file)
--- a/src/vm/jit/optimizing/escape.c
+++ b/src/vm/jit/optimizing/escape.c
@@ -1,3 +1,26 @@
+/* src/vm/optimizing/escape.c
+
+   Copyright (C) 2008
+   CACAOVM - Verein zu Foerderung der freien virtuellen Machine CACAO
+
+   This file is part of CACAO.
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2, or (at
+   your option) any later version.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   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., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
+*/
+
 #include "vm/jit/jit.h"
 #include "vmcore/class.h"
 #include "vm/jit/optimizing/escape.h"

diff --git a/src/vm/jit/optimizing/escape.h b/src/vm/jit/optimizing/escape.h
index fc81248a26c437ac7652671e8e318249a1904942..2f427fa31b6c2faf245a3748704b98485e62e234 100644 (file)
--- a/src/vm/jit/optimizing/escape.h
+++ b/src/vm/jit/optimizing/escape.h
@@ -1,3 +1,26 @@
+/* src/vm/optimizing/escape.h
+
+   Copyright (C) 2008
+   CACAOVM - Verein zu Foerderung der freien virtuellen Machine CACAO
+
+   This file is part of CACAO.
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2, or (at
+   your option) any later version.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   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., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
+*/
+
 #ifndef _VM_JIT_OPTIMIZING_ESCAPE_H
 #define _VM_JIT_OPTIMIZING_ESCAPE_H