mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-02-17 17:19:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

nasm.c: Convert GET_CURR_OFFS/SET_CURR_OFFS to functions

Browse Source 
In future better to not work with global variables but
rather pass arguments.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
This commit is contained in:
Cyrill Gorcunov 2013-02-15 12:35:04 +04:00
parent f187eb7788
commit 190232f013
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
nasm.c
View File

@ -165,20 +165,25 @@ static const struct warning {
{"hle", "invalid hle prefixes", true},
};
/*
* get/set current offset...
*/
#define GET_CURR_OFFS (in_abs_seg?abs_offset:\
raa_read(offsets,location.segment))
#define SET_CURR_OFFS(x) (in_abs_seg?(void)(abs_offset=(x)):\
(void)(offsets=raa_write(offsets,location.segment,(x))))
static bool want_usage;
static bool terminate_after_phase;
int user_nolist = 0; /* fbk 9/2/00 */
static char *quote_for_make(const char *str);
static int64_t get_curr_offs(void)
{
return in_abs_seg ? abs_offset : raa_read(offsets, location.segment);
}
static void set_curr_offs(int64_t l_off)
{
if (in_abs_seg)
abs_offset = l_off;
else
offsets = raa_write(offsets, location.segment, l_off);
}
static void nasm_fputs(const char *line, FILE * outfile)
{
if (outfile) {
@ -1216,7 +1221,7 @@ static void assemble_file(char *fname, StrList **depend_ptr)
globallineno = 0;
if (passn == 1)
location.known = true;
location.offset = offs = GET_CURR_OFFS;
location.offset = offs = get_curr_offs();
while ((line = preproc->getline())) {
enum directives d;
@ -1717,7 +1722,7 @@ static void assemble_file(char *fname, StrList **depend_ptr)
}
if (l != -1) {
offs += l;
SET_CURR_OFFS(offs);
set_curr_offs(offs);
}
/*
* else l == -1 => invalid instruction, which will be
@ -1728,14 +1733,14 @@ static void assemble_file(char *fname, StrList **depend_ptr)
offs += assemble(location.segment, offs, sb, cpu,
&output_ins, ofmt, nasm_error,
&nasmlist);
SET_CURR_OFFS(offs);
set_curr_offs(offs);
}
} /* not an EQU */
cleanup_insn(&output_ins);
}
nasm_free(line);
location.offset = offs = GET_CURR_OFFS;
location.offset = offs = get_curr_offs();
} /* end while (line = preproc->getline... */
if (pass0 == 2 && global_offset_changed && !terminate_after_phase)