diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-08-19 12:14:05 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-19 12:35:18 +0200 |
| commit | a57273f033f06a80b72b7a8c06faa08aee392cd1 (patch) | |
| tree | 1d799c0be93f72f108e08934adb6fef145b33860 /src/qml | |
| parent | b4873695ba017469a60ec95b4f8074afbde82a06 (diff) | |
Fix ARM build
Re-add variable only needed for ARM build and replace references
to removed codeRef variables from QV4::Function.
Change-Id: Id47fe57be2aa653bd8f81996463d970f27427f37
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml')
| -rw-r--r-- | src/qml/compiler/qv4isel_masm.cpp | 1 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4unwindhelper_p-arm.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/qml/compiler/qv4isel_masm.cpp b/src/qml/compiler/qv4isel_masm.cpp index 3b1c5d548b..a64c9ced14 100644 --- a/src/qml/compiler/qv4isel_masm.cpp +++ b/src/qml/compiler/qv4isel_masm.cpp @@ -567,6 +567,7 @@ void Assembler::recordLineNumber(int lineNumber) JSC::MacroAssemblerCodeRef Assembler::link() { #if defined(Q_PROCESSOR_ARM) && !defined(Q_OS_IOS) + Label endOfCode = label(); // Let the ARM exception table follow right after that for (int i = 0, nops = UnwindHelper::unwindInfoSize() / 2; i < nops; ++i) nop(); diff --git a/src/qml/jsruntime/qv4unwindhelper_p-arm.h b/src/qml/jsruntime/qv4unwindhelper_p-arm.h index dd1f1e4856..8f5febc3d5 100644 --- a/src/qml/jsruntime/qv4unwindhelper_p-arm.h +++ b/src/qml/jsruntime/qv4unwindhelper_p-arm.h @@ -79,7 +79,7 @@ static Function *lookupFunction(void *pc) if (it == allFunctions.end()) return 0; - quintptr codeStart = reinterpret_cast<quintptr>(removeThumbBit((*it)->codeRef.code().executableAddress())); + quintptr codeStart = reinterpret_cast<quintptr>(removeThumbBit((void*)(*it)->code)); if (key < codeStart || key >= codeStart + (*it)->codeSize) return 0; return *it; @@ -217,7 +217,7 @@ extern "C" Q_DECL_EXPORT void *__gnu_Unwind_Find_exidx(void *pc, int *entryCount QV4::Function *function = QT_PREPEND_NAMESPACE(QV4::lookupFunction(pc)); if (function) { *entryCount = 1; - void * codeStart = QT_PREPEND_NAMESPACE(QV4::removeThumbBit(function->codeRef.code().executableAddress())); + void * codeStart = QT_PREPEND_NAMESPACE(QV4::removeThumbBit((void*)function->code)); // At the end of the function we store our synthetic exception table entry. return (char *)codeStart + function->codeSize; } |