Title: [153744] trunk/Source/_javascript_Core
- Revision
- 153744
- Author
- par...@webkit.org
- Date
- 2013-08-06 03:03:30 -0700 (Tue, 06 Aug 2013)
Log Message
Build fix for ARM MSVC after r150109.
Read the stub template from a header files instead of the JITStubs.cpp.
* CMakeLists.txt:
* DerivedSources.pri:
* create_jit_stubs:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (153743 => 153744)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2013-08-06 09:36:04 UTC (rev 153743)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2013-08-06 10:03:30 UTC (rev 153744)
@@ -588,8 +588,9 @@
add_custom_command(
OUTPUT ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.asm
MAIN_DEPENDENCY ${_javascript_CORE_DIR}/create_jit_stubs
+ DEPENDS ${_javascript_CORE_DIR}/jit/JITStubsARM.h
DEPENDS ${_javascript_CORE_DIR}/jit/JITStubs.cpp
- COMMAND ${PERL_EXECUTABLE} ${_javascript_CORE_DIR}/create_jit_stubs --prefix=MSVC ${_javascript_CORE_DIR}/jit/JITStubs.cpp > ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.asm
+ COMMAND ${PERL_EXECUTABLE} ${_javascript_CORE_DIR}/create_jit_stubs --prefix=MSVC --header ${_javascript_CORE_DIR}/jit/JITStubsARM.h ${_javascript_CORE_DIR}/jit/JITStubs.cpp > ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.asm
VERBATIM)
add_custom_command(
Modified: trunk/Source/_javascript_Core/ChangeLog (153743 => 153744)
--- trunk/Source/_javascript_Core/ChangeLog 2013-08-06 09:36:04 UTC (rev 153743)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-08-06 10:03:30 UTC (rev 153744)
@@ -1,3 +1,13 @@
+2013-08-06 Patrick Gansterer <par...@webkit.org>
+
+ Build fix for ARM MSVC after r150109.
+
+ Read the stub template from a header files instead of the JITStubs.cpp.
+
+ * CMakeLists.txt:
+ * DerivedSources.pri:
+ * create_jit_stubs:
+
2013-08-05 Oliver Hunt <oli...@apple.com>
Move TypedArray implementation into JSC
Modified: trunk/Source/_javascript_Core/DerivedSources.pri (153743 => 153744)
--- trunk/Source/_javascript_Core/DerivedSources.pri 2013-08-06 09:36:04 UTC (rev 153743)
+++ trunk/Source/_javascript_Core/DerivedSources.pri 2013-08-06 10:03:30 UTC (rev 153744)
@@ -64,7 +64,7 @@
# GENERATOR 2-A: JIT Stub functions for RVCT
rvctstubs.output = Generated${QMAKE_FILE_BASE}_RVCT.h
rvctstubs.script = $$PWD/create_jit_stubs
-rvctstubs.commands = perl -i $$rvctstubs.script --prefix RVCT ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT}
+rvctstubs.commands = perl -i $$rvctstubs.script --prefix RVCT --header $$PWD/jit/JITStubsARM.h ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT}
rvctstubs.depends = ${QMAKE_FILE_NAME}
rvctstubs.input = JIT_STUB_FILES
rvctstubs.CONFIG += no_link
@@ -73,7 +73,7 @@
# GENERATOR 2-B: JIT Stub functions for MSVC
msvcstubs.output = Generated${QMAKE_FILE_BASE}_MSVC.asm
msvcstubs.script = $$PWD/create_jit_stubs
-msvcstubs.commands = perl -i $$msvcstubs.script --prefix MSVC ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT}
+msvcstubs.commands = perl -i $$msvcstubs.script --prefix MSVC --header $$PWD/jit/JITStubsARM.h ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT}
msvcstubs.depends = ${QMAKE_FILE_NAME}
msvcstubs.input = JIT_STUB_FILES
msvcstubs.CONFIG += no_link
Modified: trunk/Source/_javascript_Core/create_jit_stubs (153743 => 153744)
--- trunk/Source/_javascript_Core/create_jit_stubs 2013-08-06 09:36:04 UTC (rev 153743)
+++ trunk/Source/_javascript_Core/create_jit_stubs 2013-08-06 10:03:30 UTC (rev 153744)
@@ -22,23 +22,25 @@
use File::Basename;
use Getopt::Long;
-my $usage = basename($0) . " --prefix prefix file";
+my $usage = basename($0) . " --prefix prefix --header header file";
my $rtype_template = quotemeta("#rtype#");
my $op_template = quotemeta("#op#");
my $prefix;
+my $header;
my $enable_dfg = 0;
my $file;
my $getOptionsResult = GetOptions(
'prefix=s' => \$prefix,
+ 'header=s' => \$header,
'dfg!' => \$enable_dfg
);
$file = $ARGV[0];
-die "$usage\n" unless ($prefix and $file);
+die "$usage\n" unless ($header and $prefix and $file);
my $stub_template = "";
my $output_end = "";
@@ -50,6 +52,22 @@
my $dfg_begin = 0;
print STDERR "Creating JIT stubs for $file \n";
+open(IN, $header) or die "No such file $header";
+
+while ( $_ = <IN> ) {
+ if ( /^$prefix\_BEGIN\((.*)\)/ ) {
+ $stub = $1;
+ print $stub . "\n";
+ }
+ if ( /^$prefix\((.*)\)/ ) {
+ $stub_template .= $1 . "\n";
+ }
+ if ( /^$prefix\_END\((.*)\)/ ) {
+ $output_end .= $1 . "\n";
+ }
+}
+
+close(IN);
open(IN, $file) or die "No such file $file";
while ( $_ = <IN> ) {
@@ -65,16 +83,6 @@
}
$if_counter--;
}
- if ( /^$prefix\_BEGIN\((.*)\)/ ) {
- $stub = $1;
- print $stub . "\n";
- }
- if ( /^$prefix\((.*)\)/ ) {
- $stub_template .= $1 . "\n";
- }
- if ( /^$prefix\_END\((.*)\)/ ) {
- $output_end .= $1 . "\n";
- }
if ( /^DEFINE_STUB_FUNCTION\((.*), (.*)\)/ ) {
$stub = $stub_template;
$rtype = quotemeta($1);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
