From 9407b72fb4989b4cf816b303d14890f75757658a Mon Sep 17 00:00:00 2001 From: Christian Thalinger Date: Tue, 26 Aug 2008 11:11:11 +0200 Subject: [PATCH] * src/vm/jit/emit-common.c: Moved to .cpp. * src/vm/jit/emit-common.h: Likewise. * src/vm/jit/emit-common.cpp: New file. * src/vm/jit/emit-common.hpp: Likewise. * src/vm/jit/Makefile.am, src/vm/jit/alpha/codegen.c, src/vm/jit/alpha/emit.c, src/vm/jit/arm/codegen.c, src/vm/jit/arm/emit.c, src/vm/jit/codegen-common.c, src/vm/jit/i386/codegen.c, src/vm/jit/i386/emit.c, src/vm/jit/m68k/codegen.c, src/vm/jit/m68k/emit.c, src/vm/jit/mips/codegen.c, src/vm/jit/mips/emit.c, src/vm/jit/powerpc/codegen.c, src/vm/jit/powerpc/emit.c, src/vm/jit/powerpc64/codegen.c, src/vm/jit/powerpc64/emit.c, src/vm/jit/s390/codegen.c, src/vm/jit/s390/emit.c, src/vm/jit/sparc64/codegen.c, src/vm/jit/sparc64/emit.c, src/vm/jit/stubs.cpp, src/vm/jit/x86_64/codegen.c, src/vm/jit/x86_64/emit.c: Related changes. --HG-- rename : src/vm/jit/emit-common.c => src/vm/jit/emit-common.cpp rename : src/vm/jit/emit-common.h => src/vm/jit/emit-common.hpp --- src/vm/jit/Makefile.am | 4 ++-- src/vm/jit/alpha/codegen.c | 2 +- src/vm/jit/alpha/emit.c | 2 +- src/vm/jit/arm/codegen.c | 2 +- src/vm/jit/arm/emit.c | 2 +- src/vm/jit/codegen-common.c | 2 +- src/vm/jit/{emit-common.c => emit-common.cpp} | 12 ++++++------ src/vm/jit/{emit-common.h => emit-common.hpp} | 2 +- src/vm/jit/i386/codegen.c | 2 +- src/vm/jit/i386/emit.c | 2 +- src/vm/jit/m68k/codegen.c | 2 +- src/vm/jit/m68k/emit.c | 2 +- src/vm/jit/mips/codegen.c | 2 +- src/vm/jit/mips/emit.c | 2 +- src/vm/jit/powerpc/codegen.c | 2 +- src/vm/jit/powerpc/emit.c | 2 +- src/vm/jit/powerpc64/codegen.c | 2 +- src/vm/jit/powerpc64/emit.c | 2 +- src/vm/jit/s390/codegen.c | 2 +- src/vm/jit/s390/emit.c | 2 +- src/vm/jit/sparc64/codegen.c | 2 +- src/vm/jit/sparc64/emit.c | 2 +- src/vm/jit/stubs.cpp | 2 +- src/vm/jit/x86_64/codegen.c | 2 +- src/vm/jit/x86_64/emit.c | 2 +- 25 files changed, 31 insertions(+), 31 deletions(-) rename src/vm/jit/{emit-common.c => emit-common.cpp} (97%) rename src/vm/jit/{emit-common.h => emit-common.hpp} (99%) diff --git a/src/vm/jit/Makefile.am b/src/vm/jit/Makefile.am index 3e9b34e4c..ca4879870 100644 --- a/src/vm/jit/Makefile.am +++ b/src/vm/jit/Makefile.am @@ -161,8 +161,8 @@ libjit_la_SOURCES = \ $(DISASS_SOURCES) \ dseg.c \ dseg.h \ - emit-common.c \ - emit-common.h \ + emit-common.cpp \ + emit-common.hpp \ exceptiontable.c \ exceptiontable.h \ executionstate.c \ diff --git a/src/vm/jit/alpha/codegen.c b/src/vm/jit/alpha/codegen.c index 369567029..ef63f752e 100644 --- a/src/vm/jit/alpha/codegen.c +++ b/src/vm/jit/alpha/codegen.c @@ -54,7 +54,7 @@ #include "vm/jit/asmpart.h" #include "vm/jit/codegen-common.h" #include "vm/jit/dseg.h" -#include "vm/jit/emit-common.h" +#include "vm/jit/emit-common.hpp" #include "vm/jit/jit.hpp" #include "vm/jit/linenumbertable.h" #include "vm/jit/parse.h" diff --git a/src/vm/jit/alpha/emit.c b/src/vm/jit/alpha/emit.c index 0fc5314db..cdb00c327 100644 --- a/src/vm/jit/alpha/emit.c +++ b/src/vm/jit/alpha/emit.c @@ -43,7 +43,7 @@ #include "vm/jit/abi-asm.h" #include "vm/jit/asmpart.h" #include "vm/jit/dseg.h" -#include "vm/jit/emit-common.h" +#include "vm/jit/emit-common.hpp" #include "vm/jit/jit.hpp" #include "vm/jit/patcher-common.h" #include "vm/jit/replace.hpp" diff --git a/src/vm/jit/arm/codegen.c b/src/vm/jit/arm/codegen.c index 19ca2733f..caf895697 100644 --- a/src/vm/jit/arm/codegen.c +++ b/src/vm/jit/arm/codegen.c @@ -53,7 +53,7 @@ #include "vm/jit/asmpart.h" #include "vm/jit/codegen-common.h" #include "vm/jit/dseg.h" -#include "vm/jit/emit-common.h" +#include "vm/jit/emit-common.hpp" #include "vm/jit/jit.hpp" #include "vm/jit/linenumbertable.h" #include "vm/jit/methodheader.h" diff --git a/src/vm/jit/arm/emit.c b/src/vm/jit/arm/emit.c index b3efb40d2..3fffcdb2b 100644 --- a/src/vm/jit/arm/emit.c +++ b/src/vm/jit/arm/emit.c @@ -42,7 +42,7 @@ #include "vm/jit/abi.h" #include "vm/jit/asmpart.h" -#include "vm/jit/emit-common.h" +#include "vm/jit/emit-common.hpp" #include "vm/jit/jit.hpp" #include "vm/jit/patcher-common.h" #include "vm/jit/replace.hpp" diff --git a/src/vm/jit/codegen-common.c b/src/vm/jit/codegen-common.c index 6c006a9a3..a5f830bbc 100644 --- a/src/vm/jit/codegen-common.c +++ b/src/vm/jit/codegen-common.c @@ -82,7 +82,7 @@ #endif #include "vm/jit/dseg.h" -#include "vm/jit/emit-common.h" +#include "vm/jit/emit-common.hpp" #include "vm/jit/jit.hpp" #include "vm/jit/linenumbertable.h" #include "vm/jit/methodheader.h" diff --git a/src/vm/jit/emit-common.c b/src/vm/jit/emit-common.cpp similarity index 97% rename from src/vm/jit/emit-common.c rename to src/vm/jit/emit-common.cpp index 32001deb3..0535e0276 100644 --- a/src/vm/jit/emit-common.c +++ b/src/vm/jit/emit-common.cpp @@ -1,4 +1,4 @@ -/* src/vm/jit/emit-common.c - common code emitter functions +/* src/vm/jit/emit-common.cpp - common code emitter functions Copyright (C) 2006, 2007, 2008 CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO @@ -36,7 +36,7 @@ #include "vm/options.h" #include "vm/statistics.h" -#include "vm/jit/emit-common.h" +#include "vm/jit/emit-common.hpp" #include "vm/jit/jit.hpp" #include "vm/jit/patcher-common.h" @@ -267,7 +267,7 @@ void emit_patcher_traps(jitdata *jd) /* generate patcher traps code */ - for (pr = list_first(code->patchers); pr != NULL; pr = list_next(code->patchers, pr)) { + for (pr = (patchref_t*) list_first(code->patchers); pr != NULL; pr = (patchref_t*) list_next(code->patchers, pr)) { /* Calculate the patch position where the original machine code is located and the trap should be placed. */ @@ -520,7 +520,7 @@ void emit_label_bccz(codegendata *cd, s4 label, s4 condition, s4 reg, u4 options /* search if the label is already in the list */ - for (br = list_first(list); br != NULL; br = list_next(list, br)) { + for (br = (branch_label_ref_t*) list_first(list); br != NULL; br = (branch_label_ref_t*) list_next(list, br)) { /* is this entry the correct label? */ if (br->label == label) @@ -585,7 +585,7 @@ void emit_label(codegendata *cd, s4 label) /* search if the label is already in the list */ - for (br = list_first(list); br != NULL; br = list_next(list, br)) { + for (br = (branch_label_ref_t*) list_first(list); br != NULL; br = (branch_label_ref_t*) list_next(list, br)) { /* is this entry the correct label? */ if (br->label == label) @@ -722,7 +722,7 @@ void emit_label_ble(codegendata *cd, s4 label) * Emacs will automagically detect them. * --------------------------------------------------------------------- * Local variables: - * mode: c + * mode: c++ * indent-tabs-mode: t * c-basic-offset: 4 * tab-width: 4 diff --git a/src/vm/jit/emit-common.h b/src/vm/jit/emit-common.hpp similarity index 99% rename from src/vm/jit/emit-common.h rename to src/vm/jit/emit-common.hpp index 3fec792ab..f5d350ff1 100644 --- a/src/vm/jit/emit-common.h +++ b/src/vm/jit/emit-common.hpp @@ -1,4 +1,4 @@ -/* src/vm/jit/emit-common.h - common code emitter functions +/* src/vm/jit/emit-common.hpp - common code emitter functions Copyright (C) 2006, 2007 R. Grafl, A. Krall, C. Kruegel, C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner, diff --git a/src/vm/jit/i386/codegen.c b/src/vm/jit/i386/codegen.c index 55b34cb98..96986f91d 100644 --- a/src/vm/jit/i386/codegen.c +++ b/src/vm/jit/i386/codegen.c @@ -56,7 +56,7 @@ #include "vm/jit/asmpart.h" #include "vm/jit/codegen-common.h" #include "vm/jit/dseg.h" -#include "vm/jit/emit-common.h" +#include "vm/jit/emit-common.hpp" #include "vm/jit/jit.hpp" #include "vm/jit/linenumbertable.h" #include "vm/jit/parse.h" diff --git a/src/vm/jit/i386/emit.c b/src/vm/jit/i386/emit.c index 2d63231c6..5a1f886e3 100644 --- a/src/vm/jit/i386/emit.c +++ b/src/vm/jit/i386/emit.c @@ -43,7 +43,7 @@ #include "vm/jit/abi.h" #include "vm/jit/asmpart.h" #include "vm/jit/dseg.h" -#include "vm/jit/emit-common.h" +#include "vm/jit/emit-common.hpp" #include "vm/jit/jit.hpp" #include "vm/jit/patcher-common.h" #include "vm/jit/replace.hpp" diff --git a/src/vm/jit/m68k/codegen.c b/src/vm/jit/m68k/codegen.c index 1087c6273..67c554329 100644 --- a/src/vm/jit/m68k/codegen.c +++ b/src/vm/jit/m68k/codegen.c @@ -54,7 +54,7 @@ #include "vm/jit/patcher-common.h" #include "vm/jit/dseg.h" #include "vm/jit/linenumbertable.h" -#include "vm/jit/emit-common.h" +#include "vm/jit/emit-common.hpp" #include "vm/jit/jit.hpp" #include "vm/jit/abi.h" #include "vm/jit/parse.h" diff --git a/src/vm/jit/m68k/emit.c b/src/vm/jit/m68k/emit.c index 258fa6f17..81fc1288f 100644 --- a/src/vm/jit/m68k/emit.c +++ b/src/vm/jit/m68k/emit.c @@ -35,7 +35,7 @@ #include "vm/jit/builtin.hpp" #include "vm/jit/asmpart.h" -#include "vm/jit/emit-common.h" +#include "vm/jit/emit-common.hpp" #include "vm/jit/trace.hpp" #include "vm/jit/trap.h" diff --git a/src/vm/jit/mips/codegen.c b/src/vm/jit/mips/codegen.c index 57b600293..19f1706a9 100644 --- a/src/vm/jit/mips/codegen.c +++ b/src/vm/jit/mips/codegen.c @@ -52,7 +52,7 @@ #include "vm/jit/asmpart.h" #include "vm/jit/codegen-common.h" #include "vm/jit/dseg.h" -#include "vm/jit/emit-common.h" +#include "vm/jit/emit-common.hpp" #include "vm/jit/jit.hpp" #include "vm/jit/linenumbertable.h" #include "vm/jit/patcher-common.h" diff --git a/src/vm/jit/mips/emit.c b/src/vm/jit/mips/emit.c index 917733138..c7eea5e8d 100644 --- a/src/vm/jit/mips/emit.c +++ b/src/vm/jit/mips/emit.c @@ -43,7 +43,7 @@ #include "vm/jit/abi-asm.h" #include "vm/jit/asmpart.h" #include "vm/jit/dseg.h" -#include "vm/jit/emit-common.h" +#include "vm/jit/emit-common.hpp" #include "vm/jit/jit.hpp" #include "vm/jit/patcher-common.h" #include "vm/jit/replace.hpp" diff --git a/src/vm/jit/powerpc/codegen.c b/src/vm/jit/powerpc/codegen.c index f4f0cf0bd..0d2918427 100644 --- a/src/vm/jit/powerpc/codegen.c +++ b/src/vm/jit/powerpc/codegen.c @@ -55,7 +55,7 @@ #include "vm/jit/asmpart.h" #include "vm/jit/codegen-common.h" #include "vm/jit/dseg.h" -#include "vm/jit/emit-common.h" +#include "vm/jit/emit-common.hpp" #include "vm/jit/jit.hpp" #include "vm/jit/linenumbertable.h" #include "vm/jit/methodheader.h" diff --git a/src/vm/jit/powerpc/emit.c b/src/vm/jit/powerpc/emit.c index 2ef0d7d1c..c52c86146 100644 --- a/src/vm/jit/powerpc/emit.c +++ b/src/vm/jit/powerpc/emit.c @@ -44,7 +44,7 @@ #include "vm/jit/asmpart.h" #include "vm/jit/codegen-common.h" #include "vm/jit/dseg.h" -#include "vm/jit/emit-common.h" +#include "vm/jit/emit-common.hpp" #include "vm/jit/jit.hpp" #include "vm/jit/replace.hpp" #include "vm/jit/trace.hpp" diff --git a/src/vm/jit/powerpc64/codegen.c b/src/vm/jit/powerpc64/codegen.c index af3f008bf..d3a5ba495 100644 --- a/src/vm/jit/powerpc64/codegen.c +++ b/src/vm/jit/powerpc64/codegen.c @@ -56,7 +56,7 @@ #include "vm/jit/asmpart.h" #include "vm/jit/codegen-common.h" #include "vm/jit/dseg.h" -#include "vm/jit/emit-common.h" +#include "vm/jit/emit-common.hpp" #include "vm/jit/jit.hpp" #include "vm/jit/linenumbertable.h" #include "vm/jit/parse.h" diff --git a/src/vm/jit/powerpc64/emit.c b/src/vm/jit/powerpc64/emit.c index 088eeb750..5eb86886a 100644 --- a/src/vm/jit/powerpc64/emit.c +++ b/src/vm/jit/powerpc64/emit.c @@ -41,7 +41,7 @@ #include "vm/jit/abi.h" #include "vm/jit/asmpart.h" -#include "vm/jit/emit-common.h" +#include "vm/jit/emit-common.hpp" #include "vm/jit/jit.hpp" #include "vm/jit/trace.hpp" #include "vm/jit/trap.h" diff --git a/src/vm/jit/s390/codegen.c b/src/vm/jit/s390/codegen.c index 26daf82bb..7b42a7e8f 100644 --- a/src/vm/jit/s390/codegen.c +++ b/src/vm/jit/s390/codegen.c @@ -57,7 +57,7 @@ #include "vm/jit/asmpart.h" #include "vm/jit/codegen-common.h" #include "vm/jit/dseg.h" -#include "vm/jit/emit-common.h" +#include "vm/jit/emit-common.hpp" #include "vm/jit/jit.hpp" #include "vm/jit/linenumbertable.h" #include "vm/jit/methodheader.h" diff --git a/src/vm/jit/s390/emit.c b/src/vm/jit/s390/emit.c index 46ffbc430..e5b049a8b 100644 --- a/src/vm/jit/s390/emit.c +++ b/src/vm/jit/s390/emit.c @@ -44,7 +44,7 @@ #include "vm/jit/abi-asm.h" #include "vm/jit/asmpart.h" #include "vm/jit/codegen-common.h" -#include "vm/jit/emit-common.h" +#include "vm/jit/emit-common.hpp" #include "vm/jit/jit.hpp" #include "vm/jit/patcher-common.h" #include "vm/jit/replace.hpp" diff --git a/src/vm/jit/sparc64/codegen.c b/src/vm/jit/sparc64/codegen.c index 91d3025ae..e8dd622a7 100644 --- a/src/vm/jit/sparc64/codegen.c +++ b/src/vm/jit/sparc64/codegen.c @@ -52,7 +52,7 @@ #include "vm/jit/asmpart.h" #include "vm/jit/codegen-common.h" #include "vm/jit/dseg.h" -#include "vm/jit/emit-common.h" +#include "vm/jit/emit-common.hpp" #include "vm/jit/jit.hpp" #include "vm/jit/linenumbertable.h" #include "vm/jit/parse.h" diff --git a/src/vm/jit/sparc64/emit.c b/src/vm/jit/sparc64/emit.c index 0b4f66491..e7f8f379e 100644 --- a/src/vm/jit/sparc64/emit.c +++ b/src/vm/jit/sparc64/emit.c @@ -42,7 +42,7 @@ #include "vm/jit/abi-asm.h" #include "vm/jit/asmpart.h" #include "vm/jit/dseg.h" -#include "vm/jit/emit-common.h" +#include "vm/jit/emit-common.hpp" #include "vm/jit/jit.hpp" #include "vm/jit/replace.hpp" diff --git a/src/vm/jit/stubs.cpp b/src/vm/jit/stubs.cpp index 6827c3859..98e00bb58 100644 --- a/src/vm/jit/stubs.cpp +++ b/src/vm/jit/stubs.cpp @@ -40,7 +40,7 @@ #include "vm/jit/code.h" #include "vm/jit/codegen-common.h" #include "vm/jit/disass.h" -#include "vm/jit/emit-common.h" +#include "vm/jit/emit-common.hpp" #include "vm/jit/jit.hpp" #include "vm/jit/show.h" #include "vm/jit/stubs.hpp" diff --git a/src/vm/jit/x86_64/codegen.c b/src/vm/jit/x86_64/codegen.c index 8934b6d83..6835e0886 100644 --- a/src/vm/jit/x86_64/codegen.c +++ b/src/vm/jit/x86_64/codegen.c @@ -59,7 +59,7 @@ #include "vm/jit/code.h" #include "vm/jit/codegen-common.h" #include "vm/jit/dseg.h" -#include "vm/jit/emit-common.h" +#include "vm/jit/emit-common.hpp" #include "vm/jit/jit.hpp" #include "vm/jit/linenumbertable.h" #include "vm/jit/methodheader.h" diff --git a/src/vm/jit/x86_64/emit.c b/src/vm/jit/x86_64/emit.c index fe9a944d9..0395d09b1 100644 --- a/src/vm/jit/x86_64/emit.c +++ b/src/vm/jit/x86_64/emit.c @@ -43,7 +43,7 @@ #include "vm/jit/abi-asm.h" #include "vm/jit/asmpart.h" #include "vm/jit/codegen-common.h" -#include "vm/jit/emit-common.h" +#include "vm/jit/emit-common.hpp" #include "vm/jit/jit.hpp" #include "vm/jit/patcher-common.h" #include "vm/jit/replace.hpp" -- 2.25.1