|
 |
207f88 |
diff -up webkitgtk-2.0.4/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.cloop_fix webkitgtk-2.0.4/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
|
|
|
207f88 |
--- webkitgtk-2.0.4/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.cloop_fix 2014-05-12 15:38:39.748538807 +0200
|
|
|
207f88 |
+++ webkitgtk-2.0.4/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2014-05-12 15:36:46.908580462 +0200
|
|
|
207f88 |
@@ -541,7 +541,7 @@ end
|
|
|
207f88 |
|
|
|
207f88 |
macro putToBaseVariableBody(variableOffset, scratch1, scratch2, scratch3)
|
|
|
207f88 |
loadisFromInstruction(1, scratch1)
|
|
|
207f88 |
- loadp PayloadOffset[cfr, scratch1, 8], scratch1
|
|
|
207f88 |
+ loadp [cfr, scratch1, 8], scratch1
|
|
|
207f88 |
loadp JSVariableObject::m_registers[scratch1], scratch1
|
|
|
207f88 |
loadisFromInstruction(3, scratch2)
|
|
|
207f88 |
if JSVALUE64
|
|
|
207f88 |
@@ -667,7 +667,7 @@ _llint_op_resolve_global_var:
|
|
|
207f88 |
macro resolveScopedVarBody(resolveOperations)
|
|
|
207f88 |
# First ResolveOperation is to skip scope chain nodes
|
|
|
207f88 |
getScope(macro(dest)
|
|
|
207f88 |
- loadp ScopeChain + PayloadOffset[cfr], dest
|
|
|
207f88 |
+ loadp ScopeChain[cfr], dest
|
|
|
207f88 |
end,
|
|
|
207f88 |
ResolveOperation::m_scopesToSkip[resolveOperations], t1, t2)
|
|
|
207f88 |
loadp JSVariableObject::m_registers[t1], t1 # t1 now contains the activation registers
|
|
|
207f88 |
@@ -692,7 +692,7 @@ _llint_op_resolve_scoped_var_on_top_scop
|
|
|
207f88 |
loadisFromInstruction(1, t3)
|
|
|
207f88 |
|
|
|
207f88 |
# We know we want the top scope chain entry
|
|
|
207f88 |
- loadp ScopeChain + PayloadOffset[cfr], t1
|
|
|
207f88 |
+ loadp ScopeChain[cfr], t1
|
|
|
207f88 |
loadp JSVariableObject::m_registers[t1], t1 # t1 now contains the activation registers
|
|
|
207f88 |
|
|
|
207f88 |
# Second ResolveOperation tells us what offset to use
|
|
|
207f88 |
@@ -707,14 +707,14 @@ _llint_op_resolve_scoped_var_with_top_sc
|
|
|
207f88 |
# First ResolveOperation tells us what register to check
|
|
|
207f88 |
loadis ResolveOperation::m_activationRegister[t0], t1
|
|
|
207f88 |
|
|
|
207f88 |
- loadp PayloadOffset[cfr, t1, 8], t1
|
|
|
207f88 |
+ loadp [cfr, t1, 8], t1
|
|
|
207f88 |
|
|
|
207f88 |
getScope(macro(dest)
|
|
|
207f88 |
btpz t1, .scopeChainNotCreated
|
|
|
207f88 |
loadp JSScope::m_next[t1], dest
|
|
|
207f88 |
jmp .done
|
|
|
207f88 |
.scopeChainNotCreated:
|
|
|
207f88 |
- loadp ScopeChain + PayloadOffset[cfr], dest
|
|
|
207f88 |
+ loadp ScopeChain[cfr], dest
|
|
|
207f88 |
.done:
|
|
|
207f88 |
end,
|
|
|
207f88 |
# Second ResolveOperation tells us how many more nodes to skip
|
|
|
207f88 |
@@ -769,7 +769,7 @@ _llint_op_resolve_base_to_scope:
|
|
|
207f88 |
getResolveOperation(4, t0)
|
|
|
207f88 |
# First ResolveOperation is to skip scope chain nodes
|
|
|
207f88 |
getScope(macro(dest)
|
|
|
207f88 |
- loadp ScopeChain + PayloadOffset[cfr], dest
|
|
|
207f88 |
+ loadp ScopeChain[cfr], dest
|
|
|
207f88 |
end,
|
|
|
207f88 |
ResolveOperation::m_scopesToSkip[t0], t1, t2)
|
|
|
207f88 |
loadisFromInstruction(1, t3)
|
|
|
207f88 |
@@ -787,14 +787,14 @@ _llint_op_resolve_base_to_scope_with_top
|
|
|
207f88 |
# First ResolveOperation tells us what register to check
|
|
|
207f88 |
loadis ResolveOperation::m_activationRegister[t0], t1
|
|
|
207f88 |
|
|
|
207f88 |
- loadp PayloadOffset[cfr, t1, 8], t1
|
|
|
207f88 |
+ loadp [cfr, t1, 8], t1
|
|
|
207f88 |
|
|
|
207f88 |
getScope(macro(dest)
|
|
|
207f88 |
btpz t1, .scopeChainNotCreated
|
|
|
207f88 |
loadp JSScope::m_next[t1], dest
|
|
|
207f88 |
jmp .done
|
|
|
207f88 |
.scopeChainNotCreated:
|
|
|
207f88 |
- loadp ScopeChain + PayloadOffset[cfr], dest
|
|
|
207f88 |
+ loadp ScopeChain[cfr], dest
|
|
|
207f88 |
.done:
|
|
|
207f88 |
end,
|
|
|
207f88 |
# Second ResolveOperation tells us how many more nodes to skip
|
|
|
207f88 |
@@ -839,14 +839,14 @@ macro interpretResolveWithBase(opcodeLen
|
|
|
207f88 |
|
|
|
207f88 |
bineq t2, ResolveOperationSkipTopScopeNode, .notSkipTopScopeNode
|
|
|
207f88 |
loadis ResolveOperation::m_activationRegister[t0], t1
|
|
|
207f88 |
- loadp PayloadOffset[cfr, t1, 8], t1
|
|
|
207f88 |
+ loadp [cfr, t1, 8], t1
|
|
|
207f88 |
|
|
|
207f88 |
getScope(macro(dest)
|
|
|
207f88 |
btpz t1, .scopeChainNotCreated
|
|
|
207f88 |
loadp JSScope::m_next[t1], dest
|
|
|
207f88 |
jmp .done
|
|
|
207f88 |
.scopeChainNotCreated:
|
|
|
207f88 |
- loadp ScopeChain + PayloadOffset[cfr], dest
|
|
|
207f88 |
+ loadp ScopeChain[cfr], dest
|
|
|
207f88 |
.done:
|
|
|
207f88 |
end,
|
|
|
207f88 |
sizeof ResolveOperation + ResolveOperation::m_scopesToSkip[t0], t1, t2)
|