procyberian/nasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

eval: complete globalization of output format

Browse source 
Complete the globalization of the output format definitions;
one more place where a local copy was cached for no good reason.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
H. Peter Anvin 2016-02-18 01:18:50 -08:00
parent 8ac25aa020
commit 36034ec652
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
eval.c
View file

@ -56,8 +56,6 @@
static scanner scan; /* Address of scanner routine */
static lfunc labelfunc; /* Address of label routine */
static struct ofmt *outfmt; /* Structure of addresses of output routines */
static expr **tempexprs = NULL;
static int ntempexprs;
static int tempexprs_size = 0;
@ -241,7 +239,7 @@ static expr *segment_part(expr * e)
" is already a segment base");
return NULL;
} else {
int32_t base = outfmt->segbase(seg + 1);
int32_t base = ofmt->segbase(seg + 1);
begintemp();
addtotemp((base == NO_SEG ? EXPR_UNKNOWN : EXPR_SEGBASE + base),
@ -953,10 +951,8 @@ static expr *expr6(int critical)
}
}
void eval_global_info(struct ofmt *output, lfunc lookup_label,
struct location * locp)
void eval_global_info(lfunc lookup_label, struct location * locp)
{
outfmt = output;
labelfunc = lookup_label;
location = locp;
}

3
eval.h
View file

@ -43,8 +43,7 @@
* providing segment-base details, and what function can be used to
* look labels up.
*/
void eval_global_info(struct ofmt *output, lfunc lookup_label,
struct location * locp);
void eval_global_info(lfunc lookup_label, struct location * locp);
/*
* The evaluator itself.