projects / cacao.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9c5214d)
Merged revisions 7701-7706 via svnmerge from
authormichi <none@none>
Sun, 15 Apr 2007 12:23:38 +0000 (12:23 +0000)
committermichi <none@none>
Sun, 15 Apr 2007 12:23:38 +0000 (12:23 +0000)
svn+ssh://michi@c1.complang.tuwien.ac.at/ahome/cacao/svn/cacao/trunk

........
  r7703 | twisti | 2007-04-15 13:37:55 +0200 (Sun, 15 Apr 2007) | 6 lines

  * tests/regression/resolving/Makefile.am: Added GNU header and fixed
  srcdir != builddir.
  * tests/regression/resolving/classes1/Makefile.am: Likewise.
  * tests/regression/resolving/classes2/Makefile.am: Likewise.
  * tests/regression/resolving/classes3/Makefile.am: Likewise.
........
  r7704 | michi | 2007-04-15 13:55:25 +0200 (Sun, 15 Apr 2007) | 3 lines

  * src/vm/jit/i386/codegen.c (codegen_emit_stub_native): Fixed
  calculation of stackframesize.
........
  r7705 | michi | 2007-04-15 14:15:01 +0200 (Sun, 15 Apr 2007) | 4 lines

  * src/vm/jit/i386/md-abi.c (abi_registers_integer_argument): Added.
  (abi_registers_integer_saved): Likewise.
  (abi_registers_integer_temporary): Likewise.
........
  r7706 | michi | 2007-04-15 14:17:02 +0200 (Sun, 15 Apr 2007) | 2 lines

  * src/vm/jit/i386/md-abi.c (abi_registers_integer_argument): Fixed.
........

--HG--
branch : exact-gc

src/vm/jit/i386/codegen.c patch | blob | history
src/vm/jit/i386/md-abi.c patch | blob | history
tests/regression/resolving/Makefile.am patch | blob | history
tests/regression/resolving/classes1/Makefile.am patch | blob | history
tests/regression/resolving/classes2/Makefile.am patch | blob | history
tests/regression/resolving/classes3/Makefile.am patch | blob | history

diff --git a/src/vm/jit/i386/codegen.c b/src/vm/jit/i386/codegen.c
index 373e93e3886d6669ceb010189912650e84d7e665..0ebcddfca08dd20131f42a6c1ec49c1864ea4c46 100644 (file)
--- a/src/vm/jit/i386/codegen.c
+++ b/src/vm/jit/i386/codegen.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: codegen.c 7693 2007-04-12 14:56:49Z michi $
+   $Id: codegen.c 7707 2007-04-15 12:23:38Z michi $
 
 */
 
@@ -3753,7 +3753,7 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f)
                sizeof(stackframeinfo) / SIZEOF_VOID_P +
                sizeof(localref_table) / SIZEOF_VOID_P +
                1 +                             /* function pointer                   */
-               4 * 4 +                         /* 4 arguments (start_native_call)    */
+               4 +                             /* 4 arguments (start_native_call)    */
                nmd->memuse;
 
     /* keep stack 16-byte aligned */
diff --git a/src/vm/jit/i386/md-abi.c b/src/vm/jit/i386/md-abi.c
index 1355a26c49b6917e38e8258a77ff892d108c9c43..d478d9655fb3387bc9ef835beec38360b50d2579 100644 (file)
--- a/src/vm/jit/i386/md-abi.c
+++ b/src/vm/jit/i386/md-abi.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: md-abi.c 7334 2007-02-12 00:34:51Z twisti $
+   $Id: md-abi.c 7706 2007-04-15 12:17:02Z michi $
 
 */
 
@@ -50,6 +50,20 @@ const char *abi_registers_integer_name[] = {
        "eax", "ecx", "edx", "ebx", "esp", "ebp", "esi", "edi"
 };
 
