diff options
12 files changed, 30 insertions, 26 deletions
diff --git a/src/3rdparty/v8 b/src/3rdparty/v8 -Subproject 36be1e6b4af4601faa40ea4a222539c6b48f0e0 +Subproject 03d5b0219d5bdd14012c97906de9074d80d6e2d diff --git a/src/v8/0001-Add-hashing-and-comparison-methods-to-v8-String.patch b/src/v8/0001-Add-hashing-and-comparison-methods-to-v8-String.patch index 7172cbf703..7b7064b21a 100644 --- a/src/v8/0001-Add-hashing-and-comparison-methods-to-v8-String.patch +++ b/src/v8/0001-Add-hashing-and-comparison-methods-to-v8-String.patch @@ -332,5 +332,5 @@ index f7d2180..d96e5f9 100644 private: DISALLOW_IMPLICIT_CONSTRUCTORS(SeqString); -- -1.7.4.4 +1.7.6 diff --git a/src/v8/0002-Add-a-fallback-mode-for-named-property-interceptors.patch b/src/v8/0002-Add-a-fallback-mode-for-named-property-interceptors.patch index d30dc470dd..1859153686 100644 --- a/src/v8/0002-Add-a-fallback-mode-for-named-property-interceptors.patch +++ b/src/v8/0002-Add-a-fallback-mode-for-named-property-interceptors.patch @@ -357,5 +357,5 @@ index 9c23c2c..0e256c1 100644 return isolate->heap()->undefined_value(); } -- -1.7.4.4 +1.7.6 diff --git a/src/v8/0003-Generalize-external-object-resources.patch b/src/v8/0003-Generalize-external-object-resources.patch index 7d532c4a4c..45e8b7392e 100644 --- a/src/v8/0003-Generalize-external-object-resources.patch +++ b/src/v8/0003-Generalize-external-object-resources.patch @@ -591,5 +591,5 @@ index ed40061..c38d461 100644 -- -1.7.4.4 +1.7.6 diff --git a/src/v8/0004-Introduce-a-QML-compilation-mode.patch b/src/v8/0004-Introduce-a-QML-compilation-mode.patch index 8e91114ca4..9b921ebe8a 100644 --- a/src/v8/0004-Introduce-a-QML-compilation-mode.patch +++ b/src/v8/0004-Introduce-a-QML-compilation-mode.patch @@ -1,4 +1,4 @@ -From 6f97385cf3cb17d245e7f3d61ba975183a786220 Mon Sep 17 00:00:00 2001 +From b4bb5845077f9b2ad4359360d2e071ed992ede10 Mon Sep 17 00:00:00 2001 From: Aaron Kennedy <aaron.kennedy@nokia.com> Date: Thu, 27 Oct 2011 13:34:16 +0100 Subject: [PATCH 04/11] Introduce a QML compilation mode @@ -37,7 +37,7 @@ runs. src/full-codegen.h | 1 + src/heap.cc | 4 ++ src/hydrogen-instructions.cc | 5 +++ - src/hydrogen-instructions.h | 16 ++++++++- + src/hydrogen-instructions.h | 21 ++++++++++-- src/hydrogen.cc | 4 ++ src/ia32/code-stubs-ia32.cc | 5 +++ src/ia32/full-codegen-ia32.cc | 28 +++++++++------- @@ -62,7 +62,7 @@ runs. src/x64/lithium-x64.cc | 4 +- src/x64/lithium-x64.h | 12 +++++++ src/x64/macro-assembler-x64.h | 5 +++ - 47 files changed, 490 insertions(+), 117 deletions(-) + 47 files changed, 494 insertions(+), 118 deletions(-) diff --git a/include/v8.h b/include/v8.h index 3ef4dd6..193e2fe 100644 @@ -932,10 +932,10 @@ index 6f46509..ac9728c 100644 stream->Add("%o ", *name()); HUnaryCall::PrintDataTo(stream); diff --git a/src/hydrogen-instructions.h b/src/hydrogen-instructions.h -index 65fc4df..c29d781 100644 +index 65fc4df..ebf0030 100644 --- a/src/hydrogen-instructions.h +++ b/src/hydrogen-instructions.h -@@ -1410,19 +1410,27 @@ class HOuterContext: public HUnaryOperation { +@@ -1410,19 +1410,30 @@ class HOuterContext: public HUnaryOperation { class HGlobalObject: public HUnaryOperation { public: @@ -957,14 +957,18 @@ index 65fc4df..c29d781 100644 + void set_qml_global(bool v) { qml_global_ = v; } + protected: - virtual bool DataEquals(HValue* other) { return true; } +- virtual bool DataEquals(HValue* other) { return true; } ++ virtual bool DataEquals(HValue* other) { ++ HGlobalObject* o = HGlobalObject::cast(other); ++ return o->qml_global_ == qml_global_; ++ } + + private: + bool qml_global_; }; -@@ -1601,7 +1609,7 @@ class HCallFunction: public HUnaryCall { +@@ -1601,7 +1612,7 @@ class HCallFunction: public HUnaryCall { class HCallGlobal: public HUnaryCall { public: HCallGlobal(HValue* context, Handle<String> name, int argument_count) @@ -973,7 +977,7 @@ index 65fc4df..c29d781 100644 } virtual void PrintDataTo(StringStream* stream); -@@ -1613,10 +1621,14 @@ class HCallGlobal: public HUnaryCall { +@@ -1613,10 +1624,14 @@ class HCallGlobal: public HUnaryCall { return Representation::Tagged(); } @@ -2055,5 +2059,5 @@ index f5f81b1..5caa6cf 100644 static inline Operand StackSpaceOperand(int index) { #ifdef _WIN64 -- -1.7.4.4 +1.7.6 diff --git a/src/v8/0005-Allow-access-to-the-calling-script-data.patch b/src/v8/0005-Allow-access-to-the-calling-script-data.patch index ee7047e7ba..b1d18d0631 100644 --- a/src/v8/0005-Allow-access-to-the-calling-script-data.patch +++ b/src/v8/0005-Allow-access-to-the-calling-script-data.patch @@ -1,4 +1,4 @@ -From a321f382dd8a63ed71cd00a57d011f966a35645f Mon Sep 17 00:00:00 2001 +From fcb6d710f3c3aadfc66a9f60e54ddd00144fe64e Mon Sep 17 00:00:00 2001 From: Aaron Kennedy <aaron.kennedy@nokia.com> Date: Fri, 14 Oct 2011 17:03:06 +1000 Subject: [PATCH 05/11] Allow access to the calling script data @@ -44,5 +44,5 @@ index 2d3d97a..54df40d 100644 v8::Local<v8::Object> Context::Global() { if (IsDeadCheck(i::Isolate::Current(), "v8::Context::Global()")) { -- -1.7.4.4 +1.7.6 diff --git a/src/v8/0006-Add-custom-object-compare-callback.patch b/src/v8/0006-Add-custom-object-compare-callback.patch index cd779ad94e..4a2f952834 100644 --- a/src/v8/0006-Add-custom-object-compare-callback.patch +++ b/src/v8/0006-Add-custom-object-compare-callback.patch @@ -1,4 +1,4 @@ -From 15e2b05fae59aa4ed7c0974ba296ec8893c4d7f2 Mon Sep 17 00:00:00 2001 +From 5d7801496ea41f9d1cf4260cd2b0508929ebde76 Mon Sep 17 00:00:00 2001 From: Aaron Kennedy <aaron.kennedy@nokia.com> Date: Thu, 27 Oct 2011 13:40:00 +0100 Subject: [PATCH 06/11] Add custom object compare callback @@ -544,5 +544,5 @@ index f30221f..ff8337f 100644 ASSERT(GetCondition() == equal); __ subq(rax, rdx); -- -1.7.4.4 +1.7.6 diff --git a/src/v8/0007-Allow-a-script-to-be-flagged-as-native.patch b/src/v8/0007-Allow-a-script-to-be-flagged-as-native.patch index 539014ba12..6036343b72 100644 --- a/src/v8/0007-Allow-a-script-to-be-flagged-as-native.patch +++ b/src/v8/0007-Allow-a-script-to-be-flagged-as-native.patch @@ -1,4 +1,4 @@ -From c9277f820ae47f32f127b156ac2e1200458ab876 Mon Sep 17 00:00:00 2001 +From b733a2fec5c51b7d7219505b89f34715603bd49c Mon Sep 17 00:00:00 2001 From: Aaron Kennedy <aaron.kennedy@nokia.com> Date: Fri, 9 Sep 2011 14:16:12 +1000 Subject: [PATCH 07/11] Allow a script to be flagged as "native" @@ -42,5 +42,5 @@ index 4902e72..cabca74 100644 } if (!script_name.is_null()) { -- -1.7.4.4 +1.7.6 diff --git a/src/v8/0008-QtScript-V8-Add-new-v8-api-to-check-if-a-value-is-an.patch b/src/v8/0008-QtScript-V8-Add-new-v8-api-to-check-if-a-value-is-an.patch index ea87da9431..051def99aa 100644 --- a/src/v8/0008-QtScript-V8-Add-new-v8-api-to-check-if-a-value-is-an.patch +++ b/src/v8/0008-QtScript-V8-Add-new-v8-api-to-check-if-a-value-is-an.patch @@ -1,4 +1,4 @@ -From 8e095c6171d6be5ac3c90fd2a8707579050d5e47 Mon Sep 17 00:00:00 2001 +From 35ec23697719708e18a42c40fd80719247ca62e4 Mon Sep 17 00:00:00 2001 From: Jedrzej Nowacki <jedrzej.nowacki@nokia.com> Date: Tue, 7 Dec 2010 11:56:42 +0100 Subject: [PATCH 08/11] QtScript/V8: Add new v8 api to check if a value is an @@ -60,5 +60,5 @@ index 5e90964..6166cde 100644 V(to_string_symbol, "toString") \ V(char_at_symbol, "CharAt") \ -- -1.7.4.4 +1.7.6 diff --git a/src/v8/0009-Fix-deprecated-Python-code.patch b/src/v8/0009-Fix-deprecated-Python-code.patch index 253f4fd02f..68f65df20f 100644 --- a/src/v8/0009-Fix-deprecated-Python-code.patch +++ b/src/v8/0009-Fix-deprecated-Python-code.patch @@ -1,4 +1,4 @@ -From bf0c62b53bf018a7f0b3e9ea3dcdcbcc0ee6fd53 Mon Sep 17 00:00:00 2001 +From 5d8ee260641b6a6b7f50b68c7746f7ee7fe01de5 Mon Sep 17 00:00:00 2001 From: Kent Hansen <kent.hansen@nokia.com> Date: Fri, 2 Sep 2011 12:03:09 +0200 Subject: [PATCH 09/11] Fix deprecated Python code @@ -47,5 +47,5 @@ index 646bf14..395441b 100644 if identifier_second_char != 0: new_identifier = ( -- -1.7.4.4 +1.7.6 diff --git a/src/v8/0010-Remove-execute-flag-from-v8-debug.h.patch b/src/v8/0010-Remove-execute-flag-from-v8-debug.h.patch index dc1e1963a2..b0b794efaf 100644 --- a/src/v8/0010-Remove-execute-flag-from-v8-debug.h.patch +++ b/src/v8/0010-Remove-execute-flag-from-v8-debug.h.patch @@ -1,4 +1,4 @@ -From b79ebeab15653e37390ccfca1f6ee252979844ce Mon Sep 17 00:00:00 2001 +From 994dc4b9cb86604c04e02b3b2884eaa389bb62af Mon Sep 17 00:00:00 2001 From: Aaron Kennedy <aaron.kennedy@nokia.com> Date: Thu, 25 Aug 2011 11:09:58 +1000 Subject: [PATCH 10/11] Remove execute flag from v8-debug.h @@ -11,5 +11,5 @@ diff --git a/include/v8-debug.h b/include/v8-debug.h old mode 100755 new mode 100644 -- -1.7.4.4 +1.7.6 diff --git a/src/v8/0011-Fix-warnings.patch b/src/v8/0011-Fix-warnings.patch index d4d8d3aace..02b41ece65 100644 --- a/src/v8/0011-Fix-warnings.patch +++ b/src/v8/0011-Fix-warnings.patch @@ -1,4 +1,4 @@ -From 36be1e6b4af4601faa40ea4a222539c6b48f0e03 Mon Sep 17 00:00:00 2001 +From 03d5b0219d5bdd14012c97906de9074d80d6e2de Mon Sep 17 00:00:00 2001 From: Aaron Kennedy <aaron.kennedy@nokia.com> Date: Fri, 27 May 2011 13:04:15 +1000 Subject: [PATCH 11/11] Fix warnings @@ -42,5 +42,5 @@ index d995e54..a7b5c8a 100644 } // namespace internal -- -1.7.4.4 +1.7.6 |