Commit 9be62be8 authored by Julian Kranz's avatar Julian Kranz

Cleanup

parent a8e94ee8
/* vim:set ts=2:set sw=2:set expandtab: */
@I-am-a-template-so-edit-me@
#define GDSL_SPECIFIC
@include-prefix@
#include <string.h>
#include <stdio.h>
......
......@@ -3,8 +3,6 @@
#ifndef __GDSL_RUNTIME_H
#define __GDSL_RUNTIME_H
#define GDSL_SPECIFIC
#include <stdlib.h>
#include <stdint.h>
#include <setjmp.h>
......
......@@ -9,17 +9,6 @@
#include <stdint.h>
struct state {
void *userdata; /* a pointer to arbitary data */
};
/* data types used in decoder programs */
typedef void* obj_t;
typedef struct state* state_t;
typedef long long int int_t;
typedef char* string_t;
typedef uint64_t vec_data_t;
/**
* RReil defintions
*/
......@@ -50,11 +39,23 @@ enum optimization_configuration {
PRESERVATION_CONTEXT = 2
};
#ifndef __GDSL_RUNTIME_H
struct state {
void *userdata; /* a pointer to arbitary data */
};
/* data types used in decoder programs */
typedef void* obj_t;
typedef struct state* state_t;
typedef long long int int_t;
typedef char* string_t;
typedef uint64_t vec_data_t;
/**
* Interface data structures
*/
#ifndef GDSL_SPECIFIC
struct vec {
unsigned int size;
vec_data_t data;
......
......@@ -2,7 +2,7 @@ MLTK=../..
CC=gcc
#CC=clang
LIBDS=-L$(MLTK)/lib
LIBS=-lx86-tester -lgdwrap -lrreil -lrreil-sim -lx86-generator -lx86-generator -lx86 -lreadhex -lgdutil -lgdsl
LIBS=-lx86-tester -lgdwrap -lcgdsl -lrreil-sim -lx86-generator -lx86-generator -lx86 -lreadhex -lgdutil -lgdsl
LIBFLAGS=$(LIBDS) $(LIBS)
LDFLAGS=
INCDS=-Iinclude -I$(MLTK)/include
......
......@@ -2,7 +2,7 @@ MLTK=../..
CC=gcc
#CC=clang
LIBDS=-L$(MLTK)/lib
LIBS=-lx86-tester -lgdwrap -lrreil -lrreil-sim -lx86-generator -lx86-generator -lgdutil -lx86 -lgdsl
LIBS=-lx86-tester -lgdwrap -lcgdsl -lrreil-sim -lx86-generator -lx86-generator -lgdutil -lx86 -lgdsl
LIBFLAGS=$(LIBDS) $(LIBS)
LDFLAGS=
INCDS=-Iinclude -I$(MLTK)/include
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment