Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix bootimage build #40

Closed
wants to merge 1 commit into from
Closed

Fix bootimage build #40

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/bootimage.cpp
View file
Open in desktop
Expand Up @@ -19,6 +19,8 @@
#include "binaryToObject/tools.h" #include "binaryToObject/tools.h"
#include "lzma.h" #include "lzma.h"


#include "util/abort.h"

// since we aren't linking against libstdc++, we must implement this // since we aren't linking against libstdc++, we must implement this
// ourselves: // ourselves:
extern "C" void __cxa_pure_virtual(void) { abort(); } extern "C" void __cxa_pure_virtual(void) { abort(); }
Expand Down Expand Up @@ -287,7 +289,7 @@ makeCodeImage(Thread* t, Zone* zone, BootImage* image, uint8_t* code,
object methods = 0; object methods = 0;
PROTECT(t, methods); PROTECT(t, methods);


DelayedPromise* addresses = 0; avian::codegen::DelayedPromise* addresses = 0;


class MyOffsetResolver: public OffsetResolver { class MyOffsetResolver: public OffsetResolver {
public: public:
Expand Down Expand Up @@ -326,7 +328,7 @@ makeCodeImage(Thread* t, Zone* zone, BootImage* image, uint8_t* code,
Client(Thread* t): t(t) { } Client(Thread* t): t(t) { }


virtual void NO_RETURN handleError() { virtual void NO_RETURN handleError() {
vm::abort(t); abort(t);
} }


private: private:
Expand Down Expand Up @@ -671,7 +673,7 @@ makeCodeImage(Thread* t, Zone* zone, BootImage* image, uint8_t* code,
address = codeCompiled(t, methodCode(t, method)); address = codeCompiled(t, methodCode(t, method));
} }


static_cast<ListenPromise*>(pointerValue(t, tripleSecond(t, calls))) static_cast<avian::codegen::ListenPromise*>(pointerValue(t, tripleSecond(t, calls)))
->listener->resolve(address, 0); ->listener->resolve(address, 0);
} }


Expand Down Expand Up @@ -1252,7 +1254,7 @@ updateConstants(Thread* t, object constants, HeapMap* heapTable)
unsigned target = heapTable->find(tripleFirst(t, constants)); unsigned target = heapTable->find(tripleFirst(t, constants));
expect(t, target > 0); expect(t, target > 0);


for (Promise::Listener* pl = static_cast<ListenPromise*> for (avian::codegen::Promise::Listener* pl = static_cast<avian::codegen::ListenPromise*>
(pointerValue(t, tripleSecond(t, constants)))->listener; (pointerValue(t, tripleSecond(t, constants)))->listener;
pl; pl = pl->next) pl; pl = pl->next)
{ {
Expand Down