narayana
/
ravi
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

start defining gcc types

Browse Source
pull/81/head
dibyendumajumdar 9 years ago
parent d249c80646
commit 9028176d4e
8 changed files with 192 additions and 145 deletions
Show Stats Download Patch File Download Diff File

12
CMakeLists.txt
Unescape View File

@ -68,12 +68,12 @@ if (MSVC)
endif()
if (CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_C_FLAGS_DEBUG "-std=c99 -O0 -g3 -fsanitize=address -Wall -Wextra -DLUA_COMPAT_5_2 -DLUA_USE_LINUX")
set(CMAKE_C_FLAGS_RELEASE "-std=c99 -O3 -Wall -Wextra -DLUA_COMPAT_5_2 -DLUA_USE_LINUX")
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-std=c99 -O1 -g3 -fsanitize=address -Wall -Wextra -DLUA_COMPAT_5_2 -DLUA_USE_LINUX")
set(CMAKE_CXX_FLAGS_RELEASE "-fno-rtti -O3 -Wall -Wno-sign-compare -std=c++11 -fno-exceptions -DLUA_COMPAT_5_2 -DLUA_USE_LINUX")
set(CMAKE_CXX_FLAGS_DEBUG "-fno-rtti -O0 -fsanitize=address -g3 -Wall -Wno-sign-compare -std=c++11 -fno-exceptions -DLUA_COMPAT_5_2 -DLUA_USE_LINUX")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-fno-rtti -O1 -g3 -fsanitize=address -Wall -Wno-sign-compare -std=c++11 -fno-exceptions -DLUA_COMPAT_5_2 -DLUA_USE_LINUX")
set(CMAKE_C_FLAGS_DEBUG "-Werror -std=c99 -O0 -g3 -fsanitize=address -Wall -Wextra -DLUA_COMPAT_5_2 -DLUA_USE_LINUX")
set(CMAKE_C_FLAGS_RELEASE "-Werror -std=c99 -O3 -Wall -Wextra -DLUA_COMPAT_5_2 -DLUA_USE_LINUX")
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-Werror -std=c99 -O1 -g3 -fsanitize=address -Wall -Wextra -DLUA_COMPAT_5_2 -DLUA_USE_LINUX")
set(CMAKE_CXX_FLAGS_RELEASE "-Werror -fno-rtti -O3 -Wall -Wno-sign-compare -std=c++11 -fno-exceptions -DLUA_COMPAT_5_2 -DLUA_USE_LINUX")
set(CMAKE_CXX_FLAGS_DEBUG "-Werror -fno-rtti -O0 -fsanitize=address -g3 -Wall -Wno-sign-compare -std=c++11 -fno-exceptions -DLUA_COMPAT_5_2 -DLUA_USE_LINUX")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-Werror -fno-rtti -O1 -g3 -fsanitize=address -Wall -Wno-sign-compare -std=c++11 -fno-exceptions -DLUA_COMPAT_5_2 -DLUA_USE_LINUX")
endif()
if (APPLE)

2
include/lobject.h
Unescape View File

