projects
/
henge
/
apc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1effafc
)
fixes
author
Jordan
<jordanlavatai@gmail.com>
Wed, 11 Jan 2017 22:48:13 +0000
(14:48 -0800)
committer
Jordan
<jordanlavatai@gmail.com>
Wed, 11 Jan 2017 22:48:13 +0000
(14:48 -0800)
src/apc.h
patch
|
blob
|
history
src/ir.c
patch
|
blob
|
history
diff --git
a/src/apc.h
b/src/apc.h
index
efed4d4
..
a994d12
100644
(file)
--- a/
src/apc.h
+++ b/
src/apc.h
@@
-2,6
+2,9
@@
#define _APC_H_
//ir.h
#define _APC_H_
//ir.h
+enum frame_facing { SFACE, SWFACE, WFACE, NWFACE, NFACE, NEFACE, EFACE, SEFACE, FACING_MAX };
+typedef enum frame_facing apc_facing;
+
#define BUF_SIZE 256
#define MAX_SETS 256
#define MAX_ELES 256
#define BUF_SIZE 256
#define MAX_SETS 256
#define MAX_ELES 256
@@
-10,8
+13,8
@@
#define MAX_MODEL_LEN 256
#define MAX_MAPS 8
#define MAX_POSTS 256
#define MAX_MODEL_LEN 256
#define MAX_MAPS 8
#define MAX_POSTS 256
-#define MAX_CLASS_DEPTH
256
-#define MAX_CLASSES
256
+#define MAX_CLASS_DEPTH
64
+#define MAX_CLASSES
64
#define MAX_FRAMES 256
#define PTRS_IN_PAGE 1024
#define MAX_CHUNKS 256
#define MAX_FRAMES 256
#define PTRS_IN_PAGE 1024
#define MAX_CHUNKS 256
diff --git
a/src/ir.c
b/src/ir.c
index
76c221d
..
3f22400
100644
(file)
--- a/
src/ir.c
+++ b/
src/ir.c
@@
-29,11
+29,23
@@
static
\r
static inline
\r
struct ir_framebox_t* ir_set_add_framebox(struct ir_set_t*, uint8_t*);
\r
\r
static inline
\r
struct ir_framebox_t* ir_set_add_framebox(struct ir_set_t*, uint8_t*);
\r
-static
inline
\r
-void ir_
quit_r
(struct pagenode_t*);
\r
+static
\r
+void ir_
free_pages
(struct pagenode_t*);
\r
static inline
\r
int bytes_identical(uint8_t*,uint8_t*);
\r
static inline
\r
int bytes_identical(uint8_t*,uint8_t*);
\r
-
\r
+static
\r
+void* stack_alloc(size_t);
\r
+/* Memory allocator */
\r
+struct pagenode_t {
\r
+ struct pagenode_t* next;
\r
+ char* head;
\r
+ char root[];
\r
+}* pagenode_root, * pagenode_head;
\r
+#define PN_ALLOCSIZE (sys_pagesize)
\r
+#define PN_HEADERSIZE() (sizeof(struct pagenode_t*) + sizeof(char*))
\r
+#define PN_MEMSIZE() (PN_ALLOCSIZE - PN_HEADERSIZE())
\r
+#define PN_HEADSIZE() (pagenode_head->head - pagenode_head->root)
\r
+#define PN_HEADSPACE() (PN_MEMSIZE() - PN_HEADSIZE())
\r
/* Enumerated types */
\r
enum dtype { FSDAT, MSDAT, ADAT, LDAT, FBDAT };
\r
enum ltype { OLINK, MLINK, VLINK, ALINK };
\r
/* Enumerated types */
\r
enum dtype { FSDAT, MSDAT, ADAT, LDAT, FBDAT };
\r
enum ltype { OLINK, MLINK, VLINK, ALINK };
\r
@@
-128,13
+140,13
@@
int ir_init
*/
\r
void ir_quit
\r
( void )
\r
*/
\r
void ir_quit
\r
( void )
\r
-{ ir_
quit_r
(pagenode_root); }
\r
+{ ir_
free_pages
(pagenode_root); }
\r
\r
\r
-static
inline
\r
-void ir_
quit_r
\r
+static
\r
+void ir_
free_pages
\r
( struct pagenode_t* pagenode )
\r
{ if (pagenode->next != NULL)
\r
( struct pagenode_t* pagenode )
\r
{ if (pagenode->next != NULL)
\r
- ir_
quit_r
(pagenode->next);
\r
+ ir_
free_pages
(pagenode->next);
\r
free(pagenode);
\r
}
\r
\r
free(pagenode);
\r
}
\r
\r
@@
-377,19
+389,6
@@
union ir_setdata_t* ir_audio
return (union ir_setdata_t*) audio;
\r
}
\r
\r
return (union ir_setdata_t*) audio;
\r
}
\r
\r
-
\r
-#define PN_ALLOCSIZE (sys_pagesize)
\r
-#define PN_HEADERSIZE() (sizeof(struct pagenode_t*) + sizeof(void*))
\r
-#define PN_MEMSIZE() (PN_ALLOCSIZE - PN_HEADERSIZE())
\r
-#define PN_HEADSIZE() (pagenode_head->head - pagenode_head->root)
\r
-#define PN_HEADSPACE() (PN_MEMSIZE() - PN_HEADSIZE())
\r
-struct pagenode_t {
\r
- struct pagenode_t* next;
\r
- char* head;
\r
- char root[];
\r
-}* pagenode_root, * pagenode_head;
\r
-
\r
-
\r
static
\r
void* stack_alloc(size_t bytes)
\r
{ if (!bytes)
\r
static
\r
void* stack_alloc(size_t bytes)
\r
{ if (!bytes)
\r