mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-01-18 16:25:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

exprlib: move dumping code to a separate C file

Browse Source 
Most of the time we don't need the dumping code, so move it to a
separate C file to the linker can exclude it.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
H. Peter Anvin 2017-02-28 18:13:43 -08:00
parent 4d58a8fef5
commit a5a56bd117
3 changed files with 80 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.in
View File

@ -108,7 +108,7 @@ LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \
asm/directiv.$(O) \
asm/assemble.$(O) asm/labels.$(O) asm/parser.$(O) \
asm/preproc.$(O) asm/quote.$(O) asm/pptok.$(O) \
asm/listing.$(O) asm/eval.$(O) asm/exprlib.$(O) \
asm/listing.$(O) asm/eval.$(O) asm/exprlib.$(O) asm/exprdump.$(O) \
asm/stdscan.$(O) \
asm/strfunc.$(O) asm/tokhash.$(O) \
asm/segalloc.$(O) \

79
asm/exprdump.c Normal file
View File

@ -0,0 +1,79 @@
/* ----------------------------------------------------------------------- *
*
* Copyright 1996-2017 The NASM Authors - All Rights Reserved
* See the file AUTHORS included with the NASM distribution for
* the specific copyright holders.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following
* conditions are met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials provided
* with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* ----------------------------------------------------------------------- */
/*
* exprdump.c
*
* Debugging code to dump the contents of an expression vector to stdout
*/
#include "nasm.h"
static const char *expr_type(int32_t type)
{
static char seg_str[64];
switch (type) {
case 0:
return "null";
case EXPR_UNKNOWN:
return "unknown";
case EXPR_SIMPLE:
return "simple";
case EXPR_WRT:
return "wrt";
case EXPR_RDSAE:
return "sae";
default:
break;
}
if (type >= EXPR_REG_START && type <= EXPR_REG_END) {
return nasm_reg_names[type - EXPR_REG_START];
} else if (type >= EXPR_SEGBASE) {
snprintf(seg_str, sizeof seg_str, "%sseg %d",
(type - EXPR_SEGBASE) == location.segment ? "this " : "",
type - EXPR_SEGBASE);
return seg_str;
} else {
return "ERR";
}
}
void dump_expr(const expr *e)
{
printf("[");
for (; e->type; e++)
printf("<%s(%d),%"PRId64">", expr_type(e->type), e->type, e->value);
printf("]\n");
}

42
asm/exprlib.c
View File

@ -198,45 +198,3 @@ bool is_self_relative(const expr *vect)
return false;
}
/*
* Debug support: dump a description of an expression vector to stdout
*/
static const char *expr_type(int32_t type)
{
static char seg_str[64];
switch (type) {
case 0:
return "null";
case EXPR_UNKNOWN:
return "unknown";
case EXPR_SIMPLE:
return "simple";
case EXPR_WRT:
return "wrt";
case EXPR_RDSAE:
return "sae";
default:
break;
}
if (type >= EXPR_REG_START && type <= EXPR_REG_END) {
return nasm_reg_names[type - EXPR_REG_START];
} else if (type >= EXPR_SEGBASE) {
snprintf(seg_str, sizeof seg_str, "%sseg %d",
(type - EXPR_SEGBASE) == location.segment ? "this " : "",
type - EXPR_SEGBASE);
return seg_str;
} else {
return "ERR";
}
}
void dump_expr(const expr *e)
{
printf("[");
for (; e->type; e++)
printf("<%s(%d),%"PRId64">", expr_type(e->type), e->type, e->value);
printf("]\n");
}