summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2009-02-26 14:34:48 -0800
committerH. Peter Anvin <hpa@linux.intel.com>2009-02-26 14:34:48 -0800
commit7219198d729db708eddfe28615664ef55d2dfeed (patch)
tree5cff8b0a052d40d0d5ef6bd2612fc3960cda1b94
parent5a653cb65b4054d9663c668be8ff2f2e6a33efa8 (diff)
downloadnasm-7219198d729db708eddfe28615664ef55d2dfeed.tar.gz
nasm.c: readability cleanup for seg:off parsing
The code to pick apart seg:off in nasm.c was virtually unreadable due to mechanized line breaking.
-rw-r--r--nasm.c22
1 files changed, 8 insertions, 14 deletions
diff --git a/nasm.c b/nasm.c
index 405fb1e9..b2f76311 100644
--- a/nasm.c
+++ b/nasm.c
@@ -1539,23 +1539,17 @@ static void assemble_file(char *fname, StrList **depend_ptr)
false, isext, ofmt,
report_error);
} else if (output_ins.operands == 2
- && (output_ins.oprs[0].
- type & IMMEDIATE)
+ && (output_ins.oprs[0].type & IMMEDIATE)
&& (output_ins.oprs[0].type & COLON)
- && output_ins.oprs[0].segment ==
- NO_SEG
+ && output_ins.oprs[0].segment == NO_SEG
&& output_ins.oprs[0].wrt == NO_SEG
- && (output_ins.oprs[1].
- type & IMMEDIATE)
- && output_ins.oprs[1].segment ==
- NO_SEG
- && output_ins.oprs[1].wrt ==
- NO_SEG) {
+ && (output_ins.oprs[1].type & IMMEDIATE)
+ && output_ins.oprs[1].segment == NO_SEG
+ && output_ins.oprs[1].wrt == NO_SEG) {
def_label(output_ins.label,
- output_ins.oprs[0].
- offset | SEG_ABS,
- output_ins.oprs[1].offset, NULL,
- false, false, ofmt,
+ output_ins.oprs[0].offset | SEG_ABS,
+ output_ins.oprs[1].offset,
+ NULL, false, false, ofmt,
report_error);
} else
report_error(ERR_NONFATAL,