Dynamically grow/shrink MOTH code block.

Instead of allocating 4000*pageSize, and not checking if it overflows.

Change-Id: I38b37d60bb39bddbbd9a41a2e9c5958b1acc62eb
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

diff --git a/moth/qv4isel_moth.cpp b/moth/qv4isel_moth.cpp
index bfc04a3..01a5866 100644 (file)
--- a/moth/qv4isel_moth.cpp
+++ b/moth/qv4isel_moth.cpp
@@ -265,8 +265,9 @@ InstructionSelection::InstructionSelection(VM::ExecutionEngine *engine, IR::Modu
     : EvalInstructionSelection(engine, module)
     , _function(0)
     , _block(0)
-    , _code(0)
-    , _ccode(0)
+    , _codeStart(0)
+    , _codeNext(0)
+    , _codeEnd(0)
 {
 }
 
@@ -276,22 +277,23 @@ InstructionSelection::~InstructionSelection()
 
 void InstructionSelection::run(VM::Function *vmFunction, IR::Function *function)
 {
-    qSwap(_function, function);
-
     IR::BasicBlock *block;
 
     QHash<IR::BasicBlock *, QVector<ptrdiff_t> > patches;
     QHash<IR::BasicBlock *, ptrdiff_t> addrs;
 
-    // FIXME: make the size dynamic. This requires changing the patching.
-    uchar *code = new uchar[getpagesize() * 4000];
-    uchar *ccode = code;
+    int codeSize = 4096;
+    uchar *codeStart = new uchar[codeSize];
+    uchar *codeNext = codeStart;
+    uchar *codeEnd = codeStart + codeSize;
 
+    qSwap(_function, function);
     qSwap(block, _block);
     qSwap(patches, _patches);
     qSwap(addrs, _addrs);
-    qSwap(code, _code);
-    qSwap(ccode, _ccode);
+    qSwap(codeStart, _codeStart);
+    qSwap(codeNext, _codeNext);
+    qSwap(codeEnd, _codeEnd);
 
     CompressTemps().run(_function);
 
@@ -303,38 +305,26 @@ void InstructionSelection::run(VM::Function *vmFunction, IR::Function *function)
     addInstruction(push);
 
     foreach (_block, _function->basicBlocks) {
-        _addrs.insert(_block, _ccode - _code);
+        _addrs.insert(_block, _codeNext - _codeStart);
 
         foreach (IR::Stmt *s, _block->statements)
             s->accept(this);
     }
 
-    for (QHash<IR::BasicBlock *, QVector<ptrdiff_t> >::ConstIterator iter = _patches.begin();
-         iter != _patches.end(); ++iter) {
-
-        Q_ASSERT(_addrs.contains(iter.key()));
-        ptrdiff_t target = _addrs.value(iter.key());
-
-        const QVector<ptrdiff_t> &patchList = iter.value();
-        for (int ii = 0; ii < patchList.count(); ++ii) {
-            ptrdiff_t patch = patchList.at(ii);
-
-            *((ptrdiff_t *)(_code + patch)) = target - patch;
-        }
-    }
-
-    qSwap(_function, function);
-    _patches.clear();
-    _addrs.clear();
+    patchJumpAddresses();
 
     vmFunction->code = VME::exec;
-    vmFunction->codeData = _code;
+    vmFunction->codeData = squeezeCode();
 
+    qSwap(_function, function);
     qSwap(block, _block);
     qSwap(patches, _patches);
     qSwap(addrs, _addrs);
-    qSwap(code, _code);
-    qSwap(ccode, _ccode);
+    qSwap(codeStart, _codeStart);
+    qSwap(codeNext, _codeNext);
+    qSwap(codeEnd, _codeEnd);
+
+    delete[] codeStart;
 }
 
 void InstructionSelection::callActivationProperty(IR::Call *c, IR::Temp *temp)
@@ -880,14 +870,14 @@ void InstructionSelection::visitCJump(IR::CJump *s)
     Instruction::CJump jump;
     jump.offset = 0;
     jump.tempIndex = tempIndex;
-    ptrdiff_t tl = addInstruction(jump) + (((const char *)&jump.offset) - ((const char *)&jump));
-    _patches[s->iftrue].append(tl);
+    ptrdiff_t trueLoc = addInstruction(jump) + (((const char *)&jump.offset) - ((const char *)&jump));
+    _patches[s->iftrue].append(trueLoc);
 
     if (_block->index + 1 != s->iffalse->index) {
         Instruction::Jump jump;
         jump.offset = 0;
-        ptrdiff_t fl = addInstruction(jump) + (((const char *)&jump.offset) - ((const char *)&jump));
-        _patches[s->iffalse].append(fl);
+        ptrdiff_t falseLoc = addInstruction(jump) + (((const char *)&jump.offset) - ((const char *)&jump));
+        _patches[s->iffalse].append(falseLoc);
     }
 }
 
