projects
/
henge
/
apc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
const revision
[henge/apc.git]
/
src
/
ir.c
diff --git
a/src/ir.c
b/src/ir.c
index
4cec206
..
b68142e
100644
(file)
--- a/
src/ir.c
+++ b/
src/ir.c
@@
-23,6
+23,7
@@
void ir_quit(void);
int ir_linker(void);
\r
int ir_condenser(void);
\r
/* Memory allocation structures */
\r
int ir_linker(void);
\r
int ir_condenser(void);
\r
/* Memory allocation structures */
\r
+enum dtype { FSDAT, MSDAT, ADAT, LDAT, FBDAT };
\r
struct pagenode_t;
\r
struct pagenode_header_t {
\r
struct pagenode_t* next;
\r
struct pagenode_t;
\r
struct pagenode_header_t {
\r
struct pagenode_t* next;
\r
@@
-36,9
+37,6
@@
struct pagelist_t {
struct pagenode_t* root, * head;
\r
size_t pagesize;
\r
};
\r
struct pagenode_t* root, * head;
\r
size_t pagesize;
\r
};
\r
-/* Set link data */
\r
-enum dtype { FSDAT, MSDAT, ADAT, LDAT, FBDAT };
\r
-enum ltype { OLINK, MLINK, VLINK, ALINK };
\r
struct ir_namelist_t;
\r
struct ir_namelist_t
\r
{ struct ir_namelist_t* nextsib;
\r
struct ir_namelist_t;
\r
struct ir_namelist_t
\r
{ struct ir_namelist_t* nextsib;
\r
@@
-103,17
+101,17
@@
struct ir_set_t
static inline
\r
int init_pagelist(struct pagelist_t*,size_t);
\r
static inline
\r
static inline
\r
int init_pagelist(struct pagelist_t*,size_t);
\r
static inline
\r
-struct ir_framebox_t* ir_set_add_framebox(struct ir_set_t*, uint8_t*);
\r
+struct ir_framebox_t* ir_set_add_framebox(struct ir_set_t*,
const
uint8_t*);
\r
static
\r
void ir_free_pagenodes(struct pagenode_t*);
\r
static inline
\r
static
\r
void ir_free_pagenodes(struct pagenode_t*);
\r
static inline
\r
-int bytes_identical(
uint8_t*,
uint8_t*);
\r
+int bytes_identical(
const uint8_t*,const
uint8_t*);
\r
static
\r
void* stack_alloc(size_t);
\r
static
\r
static
\r
void* stack_alloc(size_t);
\r
static
\r
-uint8_t* name_alloc(uint8_t*);
\r
+uint8_t* name_alloc(
const
uint8_t*);
\r
static inline
\r
static inline
\r
-union ir_setdata_t* ir_framedata (enum dtype,uint8_t*,apc_facing,int,int);
\r
+union ir_setdata_t* ir_framedata (enum dtype,
const
uint8_t*,apc_facing,int,int);
\r
/* Function-Like Macros */
\r
#define do_warn() do { \
\r
} while (0)
\r
/* Function-Like Macros */
\r
#define do_warn() do { \
\r
} while (0)
\r
@@
-214,7
+212,7
@@
struct ir_class_t* ir_class_root
*/
\r
struct ir_class_t* ir_class_addchild
\r
( struct ir_class_t* class,
\r
*/
\r
struct ir_class_t* ir_class_addchild
\r
( struct ir_class_t* class,
\r
-
uint8_t*
name
\r
+
const uint8_t*
name
\r
)
\r
{ struct ir_class_t* iter;
\r
if (class->nextchild == NULL)
\r
)
\r
{ struct ir_class_t* iter;
\r
if (class->nextchild == NULL)
\r
@@
-239,7
+237,7
@@
struct ir_class_t* ir_class_addchild
*/
\r
struct ir_set_t* ir_class_addset
\r
( struct ir_class_t* class,
\r
*/
\r
struct ir_set_t* ir_class_addset
\r
( struct ir_class_t* class,
\r
-
uint8_t*
name
\r
+
const uint8_t*
name
\r
)
\r
{ struct ir_set_t* iter;
\r
if (class->root_set == NULL)
\r
)
\r
{ struct ir_set_t* iter;
\r
if (class->root_set == NULL)
\r
@@
-264,7
+262,7
@@
struct ir_set_t* ir_class_addset
*/
\r
struct ir_set_t* ir_set_addchild
\r
( struct ir_set_t* set,
\r
*/
\r
struct ir_set_t* ir_set_addchild
\r
( struct ir_set_t* set,
\r
-
uint8_t*
name
\r
+
const uint8_t*
name
\r
)
\r
{ struct ir_set_t* iter;
\r
if (set->nextchild == NULL)
\r
)
\r
{ struct ir_set_t* iter;
\r
if (set->nextchild == NULL)
\r
@@
-290,7
+288,7
@@
struct ir_set_t* ir_set_addchild
static inline
\r
struct ir_framebox_t* ir_set_add_framebox
\r
( struct ir_set_t* set,
\r
static inline
\r
struct ir_framebox_t* ir_set_add_framebox
\r
( struct ir_set_t* set,
\r
-
uint8_t*
name
\r
+
const uint8_t*
name
\r
)
\r
{ struct ir_framebox_t* iter;
\r
if (set->frameboxes == NULL)
\r
)
\r
{ struct ir_framebox_t* iter;
\r
if (set->frameboxes == NULL)
\r
@@
-314,14
+312,14
@@
struct ir_framebox_t* ir_set_add_framebox
*/
\r
static inline
\r
int bytes_identical
\r
*/
\r
static inline
\r
int bytes_identical
\r
-( uint8_t* stra,
\r
- uint8_t* strb
\r
+(
const
uint8_t* stra,
\r
+
const
uint8_t* strb
\r
)
\r
{ int ca, cb;
\r
do {
\r
ca = *stra++;
\r
cb = *strb++;
\r
)
\r
{ int ca, cb;
\r
do {
\r
ca = *stra++;
\r
cb = *strb++;
\r
- } while (ca && ca == cb);
\r
+ } while (ca && ca
!= '_' && ca
== cb);
\r
return (ca == cb);
\r
}
\r
\r
return (ca == cb);
\r
}
\r
\r
@@
-390,7
+388,7
@@
void ir_set_assign_ref
\r
void ir_data_assign_path
\r
( union ir_setdata_t* setdata,
\r
\r
void ir_data_assign_path
\r
( union ir_setdata_t* setdata,
\r
-
uint8_t*
path
\r
+
const uint8_t*
path
\r
)
\r
{ if (setdata->header.src_filename != NULL)
\r
wprintf("Path override: %s -> %s for setdata %s\n",
\r
)
\r
{ if (setdata->header.src_filename != NULL)
\r
wprintf("Path override: %s -> %s for setdata %s\n",
\r
@@
-399,28
+397,28
@@
void ir_data_assign_path
}
\r
\r
union ir_setdata_t* ir_framesheet
\r
}
\r
\r
union ir_setdata_t* ir_framesheet
\r
-(
uint8_t*
name,
\r
- apc_facing d,
\r
- int width,
\r
- int height
\r
+(
const uint8_t*
name,
\r
+ apc_facing
d,
\r
+ int
width,
\r
+ int
height
\r
)
\r
{ return ir_framedata(FSDAT, name, d, width, height); }
\r
\r
union ir_setdata_t* ir_mapsheet
\r
)
\r
{ return ir_framedata(FSDAT, name, d, width, height); }
\r
\r
union ir_setdata_t* ir_mapsheet
\r
-(
uint8_t*
name,
\r
- apc_facing d,
\r
- int width,
\r
- int height
\r
+(
const uint8_t*
name,
\r
+ apc_facing
d,
\r
+ int
width,
\r
+ int
height
\r
)
\r
{ return ir_framedata(MSDAT, name, d, width, height); }
\r
\r
static inline
\r
union ir_setdata_t* ir_framedata
\r
)
\r
{ return ir_framedata(MSDAT, name, d, width, height); }
\r
\r
static inline
\r
union ir_setdata_t* ir_framedata
\r
-( enum dtype type,
\r
-
uint8_t*
name,
\r
- apc_facing d,
\r
- int width,
\r
- int height
\r
+( enum dtype
type,
\r
+
const uint8_t*
name,
\r
+ apc_facing
d,
\r
+ int
width,
\r
+ int
height
\r
)
\r
{ struct ir_framedata_t* framedata = struct_alloc(ir_framedata_t);
\r
framedata->header.type = type;
\r
)
\r
{ struct ir_framedata_t* framedata = struct_alloc(ir_framedata_t);
\r
framedata->header.type = type;
\r
@@
-432,7
+430,7
@@
union ir_setdata_t* ir_framedata
}
\r
\r
union ir_setdata_t* ir_audio
\r
}
\r
\r
union ir_setdata_t* ir_audio
\r
-( uint8_t* name )
\r
+(
const
uint8_t* name )
\r
{ struct ir_simplex_t* audio = struct_alloc(ir_simplex_t);
\r
audio->header.type = ADAT;
\r
audio->header.data_name = name_alloc(name);
\r
{ struct ir_simplex_t* audio = struct_alloc(ir_simplex_t);
\r
audio->header.type = ADAT;
\r
audio->header.data_name = name_alloc(name);
\r
@@
-459,7
+457,7
@@
struct ir_setld_t* ir_setld_from_ref
\r
struct ir_setld_t* ir_setld_from_classld
\r
( struct ir_classld_t* classld,
\r
\r
struct ir_setld_t* ir_setld_from_classld
\r
( struct ir_classld_t* classld,
\r
-
uint8_t*
name
\r
+
const uint8_t*
name
\r
)
\r
{ struct ir_setld_t* setld;
\r
setld = struct_alloc(ir_setld_t);
\r
)
\r
{ struct ir_setld_t* setld;
\r
setld = struct_alloc(ir_setld_t);
\r
@@
-472,7
+470,7
@@
struct ir_setld_t* ir_setld_from_classld
\r
struct ir_setld_t* ir_setld_addchild
\r
( struct ir_setld_t* setld,
\r
\r
struct ir_setld_t* ir_setld_addchild
\r
( struct ir_setld_t* setld,
\r
-
uint8_t*
name
\r
+
const uint8_t*
name
\r
)
\r
{ if (setld->namelist == NULL)
\r
{ setld->namelist = struct_alloc(ir_namelist_t);
\r
)
\r
{ if (setld->namelist == NULL)
\r
{ setld->namelist = struct_alloc(ir_namelist_t);
\r
@@
-489,7
+487,7
@@
struct ir_setld_t* ir_setld_addchild
union ir_setdata_t* ir_link
\r
( enum ltype link_type,
\r
struct ir_setld_t* setld,
\r
union ir_setdata_t* ir_link
\r
( enum ltype link_type,
\r
struct ir_setld_t* setld,
\r
-
uint8_t*
name
\r
+
const uint8_t*
name
\r
)
\r
{ struct ir_link_t* link;
\r
link = struct_alloc(ir_link_t);
\r
)
\r
{ struct ir_link_t* link;
\r
link = struct_alloc(ir_link_t);
\r
@@
-521,13
+519,14
@@
void* stack_alloc
\r
static
\r
uint8_t* name_alloc
\r
\r
static
\r
uint8_t* name_alloc
\r
-( uint8_t* name_src )
\r
-{ uint8_t* iter, * name;
\r
- int head_mem;
\r
+( const uint8_t* name_src )
\r
+{ const uint8_t* iter;
\r
+ uint8_t* name;
\r
+ int head_mem;
\r
copy:
\r
name = (uint8_t*)namepages.head->header.head;
\r
iter = name_src;
\r
copy:
\r
name = (uint8_t*)namepages.head->header.head;
\r
iter = name_src;
\r
- for (head_mem = PL_HEADMEM(namepages); *iter && head_mem; head_mem--)
\r
+ for (head_mem = PL_HEADMEM(namepages); *iter &&
*iter != '_' &&
head_mem; head_mem--)
\r
*(namepages.head->header.head)++ = *iter++;
\r
if (head_mem == 0) //not enough room
\r
{ namepages.head->header.next = (struct pagenode_t*) calloc(namepages.pagesize,1);
\r
*(namepages.head->header.head)++ = *iter++;
\r
if (head_mem == 0) //not enough room
\r
{ namepages.head->header.next = (struct pagenode_t*) calloc(namepages.pagesize,1);
\r