wip
This commit is contained in:
Jeff Harris
parent
c57fc0e0a8
commit
25eeef2010
|
|
@ -24,7 +24,7 @@ BraceWrapping:
|
|||
AfterClass: false
|
||||
AfterControlStatement: false
|
||||
AfterEnum: false
|
||||
AfterFunction: true
|
||||
AfterFunction: false
|
||||
AfterNamespace: false
|
||||
AfterObjCDeclaration: false
|
||||
AfterStruct: false
|
||||
|
|
@ -33,7 +33,7 @@ BraceWrapping:
|
|||
BeforeElse: false
|
||||
IndentBraces: false
|
||||
BreakBeforeBinaryOperators: All
|
||||
BreakBeforeBraces: WebKit
|
||||
BreakBeforeBraces: Custom
|
||||
BreakBeforeTernaryOperators: true
|
||||
BreakConstructorInitializersBeforeComma: true
|
||||
BreakAfterJavaFieldAnnotations: false
|
||||
|
|
|
|||
|
|
@ -1,15 +1,28 @@
|
|||
#include "brbegin.h"
|
||||
|
||||
#include "CORE/HOST/himage.h"
|
||||
#include "CORE/PIXELMAP/pmsetup.h"
|
||||
#include "fwsetup.h"
|
||||
|
||||
br_boolean active;
|
||||
char rscid[54];
|
||||
|
||||
// Offset: 8
|
||||
// Size: 88
|
||||
br_error BrBegin() {
|
||||
if (active) {
|
||||
return 4103;
|
||||
} else {
|
||||
BrFwBegin();
|
||||
HostImageLoad("unk?");
|
||||
BrPixelmapBegin();
|
||||
active = 1;
|
||||
//nullsub_28();
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
// Offset: 102
|
||||
// Size: 126
|
||||
br_error BrEnd() {
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,67 +1,78 @@
|
|||
#include "brlists.h"
|
||||
|
||||
#include <unistd.h>
|
||||
|
||||
char rscid[49];
|
||||
|
||||
// Offset: 10
|
||||
// Size: 60
|
||||
void BrNewList(br_list *list) {
|
||||
void BrNewList(br_list* list) {
|
||||
list->_null = NULL;
|
||||
list->tail = (br_node*)list;
|
||||
list->head = list->_null;
|
||||
}
|
||||
|
||||
// Offset: 80
|
||||
// Size: 68
|
||||
void BrAddHead(br_list *list, br_node *node) {
|
||||
void BrAddHead(br_list* list, br_node* node) {
|
||||
}
|
||||
|
||||
// Offset: 158
|
||||
// Size: 73
|
||||
void BrAddTail(br_list *list, br_node *node) {
|
||||
void BrAddTail(br_list* list, br_node* node) {
|
||||
}
|
||||
|
||||
// Offset: 241
|
||||
// Size: 77
|
||||
br_node* BrRemHead(br_list *list) {
|
||||
br_node *n;
|
||||
br_node* BrRemHead(br_list* list) {
|
||||
br_node* n;
|
||||
}
|
||||
|
||||
// Offset: 328
|
||||
// Size: 77
|
||||
br_node* BrRemTail(br_list *list) {
|
||||
br_node *n;
|
||||
br_node* BrRemTail(br_list* list) {
|
||||
br_node* n;
|
||||
}
|
||||
|
||||
// Offset: 414
|
||||
// Size: 68
|
||||
void BrInsert(br_list *list, br_node *here, br_node *node) {
|
||||
void BrInsert(br_list* list, br_node* here, br_node* node) {
|
||||
}
|
||||
|
||||
// Offset: 491
|
||||
// Size: 66
|
||||
br_node* BrRemove(br_node *node) {
|
||||
br_node* BrRemove(br_node* node) {
|
||||
}
|
||||
|
||||
// Offset: 573
|
||||
// Size: 39
|
||||
void BrSimpleNewList(br_simple_list *list) {
|
||||
void BrSimpleNewList(br_simple_list* list) {
|
||||
list->head = NULL;
|
||||
}
|
||||
|
||||
// Offset: 628
|
||||
// Size: 76
|
||||
void BrSimpleAddHead(br_simple_list *list, br_simple_node *node) {
|
||||
void BrSimpleAddHead(br_simple_list* list, br_simple_node* node) {
|
||||
node->next = list->head;
|
||||
node->prev = &list->head;
|
||||
if (node->next) {
|
||||
node->next->prev = &node;
|
||||
}
|
||||
list->head = node;
|
||||
}
|
||||
|
||||
// Offset: 720
|
||||
// Size: 65
|
||||
br_simple_node* BrSimpleRemHead(br_simple_list *list) {
|
||||
br_simple_node *node;
|
||||
br_simple_node* BrSimpleRemHead(br_simple_list* list) {
|
||||
br_simple_node* node;
|
||||
}
|
||||
|
||||
// Offset: 800
|
||||
// Size: 76
|
||||
void BrSimpleInsert(br_simple_list *list, br_simple_node *here, br_simple_node *node) {
|
||||
void BrSimpleInsert(br_simple_list* list, br_simple_node* here, br_simple_node* node) {
|
||||
}
|
||||
|
||||
// Offset: 891
|
||||
// Size: 93
|
||||
br_simple_node* BrSimpleRemove(br_simple_node *node) {
|
||||
br_simple_node* BrSimpleRemove(br_simple_node* node) {
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -5,50 +5,50 @@
|
|||
|
||||
// Offset: 10
|
||||
// Size: 60
|
||||
void BrNewList(br_list *list);
|
||||
void BrNewList(br_list* list);
|
||||
|
||||
// Offset: 80
|
||||
// Size: 68
|
||||
void BrAddHead(br_list *list, br_node *node);
|
||||
void BrAddHead(br_list* list, br_node* node);
|
||||
|
||||
// Offset: 158
|
||||
// Size: 73
|
||||
void BrAddTail(br_list *list, br_node *node);
|
||||
void BrAddTail(br_list* list, br_node* node);
|
||||
|
||||
// Offset: 241
|
||||
// Size: 77
|
||||
br_node* BrRemHead(br_list *list);
|
||||
br_node* BrRemHead(br_list* list);
|
||||
|
||||
// Offset: 328
|
||||
// Size: 77
|
||||
br_node* BrRemTail(br_list *list);
|
||||
br_node* BrRemTail(br_list* list);
|
||||
|
||||
// Offset: 414
|
||||
// Size: 68
|
||||
void BrInsert(br_list *list, br_node *here, br_node *node);
|
||||
void BrInsert(br_list* list, br_node* here, br_node* node);
|
||||
|
||||
// Offset: 491
|
||||
// Size: 66
|
||||
br_node* BrRemove(br_node *node);
|
||||
br_node* BrRemove(br_node* node);
|
||||
|
||||
// Offset: 573
|
||||
// Size: 39
|
||||
void BrSimpleNewList(br_simple_list *list);
|
||||
void BrSimpleNewList(br_simple_list* list);
|
||||
|
||||
// Offset: 628
|
||||
// Size: 76
|
||||
void BrSimpleAddHead(br_simple_list *list, br_simple_node *node);
|
||||
void BrSimpleAddHead(br_simple_list* list, br_simple_node* node);
|
||||
|
||||
// Offset: 720
|
||||
// Size: 65
|
||||
br_simple_node* BrSimpleRemHead(br_simple_list *list);
|
||||
br_simple_node* BrSimpleRemHead(br_simple_list* list);
|
||||
|
||||
// Offset: 800
|
||||
// Size: 76
|
||||
void BrSimpleInsert(br_simple_list *list, br_simple_node *here, br_simple_node *node);
|
||||
void BrSimpleInsert(br_simple_list* list, br_simple_node* here, br_simple_node* node);
|
||||
|
||||
// Offset: 891
|
||||
// Size: 93
|
||||
br_simple_node* BrSimpleRemove(br_simple_node *node);
|
||||
br_simple_node* BrSimpleRemove(br_simple_node* node);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#include "diag.h"
|
||||
#include "fwsetup.h"
|
||||
#include "brprintf.h"
|
||||
#include "CORE/STD/brstdlib.h"
|
||||
#include "brprintf.h"
|
||||
#include "fwsetup.h"
|
||||
#include <stdarg.h>
|
||||
|
||||
// Global variables
|
||||
|
|
@ -10,7 +10,7 @@ char rscid[49];
|
|||
|
||||
// Offset: 10
|
||||
// Size: 118
|
||||
void BrFailure(const char *s, ...) {
|
||||
void BrFailure(const char* s, ...) {
|
||||
va_list args;
|
||||
const char failure_header[10] = "Failure: ";
|
||||
|
||||
|
|
@ -18,17 +18,17 @@ void BrFailure(const char *s, ...) {
|
|||
BrStrCpy(_diag_scratch, failure_header);
|
||||
BrVSprintf(&_diag_scratch[sizeof(failure_header) - 1], s, args);
|
||||
|
||||
if (fw.err->error == NULL) {
|
||||
if (fw.diag->failure == NULL) {
|
||||
BrAbort();
|
||||
}
|
||||
|
||||
fw.err->error(_diag_scratch);
|
||||
fw.diag->failure(_diag_scratch);
|
||||
va_end(args);
|
||||
}
|
||||
|
||||
// Offset: 138
|
||||
// Size: 118
|
||||
void BrWarning(const char *s, ...) {
|
||||
void BrWarning(const char* s, ...) {
|
||||
va_list args;
|
||||
const char warning_header[10] = "Warning: ";
|
||||
|
||||
|
|
@ -36,50 +36,49 @@ void BrWarning(const char *s, ...) {
|
|||
BrStrCpy(_diag_scratch, warning_header);
|
||||
BrVSprintf(&_diag_scratch[sizeof(warning_header) - 1], s, args);
|
||||
|
||||
if (fw.err->message == NULL) {
|
||||
if (fw.diag->warning == NULL) {
|
||||
BrAbort();
|
||||
}
|
||||
|
||||
fw.err->message(_diag_scratch);
|
||||
fw.diag->warning(_diag_scratch);
|
||||
va_end(args);
|
||||
}
|
||||
|
||||
// Offset: 264
|
||||
// Size: 132
|
||||
void BrFatal(const char *name, int line, const char *s, ...) {
|
||||
void BrFatal(const char* name, int line, const char* s, ...) {
|
||||
va_list args;
|
||||
int n;
|
||||
|
||||
va_start(args, s);
|
||||
n = BrSprintf(_diag_scratch, "FATAL %s:%d\n", name, line);
|
||||
BrVSprintf(&_diag_scratch[n], s, args);
|
||||
if (fw.err->error == NULL) {
|
||||
if (fw.diag->failure == NULL) {
|
||||
BrAbort();
|
||||
}
|
||||
|
||||
fw.err->error(_diag_scratch);
|
||||
fw.diag->failure(_diag_scratch);
|
||||
va_end(args);
|
||||
}
|
||||
|
||||
// Offset: 406
|
||||
// Size: 95
|
||||
void _BrAssert(const char *condition, const char *file, unsigned int line) {
|
||||
if (fw.err->error == NULL) {
|
||||
void _BrAssert(const char* condition, const char* file, unsigned int line) {
|
||||
if (fw.diag->failure == NULL) {
|
||||
BrAbort();
|
||||
}
|
||||
|
||||
BrSprintf(_diag_scratch, "ASSERTION FAILED %s:%d: \"%s\"\n", file, line, condition);
|
||||
fw.err->error(_diag_scratch);
|
||||
fw.diag->failure(_diag_scratch);
|
||||
}
|
||||
|
||||
// Offset: 512
|
||||
// Size: 95
|
||||
void _BrUAssert(const char *condition, const char *file, unsigned int line) {
|
||||
if (fw.err->error == NULL) {
|
||||
void _BrUAssert(const char* condition, const char* file, unsigned int line) {
|
||||
if (fw.diag->failure == NULL) {
|
||||
BrAbort();
|
||||
}
|
||||
|
||||
BrSprintf(_diag_scratch, "ASSERTION FAILED %s:%d: \"%s\"\n", file, line, condition);
|
||||
fw.err->error(_diag_scratch);
|
||||
fw.diag->failure(_diag_scratch);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,16 +1,91 @@
|
|||
#include "fwsetup.h"
|
||||
|
||||
#include "CORE/FW/brlists.h"
|
||||
#include "CORE/FW/file.h"
|
||||
#include "CORE/FW/image.h"
|
||||
#include "CORE/FW/object.h"
|
||||
#include "CORE/FW/register.h"
|
||||
#include "CORE/FW/resource.h"
|
||||
#include "CORE/FW/resreg.h"
|
||||
#include "CORE/FW/sys_conf.h"
|
||||
#include "CORE/FW/token.h"
|
||||
#include "CORE/STD/brstddiag.h"
|
||||
#include "CORE/STD/brstdfile.h"
|
||||
#include "CORE/STD/brstdmem.h"
|
||||
#include <stddef.h>
|
||||
#include <stdio.h>
|
||||
|
||||
br_image Image_BRCORE1;
|
||||
br_framework_state fw;
|
||||
void *functionPointers_BRCORE1[185];
|
||||
char *namePointers_BRCORE1[185];
|
||||
br_resource_class resourceClasses[25];
|
||||
void* functionPointers_BRCORE1[185];
|
||||
char* namePointers_BRCORE1[185];
|
||||
br_resource_class fw_resourceClasses[25] = {
|
||||
{ 0u, "REGISTRY", BR_MEMORY_REGISTRY, NULL, 0u },
|
||||
{ 0u, "ANCHOR", BR_MEMORY_ANCHOR, NULL, 0u },
|
||||
{ 0u, "RESOURCE_CLASS", BR_MEMORY_RESOURCE_CLASS, NULL, 0u },
|
||||
{ 0u, "SCRATCH,", BR_MEMORY_SCRATCH, NULL, 16u },
|
||||
{ 0u, "STRING", BR_MEMORY_STRING, NULL, 1u },
|
||||
{ 0u, "FILE", BR_MEMORY_FILE, &_BrFileFree, 0u },
|
||||
{ 0u, "POOL", BR_MEMORY_POOL, NULL, 16u },
|
||||
{ 0u, "EXCEPTION_HANDLER", BR_MEMORY_EXCEPTION_HANDLER, NULL, 0u },
|
||||
{ 0u, "TOKEN", BR_MEMORY_TOKEN, NULL, 0u },
|
||||
{ 0u, "TOKEN_MAP", BR_MEMORY_TOKEN_MAP, NULL, 8u },
|
||||
{ 0u, "DATAFILE", BR_MEMORY_DATAFILE, NULL, 0u },
|
||||
{ 0u, "LEXER", BR_MEMORY_LEXER, NULL, 0u },
|
||||
{ 0u, "OBJECT_LIST", BR_MEMORY_OBJECT_LIST, NULL, 0u },
|
||||
{ 0u, "OBJECT_LIST_ENTRY", BR_MEMORY_OBJECT_LIST_ENTRY, NULL, 0u },
|
||||
{ 0u, "APPLICATION", BR_MEMORY_APPLICATION, NULL, 0u },
|
||||
{ 0u, "IMAGE", BR_MEMORY_IMAGE, &_BrImageFree, 0u },
|
||||
{ 0u, "IMAGE_ARENA", BR_MEMORY_IMAGE_ARENA, NULL, 0u },
|
||||
{ 0u, "IMAGE_SECTIONS", BR_MEMORY_IMAGE_SECTIONS, NULL, 0u },
|
||||
{ 0u, "IMAGE_NAMES", BR_MEMORY_IMAGE_NAMES, NULL, 0u },
|
||||
{ 0u, "OBJECT", BR_MEMORY_OBJECT, &_BrObjectFree, 16u },
|
||||
{ 0u, "OBJECT_DATA", BR_MEMORY_OBJECT_DATA, NULL, 16u },
|
||||
{ 0u, "DRIVER", BR_MEMORY_DRIVER, NULL, 0u },
|
||||
{ 0u, "FMT_RESULTS", BR_MEMORY_FMT_RESULTS, NULL, 0u },
|
||||
{ 0u, "TOKEN_VALUE", BR_MEMORY_TOKEN_VALUE, NULL, 0u },
|
||||
{ 0u, "TOKEN_TEMPLATE", BR_MEMORY_TOKEN_TEMPLATE, NULL, 0u }
|
||||
};
|
||||
|
||||
br_uint_16 nameOrdinals_BRCORE1[185];
|
||||
char rscid[53];
|
||||
|
||||
#define NBR_DEV_SLOTS 16
|
||||
|
||||
// Offset: 10
|
||||
// Size: 324
|
||||
br_error BrFwBegin() {
|
||||
int i;
|
||||
|
||||
if (fw.active) {
|
||||
return 4103;
|
||||
}
|
||||
|
||||
if (!fw.diag)
|
||||
fw.diag = _BrDefaultDiagHandler;
|
||||
if (!fw.fsys)
|
||||
fw.fsys = _BrDefaultFilesystem;
|
||||
if (!fw.mem)
|
||||
fw.mem = _BrDefaultAllocator;
|
||||
fw.open_mode = 0;
|
||||
BrRegistryNew(&fw.reg_resource_classes);
|
||||
|
||||
printf("here21\n");
|
||||
fw.resource_class_index[BR_MEMORY_REGISTRY] = &fw_resourceClasses[0];
|
||||
fw.resource_class_index[BR_MEMORY_ANCHOR] = &fw_resourceClasses[1];
|
||||
fw.res = BrResAllocate(0, 0, BR_MEMORY_ANCHOR);
|
||||
for (i = 0; i < 25; i++) {
|
||||
BrResClassAdd(&fw_resourceClasses[i]);
|
||||
}
|
||||
BrNewList(&fw.images);
|
||||
fw.dev_slots = (br_open_device*)BrResAllocate(fw.res, sizeof(br_open_device) * NBR_DEV_SLOTS, BR_MEMORY_OBJECT_DATA);
|
||||
fw.ndev_slots = NBR_DEV_SLOTS;
|
||||
fw.active = 1;
|
||||
BrTokenBegin();
|
||||
BrSystemConfigBegin();
|
||||
fw.bAlreadyLoadedDrivers = 0;
|
||||
BrImageAdd(&Image_BRCORE1);
|
||||
return 0;
|
||||
}
|
||||
|
||||
// Offset: 342
|
||||
|
|
@ -20,19 +95,18 @@ br_error BrFwEnd() {
|
|||
|
||||
// Offset: 466
|
||||
// Size: 73
|
||||
br_diaghandler* BrDiagHandlerSet(br_diaghandler *newdh) {
|
||||
br_diaghandler *old;
|
||||
br_diaghandler* BrDiagHandlerSet(br_diaghandler* newdh) {
|
||||
br_diaghandler* old;
|
||||
}
|
||||
|
||||
// Offset: 555
|
||||
// Size: 73
|
||||
br_filesystem* BrFilesystemSet(br_filesystem *newfs) {
|
||||
br_filesystem *old;
|
||||
br_filesystem* BrFilesystemSet(br_filesystem* newfs) {
|
||||
br_filesystem* old;
|
||||
}
|
||||
|
||||
// Offset: 643
|
||||
// Size: 73
|
||||
br_allocator* BrAllocatorSet(br_allocator *newal) {
|
||||
br_allocator *old;
|
||||
br_allocator* BrAllocatorSet(br_allocator* newal) {
|
||||
br_allocator* old;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,16 +1,22 @@
|
|||
#include "mem.h"
|
||||
|
||||
#include "CORE/FW/fwsetup.h"
|
||||
#include "CORE/STD/brstdlib.h"
|
||||
|
||||
char rscid[45];
|
||||
|
||||
// Offset: 14
|
||||
// Size: 153
|
||||
void* BrMemAllocate(br_size_t size, br_uint_8 type) {
|
||||
void *b;
|
||||
void* b;
|
||||
b = fw.mem->allocate(size, type);
|
||||
BrMemSet(b, 0, size);
|
||||
return b;
|
||||
}
|
||||
|
||||
// Offset: 177
|
||||
// Size: 106
|
||||
void BrMemFree(void *block) {
|
||||
void BrMemFree(void* block) {
|
||||
}
|
||||
|
||||
// Offset: 296
|
||||
|
|
@ -22,19 +28,22 @@ br_size_t BrMemInquire(br_uint_8 type) {
|
|||
// Offset: 438
|
||||
// Size: 116
|
||||
br_int_32 BrMemAlign(br_uint_8 type) {
|
||||
br_int_32 i;
|
||||
br_int_32 i = 0;
|
||||
if (fw.mem->align) {
|
||||
i = fw.mem->align(type);
|
||||
}
|
||||
return i;
|
||||
}
|
||||
|
||||
// Offset: 566
|
||||
// Size: 161
|
||||
void* BrMemCalloc(int nelems, br_size_t size, br_uint_8 type) {
|
||||
void *b;
|
||||
void* b;
|
||||
}
|
||||
|
||||
// Offset: 739
|
||||
// Size: 120
|
||||
char* BrMemStrDup(char *str) {
|
||||
char* BrMemStrDup(char* str) {
|
||||
int l;
|
||||
char *nstr;
|
||||
char* nstr;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,26 +1,38 @@
|
|||
#include "register.h"
|
||||
|
||||
#include "brlists.h"
|
||||
#include "fwsetup.h"
|
||||
#include "resource.h"
|
||||
|
||||
char rscid[50];
|
||||
|
||||
// Offset: 14
|
||||
// Size: 96
|
||||
// EAX: reg
|
||||
void* BrRegistryNew(br_registry *reg) {
|
||||
void* BrRegistryNew(br_registry* reg) {
|
||||
BrNewList((br_list*)reg);
|
||||
reg->count = 0;
|
||||
}
|
||||
|
||||
// Offset: 126
|
||||
// Size: 126
|
||||
// EAX: reg
|
||||
void* BrRegistryClear(br_registry *reg) {
|
||||
br_registry_entry *e;
|
||||
void* BrRegistryClear(br_registry* reg) {
|
||||
br_registry_entry* e;
|
||||
}
|
||||
|
||||
// Offset: 266
|
||||
// Size: 159
|
||||
// EAX: reg
|
||||
// EDX: item
|
||||
void* BrRegistryAdd(br_registry *reg, void *item) {
|
||||
br_registry_entry *e;
|
||||
void* BrRegistryAdd(br_registry* reg, void* item) {
|
||||
br_registry_entry* e;
|
||||
|
||||
e = (br_registry_entry*)BrResAllocate(fw.res, sizeof(br_registry_entry), BR_MEMORY_REGISTRY);
|
||||
e->item = (void**)&item;
|
||||
BrAddHead(®->list, &e->node);
|
||||
reg->count++;
|
||||
return item;
|
||||
}
|
||||
|
||||
// Offset: 443
|
||||
|
|
@ -28,7 +40,7 @@ void* BrRegistryAdd(br_registry *reg, void *item) {
|
|||
// EAX: reg
|
||||
// EDX: items
|
||||
// EBX: n
|
||||
int BrRegistryAddMany(br_registry *reg, void **items, int n) {
|
||||
int BrRegistryAddMany(br_registry* reg, void** items, int n) {
|
||||
int i;
|
||||
}
|
||||
|
||||
|
|
@ -36,9 +48,9 @@ int BrRegistryAddMany(br_registry *reg, void **items, int n) {
|
|||
// Size: 198
|
||||
// EAX: reg
|
||||
// EDX: item
|
||||
void* BrRegistryRemove(br_registry *reg, void *item) {
|
||||
br_registry_entry *e;
|
||||
void *r;
|
||||
void* BrRegistryRemove(br_registry* reg, void* item) {
|
||||
br_registry_entry* e;
|
||||
void* r;
|
||||
}
|
||||
|
||||
// Offset: 827
|
||||
|
|
@ -46,7 +58,7 @@ void* BrRegistryRemove(br_registry *reg, void *item) {
|
|||
// EAX: reg
|
||||
// EDX: items
|
||||
// EBX: n
|
||||
int BrRegistryRemoveMany(br_registry *reg, void **items, int n) {
|
||||
int BrRegistryRemoveMany(br_registry* reg, void** items, int n) {
|
||||
int i;
|
||||
int r;
|
||||
}
|
||||
|
|
@ -55,8 +67,8 @@ int BrRegistryRemoveMany(br_registry *reg, void **items, int n) {
|
|||
// Size: 172
|
||||
// EAX: reg
|
||||
// EDX: pattern
|
||||
void* BrRegistryFind(br_registry *reg, char *pattern) {
|
||||
br_registry_entry *e;
|
||||
void* BrRegistryFind(br_registry* reg, char* pattern) {
|
||||
br_registry_entry* e;
|
||||
}
|
||||
|
||||
// Offset: 1204
|
||||
|
|
@ -65,8 +77,8 @@ void* BrRegistryFind(br_registry *reg, char *pattern) {
|
|||
// EDX: pattern
|
||||
// EBX: items
|
||||
// ECX: max
|
||||
int BrRegistryFindMany(br_registry *reg, char *pattern, void **items, int max) {
|
||||
br_registry_entry *e;
|
||||
int BrRegistryFindMany(br_registry* reg, char* pattern, void** items, int max) {
|
||||
br_registry_entry* e;
|
||||
int n;
|
||||
}
|
||||
|
||||
|
|
@ -74,8 +86,8 @@ int BrRegistryFindMany(br_registry *reg, char *pattern, void **items, int max) {
|
|||
// Size: 163
|
||||
// EAX: reg
|
||||
// EDX: pattern
|
||||
int BrRegistryCount(br_registry *reg, char *pattern) {
|
||||
br_registry_entry *e;
|
||||
int BrRegistryCount(br_registry* reg, char* pattern) {
|
||||
br_registry_entry* e;
|
||||
int n;
|
||||
}
|
||||
|
||||
|
|
@ -85,8 +97,8 @@ int BrRegistryCount(br_registry *reg, char *pattern) {
|
|||
// EDX: pattern
|
||||
// EBX: callback
|
||||
// ECX: arg
|
||||
int BrRegistryEnum(br_registry *reg, char *pattern, br_enum_cbfn *callback, void *arg) {
|
||||
br_registry_entry *e;
|
||||
int BrRegistryEnum(br_registry* reg, char* pattern, br_enum_cbfn* callback, void* arg) {
|
||||
br_registry_entry* e;
|
||||
int r;
|
||||
}
|
||||
|
||||
|
|
@ -95,7 +107,7 @@ int BrRegistryEnum(br_registry *reg, char *pattern, br_enum_cbfn *callback, void
|
|||
// EAX: reg
|
||||
// EDX: base
|
||||
// EBX: limit
|
||||
void* BrRegistryNewStatic(br_registry *reg, br_registry_entry *base, int limit) {
|
||||
void* BrRegistryNewStatic(br_registry* reg, br_registry_entry* base, int limit) {
|
||||
}
|
||||
|
||||
// Offset: 1907
|
||||
|
|
@ -103,13 +115,12 @@ void* BrRegistryNewStatic(br_registry *reg, br_registry_entry *base, int limit)
|
|||
// EAX: reg
|
||||
// EDX: base
|
||||
// EBX: item
|
||||
void* BrRegistryAddStatic(br_registry *reg, br_registry_entry *base, void *item) {
|
||||
void* BrRegistryAddStatic(br_registry* reg, br_registry_entry* base, void* item) {
|
||||
}
|
||||
|
||||
// Offset: 1979
|
||||
// Size: 48
|
||||
// EAX: reg
|
||||
// EDX: item
|
||||
void* BrRegistryRemoveStatic(br_registry *reg, void *item) {
|
||||
void* BrRegistryRemoveStatic(br_registry* reg, void* item) {
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,114 +1,160 @@
|
|||
#include "resource.h"
|
||||
|
||||
#include "brlists.h"
|
||||
#include "fwsetup.h"
|
||||
#include "mem.h"
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
char rscid[51];
|
||||
|
||||
// Offset: 10
|
||||
// Size: 188
|
||||
// EAX: r
|
||||
void* ResToUser(resource_header *r) {
|
||||
void* ResToUser(resource_header* r) {
|
||||
br_int_32 align;
|
||||
}
|
||||
|
||||
// Offset: 208
|
||||
// Size: 72
|
||||
// EAX: r
|
||||
resource_header* UserToRes(void *r) {
|
||||
br_uint_8 *p;
|
||||
resource_header* UserToRes(void* r) {
|
||||
br_uint_8* p;
|
||||
}
|
||||
|
||||
// Offset: 294
|
||||
// Size: 459
|
||||
void* BrResAllocate(void *vparent, br_size_t size, br_uint_8 res_class) {
|
||||
resource_header *res;
|
||||
resource_header *parent;
|
||||
void* BrResAllocate(void* vparent, br_size_t size, br_uint_8 res_class) {
|
||||
resource_header* res;
|
||||
resource_header* parent;
|
||||
br_int_32 malign;
|
||||
br_int_32 calign;
|
||||
br_int_32 pad;
|
||||
br_int_32 actual_pad;
|
||||
|
||||
br_int_32 actual_pad_2;
|
||||
|
||||
char* tmp;
|
||||
|
||||
malign = BrMemAlign(res_class) - 1;
|
||||
//LOWORD(size_plus_header_plus_3) = (size + 27) & 0xFFFC;
|
||||
printf("BrResAllocate: parent: %p, size: %d, class: %d, class_index: %p\n", vparent, size, res_class, fw.resource_class_index[res_class]);
|
||||
calign = fw.resource_class_index[res_class]->alignment;
|
||||
if (calign <= 0) {
|
||||
calign = 4;
|
||||
}
|
||||
malign--;
|
||||
calign--;
|
||||
|
||||
pad = (~malign & calign) + 3;
|
||||
actual_pad = (sizeof(resource_header) + pad) & 0xFFFC;
|
||||
actual_pad_2 = (size + sizeof(resource_header) + 3) & 0xFFFC;
|
||||
printf("pad: %d, %d, %d\n", malign, calign, pad);
|
||||
res = (resource_header*)BrMemAllocate(size + actual_pad, res_class);
|
||||
// if ((signed int)(((unsigned int)((char*)allocated + res_align_1) & ~res_align_1) - (_DWORD)allocated) > v8)
|
||||
// BrFailure((int)"Memory allocator broke alignment", v14);
|
||||
res->class = res_class;
|
||||
res->size_l = actual_pad_2 >> 2;
|
||||
res->size_m = actual_pad_2 >> 10;
|
||||
res->size_h = actual_pad_2 >> 18;
|
||||
BrSimpleNewList(&res->children);
|
||||
res->magic_ptr = res;
|
||||
res->magic_num = 0xDEADBEEF;
|
||||
|
||||
if (vparent) {
|
||||
tmp = vparent;
|
||||
while (*(tmp - 1) == 0) {
|
||||
tmp--;
|
||||
}
|
||||
parent = (resource_header*)(tmp - sizeof(resource_header));
|
||||
BrSimpleAddHead(&parent->children, &res->node);
|
||||
}
|
||||
printf("BrResAllocate returning res: %p, pad: %d, result: %p\n", res, pad, ((char*)res) + actual_pad);
|
||||
return ((char*)res) + actual_pad;
|
||||
}
|
||||
|
||||
// Offset: 771
|
||||
// Size: 367
|
||||
// EAX: res
|
||||
// EDX: callback
|
||||
void BrResInternalFree(resource_header *res, br_boolean callback) {
|
||||
void BrResInternalFree(resource_header* res, br_boolean callback) {
|
||||
int c;
|
||||
void *r;
|
||||
void* r;
|
||||
}
|
||||
|
||||
// Offset: 1148
|
||||
// Size: 79
|
||||
void BrResFree(void *vres) {
|
||||
void BrResFree(void* vres) {
|
||||
}
|
||||
|
||||
// Offset: 1247
|
||||
// Size: 76
|
||||
void BrResFreeNoCallback(void *vres) {
|
||||
void BrResFreeNoCallback(void* vres) {
|
||||
}
|
||||
|
||||
// Offset: 1332
|
||||
// Size: 259
|
||||
void* BrResAdd(void *vparent, void *vres) {
|
||||
resource_header *res;
|
||||
resource_header *parent;
|
||||
void* BrResAdd(void* vparent, void* vres) {
|
||||
resource_header* res;
|
||||
resource_header* parent;
|
||||
}
|
||||
|
||||
// Offset: 1603
|
||||
// Size: 141
|
||||
void* BrResRemove(void *vres) {
|
||||
resource_header *res;
|
||||
void* BrResRemove(void* vres) {
|
||||
resource_header* res;
|
||||
}
|
||||
|
||||
// Offset: 1755
|
||||
// Size: 132
|
||||
br_uint_8 BrResClass(void *vres) {
|
||||
resource_header *res;
|
||||
br_uint_8 BrResClass(void* vres) {
|
||||
resource_header* res;
|
||||
}
|
||||
|
||||
// Offset: 1900
|
||||
// Size: 266
|
||||
br_boolean BrResIsChild(void *vparent, void *vchild) {
|
||||
resource_header *parent;
|
||||
resource_header *child;
|
||||
resource_header *cp;
|
||||
br_boolean BrResIsChild(void* vparent, void* vchild) {
|
||||
resource_header* parent;
|
||||
resource_header* child;
|
||||
resource_header* cp;
|
||||
}
|
||||
|
||||
// Offset: 2176
|
||||
// Size: 177
|
||||
br_uint_32 BrResSize(void *vres) {
|
||||
resource_header *res;
|
||||
br_uint_32 BrResSize(void* vres) {
|
||||
resource_header* res;
|
||||
}
|
||||
|
||||
// Offset: 2366
|
||||
// Size: 80
|
||||
br_uint_32 ResSizeTotal(void *vres, br_uint_32 *ptotal) {
|
||||
br_uint_32 ResSizeTotal(void* vres, br_uint_32* ptotal) {
|
||||
}
|
||||
|
||||
// Offset: 2461
|
||||
// Size: 62
|
||||
br_uint_32 BrResSizeTotal(void *vres) {
|
||||
br_uint_32 BrResSizeTotal(void* vres) {
|
||||
br_uint_32 total;
|
||||
}
|
||||
|
||||
// Offset: 2538
|
||||
// Size: 226
|
||||
br_uint_32 BrResChildEnum(void *vres, br_resenum_cbfn *callback, void *arg) {
|
||||
resource_header *res;
|
||||
resource_header *rp;
|
||||
br_uint_32 BrResChildEnum(void* vres, br_resenum_cbfn* callback, void* arg) {
|
||||
resource_header* res;
|
||||
resource_header* rp;
|
||||
br_uint_32 r;
|
||||
}
|
||||
|
||||
// Offset: 2775
|
||||
// Size: 91
|
||||
br_uint_32 BrResCheck(void *vres, int no_tag) {
|
||||
resource_header *res;
|
||||
br_uint_32 BrResCheck(void* vres, int no_tag) {
|
||||
resource_header* res;
|
||||
}
|
||||
|
||||
// Offset: 2878
|
||||
// Size: 127
|
||||
char* BrResStrDup(void *vparent, char *str) {
|
||||
char* BrResStrDup(void* vparent, char* str) {
|
||||
int l;
|
||||
char *nstr;
|
||||
char* nstr;
|
||||
}
|
||||
|
||||
// Offset: 3026
|
||||
|
|
@ -117,22 +163,21 @@ char* BrResStrDup(void *vparent, char *str) {
|
|||
// EDX: putline
|
||||
// EBX: arg
|
||||
// ECX: level
|
||||
void InternalResourceDump(resource_header *res, br_putline_cbfn *putline, void *arg, int level) {
|
||||
void InternalResourceDump(resource_header* res, br_putline_cbfn* putline, void* arg, int level) {
|
||||
int i;
|
||||
char *cp;
|
||||
resource_header *child;
|
||||
br_resource_class *rclass;
|
||||
char* cp;
|
||||
resource_header* child;
|
||||
br_resource_class* rclass;
|
||||
}
|
||||
|
||||
// Offset: 3349
|
||||
// Size: 57
|
||||
void BrResDump(void *vres, br_putline_cbfn *putline, void *arg) {
|
||||
resource_header *res;
|
||||
void BrResDump(void* vres, br_putline_cbfn* putline, void* arg) {
|
||||
resource_header* res;
|
||||
}
|
||||
|
||||
// Offset: 3427
|
||||
// Size: 80
|
||||
char* BrResClassIdentifier(br_uint_8 res_class) {
|
||||
br_resource_class *rclass;
|
||||
br_resource_class* rclass;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,55 +1,69 @@
|
|||
#include "resreg.h"
|
||||
|
||||
#include "CORE/FW/fwsetup.h"
|
||||
#include "CORE/FW/register.h"
|
||||
#include <stddef.h>
|
||||
#include <stdio.h>
|
||||
|
||||
char rscid[48];
|
||||
|
||||
// Offset: 14
|
||||
// Size: 176
|
||||
br_resource_class* BrResClassAdd(br_resource_class *rclass) {
|
||||
br_resource_class *r;
|
||||
br_resource_class* BrResClassAdd(br_resource_class* rclass) {
|
||||
br_resource_class* r;
|
||||
|
||||
printf("BrResClassAdd (1) id: %s, %d = %p\n", rclass->identifier, rclass->res_class, fw.resource_class_index[rclass->res_class]);
|
||||
|
||||
r = BrRegistryAdd(&fw.reg_resource_classes, rclass);
|
||||
if (!r) {
|
||||
return NULL;
|
||||
}
|
||||
printf("BrResClassAdd (2) %d = %p\n", rclass->res_class, r);
|
||||
fw.resource_class_index[rclass->res_class] = r;
|
||||
return r;
|
||||
}
|
||||
|
||||
// Offset: 207
|
||||
// Size: 158
|
||||
br_resource_class* BrResClassRemove(br_resource_class *rclass) {
|
||||
br_resource_class *r;
|
||||
br_resource_class* BrResClassRemove(br_resource_class* rclass) {
|
||||
br_resource_class* r;
|
||||
}
|
||||
|
||||
// Offset: 380
|
||||
// Size: 49
|
||||
br_resource_class* BrResClassFind(char *pattern) {
|
||||
br_resource_class* BrResClassFind(char* pattern) {
|
||||
}
|
||||
|
||||
// Offset: 448
|
||||
// Size: 55
|
||||
br_resclass_find_cbfn* BrResClassFindHook(br_resclass_find_cbfn *hook) {
|
||||
br_resclass_find_cbfn *old;
|
||||
br_resclass_find_cbfn* BrResClassFindHook(br_resclass_find_cbfn* hook) {
|
||||
br_resclass_find_cbfn* old;
|
||||
}
|
||||
|
||||
// Offset: 521
|
||||
// Size: 83
|
||||
br_uint_32 BrResClassAddMany(br_resource_class **items, int n) {
|
||||
br_uint_32 BrResClassAddMany(br_resource_class** items, int n) {
|
||||
int i;
|
||||
}
|
||||
|
||||
// Offset: 625
|
||||
// Size: 100
|
||||
br_uint_32 BrResClassRemoveMany(br_resource_class **items, int n) {
|
||||
br_uint_32 BrResClassRemoveMany(br_resource_class** items, int n) {
|
||||
int i;
|
||||
int r;
|
||||
}
|
||||
|
||||
// Offset: 744
|
||||
// Size: 55
|
||||
br_uint_32 BrResClassFindMany(char *pattern, br_resource_class **items, int max) {
|
||||
br_uint_32 BrResClassFindMany(char* pattern, br_resource_class** items, int max) {
|
||||
}
|
||||
|
||||
// Offset: 815
|
||||
// Size: 49
|
||||
br_uint_32 BrResClassCount(char *pattern) {
|
||||
br_uint_32 BrResClassCount(char* pattern) {
|
||||
}
|
||||
|
||||
// Offset: 879
|
||||
// Size: 55
|
||||
br_uint_32 BrResClassEnum(char *pattern, br_resclass_enum_cbfn *callback, void *arg) {
|
||||
br_uint_32 BrResClassEnum(char* pattern, br_resclass_enum_cbfn* callback, void* arg) {
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,12 +3,15 @@
|
|||
|
||||
#include "br_types.h"
|
||||
|
||||
extern br_diaghandler BrStdioDiagHandler;
|
||||
extern br_diaghandler* _BrDefaultDiagHandler;
|
||||
|
||||
// Offset: 15
|
||||
// Size: 78
|
||||
void BrStdioWarning(char *message);
|
||||
void BrStdioWarning(char* message);
|
||||
|
||||
// Offset: 108
|
||||
// Size: 93
|
||||
void BrStdioFailure(char *message);
|
||||
void BrStdioFailure(char* message);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
#include "br_types.h"
|
||||
|
||||
extern br_filesystem *_BrDefaultFilesystem;
|
||||
extern br_filesystem* _BrDefaultFilesystem;
|
||||
|
||||
// Offset: 18
|
||||
// Size: 40
|
||||
|
|
@ -11,46 +11,46 @@ br_uint_32 BrStdioAttributes();
|
|||
|
||||
// Offset: 74
|
||||
// Size: 595
|
||||
void* BrStdioOpenRead(char *name, br_size_t n_magics, br_mode_test_cbfn *identify, int *mode_result);
|
||||
void* BrStdioOpenRead(char* name, br_size_t n_magics, br_mode_test_cbfn* identify, int* mode_result);
|
||||
|
||||
// Offset: 686
|
||||
// Size: 82
|
||||
void* BrStdioOpenWrite(char *name, int mode);
|
||||
void* BrStdioOpenWrite(char* name, int mode);
|
||||
|
||||
// Offset: 781
|
||||
// Size: 38
|
||||
void BrStdioClose(void *f);
|
||||
void BrStdioClose(void* f);
|
||||
|
||||
// Offset: 830
|
||||
// Size: 45
|
||||
int BrStdioEof(void *f);
|
||||
int BrStdioEof(void* f);
|
||||
|
||||
// Offset: 890
|
||||
// Size: 117
|
||||
int BrStdioGetChar(void *f);
|
||||
int BrStdioGetChar(void* f);
|
||||
|
||||
// Offset: 1022
|
||||
// Size: 41
|
||||
void BrStdioPutChar(int c, void *f);
|
||||
void BrStdioPutChar(int c, void* f);
|
||||
|
||||
// Offset: 1075
|
||||
// Size: 53
|
||||
br_size_t BrStdioRead(void *buf, br_size_t size, unsigned int n, void *f);
|
||||
br_size_t BrStdioRead(void* buf, br_size_t size, unsigned int n, void* f);
|
||||
|
||||
// Offset: 1141
|
||||
// Size: 53
|
||||
br_size_t BrStdioWrite(void *buf, br_size_t size, unsigned int n, void *f);
|
||||
br_size_t BrStdioWrite(void* buf, br_size_t size, unsigned int n, void* f);
|
||||
|
||||
// Offset: 1209
|
||||
// Size: 141
|
||||
br_size_t BrStdioGetLine(char *buf, br_size_t buf_len, void *f);
|
||||
br_size_t BrStdioGetLine(char* buf, br_size_t buf_len, void* f);
|
||||
|
||||
// Offset: 1365
|
||||
// Size: 54
|
||||
void BrStdioPutLine(char *buf, void *f);
|
||||
void BrStdioPutLine(char* buf, void* f);
|
||||
|
||||
// Offset: 1434
|
||||
// Size: 46
|
||||
void BrStdioAdvance(br_size_t count, void *f);
|
||||
void BrStdioAdvance(br_size_t count, void* f);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -5,44 +5,43 @@
|
|||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
|
||||
// Global variables
|
||||
// DOSPICK has "$Id: stdlib.c 2.4 1996/12/06 21:18:39 sam Exp $" for this. Do we want to implement these?
|
||||
char rscid[48];
|
||||
|
||||
// Offset: 9
|
||||
// Size: 50
|
||||
int BrMemCmp(void *s1, void *s2, size_t n) {
|
||||
int BrMemCmp(void* s1, void* s2, size_t n) {
|
||||
return memcmp(s1, s2, n);
|
||||
}
|
||||
|
||||
// Offset: 68
|
||||
// Size: 50
|
||||
void* BrMemCpy(void *s1, void *s2, size_t n) {
|
||||
void* BrMemCpy(void* s1, void* s2, size_t n) {
|
||||
memcpy(s1, s2, n);
|
||||
}
|
||||
|
||||
// Offset: 127
|
||||
// Size: 50
|
||||
void* BrMemSet(void *s, int c, size_t n) {
|
||||
void* BrMemSet(void* s, int c, size_t n) {
|
||||
memset(s, c, n);
|
||||
}
|
||||
|
||||
// Offset: 186
|
||||
// Size: 47
|
||||
char* BrStrCat(char *s1, char *s2) {
|
||||
char* BrStrCat(char* s1, char* s2) {
|
||||
return strcat(s1, s2);
|
||||
}
|
||||
|
||||
// Offset: 242
|
||||
// Size: 47
|
||||
int BrStrCmp(char *s1, char *s2) {
|
||||
int BrStrCmp(char* s1, char* s2) {
|
||||
return strcmp(s1, s2);
|
||||
}
|
||||
|
||||
// Offset: 299
|
||||
// Size: 47
|
||||
int BrStrICmp(char *s1, char *s2) {
|
||||
int BrStrICmp(char* s1, char* s2) {
|
||||
// Windows is stricmp, while posix is strcasecmp
|
||||
#ifdef _WIN32
|
||||
return stricmp(s1, s2);
|
||||
|
|
@ -53,25 +52,25 @@ int BrStrICmp(char *s1, char *s2) {
|
|||
|
||||
// Offset: 355
|
||||
// Size: 47
|
||||
char* BrStrCpy(char *s1, const char *s2) {
|
||||
char* BrStrCpy(char* s1, const char* s2) {
|
||||
return strcpy(s1, s2);
|
||||
}
|
||||
|
||||
// Offset: 411
|
||||
// Size: 44
|
||||
br_size_t BrStrLen(char *s) {
|
||||
br_size_t BrStrLen(char* s) {
|
||||
return strlen(s);
|
||||
}
|
||||
|
||||
// Offset: 465
|
||||
// Size: 50
|
||||
int BrStrNCmp(char *s1, char *s2, size_t n) {
|
||||
int BrStrNCmp(char* s1, char* s2, size_t n) {
|
||||
return strncmp(s1, s2, n);
|
||||
}
|
||||
|
||||
// Offset: 526
|
||||
// Size: 50
|
||||
int BrStrNICmp(char *s1, char *s2, size_t n) {
|
||||
int BrStrNICmp(char* s1, char* s2, size_t n) {
|
||||
// Windows is strnicmp, while posix is strncasecmp
|
||||
#ifdef _WIN32
|
||||
return strnicmp(s1, s2, n);
|
||||
|
|
@ -82,13 +81,13 @@ int BrStrNICmp(char *s1, char *s2, size_t n) {
|
|||
|
||||
// Offset: 586
|
||||
// Size: 50
|
||||
char* BrStrNCpy(char *s1, char *s2, size_t n) {
|
||||
char* BrStrNCpy(char* s1, char* s2, size_t n) {
|
||||
return strncpy(s1, s2, n);
|
||||
}
|
||||
|
||||
// Offset: 646
|
||||
// Size: 49
|
||||
char* BrStrRChr(char *s1, char c) {
|
||||
char* BrStrRChr(char* s1, char c) {
|
||||
return strrchr(s1, c);
|
||||
}
|
||||
|
||||
|
|
@ -100,31 +99,31 @@ void BrAbort(void) {
|
|||
|
||||
// Offset: 747
|
||||
// Size: 44
|
||||
char* BrGetEnv(char *name) {
|
||||
char* BrGetEnv(char* name) {
|
||||
return getenv(name);
|
||||
}
|
||||
|
||||
// Offset: 800
|
||||
// Size: 58
|
||||
float BrStrToF(char *nptr, char **endptr) {
|
||||
float BrStrToF(char* nptr, char** endptr) {
|
||||
return strtof(nptr, endptr);
|
||||
}
|
||||
|
||||
// Offset: 867
|
||||
// Size: 67
|
||||
double BrStrToD(char *nptr, char **endptr) {
|
||||
double BrStrToD(char* nptr, char** endptr) {
|
||||
return strtod(nptr, endptr);
|
||||
}
|
||||
|
||||
// Offset: 943
|
||||
// Size: 50
|
||||
long BrStrToL(char *nptr, char **endptr, int base) {
|
||||
long BrStrToL(char* nptr, char** endptr, int base) {
|
||||
return strtol(nptr, endptr, base);
|
||||
}
|
||||
|
||||
// Offset: 1003
|
||||
// Size: 50
|
||||
unsigned long BrStrToUL(char *nptr, char **endptr, int base) {
|
||||
unsigned long BrStrToUL(char* nptr, char** endptr, int base) {
|
||||
return strtoul(nptr, endptr, base);
|
||||
}
|
||||
|
||||
|
|
@ -154,13 +153,13 @@ br_boolean BrIsPrint(int c) {
|
|||
|
||||
// Offset: 1340
|
||||
// Size: 50
|
||||
br_int_32 BrVSprintf(char *buf, const 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, const 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];
|
||||
|
|
@ -177,7 +176,6 @@ br_int_32 BrVSprintfN(char *buf, br_size_t buf_size, const char *fmt, va_list ar
|
|||
|
||||
// Offset: 1513
|
||||
// Size: 50
|
||||
br_int_32 BrVSScanf(char *buf, const char *fmt, va_list args) {
|
||||
br_int_32 BrVSScanf(char* buf, const char* fmt, va_list args) {
|
||||
return vsscanf(buf, fmt, args);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,13 +3,16 @@
|
|||
|
||||
#include "br_types.h"
|
||||
|
||||
extern br_allocator BrStdlibAllocator;
|
||||
extern br_allocator* _BrDefaultAllocator;
|
||||
|
||||
// Offset: 17
|
||||
// Size: 80
|
||||
void* BrStdlibAllocate(br_size_t size, br_uint_8 type);
|
||||
|
||||
// Offset: 110
|
||||
// Size: 38
|
||||
void BrStdlibFree(void *mem);
|
||||
void BrStdlibFree(void* mem);
|
||||
|
||||
// Offset: 164
|
||||
// Size: 40
|
||||
|
|
|
|||
|
|
@ -1,13 +1,72 @@
|
|||
#include "dbsetup.h"
|
||||
|
||||
br_resource_class resourceClasses[14];
|
||||
#include "CORE/FW/brbegin.h"
|
||||
#include "CORE/FW/register.h"
|
||||
#include "CORE/FW/resource.h"
|
||||
#include "CORE/FW/resreg.h"
|
||||
#include "CORE/STD/brstdlib.h"
|
||||
#include "CORE/V1DB/def_mat.h"
|
||||
#include "CORE/V1DB/def_mdl.h"
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
br_resource_class v1db_resourceClasses[14] = {
|
||||
{ 0u, "VERTICES", BR_MEMORY_VERTICES, NULL, 0u },
|
||||
{ 0u, "FACES", BR_MEMORY_FACES, NULL, 0u },
|
||||
{ 0u, "MODEL", BR_MEMORY_MODEL, NULL, 0u },
|
||||
{ 0u, "MATERIAL", BR_MEMORY_MATERIAL, NULL, 0u },
|
||||
{ 0u, "MATERIAL_INDEX", BR_MEMORY_MATERIAL_INDEX, NULL, 0u },
|
||||
{ 0u, "ACTOR", BR_MEMORY_ACTOR, NULL, 0u },
|
||||
{ 0u, "LIGHT", BR_MEMORY_LIGHT, NULL, 0u },
|
||||
{ 0u, "CAMERA", BR_MEMORY_CAMERA, NULL, 0u },
|
||||
{ 0u, "BOUNDS", BR_MEMORY_BOUNDS, NULL, 0u },
|
||||
{ 0u, "CLIP_PLANE", BR_MEMORY_CLIP_PLANE, NULL, 0u },
|
||||
{ 0u, "TRANSFORM", BR_MEMORY_TRANSFORM, NULL, 0u },
|
||||
{ 0u, "ENABLED_ACTORS", BR_MEMORY_ENABLED_ACTORS, NULL, 0u },
|
||||
{ 0u, "PREPARED_MODEL", BR_MEMORY_PREPARED_MODEL, NULL, 32u },
|
||||
{ 0u, "ORDER_TABLE", BR_MEMORY_ORDER_TABLE, NULL, 32u }
|
||||
};
|
||||
|
||||
br_v1db_state v1db;
|
||||
|
||||
// Offset: 12
|
||||
// Size: 345
|
||||
br_error BrV1dbBegin() {
|
||||
char *devstr;
|
||||
char* devstr;
|
||||
br_size_t s;
|
||||
int i;
|
||||
|
||||
if (v1db.active) {
|
||||
return 4103;
|
||||
}
|
||||
|
||||
printf("BrV1dbBegin\n");
|
||||
|
||||
BrMemSet(&v1db, 0, sizeof(br_v1db_state));
|
||||
v1db.active = 1;
|
||||
BrRegistryNew(&v1db.reg_models);
|
||||
BrRegistryNew(&v1db.reg_materials);
|
||||
BrRegistryNew(&v1db.reg_textures);
|
||||
BrRegistryNew(&v1db.reg_tables);
|
||||
v1db.res = BrResAllocate(NULL, 0, BR_MEMORY_ANCHOR);
|
||||
|
||||
for (i = 0; i < 14; i++) {
|
||||
BrResClassAdd(&v1db_resourceClasses[i]);
|
||||
}
|
||||
|
||||
v1db.default_model = (br_model*)BrResAllocate(v1db.res, sizeof(br_model), BR_MEMORY_MODEL);
|
||||
memcpy(v1db.default_model, &_BrDefaultModel, sizeof(br_model));
|
||||
v1db.default_material = SetupDefaultMaterial();
|
||||
v1db.enabled_lights.type = 2;
|
||||
v1db.enabled_clip_planes.name = "clip plane";
|
||||
v1db.enabled_clip_planes.type = 7;
|
||||
v1db.enabled_lights.max = 16;
|
||||
v1db.enabled_lights.name = "light";
|
||||
v1db.enabled_clip_planes.max = 6;
|
||||
v1db.enabled_horizon_planes.max = 6;
|
||||
v1db.enabled_horizon_planes.name = "horizon plane";
|
||||
v1db.enabled_horizon_planes.type = 8;
|
||||
return 0;
|
||||
}
|
||||
|
||||
// Offset: 367
|
||||
|
|
@ -17,48 +76,48 @@ br_error BrV1dbEnd() {
|
|||
|
||||
// Offset: 482
|
||||
// Size: 89
|
||||
br_uint_32 updateTable(br_pixelmap *item, void *arg) {
|
||||
br_uint_32 updateTable(br_pixelmap* item, void* arg) {
|
||||
}
|
||||
|
||||
// Offset: 581
|
||||
// Size: 89
|
||||
br_uint_32 updateMap(br_pixelmap *item, void *arg) {
|
||||
br_uint_32 updateMap(br_pixelmap* item, void* arg) {
|
||||
}
|
||||
|
||||
// Offset: 685
|
||||
// Size: 89
|
||||
br_uint_32 updateMaterial(br_material *item, void *arg) {
|
||||
br_uint_32 updateMaterial(br_material* item, void* arg) {
|
||||
}
|
||||
|
||||
// Offset: 786
|
||||
// Size: 89
|
||||
br_uint_32 updateModel(br_model *item, void *arg) {
|
||||
br_uint_32 updateModel(br_model* item, void* arg) {
|
||||
}
|
||||
|
||||
// Offset: 886
|
||||
// Size: 79
|
||||
br_uint_32 clearTable(br_pixelmap *item, void *arg) {
|
||||
br_uint_32 clearTable(br_pixelmap* item, void* arg) {
|
||||
}
|
||||
|
||||
// Offset: 974
|
||||
// Size: 79
|
||||
br_uint_32 clearMap(br_pixelmap *item, void *arg) {
|
||||
br_uint_32 clearMap(br_pixelmap* item, void* arg) {
|
||||
}
|
||||
|
||||
// Offset: 1067
|
||||
// Size: 79
|
||||
br_uint_32 clearMaterial(br_material *item, void *arg) {
|
||||
br_uint_32 clearMaterial(br_material* item, void* arg) {
|
||||
}
|
||||
|
||||
// Offset: 1157
|
||||
// Size: 79
|
||||
br_uint_32 clearModel(br_model *item, void *arg) {
|
||||
br_uint_32 clearModel(br_model* item, void* arg) {
|
||||
}
|
||||
|
||||
// Offset: 1256
|
||||
// Size: 462
|
||||
br_error BrV1dbRendererBegin(br_device_pixelmap *destination, br_renderer *renderer) {
|
||||
br_renderer_facility *renderer_facility;
|
||||
br_error BrV1dbRendererBegin(br_device_pixelmap* destination, br_renderer* renderer) {
|
||||
br_renderer_facility* renderer_facility;
|
||||
br_error r;
|
||||
br_token_value tv[2];
|
||||
}
|
||||
|
|
@ -80,7 +139,7 @@ void BrZbBegin(br_uint_8 colour_type, br_uint_8 depth_type) {
|
|||
|
||||
// Offset: 2133
|
||||
// Size: 141
|
||||
void BrZsBegin(br_uint_8 colour_type, void *primitive, br_uint_32 size) {
|
||||
void BrZsBegin(br_uint_8 colour_type, void* primitive, br_uint_32 size) {
|
||||
}
|
||||
|
||||
// Offset: 2282
|
||||
|
|
@ -96,10 +155,11 @@ void BrZsEnd() {
|
|||
// Offset: 2445
|
||||
// Size: 40
|
||||
void BrV1dbBeginWrapper_Float() {
|
||||
BrBegin();
|
||||
BrV1dbBegin();
|
||||
}
|
||||
|
||||
// Offset: 2502
|
||||
// Size: 40
|
||||
void BrV1dbEndWrapper() {
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,4 +3,6 @@
|
|||
|
||||
#include "br_types.h"
|
||||
|
||||
extern br_model _BrDefaultModel;
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ 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
|
||||
CFLAGS ?= $(INC_FLAGS) -g -Wno-return-type -Wno-missing-declarations -Werror=implicit-function-declaration
|
||||
|
||||
.PHONY: clean build
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,42 @@
|
|||
#include "framework/unity.h"
|
||||
|
||||
#include "CORE/FW/brlists.h"
|
||||
#include <string.h>
|
||||
|
||||
void test_brlists_BrSimpleList() {
|
||||
br_simple_list list;
|
||||
br_simple_node one;
|
||||
br_simple_node two;
|
||||
br_simple_node three;
|
||||
|
||||
BrSimpleNewList(&list);
|
||||
TEST_ASSERT_NULL(list.head);
|
||||
|
||||
BrSimpleAddHead(&list, &one);
|
||||
TEST_ASSERT_EQUAL_PTR(&one, list.head);
|
||||
TEST_ASSERT_NULL(list.head->next);
|
||||
|
||||
//TODO: should be null?
|
||||
TEST_ASSERT_EQUAL_PTR(&one, *list.head->prev);
|
||||
|
||||
BrSimpleAddHead(&list, &two);
|
||||
TEST_ASSERT_EQUAL_PTR(&two, list.head);
|
||||
TEST_ASSERT_EQUAL_PTR(&one, list.head->next);
|
||||
|
||||
//TODO: this should be "2" IMO
|
||||
TEST_ASSERT_EQUAL_PTR(&one, *list.head->next->prev);
|
||||
|
||||
BrSimpleAddHead(&list, &three);
|
||||
TEST_ASSERT_EQUAL_PTR(&three, list.head);
|
||||
TEST_ASSERT_EQUAL_PTR(&two, list.head->next);
|
||||
TEST_ASSERT_EQUAL_PTR(&one, list.head->next->next);
|
||||
|
||||
//TODO: this doesnt look right
|
||||
//TEST_ASSERT_EQUAL_PTR(&three, *list.head->prev);
|
||||
TEST_ASSERT_EQUAL_PTR(&one, *list.head->next->prev);
|
||||
TEST_ASSERT_EQUAL_PTR(&one, *list.head->next->next->prev);
|
||||
}
|
||||
|
||||
void test_brlists_suite() {
|
||||
RUN_TEST(test_brlists_BrSimpleList);
|
||||
}
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
#include "framework/unity.h"
|
||||
|
||||
#include "CORE/FW/fwsetup.h"
|
||||
#include <string.h>
|
||||
|
||||
void test_fwsetup_BrFwBegin() {
|
||||
TEST_ASSERT_TRUE(fw.active);
|
||||
}
|
||||
|
||||
void test_fwsetup_suite() {
|
||||
RUN_TEST(test_fwsetup_BrFwBegin);
|
||||
}
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
#include "framework/unity.h"
|
||||
|
||||
#include "CORE/FW/resource.h"
|
||||
#include <string.h>
|
||||
|
||||
void test_resource_BrResAllocate() {
|
||||
void* parent;
|
||||
void* child;
|
||||
resource_header* parent_header;
|
||||
resource_header* child_header;
|
||||
|
||||
parent = BrResAllocate(NULL, 0, BR_MEMORY_ANCHOR);
|
||||
TEST_ASSERT_NOT_NULL(parent);
|
||||
parent_header = (resource_header*)(((char*)parent) - sizeof(resource_header) - 4);
|
||||
TEST_ASSERT_EQUAL_UINT32(0xDEADBEEF, parent_header->magic_num);
|
||||
TEST_ASSERT_NULL(parent_header->children.head);
|
||||
TEST_ASSERT_EQUAL_CHAR(BR_MEMORY_ANCHOR, parent_header->class);
|
||||
TEST_ASSERT_EQUAL_PTR(parent_header, parent_header->magic_ptr);
|
||||
|
||||
child = BrResAllocate(parent, 0, BR_MEMORY_ANCHOR);
|
||||
child_header = (resource_header*)(((char*)child) - sizeof(resource_header) - 4);
|
||||
TEST_ASSERT_EQUAL_PTR(&child_header->node, parent_header->children.head);
|
||||
TEST_ASSERT_NULL(parent_header->children.head->next);
|
||||
// ? TEST_ASSERT_NULL(parent_header->children.head->prev);
|
||||
}
|
||||
|
||||
void test_resource_suite() {
|
||||
RUN_TEST(test_resource_BrResAllocate);
|
||||
}
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
#include "framework/unity.h"
|
||||
|
||||
#include "CORE/FW/resource.h"
|
||||
#include <string.h>
|
||||
24
test/main.c
24
test/main.c
|
|
@ -1,11 +1,15 @@
|
|||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "framework/unity.h"
|
||||
|
||||
#include "CORE/V1DB/dbsetup.h"
|
||||
|
||||
#include "common/globvars.h"
|
||||
|
||||
#define debug(format_, ...) fprintf(stderr, format_, __VA_ARGS__)
|
||||
|
||||
extern void test_utility_suite();
|
||||
extern void test_loading_suite();
|
||||
extern void test_controls_suite();
|
||||
|
|
@ -13,18 +17,32 @@ extern void test_input_suite();
|
|||
extern void test_errors_suite();
|
||||
extern void test_dossys_suite();
|
||||
|
||||
extern void test_brlists_suite();
|
||||
extern void test_fwsetup_suite();
|
||||
extern void test_resource_suite();
|
||||
|
||||
void setUp(void) {
|
||||
strcpy(gApplication_path, "/tmp");
|
||||
strcpy(gDir_separator, "/");
|
||||
|
||||
BrV1dbBeginWrapper_Float();
|
||||
}
|
||||
|
||||
void tearDown(void) {
|
||||
|
||||
}
|
||||
|
||||
int main(int pArgc, char **pArgv) {
|
||||
int main(int pArgc, char** pArgv) {
|
||||
|
||||
debug("hi %d\n", 3);
|
||||
|
||||
UNITY_BEGIN();
|
||||
|
||||
// BRSRC13
|
||||
test_brlists_suite();
|
||||
test_fwsetup_suite();
|
||||
test_resource_suite();
|
||||
|
||||
// DETHRACE
|
||||
test_utility_suite();
|
||||
test_loading_suite();
|
||||
test_controls_suite();
|
||||
|
|
|
|||
|
|
@ -178,22 +178,6 @@ def read_file():
|
|||
|
||||
#os.exit(1)
|
||||
|
||||
# def process_type_names():
|
||||
# for m in modules:
|
||||
# for type_idx in m['types']:
|
||||
# t = m['types'][type_idx]
|
||||
# if t['type'] == 'NAME':
|
||||
|
||||
# target_type = t['type_idx']
|
||||
# if m['types'][target_type]['type'] != 'NAME':
|
||||
# #print m['types'][target_type]['type'], t['value'], t['name']
|
||||
# m['types'][target_type]['type_name'] = t['value']
|
||||
# else:
|
||||
# pass
|
||||
# #print (t)
|
||||
# #print (m['types'][target_type])
|
||||
# #print ()
|
||||
|
||||
def process_global_var():
|
||||
glob = {}
|
||||
line = read_line()
|
||||
|
|
@ -305,6 +289,7 @@ def process_type(current_module, type_name):
|
|||
# number of fields = 000D size = 00000034
|
||||
match = re.match(FIELD_LIST_REGEX, line)
|
||||
nbr_fields = int(match.group(1), 16)
|
||||
struct_size = int(match.group(2), 16)
|
||||
fields = []
|
||||
for i in range(nbr_fields):
|
||||
line = read_line()
|
||||
|
|
@ -321,7 +306,7 @@ def process_type(current_module, type_name):
|
|||
field['bit_size'] = int(match.group(2))
|
||||
#print field
|
||||
fields.append(field)
|
||||
return { 'size': int(match.group(2), 16), 'fields': fields }
|
||||
return { 'size': struct_size, 'fields': fields }
|
||||
elif type_name == 'ENUM_LIST':
|
||||
match = re.match(ENUM_LIST_REGEX, line)
|
||||
nbr_fields = int(match.group(1), 16)
|
||||
|
|
@ -547,6 +532,7 @@ def get_type_declaration(module, t, name):
|
|||
if tag_name is not None:
|
||||
s += ' ' + tag_name
|
||||
s += ' {'
|
||||
s += '\t\t// size: ' + str(t['size'])
|
||||
first_elem = True
|
||||
for e in reversed(t['fields']):
|
||||
s += '\n'
|
||||
|
|
@ -555,6 +541,7 @@ def get_type_declaration(module, t, name):
|
|||
if e['type'] == 'BIT_BYTE':
|
||||
s += ': ' + str(e['bit_size'])
|
||||
s += ';'
|
||||
s += '\t\t// @' + str(e['offset'])
|
||||
first_elem = False
|
||||
s += '\n' + ' ' * (indent * INDENT_SPACES) + '}'
|
||||
return s
|
||||
|
|
@ -692,23 +679,33 @@ def generate_types_header(module):
|
|||
if t['type'] != 'NAME':
|
||||
continue
|
||||
type_name = t['value']
|
||||
if type_name in generated_type_names:
|
||||
# skip duplicates
|
||||
continue
|
||||
|
||||
|
||||
if type_name == 'br_value_tag':
|
||||
print ('!!br_value_tag', type_name in generated_type_names)
|
||||
if type_name == 'br_value':
|
||||
print ('!!br_value', type_name in generated_type_names)
|
||||
|
||||
|
||||
cache_type_name = type_name
|
||||
|
||||
# get type that this name references
|
||||
t = module['types'][t['type_idx']]
|
||||
if t is None:
|
||||
continue
|
||||
|
||||
generated_type_names[type_name] = 1
|
||||
if t['type'] == 'FIELD_LIST':
|
||||
if len(t['fields']) == 0:
|
||||
print("skipping", type_name, "it has no fields")
|
||||
continue
|
||||
cache_type_name = '+' + cache_type_name + '|' + str(len(t['fields']))
|
||||
found_prefix = False
|
||||
found = ''
|
||||
for x in generated_type_names:
|
||||
if '+' + type_name + '|' in x:
|
||||
found_prefix=True
|
||||
found = x
|
||||
if found_prefix and cache_type_name not in generated_type_names:
|
||||
print('CACHEFOUND:', found, cache_type_name)
|
||||
|
||||
if cache_type_name in generated_type_names:
|
||||
# skip duplicates
|
||||
continue
|
||||
|
||||
generated_type_names[cache_type_name] = 1
|
||||
|
||||
if t['type'] == 'ENUM_LIST':
|
||||
s = '\ntypedef enum {} {{'.format(type_name)
|
||||
|
|
|
|||
Loading…
Reference in New Issue