[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit b9597907fa979b5e23f3bcb29619f1cae666077b
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 15 18:04:54 2010 +0000

    2010-02-15  Patrick Gansterer  <paroga at paroga.com>
    
            Reviewed by Laszlo Gombos.
    
            Added additional parameter to create_rvct_stubs
            for setting the offset of thunkReturnAddress.
            https://bugs.webkit.org/show_bug.cgi?id=34657
    
            * create_rvct_stubs:
            * jit/JITStubs.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54781 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 8c67fc0..c9cf5a1 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-02-15  Patrick Gansterer  <paroga at paroga.com>
+
+        Reviewed by Laszlo Gombos.
+
+        Added additional parameter to create_rvct_stubs 
+        for setting the offset of thunkReturnAddress.
+        https://bugs.webkit.org/show_bug.cgi?id=34657
+
+        * create_rvct_stubs:
+        * jit/JITStubs.cpp:
+
 2010-02-15  Jedrzej Nowacki  <jedrzej.nowacki at nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/JavaScriptCore/create_rvct_stubs b/JavaScriptCore/create_rvct_stubs
index 0c49c4f..d949bbe 100644
--- a/JavaScriptCore/create_rvct_stubs
+++ b/JavaScriptCore/create_rvct_stubs
@@ -1,6 +1,7 @@
 #! /usr/bin/perl -w
 #
 # Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
+# Copyright (C) 2010 Patrick Gansterer <paroga at paroga.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
@@ -18,9 +19,25 @@
 # Boston, MA 02110-1301, USA.
 
 use strict;
+use File::Basename;
+use Getopt::Long;
 
-my $file = $ARGV[0];
-shift;
+my $usage = basename($0) . " [--offset offset] file";
+
+my $rtype_template = quotemeta("#rtype#");
+my $offset_template = quotemeta("#offset#");
+my $op_template = quotemeta("#op#");
+
+my $offset = 32;
+my $file;
+
+my $getOptionsResult = GetOptions(
+    'offset=i' => \$offset
+);
+
+$file = $ARGV[0];
+
+die "$usage\n" unless ($file);
 
 my $stub_template = "";
 my $stub = "";
@@ -28,9 +45,6 @@ my $stub = "";
 my $rtype = "";
 my $op = "";
 
-my $rtype_template = quotemeta("#rtype#");
-my $op_template = quotemeta("#op#");
-
 print STDERR "Creating RVCT stubs for $file \n";
 open(IN, $file) or die "No such file $file";
 
@@ -42,6 +56,7 @@ while ( $_ = <IN> ) {
         $stub = $stub_template;
         $rtype = quotemeta($1);
         $op = quotemeta($2);
+        $stub =~ s/$offset_template/$offset/g;
         $stub =~ s/$rtype_template/$rtype/g;
         $stub =~ s/$op_template/$op/g;
         $stub =~ s/\\\*/\*/g;
diff --git a/JavaScriptCore/jit/JITStubs.cpp b/JavaScriptCore/jit/JITStubs.cpp
index 85471de..0feb4f0 100644
--- a/JavaScriptCore/jit/JITStubs.cpp
+++ b/JavaScriptCore/jit/JITStubs.cpp
@@ -1070,9 +1070,9 @@ RVCT(__asm #rtype# cti_#op#(STUB_ARGS_DECLARATION))
 RVCT({)
 RVCT(    ARM)
 RVCT(    IMPORT JITStubThunked_#op#)
-RVCT(    str lr, [sp, #32])
+RVCT(    str lr, [sp, ##offset#])
 RVCT(    bl JITStubThunked_#op#)
-RVCT(    ldr lr, [sp, #32])
+RVCT(    ldr lr, [sp, ##offset#])
 RVCT(    bx lr)
 RVCT(})
 RVCT()

-- 
WebKit Debian packaging