Reviewers: Søren Gjesse,

Description:
X64 Crankshaft: Fix error in r6897. Restore context register after KeyedCallIC. Only non-trivial change is to lithium-codegen-x64.cc.Update copyright dates on
all recently modified X64 platform files.

Please review this at http://codereview.chromium.org/6592008/

SVN Base: http://v8.googlecode.com/svn/branches/bleeding_edge/

Affected files:
  M     src/x64/assembler-x64-inl.h
  M     src/x64/assembler-x64.h
  M     src/x64/assembler-x64.cc
  M     src/x64/builtins-x64.cc
  M     src/x64/code-stubs-x64.h
  M     src/x64/codegen-x64-inl.h
  M     src/x64/codegen-x64.h
  M     src/x64/codegen-x64.cc
  M     src/x64/cpu-x64.cc
  M     src/x64/debug-x64.cc
  M     src/x64/disasm-x64.cc
  M     src/x64/frames-x64.h
  M     src/x64/frames-x64.cc
  M     src/x64/ic-x64.cc
  M     src/x64/jump-target-x64.cc
  M     src/x64/lithium-codegen-x64.cc
  M     src/x64/macro-assembler-x64.h
  M     src/x64/macro-assembler-x64.cc
  M     src/x64/regexp-macro-assembler-x64.h
  M     src/x64/regexp-macro-assembler-x64.cc
  M     src/x64/simulator-x64.h
  M     src/x64/stub-cache-x64.cc
  M     src/x64/virtual-frame-x64.h
  M     src/x64/virtual-frame-x64.cc


Index: src/x64/assembler-x64-inl.h
===================================================================
--- src/x64/assembler-x64-inl.h (revision 6951)
+++ src/x64/assembler-x64-inl.h (working copy)
@@ -1,4 +1,4 @@
-// Copyright 2009 the V8 project authors. All rights reserved.
+// Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
Index: src/x64/assembler-x64.cc
===================================================================
--- src/x64/assembler-x64.cc    (revision 6951)
+++ src/x64/assembler-x64.cc    (working copy)
@@ -1,4 +1,4 @@
-// Copyright 2010 the V8 project authors. All rights reserved.
+// Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
Index: src/x64/assembler-x64.h
===================================================================
--- src/x64/assembler-x64.h     (revision 6951)
+++ src/x64/assembler-x64.h     (working copy)
@@ -30,7 +30,7 @@

 // The original source code covered by the above license above has been
 // modified significantly by Google Inc.
-// Copyright 2010 the V8 project authors. All rights reserved.
+// Copyright 2011 the V8 project authors. All rights reserved.

 // A lightweight X64 Assembler.

Index: src/x64/builtins-x64.cc
===================================================================
--- src/x64/builtins-x64.cc     (revision 6951)
+++ src/x64/builtins-x64.cc     (working copy)
@@ -1,4 +1,4 @@
-// Copyright 2010 the V8 project authors. All rights reserved.
+// Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
Index: src/x64/code-stubs-x64.h
===================================================================
--- src/x64/code-stubs-x64.h    (revision 6951)
+++ src/x64/code-stubs-x64.h    (working copy)
@@ -1,4 +1,4 @@
-// Copyright 2010 the V8 project authors. All rights reserved.
+// Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
Index: src/x64/codegen-x64-inl.h
===================================================================
--- src/x64/codegen-x64-inl.h   (revision 6951)
+++ src/x64/codegen-x64-inl.h   (working copy)
@@ -1,4 +1,4 @@
-// Copyright 2009 the V8 project authors. All rights reserved.
+// Copyright 2010 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
Index: src/x64/codegen-x64.cc
===================================================================
--- src/x64/codegen-x64.cc      (revision 6951)
+++ src/x64/codegen-x64.cc      (working copy)
@@ -1,4 +1,4 @@
-// Copyright 2010 the V8 project authors. All rights reserved.
+// Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
Index: src/x64/codegen-x64.h
===================================================================
--- src/x64/codegen-x64.h       (revision 6951)
+++ src/x64/codegen-x64.h       (working copy)
@@ -1,4 +1,4 @@
-// Copyright 2010 the V8 project authors. All rights reserved.
+// Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
Index: src/x64/cpu-x64.cc
===================================================================
--- src/x64/cpu-x64.cc  (revision 6951)
+++ src/x64/cpu-x64.cc  (working copy)
@@ -1,4 +1,4 @@
-// Copyright 2009 the V8 project authors. All rights reserved.
+// Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
Index: src/x64/debug-x64.cc
===================================================================
--- src/x64/debug-x64.cc        (revision 6951)
+++ src/x64/debug-x64.cc        (working copy)
@@ -1,4 +1,4 @@
-// Copyright 2010 the V8 project authors. All rights reserved.
+// Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
Index: src/x64/disasm-x64.cc
===================================================================
--- src/x64/disasm-x64.cc       (revision 6951)
+++ src/x64/disasm-x64.cc       (working copy)
@@ -1,4 +1,4 @@
-// Copyright 2009 the V8 project authors. All rights reserved.
+// Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
Index: src/x64/frames-x64.cc
===================================================================
--- src/x64/frames-x64.cc       (revision 6951)
+++ src/x64/frames-x64.cc       (working copy)
@@ -1,4 +1,4 @@
-// Copyright 2009 the V8 project authors. All rights reserved.
+// Copyright 2010 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
Index: src/x64/frames-x64.h
===================================================================
--- src/x64/frames-x64.h        (revision 6951)
+++ src/x64/frames-x64.h        (working copy)
@@ -1,4 +1,4 @@
-// Copyright 2009 the V8 project authors. All rights reserved.
+// Copyright 2010 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
Index: src/x64/ic-x64.cc
===================================================================
--- src/x64/ic-x64.cc   (revision 6951)
+++ src/x64/ic-x64.cc   (working copy)
@@ -1,4 +1,4 @@
-// Copyright 2010 the V8 project authors. All rights reserved.
+// Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
Index: src/x64/jump-target-x64.cc
===================================================================
--- src/x64/jump-target-x64.cc  (revision 6951)
+++ src/x64/jump-target-x64.cc  (working copy)
@@ -1,4 +1,4 @@
-// Copyright 2009 the V8 project authors. All rights reserved.
+// Copyright 2010 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
Index: src/x64/lithium-codegen-x64.cc
===================================================================
--- src/x64/lithium-codegen-x64.cc      (revision 6951)
+++ src/x64/lithium-codegen-x64.cc      (working copy)
@@ -2530,6 +2530,7 @@
   int arity = instr->arity();