@@ -906,12 +896,48 @@ ptrdiff_t InstructionSelection::addInstructionHelper(Instr::Type type, Instr &in
     instr.common.instructionType = type;
 #endif
 
-    ptrdiff_t ptrOffset = _ccode - _code;
-    int size = Instr::size(type);
+    int instructionSize = Instr::size(type);
+    if (_codeEnd - _codeNext < instructionSize) {
+        int currSize = _codeEnd - _codeStart;
+        uchar *newCode = new uchar[currSize * 2];
+        ::memset(newCode + currSize, 0, currSize);
+        ::memcpy(newCode, _codeStart, currSize);
+        _codeNext = _codeNext - _codeStart + newCode;
+        delete[] _codeStart;
+        _codeStart = newCode;
+        _codeEnd = _codeStart + currSize * 2;
+    }
 
-    ::memcpy(_ccode, reinterpret_cast<const char *>(&instr), size);
-    _ccode += size;
+    ::memcpy(_codeNext, reinterpret_cast<const char *>(&instr), instructionSize);
+    ptrdiff_t ptrOffset = _codeNext - _codeStart;
+    _codeNext += instructionSize;
 
     return ptrOffset;
 }
 
+void InstructionSelection::patchJumpAddresses()
+{
+    typedef QHash<IR::BasicBlock *, QVector<ptrdiff_t> >::ConstIterator PatchIt;
+    for (PatchIt i = _patches.begin(), ei = _patches.end(); i != ei; ++i) {
+        Q_ASSERT(_addrs.contains(i.key()));
+        ptrdiff_t target = _addrs.value(i.key());
+
+        const QVector<ptrdiff_t> &patchList = i.value();
+        for (int ii = 0, eii = patchList.count(); ii < eii; ++ii) {
+            ptrdiff_t patch = patchList.at(ii);
+
+            *((ptrdiff_t *)(_codeStart + patch)) = target - patch;
+        }
+    }
+
+    _patches.clear();
+    _addrs.clear();
+}
+
+uchar *InstructionSelection::squeezeCode() const
+{
+    int codeSize = _codeNext - _codeStart;
+    uchar *squeezed = new uchar[codeSize];
+    ::memcpy(squeezed, _codeStart, codeSize);
+    return squeezed;
+}

diff --git a/moth/qv4isel_moth_p.h b/moth/qv4isel_moth_p.h
index 0456394..c0e8595 100644 (file)
--- a/moth/qv4isel_moth_p.h
+++ b/moth/qv4isel_moth_p.h
@@ -67,6 +67,8 @@ private:
     template <int Instr>
     inline ptrdiff_t addInstruction(const InstrData<Instr> &data);
     ptrdiff_t addInstructionHelper(Instr::Type type, Instr &instr);
+    void patchJumpAddresses();
+    uchar *squeezeCode() const;
 
     IR::Function *_function;
     IR::BasicBlock *_block;
@@ -74,8 +76,9 @@ private:
     QHash<IR::BasicBlock *, QVector<ptrdiff_t> > _patches;
     QHash<IR::BasicBlock *, ptrdiff_t> _addrs;
 
-    uchar *_code;
-    uchar *_ccode;
+    uchar *_codeStart;
+    uchar *_codeNext;
+    uchar *_codeEnd;
 };
 
 class ISelFactory: public EvalISelFactory

diff --git a/tests/TestExpectations b/tests/TestExpectations
index 1341803..96c6b25 100644 (file)
--- a/tests/TestExpectations
+++ b/tests/TestExpectations
@@ -838,9 +838,6 @@ S15.1.3.2_A5.3 failing
 15.2.3.6-4-41 failing
 15.2.3.6-4-410 failing
 15.2.3.6-4-586 failing
-15.2.3.6-4-593 failing
-15.2.3.6-4-594 failing
-15.2.3.6-4-596 failing
 15.2.3.6-4-621 failing
 15.2.3.6-4-622 failing
 15.2.3.6-4-623 failing
@@ -2951,4 +2948,4 @@ S15.4.4.13_A1_T2 failing
 15.4.4.19-8-c-i-6 failing
 15.4.4.20-9-c-i-6 failing
 15.4.4.21-8-b-iii-1-6 failing
-15.4.4.22-8-b-iii-1-6 failing
\ No newline at end of file
+15.4.4.22-8-b-iii-1-6 failing