falso
/
dethrace
mirror of https://github.com/dethrace-labs/dethrace.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

compile DETHRACE and BRSRC13 separately. (#13) 

* compile DETHRACE and BRSRC13 separately. Fixed some types wronly generated into dr_types.h

* Fix makefile ordering

* make gcc happy
This commit is contained in:
Jeff Harris 2019-11-22 09:25:44 -08:00 committed by GitHub
parent 517c82b1e1
commit 57bf2c3dc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
198 changed files with 512 additions and 498 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Makefile
View File

@ -1,30 +1,12 @@
TARGET_EXEC ?= a.out
.PHONY: clean build test run
BUILD_DIR ?= ./build
SRC_DIRS ?= ./src
SRCS := $(shell find $(SRC_DIRS) -name *.c)
OBJS := $(SRCS:%=$(BUILD_DIR)/%.o)
DEPS := $(OBJS:.o=.d)
INC_DIRS := $(shell find $(SRC_DIRS) -type d)
INC_FLAGS := $(addprefix -I,$(INC_DIRS))
CFLAGS ?= $(INC_FLAGS) -Wno-return-type -Wno-missing-declarations -Werror=implicit-function-declaration
$(BUILD_DIR)/$(TARGET_EXEC): $(OBJS)
$(CC) $(OBJS) -o $@ $(LDFLAGS)
# c source
$(BUILD_DIR)/%.c.o: %.c
@$(MKDIR_P) $(dir $@)
@$(CC) $(CFLAGS) -c $< -o $@
.PHONY: clean
build:
$(MAKE) -C src/BRSRC13 build
$(MAKE) -C src/DETHRACE build
clean:
$(RM) -r $(BUILD_DIR)
$(MAKE) -C src/BRSRC13 clean
$(MAKE) -C src/DETHRACE clean
-include $(DEPS)
MKDIR_P ?= mkdir -p
run: build
$(src/DETHRACE/build/c1)

1
src/BRSRC13/CORE/DOSIO/eventq.h
View File

@ -1,7 +1,6 @@
#ifndef _EVENTQ_H_
#define _EVENTQ_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 14

1
src/BRSRC13/CORE/DOSIO/readmse.h
View File

@ -1,7 +1,6 @@
#ifndef _READMSE_H_
#define _READMSE_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 14

1
src/BRSRC13/CORE/FW/assocarr.h
View File

@ -1,7 +1,6 @@
#ifndef _ASSOCARR_H_
#define _ASSOCARR_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 27

1
src/BRSRC13/CORE/FW/brbegin.h
View File

@ -1,7 +1,6 @@
#ifndef _BRBEGIN_H_
#define _BRBEGIN_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 8

1
src/BRSRC13/CORE/FW/brbhook.h
View File

@ -1,7 +1,6 @@
#ifndef _BRBHOOK_H_
#define _BRBHOOK_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 13

1
src/BRSRC13/CORE/FW/brlists.h
View File

@ -1,7 +1,6 @@
#ifndef _BRLISTS_H_
#define _BRLISTS_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 10

2
src/BRSRC13/CORE/FW/brprintf.c
View File

@ -2,6 +2,8 @@
char rscid[48];
#include <stdarg.h>
// Offset: 10
// Size: 75
br_int_32 BrSprintf(char *buf, char *fmt, ...) {

3
src/BRSRC13/CORE/FW/brprintf.h
View File

@ -1,9 +1,10 @@
#ifndef _BRPRINTF_H_
#define _BRPRINTF_H_
#include "dr_types.h"
#include "br_types.h"
#include <stdlib.h>
// Offset: 10
// Size: 75
br_int_32 BrSprintf(char *buf, char *fmt, ...);

1
src/BRSRC13/CORE/FW/brqsort.h
View File

@ -1,7 +1,6 @@
#ifndef _BRQSORT_H_
#define _BRQSORT_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 8

1
src/BRSRC13/CORE/FW/bswap.h
View File

@ -1,7 +1,6 @@
#ifndef _BSWAP_H_
#define _BSWAP_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 9

1
src/BRSRC13/CORE/FW/datafile.h
View File

@ -1,7 +1,6 @@
#ifndef _DATAFILE_H_
#define _DATAFILE_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 7

1
src/BRSRC13/CORE/FW/devlist.h
View File

@ -1,7 +1,6 @@
#ifndef _DEVLIST_H_
#define _DEVLIST_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 20

2
src/BRSRC13/CORE/FW/devsetup.c
View File

@ -1,5 +1,7 @@
#include "devsetup.h"
#include <stdarg.h>
br_pixelmap *last_begin_screen;
char rscid[51];

1
src/BRSRC13/CORE/FW/devsetup.h
View File

@ -1,7 +1,6 @@
#ifndef _DEVSETUP_H_
#define _DEVSETUP_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 20

2
src/BRSRC13/CORE/FW/diag.c
View File

@ -1,7 +1,7 @@
#include "diag.h"
#include "fwsetup.h"
#include "brprintf.h"
#include "brstdlib.h"
#include "CORE/STD/brstdlib.h"
#include <stdarg.h>
// Global variables

1
src/BRSRC13/CORE/FW/diag.h
View File

@ -1,7 +1,6 @@
#ifndef _DIAG_H_
#define _DIAG_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 10
// Size: 118

1
src/BRSRC13/CORE/FW/error.h
View File

@ -1,7 +1,6 @@
#ifndef _ERROR_H_
#define _ERROR_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 15

2
src/BRSRC13/CORE/FW/file.c
View File

@ -1,5 +1,7 @@
#include "file.h"
#include <stdarg.h>
char rscid[49];
// Offset: 12

1
src/BRSRC13/CORE/FW/file.h
View File

@ -1,7 +1,6 @@
#ifndef _FILE_H_
#define _FILE_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 12

1
src/BRSRC13/CORE/FW/fwsetup.h
View File

@ -1,7 +1,6 @@
#ifndef _FWSETUP_H_
#define _FWSETUP_H_
#include "dr_types.h"
#include "br_types.h"
extern br_framework_state fw;

1
src/BRSRC13/CORE/FW/genfile.h
View File

@ -1,7 +1,6 @@
#ifndef _GENFILE_H_
#define _GENFILE_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 12

1
src/BRSRC13/CORE/FW/image.h
View File

@ -1,7 +1,6 @@
#ifndef _IMAGE_H_
#define _IMAGE_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 11

1
src/BRSRC13/CORE/FW/lexer.h
View File

@ -1,7 +1,6 @@
#ifndef _LEXER_H_
#define _LEXER_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 11

1
src/BRSRC13/CORE/FW/loader.h
View File

@ -1,7 +1,6 @@
#ifndef _LOADER_H_
#define _LOADER_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 10

1
src/BRSRC13/CORE/FW/mem.h
View File

@ -1,7 +1,6 @@
#ifndef _MEM_H_
#define _MEM_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 14

1
src/BRSRC13/CORE/FW/object.h
View File

@ -1,7 +1,6 @@
#ifndef _OBJECT_H_
#define _OBJECT_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 19

1
src/BRSRC13/CORE/FW/objectc.h
View File

@ -1,7 +1,6 @@
#ifndef _OBJECTC_H_
#define _OBJECTC_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 21

1
src/BRSRC13/CORE/FW/pattern.h
View File

@ -1,7 +1,6 @@
#ifndef _PATTERN_H_
#define _PATTERN_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 19

1
src/BRSRC13/CORE/FW/register.h
View File

@ -1,7 +1,6 @@
#ifndef _REGISTER_H_
#define _REGISTER_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 14

1
src/BRSRC13/CORE/FW/resource.h
View File

@ -1,7 +1,6 @@
#ifndef _RESOURCE_H_
#define _RESOURCE_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 10

2
src/BRSRC13/CORE/FW/resreg.h
View File

@ -1,7 +1,7 @@
#ifndef _RESREG_H_
#define _RESREG_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 14

1
src/BRSRC13/CORE/FW/scratch.h
View File

@ -1,7 +1,6 @@
#ifndef _SCRATCH_H_
#define _SCRATCH_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 18

1
src/BRSRC13/CORE/FW/sys_conf.h
View File

@ -1,7 +1,6 @@
#ifndef _SYS_CONF_H_
#define _SYS_CONF_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 26

1
src/BRSRC13/CORE/FW/token.h
View File

@ -1,7 +1,6 @@
#ifndef _TOKEN_H_
#define _TOKEN_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 13

1
src/BRSRC13/CORE/FW/tokenval.h
View File

@ -1,7 +1,6 @@
#ifndef _TOKENVAL_H_
#define _TOKENVAL_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 21

1
src/BRSRC13/CORE/HOST/himage.h
View File

@ -1,7 +1,6 @@
#ifndef _HIMAGE_H_
#define _HIMAGE_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 14

1
src/BRSRC13/CORE/HOST/hook.h
View File

@ -1,7 +1,6 @@
#ifndef _HOOK_H_
#define _HOOK_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 18

1
src/BRSRC13/CORE/HOST/hostcfg.h
View File

@ -1,7 +1,6 @@
#ifndef _HOSTCFG_H_
#define _HOSTCFG_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 18

1
src/BRSRC13/CORE/HOST/hstsetup.h
View File

@ -1,7 +1,6 @@
#ifndef _HSTSETUP_H_
#define _HSTSETUP_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 10

6
src/BRSRC13/CORE/HOST/memmgmt.c
View File

@ -1,5 +1,9 @@
#include "memmgmt.h"
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
host_regs regs;
// Offset: 9
@ -64,6 +68,6 @@ br_error HostSelectorBaseQuery(br_uint_32 *basep, br_uint_16 sel) {
// Size: 175
br_error HostSelectorLimitQuery(br_uint_32 *limitp, br_uint_16 sel) {
br_uint_32 limit;
ldt ldt;
ldt ldta;
}

1
src/BRSRC13/CORE/HOST/memmgmt.h
View File

@ -1,7 +1,6 @@
#ifndef _MEMMGMT_H_
#define _MEMMGMT_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 9

1
src/BRSRC13/CORE/MATH/angles.h
View File

@ -1,7 +1,6 @@
#ifndef _ANGLES_H_
#define _ANGLES_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 18

1
src/BRSRC13/CORE/MATH/matrix23.h
View File

@ -1,7 +1,6 @@
#ifndef _MATRIX23_H_
#define _MATRIX23_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 15

1
src/BRSRC13/CORE/MATH/matrix34.h
View File

@ -1,7 +1,6 @@
#ifndef _MATRIX34_H_
#define _MATRIX34_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 15

1
src/BRSRC13/CORE/MATH/matrix4.h
View File

@ -1,7 +1,6 @@
#ifndef _MATRIX4_H_
#define _MATRIX4_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 14

1
src/BRSRC13/CORE/MATH/plane.h
View File

@ -1,7 +1,6 @@
#ifndef _PLANE_H_
#define _PLANE_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 16

1
src/BRSRC13/CORE/MATH/quat.h
View File

@ -1,7 +1,6 @@
#ifndef _QUAT_H_
#define _QUAT_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 10

1
src/BRSRC13/CORE/MATH/transfrm.h
View File

@ -1,7 +1,6 @@
#ifndef _TRANSFRM_H_
#define _TRANSFRM_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 22

1
src/BRSRC13/CORE/MATH/vector.h
View File

@ -1,7 +1,6 @@
#ifndef _VECTOR_H_
#define _VECTOR_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 14

1
src/BRSRC13/CORE/PIXELMAP/fontptrs.h
View File

@ -1,7 +1,6 @@
#ifndef _FONTPTRS_H_
#define _FONTPTRS_H_
#include "dr_types.h"
#include "br_types.h"
#endif

1
src/BRSRC13/CORE/PIXELMAP/genclip.h
View File

@ -1,7 +1,6 @@
#ifndef _GENCLIP_H_
#define _GENCLIP_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 18

1
src/BRSRC13/CORE/PIXELMAP/gencopy.h
View File

@ -1,7 +1,6 @@
#ifndef _GENCOPY_H_
#define _GENCOPY_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 21

1
src/BRSRC13/CORE/PIXELMAP/pixelmap.h
View File

@ -1,7 +1,6 @@
#ifndef _PIXELMAP_H_
#define _PIXELMAP_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 19

2
src/BRSRC13/CORE/PIXELMAP/pmdsptch.c
View File

@ -1,5 +1,7 @@
#include "pmdsptch.h"
#include <stdarg.h>
char rscid[65];
// Offset: 22

1
src/BRSRC13/CORE/PIXELMAP/pmdsptch.h
View File

@ -1,7 +1,6 @@
#ifndef _PMDSPTCH_H_
#define _PMDSPTCH_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 22

1
src/BRSRC13/CORE/PIXELMAP/pmfile.h
View File

@ -1,7 +1,6 @@
#ifndef _PMFILE_H_
#define _PMFILE_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 18

1
src/BRSRC13/CORE/PIXELMAP/pmgen.h
View File

@ -1,7 +1,6 @@
#ifndef _PMGEN_H_
#define _PMGEN_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 32

1
src/BRSRC13/CORE/PIXELMAP/pmmem.h
View File

@ -1,7 +1,6 @@
#ifndef _PMMEM_H_
#define _PMMEM_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 26

1
src/BRSRC13/CORE/PIXELMAP/pmnull.h
View File

@ -1,7 +1,6 @@
#ifndef _PMNULL_H_
#define _PMNULL_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 34

1
src/BRSRC13/CORE/PIXELMAP/pmsetup.h
View File

@ -1,7 +1,6 @@
#ifndef _PMSETUP_H_
#define _PMSETUP_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 16

1
src/BRSRC13/CORE/STD/brexcept.h
View File

@ -1,7 +1,6 @@
#ifndef _BREXCEPT_H_
#define _BREXCEPT_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 18

1
src/BRSRC13/CORE/STD/brmath.h
View File

@ -1,7 +1,6 @@
#ifndef _BRMATH_H_
#define _BRMATH_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 13

1
src/BRSRC13/CORE/STD/brstddiag.h
View File

@ -1,7 +1,6 @@
#ifndef _STDDIAG_H_
#define _STDDIAG_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 15

1
src/BRSRC13/CORE/STD/brstdfile.h
View File

@ -1,7 +1,6 @@
#ifndef _BRSTDFILE_H_
#define _BRSTDFILE_H_
#include "dr_types.h"
#include "br_types.h"
extern br_filesystem *_BrDefaultFilesystem;

10
src/BRSRC13/CORE/STD/brstdlib.c
View File

@ -2,9 +2,7 @@
#include <ctype.h>
#include <errno.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -55,7 +53,7 @@ int BrStrICmp(char *s1, char *s2) {
// Offset: 355
// Size: 47
char* BrStrCpy(char *s1, char *s2) {
char* BrStrCpy(char *s1, const char *s2) {
return strcpy(s1, s2);
}
@ -156,13 +154,13 @@ br_boolean BrIsPrint(int c) {
// Offset: 1340
// Size: 50
br_int_32 BrVSprintf(char *buf, char *fmt, va_list args) {
br_int_32 BrVSprintf(char *buf, const char *fmt, va_list args) {
return vsprintf(buf, fmt, args);
}
// Offset: 1402
// Size: 101
br_int_32 BrVSprintfN(char *buf, br_size_t buf_size, char *fmt, va_list args) {
br_int_32 BrVSprintfN(char *buf, br_size_t buf_size, const char *fmt, va_list args) {
// Most C libs have vsnprintf these days that can replace this.
unsigned int n;
char tmp[512];
@ -179,7 +177,7 @@ br_int_32 BrVSprintfN(char *buf, br_size_t buf_size, char *fmt, va_list args) {
// Offset: 1513
// Size: 50
br_int_32 BrVSScanf(char *buf, char *fmt, va_list args) {
br_int_32 BrVSScanf(char *buf, const char *fmt, va_list args) {
return vsscanf(buf, fmt, args);
}

12
src/BRSRC13/CORE/STD/brstdlib.h
View File

@ -5,9 +5,11 @@
#ifndef _BRSTDLIB_H_
#define _BRSTDLIB_H_
#include "dr_types.h"
#include "br_types.h"
#include <stdarg.h>
#include <stdlib.h>
// Offset: 9
// Size: 50
int BrMemCmp(void *s1, void *s2, size_t n);
@ -34,7 +36,7 @@ int BrStrICmp(char *s1, char *s2);
// Offset: 355
// Size: 47
char* BrStrCpy(char *s1, char *s2);
char* BrStrCpy(char *s1, const char *s2);
// Offset: 411
// Size: 44
@ -98,15 +100,15 @@ br_boolean BrIsPrint(int c);
// Offset: 1340
// Size: 50
br_int_32 BrVSprintf(char *buf, char *fmt, va_list args);
br_int_32 BrVSprintf(char *buf, const char *fmt, va_list args);
// Offset: 1402
// Size: 101
br_int_32 BrVSprintfN(char *buf, br_size_t buf_size, char *fmt, va_list args);
br_int_32 BrVSprintfN(char *buf, br_size_t buf_size, const char *fmt, va_list args);
// Offset: 1513
// Size: 50
br_int_32 BrVSScanf(char *buf, char *fmt, va_list args);
br_int_32 BrVSScanf(char *buf, const char *fmt, va_list args);
#endif

1
src/BRSRC13/CORE/STD/brstdmem.h
View File

@ -1,7 +1,6 @@
#ifndef _BRSTDMEM_H_
#define _BRSTDMEM_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 17

1
src/BRSRC13/CORE/STD/logwrite.h
View File

@ -1,7 +1,6 @@
#ifndef _LOGWRITE_H_
#define _LOGWRITE_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 11

1
src/BRSRC13/CORE/V1DB/actsupt.h
View File

@ -1,7 +1,6 @@
#ifndef _ACTSUPT_H_
#define _ACTSUPT_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 12

1
src/BRSRC13/CORE/V1DB/custsupt.h
View File

@ -1,7 +1,6 @@
#ifndef _CUSTSUPT_H_
#define _CUSTSUPT_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 21

1
src/BRSRC13/CORE/V1DB/dbsetup.h
View File

@ -1,7 +1,6 @@
#ifndef _DBSETUP_H_
#define _DBSETUP_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 12

1
src/BRSRC13/CORE/V1DB/def_mat.h
View File

@ -1,7 +1,6 @@
#ifndef _DEF_MAT_H_
#define _DEF_MAT_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 21

1
src/BRSRC13/CORE/V1DB/def_mdl.h
View File

@ -1,7 +1,6 @@
#ifndef _DEF_MDL_H_
#define _DEF_MDL_H_
#include "dr_types.h"
#include "br_types.h"
#endif

1
src/BRSRC13/CORE/V1DB/def_otab.h
View File

@ -1,7 +1,6 @@
#ifndef _DEF_OTAB_H_
#define _DEF_OTAB_H_
#include "dr_types.h"
#include "br_types.h"
#endif

1
src/BRSRC13/CORE/V1DB/enables.h
View File

@ -1,7 +1,6 @@
#ifndef _ENABLES_H_
#define _ENABLES_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 12

1
src/BRSRC13/CORE/V1DB/matsupt.h
View File

@ -1,7 +1,6 @@
#ifndef _MATSUPT_H_
#define _MATSUPT_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 19

1
src/BRSRC13/CORE/V1DB/modrend.h
View File

@ -1,7 +1,6 @@
#ifndef _MODREND_H_
#define _MODREND_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 12

1
src/BRSRC13/CORE/V1DB/modsupt.h
View File

@ -1,7 +1,6 @@
#ifndef _MODSUPT_H_
#define _MODSUPT_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 16

1
src/BRSRC13/CORE/V1DB/otable.h
View File

@ -1,7 +1,6 @@
#ifndef _OTABLE_H_
#define _OTABLE_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 23

1
src/BRSRC13/CORE/V1DB/prepmap.h
View File

@ -1,7 +1,6 @@
#ifndef _PREPMAP_H_
#define _PREPMAP_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 12

1
src/BRSRC13/CORE/V1DB/prepmatl.h
View File

@ -1,7 +1,6 @@
#ifndef _PREPMATL_H_
#define _PREPMATL_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 17

1
src/BRSRC13/CORE/V1DB/prepmesh.h
View File

@ -1,7 +1,6 @@
#ifndef _PREPMESH_H_
#define _PREPMESH_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 8

1
src/BRSRC13/CORE/V1DB/preptab.h
View File

@ -1,7 +1,6 @@
#ifndef _PREPTAB_H_
#define _PREPTAB_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 14

1
src/BRSRC13/CORE/V1DB/regsupt.h
View File

@ -1,7 +1,6 @@
#ifndef _REGSUPT_H_
#define _REGSUPT_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 11

1
src/BRSRC13/CORE/V1DB/render.h
View File

@ -1,7 +1,6 @@
#ifndef _RENDER_H_
#define _RENDER_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 16

2
src/BRSRC13/CORE/V1DB/v1dbfile.c
View File

@ -1,5 +1,7 @@
#include "v1dbfile.h"
#include <stdlib.h>
br_chunks_table_entry MaterialLoadEntries[8];
br_chunks_table MaterialLoadTable;
br_chunks_table ActorLoadTable;

1
src/BRSRC13/CORE/V1DB/v1dbfile.h
View File

@ -1,7 +1,6 @@
#ifndef _V1DBFILE_H_
#define _V1DBFILE_H_
#include "dr_types.h"
#include "br_types.h"
// Offset: 18

29
src/BRSRC13/Makefile Normal file
View File

@ -0,0 +1,29 @@
TARGET_EXEC ?= c1
BUILD_DIR ?= ./build
SRC_DIR ?= .
SRCS := $(shell find $(SRC_DIR) -name *.c)
OBJS := $(SRCS:%=$(BUILD_DIR)/%.o)
DEPS := $(OBJS:.o=.d)
INC_DIRS := $(shell find $(SRC_DIR) -type d)
INC_FLAGS := $(addprefix -I,$(INC_DIRS))
CFLAGS ?= $(INC_FLAGS) -Wno-return-type -Wno-missing-declarations -Werror=implicit-function-declaration
.PHONY: clean build
build: $(OBJS)
# c source
$(BUILD_DIR)/%.c.o: %.c
@$(MKDIR_P) $(dir $@)
@$(CC) $(CFLAGS) -c $< -o $@
clean:
$(RM) -r $(BUILD_DIR)
-include $(DEPS)
MKDIR_P ?= mkdir -p

374
src/types/br_types.h → src/BRSRC13/br_types.h
View File

@ -1,6 +1,8 @@
#ifndef BR_TYPES_H
#define BR_TYPES_H
#include <setjmp.h>
typedef long br_int_32;
typedef unsigned long br_uint_32;
typedef short br_int_16;
@ -2324,7 +2326,7 @@ typedef struct br_token_entry {
br_int_32 base_length;
} br_token_entry;
typedef unsigned int jmp_buf[13];
typedef struct br_exception_handler br_exception_handler;
typedef struct br_exception_handler {
br_exception_handler *prev;
@ -2337,5 +2339,375 @@ typedef struct br_pixelmap_state {
br_tv_template *pixelmap_match_template;
} br_pixelmap_state;
typedef struct pm_type_info {
br_uint_16 bits;
br_uint_16 file_size;
br_uint_16 align;
br_uint_16 channels;
} pm_type_info;
typedef struct match_tokens {
br_token use;
br_uint_8 pixel_type;
br_int_32 pixel_bits;
br_int_32 width;
br_int_32 height;
br_object *renderer;
} match_tokens;
typedef struct host_info {
br_uint_32 size;
char identifier[40];
br_uint_32 capabilities;
br_token processor_family;
br_token processor_type;
} host_info;
typedef struct host_interrupt_hook {
br_uint_8 vector;
br_boolean active;
br_uint_32 old_offset;
br_uint_16 old_sel;
} host_interrupt_hook;
typedef struct host_exception_hook {
br_uint_8 exception;
br_boolean active;
br_uint_32 old_offset;
br_uint_16 old_sel;
br_uint_8 scratch[256];
} host_exception_hook;
typedef struct host_regs {
struct {
br_uint_32 edi;
br_uint_32 esi;
br_uint_32 ebp;
br_uint_32 _res;
br_uint_32 ebx;
br_uint_32 edx;
br_uint_32 ecx;
br_uint_32 eax;
br_uint_16 flags;
br_uint_16 es;
br_uint_16 ds;
br_uint_16 fs;
br_uint_16 gs;
br_uint_16 ip;
br_uint_16 cs;
br_uint_16 sp;
br_uint_16 ss;
}a;
struct {
br_uint_16 di;
br_uint_16 _pad0;
br_uint_16 si;
br_uint_16 _pad1;
br_uint_16 bp;
br_uint_16 _pad2;
br_uint_16 _res;
br_uint_16 _pad3;
br_uint_16 bx;
br_uint_16 _pad4;
br_uint_16 dx;
br_uint_16 _pad5;
br_uint_16 cx;
br_uint_16 _pad6;
br_uint_16 ax;
br_uint_16 _pad7;
br_uint_16 flags;
br_uint_16 es;
br_uint_16 ds;
br_uint_16 fs;
br_uint_16 gs;
br_uint_16 ip;
br_uint_16 cs;
br_uint_16 sp;
br_uint_16 ss;
}b;
struct {
br_uint_32 _pad0[4];
br_uint_8 bl;
br_uint_8 bh;
br_uint_8 _pad1;
br_uint_8 _pad2;
br_uint_8 dl;
br_uint_8 dh;
br_uint_8 _pad3;
br_uint_8 _pad4;
br_uint_8 cl;
br_uint_8 ch;
br_uint_8 _pad5;
br_uint_8 _pad6;
br_uint_8 al;
br_uint_8 ah;
br_uint_8 _pad7;
br_uint_8 _pad8;
}c;
} host_regs;
typedef struct ldt {
unsigned long limit_0: 10;
unsigned long base_0: 10;
unsigned long base_1: 8;
unsigned long type: 4;
unsigned long application: 1;
unsigned long dpl: 2;
unsigned long present: 1;
unsigned long limit_1: 4;
unsigned long system: 1;
unsigned long reserved: 1;
unsigned long use32: 1;
unsigned long granularity: 1;
unsigned long base_2: 8;
} ldt;
typedef struct msdos_header {
br_uint_16 magic;
br_uint_16 last_page_bytes;
br_uint_16 pages;
br_uint_16 n_relocations;
br_uint_16 header_size;
br_uint_16 minalloc;
br_uint_16 maxalloc;
br_uint_16 start_ss;
br_uint_16 start_sp;
br_uint_16 checksum;
br_uint_16 start_ip;
br_uint_16 start_cs;
br_uint_16 reloc_offset;
br_uint_16 overlay_number;
br_uint_16 _reserved0[4];
br_uint_16 oem_id;
br_uint_16 oem_info;
br_uint_16 _reserved1[10];
br_uint_32 new_header_offset;
} msdos_header;
typedef struct coff_header {
br_uint_16 machine;
br_uint_16 n_sections;
br_uint_32 time_date;
br_uint_32 symbols_offset;
br_uint_32 n_symbols;
br_uint_16 opt_header_size;
br_uint_16 flags;
} coff_header;
typedef struct nt_optional_header {
br_uint_16 magic;
br_uint_8 l_major;
br_uint_8 l_minor;
br_uint_32 code_size;
br_uint_32 data_size;
br_uint_32 bss_size;
br_uint_32 entry_point;
br_uint_32 code_base;
br_uint_32 data_base;
br_uint_32 image_base;
br_uint_32 section_alignment;
br_uint_32 file_alignment;
br_uint_16 os_major;
br_uint_16 os_minor;
br_uint_16 user_major;
br_uint_16 user_minor;
br_uint_16 subsys_major;
br_uint_16 subsys_minor;
br_uint_32 _reserved;
br_uint_32 image_size;
br_uint_32 header_size;
br_uint_32 file_checksum;
br_uint_16 subsystem;
br_uint_16 dll_flags;
br_uint_32 stack_reserve_size;
br_uint_32 stack_commit_size;
br_uint_32 heap_reserve_size;
br_uint_32 heap_commit_size;
br_uint_32 loader_flags;
br_uint_32 n_data_directories;
struct {
br_uint_32 rva;
br_uint_32 size;
};
} nt_optional_header;
typedef struct section_header {
br_uint_8 section_name[8];
br_uint_32 virtual_size;
br_uint_32 rva;
br_uint_32 data_size;
br_uint_32 data_offset;
br_uint_32 relocs_offset;
br_uint_32 linenums_offset;
br_uint_16 n_relocs;
br_uint_16 n_linenums;
br_uint_32 flags;
} section_header;
typedef struct resource_header {
br_simple_node node;
br_simple_list children;
br_uint_8 size_l;
br_uint_8 size_m;
br_uint_8 size_h;
br_uint_8 class;
void *magic_ptr;
int magic_num;
} resource_header;
typedef struct host_real_memory {
br_uint_32 pm_off;
br_uint_16 pm_seg;
br_uint_16 _reserved;
br_uint_16 rm_off;
br_uint_16 rm_seg;
} host_real_memory;
typedef struct file_info {
br_uint_32 type;
br_uint_32 version;
} file_info;
typedef struct object_list {
br_simple_list l;
} object_list;
typedef struct object_list_entry {
br_simple_node n;
br_object *h;
} object_list_entry;
typedef struct token_match {
br_token_value *original;
br_token_value *query;
br_int_32 n;
void *extra;
br_size_t extra_size;
} token_match;
typedef struct token_type {
char *identifier;
br_token type;
int length;
} token_type;
typedef struct export_directory {
br_uint_32 flags;
br_uint_32 timestamp;
br_uint_16 major_version;
br_uint_16 minor_version;
br_uint_32 name;
br_uint_32 ordinal_base;
br_uint_32 n_entries;
br_uint_32 n_names;
br_uint_32 export_table;
br_uint_32 name_table;
br_uint_32 ordinal_table;
} export_directory;
typedef struct import_directory {
br_uint_32 lookup_table;
br_uint_32 timestamp;
br_uint_32 forwarder;
br_uint_32 name;
br_uint_32 address_table;
} import_directory;
typedef struct basereloc_header {
br_uint_32 rva;
br_uint_32 size;
} basereloc_header;
typedef struct order_info {
br_uint_8 a0;
br_uint_8 a1;
br_uint_8 a2;
br_uint_8 _pad[1];
} order_info;
typedef struct transform_type {
br_uint_32 id;
br_file_struct *fs;
} transform_type;
typedef enum dosio_event_type {
DOSIO_EVENT_KEY_DOWN = 0,
DOSIO_EVENT_KEY_UP = 1,
DOSIO_EVENT_POINTER1_DOWN = 2,
DOSIO_EVENT_POINTER1_UP = 3,
DOSIO_EVENT_POINTER2_DOWN = 4,
DOSIO_EVENT_POINTER2_UP = 5,
DOSIO_EVENT_POINTER3_DOWN = 6,
DOSIO_EVENT_POINTER3_UP = 7,
DOSIO_EVENT_POINTER_MOVE = 8,
DOSIO_EVENT_MAX = 9
} dosio_event_type;
typedef enum dosio_event_qual {
DOSIO_QUAL_SHIFT = 1,
DOSIO_QUAL_CONTROL = 2,
DOSIO_QUAL_ALT = 4
} dosio_event_qual;
typedef struct dosio_event {
br_uint_16 type;
br_uint_16 qualifiers;
br_uint_32 value_1;
br_uint_32 value_2;
} dosio_event;
typedef struct dosio_event_queue {
br_uint_16 total;
br_uint_16 count;
br_uint_16 head;
br_uint_16 tail;
dosio_event slots[1];
} dosio_event_queue;
typedef struct pm_temp_edge {
struct pm_temp_edge *next;
br_uint_16 first;
br_uint_16 last;
char other;
} pm_temp_edge;
typedef struct prep_vertex {
br_vector3 n;
br_uint_16 v;
br_uint_16 f;
} prep_vertex;
typedef struct fmt_vertex {
br_vector3 p;
br_vector2 map;
br_vector3 n;
} DR_VERTEX, fmt_vertex;
typedef struct v11face {
br_uint_16 vertices[3];
br_uint_16 edges[3];
br_vector4 eqn;
} DR_FACE, v11face;
typedef struct v11group {
void *stored;
DR_FACE *faces;
br_colour *face_colours;
br_uint_16 *face_user;
DR_VERTEX *vertices;
br_colour *vertex_colours;
br_uint_16 *vertex_user;
br_uint_16 nfaces;
br_uint_16 nvertices;
br_uint_16 nedges;
} v11group;
typedef struct v11model {
br_size_t size;
br_uint_32 flags;
br_uint_16 ngroups;
br_vector3 pivot;
v11group *groups;
} v11model;
#endif

40
src/DETHRACE/Makefile Normal file
View File

@ -0,0 +1,40 @@
TARGET_EXEC ?= c1
BUILD_DIR ?= ./build
SRC_DIR ?= .
BR_SRC_DIR ?= ../BRSRC13
SRCS := $(shell find $(SRC_DIR) -name *.c)
OBJS := $(SRCS:%=$(BUILD_DIR)/%.o) $(shell find $(BR_SRC_DIR) -name *.o)
DEPS := $(OBJS:.o=.d)
INC_DIRS := $(shell find $(SRC_DIR) -type d) ../BRSRC13
INC_FLAGS := $(addprefix -I,$(INC_DIRS))
CFLAGS ?= $(INC_FLAGS) -Wno-return-type -Wno-missing-declarations -Werror=implicit-function-declaration
.PHONY: clean build test
build: $(BUILD_DIR)/$(TARGET_EXEC)
brender: $(BR_OBJS)
$(MAKE) -C BRSRC13
$(BUILD_DIR)/$(TARGET_EXEC): $(OBJS)
@$(CC) $(OBJS) -o $@ $(LDFLAGS)
# c source
$(BUILD_DIR)/%.c.o: %.c
@$(MKDIR_P) $(dir $@)
@$(CC) $(CFLAGS) -c $< -o $@
clean:
$(RM) -r $(BUILD_DIR)
test: build
$(BUILD_DIR)/$(TARGET_EXEC) -test
-include $(DEPS)
MKDIR_P ?= mkdir -p

4
src/DETHRACE/source/common/brucetrk.c → src/DETHRACE/common/brucetrk.c
View File

@ -1,5 +1,7 @@
#include "brucetrk.h"
#include "CORE/STD/brstdlib.h"
br_actor *gMr_blendy;
int gDefault_blend_pc;
@ -9,6 +11,8 @@ int gDefault_blend_pc;
// EDX: pDst
void AllocateActorMatrix(tTrack_spec *pTrack_spec, br_actor ****pDst) {
tU16 z;
char *s = "jeff";
BrStrLen(s);
}
// Offset: 204

0
src/DETHRACE/source/common/brucetrk.h → src/DETHRACE/common/brucetrk.h
View File

0
src/DETHRACE/source/common/car.c → src/DETHRACE/common/car.c
View File

0
src/DETHRACE/source/common/car.h → src/DETHRACE/common/car.h
View File

1
src/DETHRACE/source/common/controls.c → src/DETHRACE/common/controls.c
View File

@ -736,4 +736,3 @@ void InitAbuseomatic() {
// Size: 94
void DisposeAbuseomatic() {
}

0
src/DETHRACE/source/common/controls.h → src/DETHRACE/common/controls.h
View File

0
src/DETHRACE/source/common/crush.c → src/DETHRACE/common/crush.c
View File

0
src/DETHRACE/source/common/crush.h → src/DETHRACE/common/crush.h
View File

0
src/DETHRACE/source/common/cutscene.c → src/DETHRACE/common/cutscene.c
View File

Some files were not shown because too many files have changed in this diff Show More