@ -569,7 +569,7 @@ typedef union UUdata {
** other types appear then they are all treated as ANY
**/
typedef enum {
RAVI_TANY, /* Lua dynamic type */
RAVI_TANY = -1, /* Lua dynamic type */
RAVI_TNUMINT, /* integer number */
RAVI_TNUMFLT, /* floating point number */
RAVI_TARRAYINT, /* array of ints */

6
include/ravi_gccjit.h
Unescape View File

@ -145,7 +145,7 @@ struct ravi_gcc_types_t {
gcc_jit_type *pGCObjectT;
gcc_jit_type *ValueT;
gcc_jit_type *TValueT;
gcc_jit_struct *TValueT;
gcc_jit_type *pTValueT;
gcc_jit_struct *HiLoT;
@ -164,7 +164,7 @@ struct ravi_gcc_types_t {
gcc_jit_struct *UpvaldescT;
gcc_jit_type *pUpvaldescT;
gcc_jit_struct *ravitype_tT;
gcc_jit_type *ravitype_tT;
gcc_jit_struct *LocVarT;
gcc_jit_type *pLocVarT;
@ -193,7 +193,7 @@ struct ravi_gcc_types_t {
gcc_jit_struct *NodeT;
gcc_jit_type *pNodeT;
gcc_jit_type *lua_DebugT;
gcc_jit_struct *lua_DebugT;
gcc_jit_type *plua_DebugT;
gcc_jit_struct *lua_longjumpT;

4
src/ltable.c
Unescape View File

@ -774,7 +774,7 @@ Table *raviH_new_integer_array(lua_State *L, unsigned int len,
ravi_resize_array(L, t, len + 1, 0);
lua_Integer *data = (lua_Integer *)t->ravi_array.data;
data[0] = 0;
for (int i = 1; i <= len; i++) {
for (unsigned int i = 1; i <= len; i++) {
data[i] = init_value;
}
t->ravi_array.len = len + 1;
@ -789,7 +789,7 @@ Table *raviH_new_number_array(lua_State *L, unsigned int len,
ravi_resize_array(L, t, len + 1, 0);
lua_Number *data = (lua_Number *)t->ravi_array.data;
data[0] = 0;
for (int i = 1; i <= len; i++) {
for (unsigned int i = 1; i <= len; i++) {
data[i] = init_value;
}
t->ravi_array.len = len + 1;

137
src/ravi_gccjit.c
Unescape View File

@ -25,13 +25,14 @@
#include "ravi_gccjit.h"
ravi_gcc_context_t *ravi_jit_new_context(void) {
ravi_gcc_context_t *ravi = NULL;
gcc_jit_context *gcc_ctx = gcc_jit_context_acquire();
if (!gcc_ctx) {
fprintf(stderr, "failed to allocate a GCC JIT context\n");
goto on_error;
}
ravi_gcc_context_t *ravi = (ravi_gcc_context_t *) calloc(1, sizeof(ravi_gcc_context_t));
ravi = (ravi_gcc_context_t *) calloc(1, sizeof(ravi_gcc_context_t));
if (!ravi) {
fprintf(stderr, "failed to allocate a Ravi JIT context\n");
goto on_error;
@ -61,7 +62,7 @@ on_error:
}
void ravi_jit_context_free(ravi_gcc_context_t *ravi) {
if (!ravi)
if (ravi == NULL)
return;
if (ravi->context) {
gcc_jit_context_release(ravi->context);
@ -71,140 +72,14 @@ void ravi_jit_context_free(ravi_gcc_context_t *ravi) {
free(ravi);
}
bool ravi_setup_lua_types(ravi_gcc_context_t *ravi) {
ravi->types = (ravi_gcc_types_t *) calloc(1, sizeof(ravi_gcc_types_t));
if (!ravi->types)
return false;
ravi_gcc_types_t *t = ravi->types;
t->C_doubleT = gcc_jit_context_get_type(ravi->context, GCC_JIT_TYPE_DOUBLE);
t->lua_NumberT = t->C_doubleT;
t->plua_NumberT = gcc_jit_type_get_pointer(t->lua_NumberT);
t->pplua_NumberT = gcc_jit_type_get_pointer(t->plua_NumberT);
t->lua_IntegerT = gcc_jit_context_get_int_type(ravi->context, sizeof(lua_Integer), 1);
t->plua_IntegerT = gcc_jit_type_get_pointer(t->lua_IntegerT);
t->pplua_IntegerT = gcc_jit_type_get_pointer(t->plua_IntegerT);
t->lua_UnsignedT = gcc_jit_context_get_int_type(ravi->context, sizeof(lua_Unsigned), 0);
t->C_intptr_t = gcc_jit_context_get_int_type(ravi->context, sizeof(intptr_t), 1);
t->C_size_t = gcc_jit_context_get_type(ravi->context, GCC_JIT_TYPE_SIZE_T);
t->C_ptrdiff_t = gcc_jit_context_get_int_type(ravi->context, sizeof(ptrdiff_t), 1);
t->C_int64_t = gcc_jit_context_get_int_type(ravi->context, sizeof(int64_t), 1);
t->C_intT = gcc_jit_context_get_type(ravi->context, GCC_JIT_TYPE_INT);
t->C_pintT = gcc_jit_type_get_pointer(t->C_intT);
t->C_shortT = gcc_jit_context_get_type(ravi->context, GCC_JIT_TYPE_SHORT);
t->C_unsigned_intT = gcc_jit_context_get_type(ravi->context, GCC_JIT_TYPE_UNSIGNED_INT);
t->lu_memT = t->C_size_t;
t->l_memT = t->C_ptrdiff_t;
t->tmsT = t->C_intT;
t->L_UmaxalignT = t->C_doubleT;
t->lu_byteT = gcc_jit_context_get_type(ravi->context, GCC_JIT_TYPE_UNSIGNED_CHAR);
t->C_charT = gcc_jit_context_get_type(ravi->context, GCC_JIT_TYPE_SIGNED_CHAR);
t->C_pcharT = gcc_jit_type_get_pointer(t->C_charT);
t->C_voidT = gcc_jit_context_get_type(ravi->context, GCC_JIT_TYPE_VOID);
t->C_pvoidT = gcc_jit_context_get_type(ravi->context, GCC_JIT_TYPE_VOID_PTR);
/* typedef unsigned int Instruction */
t->InstructionT = t->C_unsigned_intT;
t->pInstructionT = gcc_jit_type_get_pointer(t->InstructionT);
t->ravitype_tT = gcc_jit_context_get_int_type(ravi->context, sizeof(ravitype_t), 1);
t->lua_StateT = gcc_jit_context_new_opaque_struct(ravi->context, NULL, "ravi_lua_State");
t->plua_StateT = gcc_jit_type_get_pointer(gcc_jit_struct_as_type(t->lua_StateT));
t->lua_KContextT = t->C_ptrdiff_t;
gcc_jit_type *elements[32];
/*
** Type for C functions registered with Lua
* typedef int (*lua_CFunction) (lua_State *L);
*/
elements[0] = t->plua_StateT;
t->plua_CFunctionT = gcc_jit_context_new_function_ptr_type(ravi->context, NULL,
t->C_intT, 1, elements,
0);
/*
** Type for continuation functions
* typedef int (*lua_KFunction) (lua_State *L, int status, lua_KContext ctx);
*/
elements[0] = t->plua_StateT;
elements[1] = t->C_intT;
elements[2] = t->lua_KContextT;
t->plua_KFunctionT = gcc_jit_context_new_function_ptr_type(ravi->context, NULL, t->C_intT,
3, elements, 0);
/*
** Type for memory-allocation functions
* typedef void * (*lua_Alloc) (void *ud, void *ptr, size_t osize, size_t nsize);
*/
elements[0] = t->C_pvoidT;
elements[1] = t->C_pvoidT;
elements[2] = t->C_size_t;
elements[3] = t->C_size_t;
t->plua_AllocT = gcc_jit_context_new_function_ptr_type(ravi->context, NULL, t->C_voidT,
4, elements, 0);
t->lua_DebugT = gcc_jit_context_new_opaque_struct(ravi->context, NULL, "ravi_lua_Debug");
t->plua_DebugT = gcc_jit_type_get_pointer(t->lua_DebugT);
/* typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar); */
elements[0] = t->plua_StateT;
elements[1] = t->plua_DebugT;
t->plua_HookT = gcc_jit_context_new_function_ptr_type(ravi->context, NULL, t->C_pvoidT,
2, elements, 0);
gcc_jit_field *fields[32];
// struct GCObject {
// GCObject *next;
// lu_byte tt;
// lu_byte marked
// };
t->GCObjectT = gcc_jit_context_new_opaque_struct(ravi->context, NULL, "ravi_GCObject");
t->pGCObjectT = gcc_jit_type_get_pointer(t->GCObjectT);
fields[0] = gcc_jit_context_new_field(ravi->context, NULL, t->pGCObjectT, "next");
fields[1] = gcc_jit_context_new_field(ravi->context, NULL, t->lu_byteT, "tt");
fields[2] = gcc_jit_context_new_field(ravi->context, NULL, t->lu_byteT, "marked");
gcc_jit_struct_set_fields(t->GCObjectT, NULL, 3, fields);
// union Value {
// GCObject *gc; /* collectable objects */
// void *p; /* light userdata */
// int b; /* booleans */
// lua_CFunction f; /* light C functions */
// lua_Integer i; /* integer numbers */
// lua_Number n; /* float numbers */
// };
fields[0] = gcc_jit_context_new_field(ravi->context, NULL, t->pGCObjectT, "gc");
fields[1] = gcc_jit_context_new_field(ravi->context, NULL, t->C_pvoidT, "p");
fields[2] = gcc_jit_context_new_field(ravi->context, NULL, t->C_intT, "b");
fields[3] = gcc_jit_context_new_field(ravi->context, NULL, t->plua_CFunctionT, "f");
fields[4] = gcc_jit_context_new_field(ravi->context, NULL, t->lua_IntegerT, "i");
fields[5] = gcc_jit_context_new_field(ravi->context, NULL, t->lua_NumberT, "n");
t->ValueT = gcc_jit_context_new_union_type(ravi->context, NULL, "ravi_Value", 6, fields);
gcc_jit_context_dump_to_file(ravi->context, "dump.txt", 0);
return false;
}
ravi_gcc_codegen_t *ravi_jit_new_codegen(ravi_gcc_context_t *ravi) {
(void) ravi;
return NULL;
}
void ravi_jit_codegen_free(ravi_gcc_context_t *ravi, ravi_gcc_codegen_t *codegen) {
(void)ravi;
(void)codegen;
}

166
src/ravi_gcctypes.c
Unescape View File

@ -21,3 +21,169 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************************/
#include <stddef.h>
#include "ravi_gccjit.h"
bool ravi_setup_lua_types(ravi_gcc_context_t *ravi) {
ravi->types = (ravi_gcc_types_t *) calloc(1, sizeof(ravi_gcc_types_t));
if (!ravi->types)
return false;
ravi_gcc_types_t *t = ravi->types;
t->C_doubleT = gcc_jit_context_get_type(ravi->context, GCC_JIT_TYPE_DOUBLE);
t->lua_NumberT = t->C_doubleT;
t->plua_NumberT = gcc_jit_type_get_pointer(t->lua_NumberT);
t->pplua_NumberT = gcc_jit_type_get_pointer(t->plua_NumberT);
t->lua_IntegerT = gcc_jit_context_get_int_type(ravi->context, sizeof(lua_Integer), 1);
t->plua_IntegerT = gcc_jit_type_get_pointer(t->lua_IntegerT);
t->pplua_IntegerT = gcc_jit_type_get_pointer(t->plua_IntegerT);
t->lua_UnsignedT = gcc_jit_context_get_int_type(ravi->context, sizeof(lua_Unsigned), 0);
t->C_intptr_t = gcc_jit_context_get_int_type(ravi->context, sizeof(intptr_t), 1);
t->C_size_t = gcc_jit_context_get_type(ravi->context, GCC_JIT_TYPE_SIZE_T);
t->C_ptrdiff_t = gcc_jit_context_get_int_type(ravi->context, sizeof(ptrdiff_t), 1);
t->C_int64_t = gcc_jit_context_get_int_type(ravi->context, sizeof(int64_t), 1);
t->C_intT = gcc_jit_context_get_type(ravi->context, GCC_JIT_TYPE_INT);
t->C_pintT = gcc_jit_type_get_pointer(t->C_intT);
t->C_shortT = gcc_jit_context_get_type(ravi->context, GCC_JIT_TYPE_SHORT);
t->C_unsigned_intT = gcc_jit_context_get_type(ravi->context, GCC_JIT_TYPE_UNSIGNED_INT);
t->lu_memT = t->C_size_t;
t->l_memT = t->C_ptrdiff_t;
t->tmsT = t->C_intT;
t->L_UmaxalignT = t->C_doubleT;
t->lu_byteT = gcc_jit_context_get_type(ravi->context, GCC_JIT_TYPE_UNSIGNED_CHAR);
t->C_charT = gcc_jit_context_get_type(ravi->context, GCC_JIT_TYPE_SIGNED_CHAR);
t->C_pcharT = gcc_jit_type_get_pointer(t->C_charT);
t->C_voidT = gcc_jit_context_get_type(ravi->context, GCC_JIT_TYPE_VOID);
t->C_pvoidT = gcc_jit_context_get_type(ravi->context, GCC_JIT_TYPE_VOID_PTR);
/* typedef unsigned int Instruction */
t->InstructionT = t->C_unsigned_intT;
t->pInstructionT = gcc_jit_type_get_pointer(t->InstructionT);
t->ravitype_tT = gcc_jit_context_get_int_type(ravi->context, sizeof(ravitype_t), 1);
t->lua_StateT = gcc_jit_context_new_opaque_struct(ravi->context, NULL, "ravi_lua_State");
t->plua_StateT = gcc_jit_type_get_pointer(gcc_jit_struct_as_type(t->lua_StateT));
t->lua_KContextT = t->C_ptrdiff_t;
gcc_jit_type *elements[32];
/*
** Type for C functions registered with Lua
* typedef int (*lua_CFunction) (lua_State *L);
*/
elements[0] = t->plua_StateT;
t->plua_CFunctionT = gcc_jit_context_new_function_ptr_type(ravi->context, NULL,
t->C_intT, 1, elements,
0);
/*
** Type for continuation functions
* typedef int (*lua_KFunction) (lua_State *L, int status, lua_KContext ctx);
*/
elements[0] = t->plua_StateT;
elements[1] = t->C_intT;
elements[2] = t->lua_KContextT;
t->plua_KFunctionT = gcc_jit_context_new_function_ptr_type(ravi->context, NULL, t->C_intT,
3, elements, 0);
/*
** Type for memory-allocation functions
* typedef void * (*lua_Alloc) (void *ud, void *ptr, size_t osize, size_t nsize);
*/
elements[0] = t->C_pvoidT;
elements[1] = t->C_pvoidT;
elements[2] = t->C_size_t;
elements[3] = t->C_size_t;
t->plua_AllocT = gcc_jit_context_new_function_ptr_type(ravi->context, NULL, t->C_voidT,
4, elements, 0);
t->lua_DebugT = gcc_jit_context_new_opaque_struct(ravi->context, NULL, "ravi_lua_Debug");
t->plua_DebugT = gcc_jit_type_get_pointer(gcc_jit_struct_as_type(t->lua_DebugT));
/* typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar); */
elements[0] = t->plua_StateT;
elements[1] = t->plua_DebugT;
t->plua_HookT = gcc_jit_context_new_function_ptr_type(ravi->context, NULL, t->C_pvoidT,
2, elements, 0);
gcc_jit_field *fields[32];
// struct GCObject {
// GCObject *next;
// lu_byte tt;
// lu_byte marked
// };
t->GCObjectT = gcc_jit_context_new_opaque_struct(ravi->context, NULL, "ravi_GCObject");
t->pGCObjectT = gcc_jit_type_get_pointer(gcc_jit_struct_as_type(t->GCObjectT));
fields[0] = gcc_jit_context_new_field(ravi->context, NULL, t->pGCObjectT, "next");
fields[1] = gcc_jit_context_new_field(ravi->context, NULL, t->lu_byteT, "tt");
fields[2] = gcc_jit_context_new_field(ravi->context, NULL, t->lu_byteT, "marked");
gcc_jit_struct_set_fields(t->GCObjectT, NULL, 3, fields);
// union Value {
// GCObject *gc; /* collectable objects */
// void *p; /* light userdata */
// int b; /* booleans */
// lua_CFunction f; /* light C functions */
// lua_Integer i; /* integer numbers */
// lua_Number n; /* float numbers */
// };
fields[0] = gcc_jit_context_new_field(ravi->context, NULL, t->pGCObjectT, "gc");
fields[1] = gcc_jit_context_new_field(ravi->context, NULL, t->C_pvoidT, "p");
fields[2] = gcc_jit_context_new_field(ravi->context, NULL, t->C_intT, "b");
fields[3] = gcc_jit_context_new_field(ravi->context, NULL, t->plua_CFunctionT, "f");
fields[4] = gcc_jit_context_new_field(ravi->context, NULL, t->lua_IntegerT, "i");
fields[5] = gcc_jit_context_new_field(ravi->context, NULL, t->lua_NumberT, "n");
t->ValueT = gcc_jit_context_new_union_type(ravi->context, NULL, "ravi_Value", 6, fields);
// NOTE: Following structure changes when NaN tagging is enabled
// struct TValue {
// union Value value_;
// int tt_;
// };
fields[0] = gcc_jit_context_new_field(ravi->context, NULL, t->ValueT, "value_");
fields[1] = gcc_jit_context_new_field(ravi->context, NULL, t->C_intT, "tt_");
t->TValueT = gcc_jit_context_new_struct_type(ravi->context, NULL, "ravi_TValue", 2, fields);
t->pTValueT = gcc_jit_type_get_pointer(gcc_jit_struct_as_type(t->TValueT));
t->StkIdT = t->pTValueT;
// typedef struct TString {
// GCObject *next;
// lu_byte tt;
// lu_byte marked
// lu_byte extra; /* reserved words for short strings; "has hash" for longs
// */
// unsigned int hash;
// size_t len; /* number of characters in string */
// struct TString *hnext; /* linked list for hash table */
// } TString;
t->TStringT = gcc_jit_context_new_opaque_struct(ravi->context, NULL, "ravi_TString");
t->pTStringT = gcc_jit_type_get_pointer(gcc_jit_struct_as_type(t->TStringT));
fields[0] = gcc_jit_context_new_field(ravi->context, NULL, t->pGCObjectT, "next");
fields[1] = gcc_jit_context_new_field(ravi->context, NULL, t->lu_byteT, "tt");
fields[2] = gcc_jit_context_new_field(ravi->context, NULL, t->lu_byteT, "marked");
fields[3] = gcc_jit_context_new_field(ravi->context, NULL, t->lu_byteT, "extra");
fields[4] = gcc_jit_context_new_field(ravi->context, NULL, t->C_unsigned_intT, "hash");
fields[5] = gcc_jit_context_new_field(ravi->context, NULL, t->C_size_t, "len");
fields[6] = gcc_jit_context_new_field(ravi->context, NULL, t->pTStringT, "hash");
gcc_jit_struct_set_fields(t->TStringT, NULL, 7, fields);
gcc_jit_context_dump_to_file(ravi->context, "dump.txt", 0);
return false;
}

3
tests/test_gccjit.c
Unescape View File

@ -81,6 +81,9 @@ main (int argc, char **argv)
gcc_jit_context *ctxt;
gcc_jit_result *result;
(void)argc;
(void)argv;
/* Get a "context" object for working with the library. */
ctxt = gcc_jit_context_acquire ();
if (!ctxt)

7
tests/test_misc.c
Unescape View File

@ -145,7 +145,7 @@ typedef struct lua_TValue TValue;
/* macro defining a nil value */
#define NILCONSTANT {NULL}, {0, (RAVI_NAN_TAG|LUA_TNIL)}
#define NILCONSTANT {NULL}, { {0, (RAVI_NAN_TAG|LUA_TNIL)} }
/* Note that numbers are not stored in value_ when NaN tagging is ON */
#define val_(o) ((o)->value_)
@ -508,7 +508,10 @@ static void dumpvalue(TValue* v)
}
int main(int argc, const char *argv) {
int main(int argc, const char **argv) {
(void)argc;
(void)argv;
TValue v = { NILCONSTANT };
dumpvalue(&v);

Write Preview
Loading…
Cancel
Save