mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-11 16:20:19 +02:00
Code Activity

Refactor type definitions

Browse source
This commit is contained in:
Andy Wingo 2022-03-16 09:05:31 +01:00
parent a1b4311cfc
commit aac0faf4cf
3 changed files with 31 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -8,16 +8,16 @@ ALL_TESTS=$(foreach COLLECTOR,$(COLLECTORS),$(addprefix $(COLLECTOR)-,$(TESTS)))
all: $(ALL_TESTS) all: $(ALL_TESTS)
bdw-%: bdw.h conservative-roots.h %.c bdw-%: bdw.h conservative-roots.h %-types.h %.c
$(CC) $(CFLAGS) -DNDEBUG -lpthread `pkg-config --libs --cflags bdw-gc` -I. -DGC_BDW -o $@ $*.c $(CC) $(CFLAGS) -DNDEBUG -lpthread `pkg-config --libs --cflags bdw-gc` -I. -DGC_BDW -o $@ $*.c
semi-%: semi.h precise-roots.h %.c semi-%: semi.h precise-roots.h %-types.h heap-objects.h %.c
$(CC) $(CFLAGS) -I. -DNDEBUG -DGC_SEMI -o $@ $*.c $(CC) $(CFLAGS) -I. -DNDEBUG -DGC_SEMI -o $@ $*.c
mark-sweep-%: mark-sweep.h precise-roots.h serial-marker.h assert.h debug.h %.c mark-sweep-%: mark-sweep.h precise-roots.h serial-marker.h assert.h debug.h %-types.h heap-objects.h %.c
$(CC) $(CFLAGS) -I. -Wno-unused -DNDEBUG -DGC_MARK_SWEEP -o $@ $*.c $(CC) $(CFLAGS) -I. -Wno-unused -DNDEBUG -DGC_MARK_SWEEP -o $@ $*.c
parallel-mark-sweep-%: mark-sweep.h precise-roots.h parallel-marker.h assert.h debug.h %.c parallel-mark-sweep-%: mark-sweep.h precise-roots.h parallel-marker.h assert.h debug.h %-types.h heap-objects.h %.c
$(CC) $(CFLAGS) -I. -Wno-unused -DNDEBUG -DGC_PARALLEL_MARK_SWEEP -lpthread -o $@ $*.c $(CC) $(CFLAGS) -I. -Wno-unused -DNDEBUG -DGC_PARALLEL_MARK_SWEEP -lpthread -o $@ $*.c
check: $(addprefix test-$(TARGET),$(TARGETS)) check: $(addprefix test-$(TARGET),$(TARGETS))

22
gcbench-types.h
View file

@ -1,30 +1,10 @@
#ifndef GCBENCH_TYPES_H #ifndef GCBENCH_TYPES_H
#define GCBENCH_TYPES_H #define GCBENCH_TYPES_H
#include "inline.h"
#define FOR_EACH_HEAP_OBJECT_KIND(M) \ #define FOR_EACH_HEAP_OBJECT_KIND(M) \
M(node, Node, NODE) \ M(node, Node, NODE) \
M(double_array, DoubleArray, DOUBLE_ARRAY) M(double_array, DoubleArray, DOUBLE_ARRAY)
#define DECLARE_NODE_TYPE(name, Name, NAME) \ #include "heap-objects.h"
struct Name; \
typedef struct Name Name;
FOR_EACH_HEAP_OBJECT_KIND(DECLARE_NODE_TYPE)
#undef DECLARE_NODE_TYPE
#define DEFINE_ENUM(name, Name, NAME) ALLOC_KIND_##NAME,
enum alloc_kind {
FOR_EACH_HEAP_OBJECT_KIND(DEFINE_ENUM)
};
#undef DEFINE_ENUM
#define DEFINE_METHODS(name, Name, NAME) \
static inline size_t name##_size(Name *obj) ALWAYS_INLINE; \
static inline void visit_##name##_fields(Name *obj,\
void (*visit)(void **loc, void *visit_data), \
void *visit_data) ALWAYS_INLINE;
FOR_EACH_HEAP_OBJECT_KIND(DEFINE_METHODS)
#undef DEFINE_METHODS
#endif // GCBENCH_TYPES_H #endif // GCBENCH_TYPES_H

26
heap-objects.h Normal file
View file

@ -0,0 +1,26 @@
#ifndef HEAP_OBJECTS_H
#define HEAP_OBJECTS_H
#include "inline.h"
#define DECLARE_NODE_TYPE(name, Name, NAME) \
struct Name; \
typedef struct Name Name;
FOR_EACH_HEAP_OBJECT_KIND(DECLARE_NODE_TYPE)
#undef DECLARE_NODE_TYPE
#define DEFINE_ENUM(name, Name, NAME) ALLOC_KIND_##NAME,
enum alloc_kind {
FOR_EACH_HEAP_OBJECT_KIND(DEFINE_ENUM)
};
#undef DEFINE_ENUM
#define DEFINE_METHODS(name, Name, NAME) \
static inline size_t name##_size(Name *obj) ALWAYS_INLINE; \
static inline void visit_##name##_fields(Name *obj,\
void (*visit)(void **loc, void *visit_data), \
void *visit_data) ALWAYS_INLINE;
FOR_EACH_HEAP_OBJECT_KIND(DEFINE_METHODS)
#undef DEFINE_METHODS
#endif // HEAP_OBJECTS_H