From 0c5284e1250d4038aef11f4f89f93d091c3196f7 Mon Sep 17 00:00:00 2001 From: Andreas HUBERT Date: Sun, 12 Oct 2008 21:55:03 +0200 Subject: [PATCH] * src/vm/jit/parse.cpp, src/vm/jit/parse.hpp: Moved to C++. --HG-- rename : src/vm/jit/parse.c => src/vm/jit/parse.cpp rename : src/vm/jit/parse.h => src/vm/jit/parse.hpp --- INSTALL | 250 ++++++++++++++++++++-- src/vm/jit/Makefile.am | 4 +- src/vm/jit/alpha/codegen.c | 2 +- src/vm/jit/arm/codegen.c | 2 +- src/vm/jit/i386/codegen.c | 2 +- src/vm/jit/inline/inline.c | 2 +- src/vm/jit/intrp/codegen.c | 2 +- src/vm/jit/jit.cpp | 2 +- src/vm/jit/m68k/codegen.c | 2 +- src/vm/jit/{parse.c => parse.cpp} | 54 ++--- src/vm/jit/{parse.h => parse.hpp} | 0 src/vm/jit/powerpc/codegen.c | 2 +- src/vm/jit/powerpc64/codegen.c | 2 +- src/vm/jit/s390/codegen.c | 2 +- src/vm/jit/show.cpp | 2 +- src/vm/jit/sparc64/codegen.c | 2 +- src/vm/jit/stack.c | 2 +- src/vm/jit/verify/typecheck-stackbased.c | 2 +- src/vm/jit/verify/typecheck-typeinferer.c | 2 +- src/vm/jit/verify/typecheck.c | 2 +- src/vm/jit/x86_64/codegen.c | 2 +- 21 files changed, 279 insertions(+), 63 deletions(-) rename src/vm/jit/{parse.c => parse.cpp} (95%) rename src/vm/jit/{parse.h => parse.hpp} (100%) diff --git a/INSTALL b/INSTALL index f3869a941..d3c5b40a9 100644 --- a/INSTALL +++ b/INSTALL @@ -1,27 +1,237 @@ -Quick start instructions -======================== +Installation Instructions +************************* -You can check the configure options via `./configure --help'. But the -default settings should be ok. For building the package type: +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007 Free Software Foundation, Inc. - $ ./configure - $ make - $ make install +This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. -The default installation prefix is `/usr/local/cacao'. You can change -this destination by providing the `--prefix=PATH' option to configure. +Basic Installation +================== -This version of cacao only supports the `--prefix' option, even if -configure processes the other options (`--bindir', `--libdir', etc.), -it will screw up your installation since CACAO tries to setup a -directory tree like the JVMs from Sun or IBM do. +Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). -Requirements: -------------- + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + +Some systems require unusual options for compilation or linking that the +`configure' script does not know about. Run `./configure --help' for +details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + +You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + +Installation Names +================== + +By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + +Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Specifying the System Type +========================== + +There may be some features `configure' cannot figure out automatically, +but needs to determine by the type of machine the package will run on. +Usually, assuming the package is built to be run on the _same_ +architectures, `configure' can figure that out, but if it prints a +message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + +If you want to set default values for `configure' scripts to share, you +can create a site shell script called `config.site' that gives default +values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + +Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + +`configure' recognizes the following options to control how it operates. + +`--help' +`-h' + Print a summary of the options to `configure', and exit. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. -In order to compile the Java classes from GNU classpath, you need a -Java compiler supported by GNU classpath. To get a working classpath -in an appropriate time, we recommend IBM jikes 1.18 or newer. For -further instructions concerning GNU classpath, please refer to -`src/classpath/INSTALL'. diff --git a/src/vm/jit/Makefile.am b/src/vm/jit/Makefile.am index c8d27ba74..42bb84247 100644 --- a/src/vm/jit/Makefile.am +++ b/src/vm/jit/Makefile.am @@ -181,8 +181,8 @@ libjit_la_SOURCES = \ linenumbertable.hpp \ methodtree.c \ methodtree.h \ - parse.c \ - parse.h \ + parse.cpp \ + parse.hpp \ patcher-common.cpp \ patcher-common.hpp \ $(RECOMPILE_SOURCES) \ diff --git a/src/vm/jit/alpha/codegen.c b/src/vm/jit/alpha/codegen.c index 6dab39a3c..bb5f050f8 100644 --- a/src/vm/jit/alpha/codegen.c +++ b/src/vm/jit/alpha/codegen.c @@ -57,7 +57,7 @@ #include "vm/jit/emit-common.hpp" #include "vm/jit/jit.hpp" #include "vm/jit/linenumbertable.hpp" -#include "vm/jit/parse.h" +#include "vm/jit/parse.hpp" #include "vm/jit/patcher-common.hpp" #include "vm/jit/reg.h" #include "vm/jit/replace.hpp" diff --git a/src/vm/jit/arm/codegen.c b/src/vm/jit/arm/codegen.c index efe6d3d74..0df334e9a 100644 --- a/src/vm/jit/arm/codegen.c +++ b/src/vm/jit/arm/codegen.c @@ -58,7 +58,7 @@ #include "vm/jit/jitcache.hpp" #include "vm/jit/linenumbertable.hpp" #include "vm/jit/methodheader.h" -#include "vm/jit/parse.h" +#include "vm/jit/parse.hpp" #include "vm/jit/patcher-common.hpp" #include "vm/jit/reg.h" diff --git a/src/vm/jit/i386/codegen.c b/src/vm/jit/i386/codegen.c index b7e808cab..3d667c726 100644 --- a/src/vm/jit/i386/codegen.c +++ b/src/vm/jit/i386/codegen.c @@ -60,7 +60,7 @@ #include "vm/jit/jit.hpp" #include "vm/jit/jitcache.hpp" #include "vm/jit/linenumbertable.hpp" -#include "vm/jit/parse.h" +#include "vm/jit/parse.hpp" #include "vm/jit/patcher-common.hpp" #include "vm/jit/reg.h" #include "vm/jit/replace.hpp" diff --git a/src/vm/jit/inline/inline.c b/src/vm/jit/inline/inline.c index ca7fb42ad..bb056dbe8 100644 --- a/src/vm/jit/inline/inline.c +++ b/src/vm/jit/inline/inline.c @@ -49,7 +49,7 @@ #include "vm/statistics.h" #include "vm/jit/jit.hpp" -#include "vm/jit/parse.h" +#include "vm/jit/parse.hpp" #include "vm/jit/reg.h" #include "vm/jit/show.hpp" #include "vm/jit/stack.h" diff --git a/src/vm/jit/intrp/codegen.c b/src/vm/jit/intrp/codegen.c index ddb68c730..4fbca4a70 100644 --- a/src/vm/jit/intrp/codegen.c +++ b/src/vm/jit/intrp/codegen.c @@ -58,7 +58,7 @@ #include "vm/jit/codegen-common.hpp" #include "vm/jit/dseg.h" #include "vm/jit/jit.hpp" -#include "vm/jit/parse.h" +#include "vm/jit/parse.hpp" #include "vm/jit/patcher.h" #include "vm/jit/stack.h" #include "vm/jit/stacktrace.hpp" diff --git a/src/vm/jit/jit.cpp b/src/vm/jit/jit.cpp index 09c9e862e..1dbb5c695 100644 --- a/src/vm/jit/jit.cpp +++ b/src/vm/jit/jit.cpp @@ -58,7 +58,7 @@ #include "vm/jit/disass.h" #include "vm/jit/dseg.h" #include "vm/jit/jit.hpp" -#include "vm/jit/parse.h" +#include "vm/jit/parse.hpp" #include "vm/jit/reg.h" #include "vm/jit/show.hpp" diff --git a/src/vm/jit/m68k/codegen.c b/src/vm/jit/m68k/codegen.c index 6a0254b8c..a6ad45abe 100644 --- a/src/vm/jit/m68k/codegen.c +++ b/src/vm/jit/m68k/codegen.c @@ -57,7 +57,7 @@ #include "vm/jit/emit-common.hpp" #include "vm/jit/jit.hpp" #include "vm/jit/abi.h" -#include "vm/jit/parse.h" +#include "vm/jit/parse.hpp" #include "vm/jit/reg.h" #include "vm/jit/replace.hpp" #include "vm/jit/stacktrace.hpp" diff --git a/src/vm/jit/parse.c b/src/vm/jit/parse.cpp similarity index 95% rename from src/vm/jit/parse.c rename to src/vm/jit/parse.cpp index 7b1c1ace3..ddc5d9b80 100644 --- a/src/vm/jit/parse.c +++ b/src/vm/jit/parse.cpp @@ -55,7 +55,7 @@ #include "vm/jit/asmpart.h" #include "vm/jit/jit.hpp" -#include "vm/jit/parse.h" +#include "vm/jit/parse.hpp" #include "vm/jit/loop/loop.h" #include "vm/jit/ir/bytecode.h" @@ -90,6 +90,9 @@ struct parsedata_t { s4 *instructionmap; /* IR to basic-block mapping */ }; +#if defined(__cplusplus) +extern "C" { +#endif /* parse_setup ***************************************************************** @@ -107,23 +110,23 @@ static void parse_setup(jitdata *jd, parsedata_t *pd) /* bytecode start array */ - pd->bytecodestart = DMNEW(u1, m->jcodelength + 1); + pd->bytecodestart = (u1*) DumpMemory::allocate(sizeof(u1) * (m->jcodelength + 1)); MZERO(pd->bytecodestart, u1, m->jcodelength + 1); /* bytecode basic-block start array */ - pd->basicblockstart = DMNEW(u1, m->jcodelength + 1); + pd->basicblockstart = (u1*) DumpMemory::allocate(sizeof(u1) *(m->jcodelength + 1)); MZERO(pd->basicblockstart, u1, m->jcodelength + 1); /* bytecode instruction index to IR instruction mapping */ - pd->bytecodemap = DMNEW(s4, m->jcodelength + 1); + pd->bytecodemap = (s4*) DumpMemory::allocate(sizeof(s4) * (m->jcodelength + 1)); MSET(pd->bytecodemap, -1, s4, m->jcodelength + 1); /* allocate the instruction array */ pd->instructionslength = m->jcodelength + 1; - pd->instructions = DMNEW(instruction, pd->instructionslength); + pd->instructions = (instruction*) DumpMemory::allocate(sizeof(instruction) * pd->instructionslength); /* Zero the intermediate instructions array so we don't have any invalid pointers in it if we cannot finish stack_analyse(). */ @@ -155,8 +158,8 @@ static instruction *parse_realloc_instructions(parsedata_t *pd, s4 icount, s4 n) /* reallocate the array */ - pd->instructions = DMREALLOC(pd->instructions, instruction, icount, - pd->instructionslength); + pd->instructions = (instruction*) DumpMemory::reallocate(pd->instructions, sizeof(instruction) * icount, + sizeof(instruction) * pd->instructionslength); MZERO(pd->instructions + icount, instruction, (pd->instructionslength - icount)); @@ -301,7 +304,7 @@ static bool parse_resolve_exception_table(jitdata *jd, parsedata_t *pd) /* allocate the exception table */ jd->exceptiontablelength = len; - jd->exceptiontable = DMNEW(exception_entry, len + 1); /* XXX why +1? */ + jd->exceptiontable = (exception_entry*) DumpMemory::allocate(sizeof(exception_entry) * (len + 1)); /* XXX why +1? */ /* copy and resolve the entries */ @@ -418,7 +421,7 @@ bool parse(jitdata *jd) /* allocate buffers for local variable renaming */ - local_map = DMNEW(int, m->maxlocals * 5); + local_map = (int*) DumpMemory::allocate(sizeof(int) * m->maxlocals * 5); for (i = 0; i < m->maxlocals; i++) { local_map[i * 5 + 0] = 0; @@ -1040,7 +1043,7 @@ jsr_tail: /* allocate the intermediate code table */ - lookup = DMNEW(lookup_target_t, num); + lookup = (lookup_target_t*) DumpMemory::allocate(sizeof(lookup_target_t) * num); iptr->dst.lookup = lookup; /* iterate over the lookup table */ @@ -1124,7 +1127,7 @@ jsr_tail: /* create the intermediate code table */ /* the first entry is the default target */ - table = DMNEW(branch_target_t, 1 + num); + table = (branch_target_t*) DumpMemory::allocate(sizeof(branch_target_t) * (1 + num)); iptr->dst.table = table; (table++)->insindex = deftarget; @@ -1157,7 +1160,7 @@ jsr_tail: case BC_getfield: case BC_putfield: i = SUCK_BE_U2(m->jcode + bcindex + 1); - fmi = class_getconstant(m->clazz, i, CONSTANT_Fieldref); + fmi = (constant_FMIref*) class_getconstant(m->clazz, i, CONSTANT_Fieldref); if (fmi == NULL) return false; @@ -1199,7 +1202,7 @@ jsr_tail: OP_PREPARE_ZEROFLAGS(opcode); i = SUCK_BE_U2(m->jcode + bcindex + 1); - fmi = class_getconstant(m->clazz, i, CONSTANT_Methodref); + fmi = (constant_FMIref*) class_getconstant(m->clazz, i, CONSTANT_Methodref); if (fmi == NULL) return false; @@ -1216,7 +1219,7 @@ jsr_tail: OP_PREPARE_FLAGS(opcode, INS_FLAG_CHECK); i = SUCK_BE_U2(m->jcode + bcindex + 1); - fmi = class_getconstant(m->clazz, i, CONSTANT_Methodref); + fmi = (constant_FMIref*) class_getconstant(m->clazz, i, CONSTANT_Methodref); goto invoke_nonstatic_method; @@ -1224,7 +1227,7 @@ jsr_tail: OP_PREPARE_ZEROFLAGS(opcode); i = SUCK_BE_U2(m->jcode + bcindex + 1); - fmi = class_getconstant(m->clazz, i, CONSTANT_InterfaceMethodref); + fmi = (constant_FMIref*) class_getconstant(m->clazz, i, CONSTANT_InterfaceMethodref); goto invoke_nonstatic_method; @@ -1232,7 +1235,7 @@ jsr_tail: OP_PREPARE_ZEROFLAGS(opcode); i = SUCK_BE_U2(m->jcode + bcindex + 1); - fmi = class_getconstant(m->clazz, i, CONSTANT_Methodref); + fmi = (constant_FMIref*) class_getconstant(m->clazz, i, CONSTANT_Methodref); invoke_nonstatic_method: if (fmi == NULL) @@ -1298,7 +1301,7 @@ invoke_method: case BC_new: i = SUCK_BE_U2(m->jcode + bcindex + 1); - cr = class_getconstant(m->clazz, i, CONSTANT_Class); + cr = (constant_classref*) class_getconstant(m->clazz, i, CONSTANT_Class); if (cr == NULL) return false; @@ -1315,7 +1318,7 @@ invoke_method: case BC_checkcast: i = SUCK_BE_U2(m->jcode + bcindex + 1); - cr = class_getconstant(m->clazz, i, CONSTANT_Class); + cr = (constant_classref*) class_getconstant(m->clazz, i, CONSTANT_Class); if (cr == NULL) return false; @@ -1337,7 +1340,7 @@ invoke_method: case BC_instanceof: i = SUCK_BE_U2(m->jcode + bcindex + 1); - cr = class_getconstant(m->clazz, i, CONSTANT_Class); + cr = (constant_classref*) class_getconstant(m->clazz, i, CONSTANT_Class); if (cr == NULL) return false; @@ -1668,7 +1671,7 @@ invoke_method: /* IR instruction index to basic-block index mapping */ - pd.instructionmap = DMNEW(s4, ircount); + pd.instructionmap = (s4*) DumpMemory::allocate(sizeof(s4) * ircount); MZERO(pd.instructionmap, s4, ircount); /* Iterate over all IR instructions and count the basic blocks. */ @@ -1692,7 +1695,7 @@ invoke_method: /* Allocate basic block array (one more for end ipc). */ - jd->basicblocks = DMNEW(basicblock, bbcount + 1); + jd->basicblocks = (basicblock*) DumpMemory::allocate(sizeof(basicblock) * (bbcount + 1)); MZERO(jd->basicblocks, basicblock, bbcount + 1); /* Now iterate again over all IR instructions and initialize the @@ -1852,13 +1855,13 @@ invoke_method: #endif /* allocate and initialize the variable array */ - jd->var = DMNEW(varinfo, jd->varcount); + jd->var = (varinfo*) DumpMemory::allocate(sizeof(varinfo) * jd->varcount); MZERO(jd->var, varinfo, jd->varcount); /* set types of all locals in jd->var */ /* and fill the reverselocalmap */ - reversemap = DMNEW(s4, nlocals); + reversemap = (s4*) DumpMemory::allocate(sizeof(s4) * nlocals); for (i = 0; i < m->maxlocals; i++) for (t=0; t<5; t++) { @@ -1881,7 +1884,7 @@ invoke_method: /* allocate stack table */ - jd->stack = DMNEW(stackelement_t, jd->stackcount); + jd->stack = (stackelement_t*) DumpMemory::allocate(sizeof(stackelement_t) * jd->stackcount); /* everything's ok */ @@ -1906,6 +1909,9 @@ throw_illegal_local_variable_number: #endif /* ENABLE_VERIFIER */ } +#if defined(__cplusplus) +} +#endif /* * These are local overrides for various environment variables in Emacs. diff --git a/src/vm/jit/parse.h b/src/vm/jit/parse.hpp similarity index 100% rename from src/vm/jit/parse.h rename to src/vm/jit/parse.hpp diff --git a/src/vm/jit/powerpc/codegen.c b/src/vm/jit/powerpc/codegen.c index c7431f809..dcfc0482e 100644 --- a/src/vm/jit/powerpc/codegen.c +++ b/src/vm/jit/powerpc/codegen.c @@ -59,7 +59,7 @@ #include "vm/jit/jit.hpp" #include "vm/jit/linenumbertable.hpp" #include "vm/jit/methodheader.h" -#include "vm/jit/parse.h" +#include "vm/jit/parse.hpp" #include "vm/jit/patcher-common.hpp" #include "vm/jit/reg.h" #include "vm/jit/replace.hpp" diff --git a/src/vm/jit/powerpc64/codegen.c b/src/vm/jit/powerpc64/codegen.c index 64855d6dd..6de89aaf0 100644 --- a/src/vm/jit/powerpc64/codegen.c +++ b/src/vm/jit/powerpc64/codegen.c @@ -59,7 +59,7 @@ #include "vm/jit/emit-common.hpp" #include "vm/jit/jit.hpp" #include "vm/jit/linenumbertable.hpp" -#include "vm/jit/parse.h" +#include "vm/jit/parse.hpp" #include "vm/jit/patcher-common.hpp" #include "vm/jit/reg.h" #include "vm/jit/replace.hpp" diff --git a/src/vm/jit/s390/codegen.c b/src/vm/jit/s390/codegen.c index 7db818cad..f69e661fb 100644 --- a/src/vm/jit/s390/codegen.c +++ b/src/vm/jit/s390/codegen.c @@ -61,7 +61,7 @@ #include "vm/jit/jit.hpp" #include "vm/jit/linenumbertable.hpp" #include "vm/jit/methodheader.h" -#include "vm/jit/parse.h" +#include "vm/jit/parse.hpp" #include "vm/jit/patcher-common.hpp" #include "vm/jit/reg.h" #include "vm/jit/replace.hpp" diff --git a/src/vm/jit/show.cpp b/src/vm/jit/show.cpp index d4dad98c7..e0ba2a3cf 100644 --- a/src/vm/jit/show.cpp +++ b/src/vm/jit/show.cpp @@ -45,7 +45,7 @@ #include "vm/jit/show.hpp" #include "vm/jit/disass.h" #include "vm/jit/stack.h" -#include "vm/jit/parse.h" +#include "vm/jit/parse.hpp" #if defined(ENABLE_DEBUG_FILTER) # include diff --git a/src/vm/jit/sparc64/codegen.c b/src/vm/jit/sparc64/codegen.c index dc0533c2f..b048fbe32 100644 --- a/src/vm/jit/sparc64/codegen.c +++ b/src/vm/jit/sparc64/codegen.c @@ -55,7 +55,7 @@ #include "vm/jit/emit-common.hpp" #include "vm/jit/jit.hpp" #include "vm/jit/linenumbertable.hpp" -#include "vm/jit/parse.h" +#include "vm/jit/parse.hpp" #include "vm/jit/patcher.h" #include "vm/jit/reg.h" #include "vm/jit/replace.hpp" diff --git a/src/vm/jit/stack.c b/src/vm/jit/stack.c index 2420c649f..8c7ad97c3 100644 --- a/src/vm/jit/stack.c +++ b/src/vm/jit/stack.c @@ -54,7 +54,7 @@ #include "vm/jit/abi.h" #include "vm/jit/cfg.h" #include "vm/jit/codegen-common.hpp" -#include "vm/jit/parse.h" +#include "vm/jit/parse.hpp" #include "vm/jit/show.hpp" #if defined(ENABLE_DISASSEMBLER) diff --git a/src/vm/jit/verify/typecheck-stackbased.c b/src/vm/jit/verify/typecheck-stackbased.c index b978516b5..7056142f0 100644 --- a/src/vm/jit/verify/typecheck-stackbased.c +++ b/src/vm/jit/verify/typecheck-stackbased.c @@ -38,7 +38,7 @@ #include "vm/globals.hpp" #include "vm/primitive.hpp" -#include "vm/jit/parse.h" +#include "vm/jit/parse.hpp" #include "vm/jit/show.hpp" #include "vm/jit/stack.h" #include "vm/jit/verify/typecheck-common.h" diff --git a/src/vm/jit/verify/typecheck-typeinferer.c b/src/vm/jit/verify/typecheck-typeinferer.c index 8dfbd4f74..60af00882 100644 --- a/src/vm/jit/verify/typecheck-typeinferer.c +++ b/src/vm/jit/verify/typecheck-typeinferer.c @@ -48,7 +48,7 @@ #include "vm/jit/jit.hpp" #include "vm/jit/show.hpp" -#include "vm/jit/parse.h" +#include "vm/jit/parse.hpp" #include "vm/jit/verify/typecheck-typeinferer.h" diff --git a/src/vm/jit/verify/typecheck.c b/src/vm/jit/verify/typecheck.c index 842f89f16..00e3cfdea 100644 --- a/src/vm/jit/verify/typecheck.c +++ b/src/vm/jit/verify/typecheck.c @@ -159,7 +159,7 @@ error reporting. #include "vm/resolve.hpp" #include "vm/jit/jit.hpp" -#include "vm/jit/parse.h" +#include "vm/jit/parse.hpp" #include "vm/jit/show.hpp" #include diff --git a/src/vm/jit/x86_64/codegen.c b/src/vm/jit/x86_64/codegen.c index c2cbea33f..18e86af09 100644 --- a/src/vm/jit/x86_64/codegen.c +++ b/src/vm/jit/x86_64/codegen.c @@ -63,7 +63,7 @@ #include "vm/jit/jit.hpp" #include "vm/jit/linenumbertable.hpp" #include "vm/jit/methodheader.h" -#include "vm/jit/parse.h" +#include "vm/jit/parse.hpp" #include "vm/jit/patcher-common.hpp" #include "vm/jit/reg.h" #include "vm/jit/replace.hpp" -- 2.25.1