Skip to content

fix several runtime bug on gcc10.5.1 #8

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

Open
ywen-cmd wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix several runtime bug on gcc10.5.1 #8

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 32 additions & 23 deletions abi_v12/mycppabi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
#include <string.h>

namespace __cxxabiv1 {
struct __class_type_info {
Expand All @@ -15,12 +16,6 @@ char exception_buff[EXCEPTION_BUFF_SIZE];

extern "C" {

void* __cxa_allocate_exception(size_t thrown_size)
{
if (thrown_size > EXCEPTION_BUFF_SIZE) printf("Exception too big");
return &exception_buff;
}

void __cxa_free_exception(void *thrown_exception);


Expand All @@ -30,23 +25,35 @@ void __cxa_free_exception(void *thrown_exception);
typedef void (*unexpected_handler)(void);
typedef void (*terminate_handler)(void);

struct __cxa_exception {
std::type_info * exceptionType;
void (*exceptionDestructor) (void *);
unexpected_handler unexpectedHandler;
terminate_handler terminateHandler;
__cxa_exception * nextException;

int handlerCount;
int handlerSwitchValue;
const char * actionRecord;
const char * languageSpecificData;
void * catchTemp;
void * adjustedPtr;

_Unwind_Exception unwindHeader;
struct __cxa_exception
{
std::type_info *exceptionType;
void (*exceptionDestructor) (void *);
unexpected_handler unexpectedHandler;
terminate_handler terminateHandler;
__cxa_exception *nextException;
int handlerCount;
int handlerSwitchValue;
const unsigned char *actionRecord;
const unsigned char *languageSpecificData;
_Unwind_Ptr catchTemp;
void *adjustedPtr;
_Unwind_Exception unwindHeader;
};

struct __cxa_refcounted_exception
{
int referenceCount;
__cxa_exception exc;
};

void *
__cxa_allocate_exception(std::size_t thrown_size) _GLIBCXX_NOTHROW
{
thrown_size += sizeof (__cxa_refcounted_exception);
return (void *)((char *)exception_buff + sizeof (__cxa_refcounted_exception));
}

void __cxa_throw(void* thrown_exception,
std::type_info *tinfo,
void (*dest)(void*))
Expand Down Expand Up @@ -352,8 +359,10 @@ struct LSDA
{
// The index starts at the end of the types table
int idx = -1 * action->type_index;
const void* catch_type_info = this->types_table_start[idx];
return (const std::type_info *) catch_type_info;
// read by encode, but i just make a toy version here
// ywen hack here for gcc 10.5.0
uint64_t* catch_type_info_addr = (uint64_t*)((*((uint32_t* )(this->types_table_start) + idx) + (uint64_t)(this->types_table_start)) + idx * 4);
return (const std::type_info *) (*catch_type_info_addr);
}
};

Expand Down