From f149e4cd9088a8995ff3896415f9e90fe0ec483e Mon Sep 17 00:00:00 2001 From: "whesse@chromium.org" Date: Fri, 25 Feb 2011 13:22:38 +0000 Subject: [PATCH] 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. Review URL: http://codereview.chromium.org/6592008 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@6952 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/x64/assembler-x64-inl.h | 2 +- src/x64/assembler-x64.cc | 2 +- src/x64/assembler-x64.h | 2 +- src/x64/builtins-x64.cc | 2 +- src/x64/code-stubs-x64.h | 2 +- src/x64/codegen-x64-inl.h | 2 +- src/x64/codegen-x64.cc | 2 +- src/x64/codegen-x64.h | 2 +- src/x64/cpu-x64.cc | 2 +- src/x64/debug-x64.cc | 2 +- src/x64/disasm-x64.cc | 2 +- src/x64/frames-x64.cc | 2 +- src/x64/frames-x64.h | 2 +- src/x64/ic-x64.cc | 2 +- src/x64/jump-target-x64.cc | 2 +- src/x64/lithium-codegen-x64.cc | 1 + src/x64/macro-assembler-x64.cc | 2 +- src/x64/macro-assembler-x64.h | 2 +- src/x64/regexp-macro-assembler-x64.cc | 2 +- src/x64/regexp-macro-assembler-x64.h | 2 +- src/x64/simulator-x64.h | 2 +- src/x64/stub-cache-x64.cc | 2 +- src/x64/virtual-frame-x64.cc | 2 +- src/x64/virtual-frame-x64.h | 2 +- 24 files changed, 24 insertions(+), 23 deletions(-) diff --git a/src/x64/assembler-x64-inl.h b/src/x64/assembler-x64-inl.h index 285c078..b082624 100644 --- a/src/x64/assembler-x64-inl.h +++ b/src/x64/assembler-x64-inl.h @@ -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: diff --git a/src/x64/assembler-x64.cc b/src/x64/assembler-x64.cc index 38108b5..41111a7 100644 --- a/src/x64/assembler-x64.cc +++ b/src/x64/assembler-x64.cc @@ -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: diff --git a/src/x64/assembler-x64.h b/src/x64/assembler-x64.h index c029fb5..f6cd570 100644 --- a/src/x64/assembler-x64.h +++ b/src/x64/assembler-x64.h @@ -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. diff --git a/src/x64/builtins-x64.cc b/src/x64/builtins-x64.cc index c362f7b..a2dd6cd 100644 --- a/src/x64/builtins-x64.cc +++ b/src/x64/builtins-x64.cc @@ -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: diff --git a/src/x64/code-stubs-x64.h b/src/x64/code-stubs-x64.h index b6f2753..32a37b2 100644 --- a/src/x64/code-stubs-x64.h +++ b/src/x64/code-stubs-x64.h @@ -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: diff --git a/src/x64/codegen-x64-inl.h b/src/x64/codegen-x64-inl.h index 60e9ab0..53caf91 100644 --- a/src/x64/codegen-x64-inl.h +++ b/src/x64/codegen-x64-inl.h @@ -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: diff --git a/src/x64/codegen-x64.cc b/src/x64/codegen-x64.cc index f47ba18..d713b75 100644 --- a/src/x64/codegen-x64.cc +++ b/src/x64/codegen-x64.cc @@ -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: diff --git a/src/x64/codegen-x64.h b/src/x64/codegen-x64.h index c283db3..4392829 100644 --- a/src/x64/codegen-x64.h +++ b/src/x64/codegen-x64.h @@ -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: diff --git a/src/x64/cpu-x64.cc b/src/x64/cpu-x64.cc index 513c522..3ff292e 100644 --- a/src/x64/cpu-x64.cc +++ b/src/x64/cpu-x64.cc @@ -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: diff --git a/src/x64/debug-x64.cc b/src/x64/debug-x64.cc index 4218647..2c50ddd 100644 --- a/src/x64/debug-x64.cc +++ b/src/x64/debug-x64.cc @@ -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: diff --git a/src/x64/disasm-x64.cc b/src/x64/disasm-x64.cc index 32752fa..21a100f 100644 --- a/src/x64/disasm-x64.cc +++ b/src/x64/disasm-x64.cc @@ -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: diff --git a/src/x64/frames-x64.cc b/src/x64/frames-x64.cc index 9c96047..6c58bc9 100644 --- a/src/x64/frames-x64.cc +++ b/src/x64/frames-x64.cc @@ -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: diff --git a/src/x64/frames-x64.h b/src/x64/frames-x64.h index 998b3e9..81be819 100644 --- a/src/x64/frames-x64.h +++ b/src/x64/frames-x64.h @@ -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: diff --git a/src/x64/ic-x64.cc b/src/x64/ic-x64.cc index f8c40ab..55d837c 100644 --- a/src/x64/ic-x64.cc +++ b/src/x64/ic-x64.cc @@ -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: diff --git a/src/x64/jump-target-x64.cc b/src/x64/jump-target-x64.cc index 1208b0d..e715604 100644 --- a/src/x64/jump-target-x64.cc +++ b/src/x64/jump-target-x64.cc @@ -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: diff --git a/src/x64/lithium-codegen-x64.cc b/src/x64/lithium-codegen-x64.cc index 0704f7c..90244f1 100644 --- a/src/x64/lithium-codegen-x64.cc +++ b/src/x64/lithium-codegen-x64.cc @@ -2530,6 +2530,7 @@ void LCodeGen::DoCallKeyed(LCallKeyed* instr) { int arity = instr->arity(); Handle ic = StubCache::ComputeKeyedCallInitialize(arity, NOT_IN_LOOP); CallCode(ic, RelocInfo::CODE_TARGET, instr); + __ movq(rsi, Operand(rbp, StandardFrameConstants::kContextOffset)); } diff --git a/src/x64/macro-assembler-x64.cc b/src/x64/macro-assembler-x64.cc index 97841a8..8845bbb 100644 --- a/src/x64/macro-assembler-x64.cc +++ b/src/x64/macro-assembler-x64.cc @@ -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: diff --git a/src/x64/macro-assembler-x64.h b/src/x64/macro-assembler-x64.h index c63cf13..4cf59c4 100644 --- a/src/x64/macro-assembler-x64.h +++ b/src/x64/macro-assembler-x64.h @@ -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: diff --git a/src/x64/regexp-macro-assembler-x64.cc b/src/x64/regexp-macro-assembler-x64.cc index 27f3482..cd3bfbd 100644 --- a/src/x64/regexp-macro-assembler-x64.cc +++ b/src/x64/regexp-macro-assembler-x64.cc @@ -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: diff --git a/src/x64/regexp-macro-assembler-x64.h b/src/x64/regexp-macro-assembler-x64.h index 182bc55..421a229 100644 --- a/src/x64/regexp-macro-assembler-x64.h +++ b/src/x64/regexp-macro-assembler-x64.h @@ -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: diff --git a/src/x64/simulator-x64.h b/src/x64/simulator-x64.h index 3a62ffd..aa2994f 100644 --- a/src/x64/simulator-x64.h +++ b/src/x64/simulator-x64.h @@ -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: diff --git a/src/x64/stub-cache-x64.cc b/src/x64/stub-cache-x64.cc index c27e1b8..774de71 100644 --- a/src/x64/stub-cache-x64.cc +++ b/src/x64/stub-cache-x64.cc @@ -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: diff --git a/src/x64/virtual-frame-x64.cc b/src/x64/virtual-frame-x64.cc index 31f9527..ea115f2 100644 --- a/src/x64/virtual-frame-x64.cc +++ b/src/x64/virtual-frame-x64.cc @@ -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: diff --git a/src/x64/virtual-frame-x64.h b/src/x64/virtual-frame-x64.h index 4a9c720..4029c58 100644 --- a/src/x64/virtual-frame-x64.h +++ b/src/x64/virtual-frame-x64.h @@ -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: -- 2.7.4