aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2019-09-12 20:26:23 -0400
committerH. Peter Anvin <hpa@zytor.com>2019-09-12 20:26:23 -0400
commit7ad25b2e1828a4569812f3296473f7a3bc7cd941 (patch)
tree2588114d21407401b7e57092469edec92ed91f20
parent90b1ccff86d530b140eb391ede3c50e33bcf9410 (diff)
downloadnasm-7ad25b2e1828a4569812f3296473f7a3bc7cd941.tar.gz
nasm-7ad25b2e1828a4569812f3296473f7a3bc7cd941.tar.xz
nasm-7ad25b2e1828a4569812f3296473f7a3bc7cd941.zip
Change LBL_NONE to LBL_none
NASM convention is to use all-upper-case for "real" information, and mixed-case (upper case common prefix, lower case description) for meta-information. This is a highly useful distinction. Thus "LBL_NONE" implies an actual label of type "NONE", as opposed to no label at all. Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
-rw-r--r--asm/eval.c2
-rw-r--r--asm/labels.c4
-rw-r--r--include/labels.h2
-rw-r--r--output/outbin.c4
-rw-r--r--output/outmacho.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/asm/eval.c b/asm/eval.c
index db915ef2..c99ee11c 100644
--- a/asm/eval.c
+++ b/asm/eval.c
@@ -974,7 +974,7 @@ static expr *expr6(void)
} else {
enum label_type ltype;
ltype = lookup_label(tokval->t_charptr, &label_seg, &label_ofs);
- if (ltype == LBL_NONE) {
+ if (ltype == LBL_none) {
scope = local_scope(tokval->t_charptr);
if (critical) {
nasm_nonfatal("symbol `%s%s' not defined%s",
diff --git a/asm/labels.c b/asm/labels.c
index 4618fc70..f6b940fc 100644
--- a/asm/labels.c
+++ b/asm/labels.c
@@ -272,7 +272,7 @@ enum label_type lookup_label(const char *label,
union label *lptr;
if (!initialized)
- return LBL_NONE;
+ return LBL_none;
lptr = find_label(label, false, NULL);
if (lptr && lptr->defn.defined) {
@@ -284,7 +284,7 @@ enum label_type lookup_label(const char *label,
return lptr->defn.type;
}
- return LBL_NONE;
+ return LBL_none;
}
static inline bool is_global(enum label_type type)
diff --git a/include/labels.h b/include/labels.h
index 32df8071..a825d1ff 100644
--- a/include/labels.h
+++ b/include/labels.h
@@ -48,7 +48,7 @@ enum mangle_index {
};
enum label_type {
- LBL_NONE = -1, /* No label */
+ LBL_none = -1, /* No label */
LBL_LOCAL = 0, /* Must be zero */
LBL_STATIC,
LBL_GLOBAL,
diff --git a/output/outbin.c b/output/outbin.c
index 5c2f0631..29659f00 100644
--- a/output/outbin.c
+++ b/output/outbin.c
@@ -655,7 +655,7 @@ static void bin_cleanup(void)
fprintf(rf, "\n\nValue Name\n");
list_for_each(l, no_seg_labels) {
found_label = lookup_label(l->name, &segment, &offset);
- nasm_assert(found_label != LBL_NONE);
+ nasm_assert(found_label != LBL_none);
fprintf(rf, "%08"PRIX64" %s\n", offset, l->name);
}
fprintf(rf, "\n\n");
@@ -668,7 +668,7 @@ static void bin_cleanup(void)
fprintf(rf, "\n\nReal Virtual Name\n");
list_for_each(l, s->labels) {
found_label = lookup_label(l->name, &segment, &offset);
- nasm_assert(found_label != LBL_NONE);
+ nasm_assert(found_label != LBL_none);
fprintf(rf, "%16"PRIX64" %16"PRIX64" %s\n",
s->start + offset, s->vstart + offset,
l->name);
diff --git a/output/outmacho.c b/output/outmacho.c
index 6cbaa012..08147883 100644
--- a/output/outmacho.c
+++ b/output/outmacho.c
@@ -1740,7 +1740,7 @@ static bool macho_set_section_attribute_by_symbol(const char *label, uint32_t fl
int32_t nasm_seg;
int64_t offset;
- if (lookup_label(label, &nasm_seg, &offset) == LBL_NONE) {
+ if (lookup_label(label, &nasm_seg, &offset) == LBL_none) {
nasm_error(ERR_NONFATAL, "unknown symbol `%s' in no_dead_strip", label);
return false;
}