Merge 'wip/next' into dev

Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9

1 files changed, 8 insertions, 40 deletions

diff --git a/Source/JavaScriptCore/llint/LLIntCLoop.cpp b/Source/JavaScriptCore/llint/LLIntCLoop.cpp
index 14fc04930..e3c6c6ce9 100644
--- a/Source/JavaScriptCore/llint/LLIntCLoop.cpp
+++ b/Source/JavaScriptCore/llint/LLIntCLoop.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2012, 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -26,51 +26,19 @@
 #include "config.h"
 #include "LLIntCLoop.h"
 
-#include "Instruction.h"
+#if !ENABLE(JIT)
 
-namespace JSC {
+#include "LLIntData.h"
 
+namespace JSC {
 namespace LLInt {
 
-#if ENABLE(LLINT_C_LOOP)
-
 void CLoop::initialize()
 {
-    execute(0, llint_unused, true);
-}
-
-void* CLoop::catchRoutineFor(Instruction* catchPCForInterpreter)
-{
-    return reinterpret_cast<Instruction*>(catchPCForInterpreter->u.opcode);
-}
-
-MacroAssemblerCodePtr CLoop::hostCodeEntryFor(CodeSpecializationKind kind)
-{
-    MacroAssemblerCodePtr codePtr;
-    codePtr = (kind == CodeForCall) ?
-        MacroAssemblerCodePtr::createLLIntCodePtr(llint_native_call_trampoline) :
-        MacroAssemblerCodePtr::createLLIntCodePtr(llint_native_construct_trampoline);
-    return codePtr;
-}
-
-MacroAssemblerCodePtr CLoop::jsCodeEntryWithArityCheckFor(CodeSpecializationKind kind)
-{
-    MacroAssemblerCodePtr codePtr;
-    codePtr = (kind == CodeForCall) ?
-        MacroAssemblerCodePtr::createLLIntCodePtr(llint_function_for_call_arity_check) :
-        MacroAssemblerCodePtr::createLLIntCodePtr(llint_function_for_construct_arity_check);
-    return codePtr;
-}
-
-MacroAssemblerCodePtr CLoop::jsCodeEntryFor(CodeSpecializationKind kind)
-{
-    MacroAssemblerCodePtr codePtr;
-    codePtr = (kind == CodeForCall) ?
-        MacroAssemblerCodePtr::createLLIntCodePtr(llint_function_for_call_prologue) :
-        MacroAssemblerCodePtr::createLLIntCodePtr(llint_function_for_construct_prologue);
-    return codePtr;
+    execute(llint_entry, 0, 0, 0, true);
 }
 
-#endif // ENABLE(LLINT_C_LOOP)
+} // namespace LLInt
+} // namespace JSC
 
-} } // namespace JSC::LLInt
+#endif // !ENABLE(JIT)