pike.git/
src/
program.h
Branch:
Tag:
Non-build tags
All tags
No tags
2014-01-16
2014-01-16 20:29:37 by Arne Goedeke <el@laramies.com>
80e1258050ce9465c12023ad7616e16e1a5a1c52 (
9
lines) (+
8
/-
1
)
[
Show
|
Annotate
]
Branch:
7.8
Runtime: make FIND_LFUN work again with unfixed programs
Conflicts:
src/program.h
654:
#define PROG_FROM_INT(P,X) PROG_FROM_PTR(P, PTR_FROM_INT(P, X)) #define ID_FROM_INT(P,X) ID_FROM_PTR(P, PTR_FROM_INT(P, X))
-
#define FIND_LFUN(P,N) ( dmalloc_touch(struct program *,(P))->flags & PROGRAM_FIXED && (N) < NUM_LFUNS ?((P)->lfuns[(N)]):find_lfun_fatal((P), (N)) )
+
#define QUICK_FIND_LFUN(P,N) (dmalloc_touch(struct program *,(P))->lfuns[N]) #ifdef DO_PIKE_CLEANUP
1014:
/* Prototypes end here */ void count_memory_in_programs(size_t *, size_t *);
+
static INLINE int FIND_LFUN(struct program * p, int lfun) {
+
dmalloc_touch(struct program*, p);
+
if (lfun < 0 || lfun >= NUM_LFUNS) return find_lfun_fatal(p, lfun);
-
+
if (p->flags & PROGRAM_FIXED) return p->lfuns[lfun];
+
return low_find_lfun(p, lfun);
+
}
+
#ifndef PIKE_USE_MACHINE_CODE #define make_program_executable(X) #endif