Commit-ID: 36034ec65203acfd1419992743a143b33bfc8ab1
Gitweb: http://repo.or.cz/w/nasm.git?a=commitdiff;h=36034ec65203acfd1419992743a143b33bfc8ab1
Author: H. Peter Anvin <hp...@li...>
AuthorDate: Thu, 18 Feb 2016 01:18:50 -0800
Committer: H. Peter Anvin <hp...@li...>
CommitDate: Thu, 18 Feb 2016 01:18:50 -0800
eval: complete globalization of output format
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 <hp...@li...>
---
eval.c | 8 ++------
eval.h | 3 +--
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/eval.c b/eval.c
index a8e463f..1709933 100644
--- a/eval.c
+++ b/eval.c
@@ -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;
}
diff --git a/eval.h b/eval.h
index 76ea14b..41949d4 100644
--- a/eval.h
+++ b/eval.h
@@ -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.
|
