Skip to content

Commit 5c8ff63

Browse files
d-torranced-torrance
committed
Use engine for all debug build code
This way we have it for the standalone engine but don't get multiple definition errors when we link with the interpreter.
1 parent 89952b8 commit 5c8ff63

9 files changed

Lines changed: 8 additions & 143 deletions

File tree

‎M2/Macaulay2/bin/main.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
#include "M2mem.h"
1010
#include "types.h"
11-
#include "debug.h"
1211

1312
#include <engine.h> /* to get IM2_initialize() : */
1413
#include "supervisorinterface.h"

‎M2/Macaulay2/d/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ set(CLIST
1818
M2types.c M2lib.c M2mem.c types.h
1919
scclib.c ../c/scc-core.h
2020
memdebug.c memdebug.h
21-
debug.c debug.h
2221
getpagesize.h M2mem.h
2322
gmp_aux.c gmp_aux.h
2423
gdbm_interface.c

‎M2/Macaulay2/d/M2lib.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include "M2mem.h"
66
#include "types.h"
7-
#include "debug.h"
7+
#include <interface/m2-mem.h>
88
#include "supervisorinterface.h"
99

1010
#include <readline/readline.h>

‎M2/Macaulay2/d/M2mem.c‎

Lines changed: 1 addition & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include "types.h"
44
#include "M2mem.h"
5-
#include "debug.h"
5+
#include <interface/m2-mem.h>
66

77
#ifdef MEMDEBUG
88
#include <memdebug.h>
@@ -95,56 +95,6 @@ char *getmoremem_atomic (char *s, size_t old, size_t new) {
9595
return p;
9696
}
9797

98-
/* Valgrind helper functions */
99-
#ifndef NVALGRIND
100-
101-
void *I_WRAP_SONAME_FNNAME_ZU(libgcZdsoZd1,GC_malloc)(size_t s){
102-
long result;
103-
OrigFn fn;
104-
VALGRIND_GET_ORIG_FN(fn);
105-
CALL_FN_W_W(result,fn,s);
106-
VALGRIND_MAKE_MEM_DEFINED(&result,sizeof(result));
107-
return (void*)result;
108-
}
109-
110-
void *I_WRAP_SONAME_FNNAME_ZU(libgcZdsoZd1,GC_malloc_atomic)(size_t s){
111-
long result;
112-
OrigFn fn;
113-
VALGRIND_GET_ORIG_FN(fn);
114-
CALL_FN_W_W(result,fn,s);
115-
VALGRIND_MAKE_MEM_DEFINED(&result,sizeof(result));
116-
return (void*)result;
117-
}
118-
119-
void *I_WRAP_SONAME_FNNAME_ZU(libgcZdsoZd1,GC_malloc_ignore_off_page)(size_t s){
120-
long result;
121-
OrigFn fn;
122-
VALGRIND_GET_ORIG_FN(fn);
123-
CALL_FN_W_W(result,fn,s);
124-
VALGRIND_MAKE_MEM_DEFINED(&result,sizeof(result));
125-
return (void*)result;
126-
}
127-
128-
void *I_WRAP_SONAME_FNNAME_ZU(libgcZdsoZd1,GC_malloc_atomic_ignore_off_page)(size_t s){
129-
long result;
130-
OrigFn fn;
131-
VALGRIND_GET_ORIG_FN(fn);
132-
CALL_FN_W_W(result,fn,s);
133-
VALGRIND_MAKE_MEM_DEFINED(&result,sizeof(result));
134-
return (void*)result;
135-
}
136-
137-
void *I_WRAP_SONAME_FNNAME_ZU(libgcZdsoZd1,GC_realloc)(void *p, size_t s){
138-
long result;
139-
OrigFn fn;
140-
VALGRIND_GET_ORIG_FN(fn);
141-
CALL_FN_W_WW(result,fn,(long)p,s);
142-
VALGRIND_MAKE_MEM_DEFINED(&result,sizeof(result));
143-
return (void*)result;
144-
}
145-
146-
#endif /* NVALGRIND */
147-
14898
/*
14999
Local Variables:
150100
compile-command: "echo \"make: Entering directory \\`$M2BUILDDIR/Macaulay2/d'\" && make -C $M2BUILDDIR/Macaulay2/d "

‎M2/Macaulay2/d/Makefile.files.in‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,13 @@ M2_OPTCFILES :=
55
M2_EXTRACFILES :=
66
M2_MADECFILES :=
77
M2_SRCFILES :=
8-
M2_OPTCFILES += debug.c
9-
ifeq "@DEBUG@" "yes"
10-
M2_OBJECTS += debug.o
11-
endif
128
M2_CFILES += gmp_aux.c
139
M2_LASTCFILES += M2types.c scclib.c M2lib.c M2mem.c gdbm_interface.c memdebug.c
1410
M2_MADECFILES := startup.c
1511
M2_OBJECTS += $(M2_MADECFILES:.c=.o)
1612
M2_CCFILES := boost-regex.cpp main.cpp
1713
M2_OBJECTS += $(M2_CCFILES:.cpp=.o)
18-
M2_HFILES := getpagesize.h types.h M2mem.h debug.h startup-header.h startup-trailer.h memdebug.h
14+
M2_HFILES := getpagesize.h types.h M2mem.h startup-header.h startup-trailer.h memdebug.h
1915

2016
M2_DFILES :=
2117
M2_DFILES += arithmetic.d
@@ -120,7 +116,6 @@ actors5.o basic.o : \
120116
@srcdir@/../e/engine.h \
121117
@srcdir@/../e/newdelete.hpp \
122118
@srcdir@/../d/M2mem.h \
123-
@srcdir@/../d/debug.h \
124119
../../include/M2/config.h
125120

126121
interface2.o : \
@@ -132,16 +127,14 @@ interface2.o : \
132127
@srcdir@/../system/supervisorinterface.h \
133128
@srcdir@/../e/engine.h \
134129
@srcdir@/../e/engine-includes.hpp \
135-
@srcdir@/../d/M2mem.h \
136-
@srcdir@/../d/debug.h
130+
@srcdir@/../d/M2mem.h
137131

138132
interface.o : \
139133
../../include/M2/config.h \
140134
@srcdir@/../system/mutex.h \
141135
@srcdir@/../e/newdelete.hpp \
142136
@srcdir@/../d/M2mem.h \
143137
@srcdir@/../c/scc-core.h \
144-
@srcdir@/../d/debug.h \
145138
@srcdir@/../system/supervisorinterface.h \
146139
@srcdir@/../e/engine.h \
147140
@srcdir@/../e/engine-includes.hpp \
@@ -229,7 +222,6 @@ engine.o : \
229222
@srcdir@/../c/scc-core.h \
230223
@srcdir@/../../include/M2/gc-include.h \
231224
@srcdir@/../c/scc-core.h \
232-
@srcdir@/../d/debug.h \
233225
@srcdir@/../system/supervisorinterface.h \
234226
@srcdir@/../e/error.h \
235227
@srcdir@/../e/exceptions.hpp \

‎M2/Macaulay2/d/Makefile.in‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ LIBFILES :=
6666

6767
# to get getmem
6868
LIBFILES += M2mem.o
69-
# to get trapchk()
70-
LIBFILES += debug.o
7169
LIBFILES += gmp_aux.o arithmetic.o atomic.o M2.o system.o strings.o varstrin.o errio.o vararray.o ctype.o nets.o varnets.o interrupts.o pthread0.o stdio.o stdiop.o err.o gmp.o
7270
libd.a: $(LIBFILES) ; ar -r $@ $?
7371
rm-libd.a:; rm libd.a
@@ -208,9 +206,9 @@ M2lib.o : M2_CFLAGS += -Wno-frame-address
208206
endif
209207

210208
M2lib.o scclib.o : | interp-exports.h.tmp
211-
scclib.o : expr-exports.h M2mem.h debug.h types.h ../c/compat.h ../e/engine.h
212-
M2lib.o : types.h ../c/compat.c debug.h M2mem.h ../c/compat.h ../e/engine.h
213-
M2lib.o scclib.o gdbm_interface.o gc_cpp.o debug.o : ../../include/M2/config.h
209+
scclib.o : expr-exports.h M2mem.h types.h ../c/compat.h ../e/engine.h
210+
M2lib.o : types.h ../c/compat.c M2mem.h ../c/compat.h ../e/engine.h
211+
M2lib.o scclib.o gdbm_interface.o gc_cpp.o : ../../include/M2/config.h
214212
M2.o : ../../include/M2/config.h @srcdir@/../c/scc-core.h
215213

216214
clean::; rm -f startup.c

‎M2/Macaulay2/d/debug.c‎

Lines changed: 0 additions & 47 deletions
This file was deleted.

‎M2/Macaulay2/d/debug.h‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎M2/Macaulay2/d/scclib.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "types.h"
77
#include "M2mem.h"
88
#include "../c/compat.c"
9-
#include "debug.h"
9+
#include <interface/m2-mem.h>
1010

1111
#include "../system/supervisorinterface.h"
1212

0 commit comments

Comments
 (0)