2003-04-02
2003-04-02 19:22:44 by Martin Stjernholm <mast@lysator.liu.se>
-
7e877a61f4ef9bb02c4b2ee97c96b2e5d8073dc2
(45 lines)
(+23/-22)
[
Show
| Annotate
]
Branch: 7.9
Extended all integer argument types shorter than int to int since that's
more efficient.
Rev: src/constants.c:1.47
Rev: src/constants.h:1.30
Rev: src/docode.c:1.164
Rev: src/docode.h:1.18
Rev: src/dynamic_buffer.c:1.23
Rev: src/dynamic_buffer.h:1.18
Rev: src/encode.c:1.171
Rev: src/gc.c:1.216
Rev: src/global.h:1.85
Rev: src/las.c:1.334
Rev: src/las.h:1.62
Rev: src/multiset.c:1.71
Rev: src/pike_memory.c:1.145
Rev: src/pike_memory.h:1.44
Rev: src/pike_search.c:1.14
Rev: src/pike_search.h:1.7
Rev: src/pike_types.c:1.214
Rev: src/pike_types.h:1.86
Rev: src/port.h:1.50
Rev: src/program.c:1.497
Rev: src/program.h:1.181
Rev: src/program_areas.h:1.13
Rev: src/rbtree.h:1.10
Rev: src/svalue.h:1.118
2:
|| This file is part of Pike. For copyright information see COPYRIGHT.
|| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
|| for more information.
- || $Id: program.c,v 1.496 2003/04/01 18:11:09 nilsson Exp $
+ || $Id: program.c,v 1.497 2003/04/02 19:22:44 mast Exp $
*/
#include "global.h"
- RCSID("$Id: program.c,v 1.496 2003/04/01 18:11:09 nilsson Exp $");
+ RCSID("$Id: program.c,v 1.497 2003/04/02 19:22:44 mast Exp $");
#include "program.h"
#include "object.h"
#include "dynamic_buffer.h"
928:
#define RELOCATE_constants(ORIG,NEW)
#define RELOCATE_relocations(ORIG,NEW)
- #define FOO(NUMTYPE,TYPE,NAME) \
+ #define FOO(NUMTYPE,TYPE,ARGTYPE,NAME) \
void PIKE_CONCAT(low_add_to_,NAME) (struct program_state *state, \
TYPE ARG) { \
if(state->malloc_size_program->PIKE_CONCAT(num_,NAME) == \
947:
state->new_program-> \
NAME[state->new_program->PIKE_CONCAT(num_,NAME)++]=(ARG); \
} \
- void PIKE_CONCAT(add_to_,NAME) (TYPE ARG) { \
+ void PIKE_CONCAT(add_to_,NAME) (ARGTYPE ARG) { \
CHECK_FOO(NUMTYPE,TYPE,NAME); \
PIKE_CONCAT(low_add_to_,NAME) ( Pike_compiler, ARG ); \
}
970:
}
}
- void ins_short(INT16 i, void (*func)(char tmp))
+ void ins_short(int i, void (*func)(char tmp))
{
int e;
unsigned char *p = (unsigned char *)&i;
1443:
/* Already done (shouldn't happen, but who knows?) */
if(p->flags & PROGRAM_OPTIMIZED) return;
- #define FOO(NUMTYPE,TYPE,NAME) \
+ #define FOO(NUMTYPE,TYPE,ARGTYPE,NAME) \
size=DO_ALIGN(size, ALIGNOF(TYPE)); \
size+=p->PIKE_CONCAT(num_,NAME)*sizeof(p->NAME[0]);
#include "program_areas.h"
1457:
size=0;
- #define FOO(NUMTYPE,TYPE,NAME) \
+ #define FOO(NUMTYPE,TYPE,ARGTYPE,NAME) \
size=DO_ALIGN(size, ALIGNOF(TYPE)); \
MEMCPY(data+size,p->NAME,p->PIKE_CONCAT(num_,NAME)*sizeof(p->NAME[0])); \
PIKE_CONCAT(RELOCATE_,NAME)(p, (TYPE *)(data+size)); \
1505: Inside #if defined(PIKE_DEBUG) and #if defined(DEBUG_MALLOC)
{
char *tmp=dmalloc_find_name(p);
if (tmp) {
- char *p = strchr (tmp, ':');
+ char *p = STRCHR (tmp, ':');
if (p) {
char *pp;
- while ((pp = strchr (p + 1, ':'))) p = pp;
+ while ((pp = STRCHR (p + 1, ':'))) p = pp;
*line = atoi (p + 1);
return make_shared_binary_string (tmp, p - tmp);
}
1928:
if(Pike_compiler->new_program->program)
{
- #define FOO(NUMTYPE,TYPE,NAME) \
+ #define FOO(NUMTYPE,TYPE,ARGTYPE,NAME) \
Pike_compiler->malloc_size_program->PIKE_CONCAT(num_,NAME)=Pike_compiler->new_program->PIKE_CONCAT(num_,NAME);
#include "program_areas.h"
1971:
struct inherit i;
#define START_SIZE 64
- #define FOO(NUMTYPE,TYPE,NAME) \
+ #define FOO(NUMTYPE,TYPE,ARGTYPE,NAME) \
if (Pike_compiler->new_program->NAME) { \
free (Pike_compiler->new_program->NAME); \
Pike_compiler->new_program->PIKE_CONCAT(num_,NAME) = 0; \
2034:
static void exit_program_struct(struct program *p)
{
- unsigned INT16 e;
+ unsigned e;
#ifdef PIKE_DEBUG
if (p->refs) {
2109:
#endif /* PIKE_USE_MACHINE_CODE */
dmfree(p->program);
}
- #define FOO(NUMTYPE,TYPE,NAME) p->NAME=0;
+ #define FOO(NUMTYPE,TYPE,ARGTYPE,NAME) p->NAME=0;
#include "program_areas.h"
}else{
- #define FOO(NUMTYPE,TYPE,NAME) \
+ #define FOO(NUMTYPE,TYPE,ARGTYPE,NAME) \
if(p->NAME) { dmfree((char *)p->NAME); p->NAME=0; }
#include "program_areas.h"
}
4191:
}
PMOD_EXPORT int add_function_constant(const char *name, void (*cfun)(INT32),
- const char * type, INT16 flags)
+ const char * type, int flags)
{
struct svalue s;
INT32 ret;
4230:
*/
INT32 define_function(struct pike_string *name,
struct pike_type *type,
- unsigned INT16 flags,
- unsigned INT8 function_flags,
+ unsigned flags,
+ unsigned function_flags,
union idptr *func,
- unsigned INT16 opt_flags)
+ unsigned opt_flags)
{
struct identifier *funp,fun;
struct reference ref;
6209:
}
PMOD_EXPORT int pike_add_function2(const char *name, void (*cfun)(INT32),
- const char *type, unsigned INT8 flags,
- unsigned INT16 opt_flags)
+ const char *type, unsigned flags,
+ unsigned opt_flags)
{
int ret;
struct pike_string *name_tmp;
6247:
void (*cfun)(INT32),
const char *type,
int type_length,
- unsigned INT8 flags,
- unsigned INT16 opt_flags)
+ unsigned flags,
+ unsigned opt_flags)
{
int ret;
struct pike_string *name_tmp;