dpatel 02/10/24 17:30:05
Modified: live/gcc3/gcc Tag: pre-import-2002-10-21 pfe-config.h
varray.c
Log:
Fix PFE merge confusion due to introduction of ggc_alloc_cleared()
usage in FSF sources.
Revision Changes Path
No revision
No revision
1.9.2.1 +3 -3 src/live/gcc3/gcc/pfe-config.h
Index: pfe-config.h
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/pfe-config.h,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- pfe-config.h 2002/08/07 03:13:10 1.9
+++ pfe-config.h 2002/10/25 00:30:04 1.9.2.1
@@ -76,9 +76,9 @@
/* Disable the following block of #define's when the pfe_ggc_...
routines are defined to accept the "kind" argument. */
#if 1
-#define pfe_ggc_alloc(size, kind) ggc_alloc (size)
-#define pfe_ggc_alloc_cleared(size, kind) ggc_alloc_cleared (size)
-#define pfe_ggc_realloc(p, size, kind) ggc_realloc (p, size)
+#define pfe_ggc_alloc(size, kind) ((PFE_DUMPING || PFE_LOADING) ?
pfe_malloc(size) : ggc_alloc (size))
+#define pfe_ggc_alloc_cleared(size, kind) (((PFE_DUMPING) || (PFE_LOADING)) ?
pfe_calloc(1,size) : ggc_alloc_cleared (size))
+#define pfe_ggc_realloc(p, size, kind) ((PFE_DUMPING || PFE_LOADING) ?
pfe_realloc(p, size) : ggc_realloc (p, size))
#define pfe_ggc_alloc_rtx(nslots) ggc_alloc_rtx (nslots)
#define pfe_ggc_alloc_rtvec(nelt) ggc_alloc_rtvec (nelt)
#define pfe_ggc_alloc_tree(length) ggc_alloc_tree (length)
1.15.2.2 +3 -2 src/live/gcc3/gcc/varray.c
Index: varray.c
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/varray.c,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -u -r1.15.2.1 -r1.15.2.2
--- varray.c 2002/10/23 04:51:48 1.15.2.1
+++ varray.c 2002/10/25 00:30:04 1.15.2.2
@@ -32,7 +32,8 @@
ones needed to ve freeze/thawed. They are indicated by their
varray name being prefixed with the string defined by PFE_VARRAY. */
static char *use_pfe_mem_indicator = PFE_VARRAY"";
-#define USE_PFE_MEMORY(name) (*(name) == *use_pfe_mem_indicator)
+#define USE_PFE_MEMORY(name) ((*(name) == *use_pfe_mem_indicator) \
+ && (PFE_DUMPING || PFE_LOADING))
/* APPLE LOCAL end PFE */
#define VARRAY_HDR_SIZE (sizeof (struct varray_head_tag) - sizeof (varray_data))
@@ -83,7 +84,7 @@
PFE_ALLOC_VARRAY)
: (varray_type) ggc_alloc_cleared (VARRAY_HDR_SIZE + data_size);
else
- ptr = USE_PFE_MEMORY (name)
+ ptr = USE_PFE_MEMORY (name)
? (varray_type) PFE_CALLOC (VARRAY_HDR_SIZE + data_size, 1,
PFE_ALLOC_VARRAY)
: (varray_type) xcalloc (VARRAY_HDR_SIZE + data_size, 1);