Handle<Code> ic = StubCache::ComputeKeyedCallInitialize(arity, NOT_IN_LOOP);
   CallCode(ic, RelocInfo::CODE_TARGET, instr);
+  __ movq(rsi, Operand(rbp, StandardFrameConstants::kContextOffset));
 }


Index: src/x64/macro-assembler-x64.cc
===================================================================
--- src/x64/macro-assembler-x64.cc      (revision 6951)
+++ src/x64/macro-assembler-x64.cc      (working copy)
@@ -1,4 +1,4 @@
-// Copyright 2010 the V8 project authors. All rights reserved.
+// Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
Index: src/x64/macro-assembler-x64.h
===================================================================
--- src/x64/macro-assembler-x64.h       (revision 6951)
+++ src/x64/macro-assembler-x64.h       (working copy)
@@ -1,4 +1,4 @@
-// Copyright 2010 the V8 project authors. All rights reserved.
+// Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
Index: src/x64/regexp-macro-assembler-x64.cc
===================================================================
--- src/x64/regexp-macro-assembler-x64.cc       (revision 6951)
+++ src/x64/regexp-macro-assembler-x64.cc       (working copy)
@@ -1,4 +1,4 @@
-// Copyright 2009 the V8 project authors. All rights reserved.
+// Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
Index: src/x64/regexp-macro-assembler-x64.h
===================================================================
--- src/x64/regexp-macro-assembler-x64.h        (revision 6951)
+++ src/x64/regexp-macro-assembler-x64.h        (working copy)
@@ -1,4 +1,4 @@
-// Copyright 2009 the V8 project authors. All rights reserved.
+// Copyright 2010 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
Index: src/x64/simulator-x64.h
===================================================================
--- src/x64/simulator-x64.h     (revision 6951)
+++ src/x64/simulator-x64.h     (working copy)
@@ -1,4 +1,4 @@
-// Copyright 2009 the V8 project authors. All rights reserved.
+// Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
Index: src/x64/stub-cache-x64.cc
===================================================================
--- src/x64/stub-cache-x64.cc   (revision 6951)
+++ src/x64/stub-cache-x64.cc   (working copy)
@@ -1,4 +1,4 @@
-// Copyright 2010 the V8 project authors. All rights reserved.
+// Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
Index: src/x64/virtual-frame-x64.cc
===================================================================
--- src/x64/virtual-frame-x64.cc        (revision 6951)
+++ src/x64/virtual-frame-x64.cc        (working copy)
@@ -1,4 +1,4 @@
-// Copyright 2010 the V8 project authors. All rights reserved.
+// Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
Index: src/x64/virtual-frame-x64.h
===================================================================
--- src/x64/virtual-frame-x64.h (revision 6951)
+++ src/x64/virtual-frame-x64.h (working copy)
@@ -1,4 +1,4 @@
-// Copyright 2009 the V8 project authors. All rights reserved.
+// Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:


--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev

Reply via email to