+const s4 abi_registers_integer_argument[] = {
+       -1,  /* empty */
+};
+
+const s4 abi_registers_integer_saved[] = {
+       5,  /* s0 */
+       6,  /* s1 */
+       7,  /* s2 */
+};
+
+const s4 abi_registers_integer_temporary[] = {
+       3,  /* t0 */
+};
+
 
 s4 nregdescfloat[] = {
  /* rounding problems with callee saved registers */
diff --git a/tests/regression/resolving/Makefile.am b/tests/regression/resolving/Makefile.am
index 560f993c61a1c985beffaeec04699e3651055bd2..c4be51e625a8c73174a0c6d0e01ecd30ab999708 100644 (file)
--- a/tests/regression/resolving/Makefile.am
+++ b/tests/regression/resolving/Makefile.am
@@ -1,25 +1,53 @@
+## tests/regression/resolving/Makefile.am
+##
+## Copyright (C) 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
+##
+## 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.
+##
+## $Id: Makefile.am 7433 2007-03-02 19:42:13Z edwin $
+
+## Process this file with automake to produce Makefile.in
+
 SUBDIRS = \
-    classes1 \
+       classes1 \
        classes2 \
        classes3
 
 HARNESS_SOURCE_FILES = \
-       TestController.java \
-       TestLoader.java
+       $(srcdir)/TestController.java \
+       $(srcdir)/TestLoader.java
 
 HARNESS_CLASS_FILES = \
        TestController.class \
        TestLoader.class
 
 TEST_SOURCE_FILES = \
-       test_instance_subtype_violated.java \
-       test_param_loading_constraint_violated_derived.java \
-       test_param_loading_constraint_violated.java \
-       test_param_subtype_violated.java \
-       test_retval_loading_constraint_violated.java \
-       test_return_subtype_ok.java \
-       test_return_subtype_violated.java \
-       test_simple_lazy_load.java
+       $(srcdir)/test_instance_subtype_violated.java \
+       $(srcdir)/test_param_loading_constraint_violated_derived.java \
+       $(srcdir)/test_param_loading_constraint_violated.java \
+       $(srcdir)/test_param_subtype_violated.java \
+       $(srcdir)/test_retval_loading_constraint_violated.java \
+       $(srcdir)/test_return_subtype_ok.java \
+       $(srcdir)/test_return_subtype_violated.java \
+       $(srcdir)/test_simple_lazy_load.java
 
 TEST_NAMES = \
        test_instance_subtype_violated \
@@ -45,8 +73,8 @@ JAVAFLAGS = -Xbootclasspath:$(CLASSPATH_CLASSES)
 endif
 
 check: $(HARNESS_CLASS_FILES)
-       for t in $(TEST_NAMES) ; do echo "TEST $$t" ; { $(JAVAC) $$t.java && $(JAVA) $$t ; } || exit 1 ; done
+       for t in $(TEST_NAMES) ; do echo "TEST $$t" ; { $(JAVAC) -d . $(srcdir)/$$t.java && $(JAVA) $$t ; } || exit 1 ; done
 
 $(HARNESS_CLASS_FILES): $(HARNESS_SOURCE_FILES)
-       $(JAVAC) $(HARNESS_SOURCE_FILES)
+       $(JAVAC) -d . $(HARNESS_SOURCE_FILES)
 
diff --git a/tests/regression/resolving/classes1/Makefile.am b/tests/regression/resolving/classes1/Makefile.am
index 320cd8bc6d18f44aa897aa51d0b782703da99d52..0e5488257d275fad78e82a9fdeec01241c268ce2 100644 (file)
--- a/tests/regression/resolving/classes1/Makefile.am
+++ b/tests/regression/resolving/classes1/Makefile.am
@@ -1,7 +1,35 @@
+## tests/regression/resolving/classes1/Makefile.am
+##
+## Copyright (C) 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
+##
+## 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.
+##
+## $Id: Makefile.am 7433 2007-03-02 19:42:13Z edwin $
+
+## Process this file with automake to produce Makefile.in
+
 SOURCE_FILES = \
-       BarPassFoo.java \
-       BarUseFoo.java \
-       Foo.java
+       $(srcdir)/BarPassFoo.java \
+       $(srcdir)/BarUseFoo.java \
+       $(srcdir)/Foo.java
 
 CLASS_FILES = \
        BarPassFoo.class \
@@ -16,5 +44,5 @@ CLEANFILES = \
 check: $(CLASS_FILES)
 
 $(CLASS_FILES): $(SOURCE_FILES)
-       $(JAVAC) $(SOURCE_FILES)
+       $(JAVAC) -d . $(SOURCE_FILES)
 
diff --git a/tests/regression/resolving/classes2/Makefile.am b/tests/regression/resolving/classes2/Makefile.am
index dc89ae43820a3401d8648f01b2c944217ba7d3eb..d1035693cef85a4691175112a7f94d45faa07bff 100644 (file)
--- a/tests/regression/resolving/classes2/Makefile.am
+++ b/tests/regression/resolving/classes2/Makefile.am
@@ -1,8 +1,36 @@
+## tests/regression/resolving/classes2/Makefile.am
+##
+## Copyright (C) 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
+##
+## 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.
+##
+## $Id: Makefile.am 7433 2007-03-02 19:42:13Z edwin $
+
+## Process this file with automake to produce Makefile.in
+
 SOURCE_FILES = \
-       BarPassFoo.java \
-       BarUseFoo.java \
-       DerivedFoo.java \
-       Foo.java
+       $(srcdir)/BarPassFoo.java \
+       $(srcdir)/BarUseFoo.java \
+       $(srcdir)/DerivedFoo.java \
+       $(srcdir)/Foo.java
 
 CLASS_FILES = \
        BarPassFoo.class \
@@ -18,6 +46,6 @@ CLEANFILES = \
 check: $(CLASS_FILES)
 
 $(CLASS_FILES): $(SOURCE_FILES)
-       $(JAVAC) $(SOURCE_FILES)
+       $(JAVAC) -d . $(SOURCE_FILES)
 
 
diff --git a/tests/regression/resolving/classes3/Makefile.am b/tests/regression/resolving/classes3/Makefile.am
index dc89ae43820a3401d8648f01b2c944217ba7d3eb..96ea9e62157aba52e9fe4dbc7c823c216c235e36 100644 (file)
--- a/tests/regression/resolving/classes3/Makefile.am
+++ b/tests/regression/resolving/classes3/Makefile.am
@@ -1,8 +1,36 @@
+## tests/regression/resolving/classes3/Makefile.am
+##
+## Copyright (C) 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
+##
+## 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.
+##
+## $Id: Makefile.am 7433 2007-03-02 19:42:13Z edwin $
+
+## Process this file with automake to produce Makefile.in
+
 SOURCE_FILES = \
-       BarPassFoo.java \
-       BarUseFoo.java \
-       DerivedFoo.java \
-       Foo.java
+       $(srcdir)/BarPassFoo.java \
+       $(srcdir)/BarUseFoo.java \
+       $(srcdir)/DerivedFoo.java \
+       $(srcdir)/Foo.java
 
 CLASS_FILES = \
        BarPassFoo.class \
@@ -18,6 +46,6 @@ CLEANFILES = \
 check: $(CLASS_FILES)
 
 $(CLASS_FILES): $(SOURCE_FILES)
-       $(JAVAC) $(SOURCE_FILES)
+       $(JAVAC) -d . $(SOURCE_FILES)
 
 
inofficial http://www.cacaojvm.org/ git mirror