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

outmac: move the format definitions down to the format-specific code

Browse Source 
Move the format definitions down the to where the format-specific
initialization code lives.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin 2016-02-12 03:13:00 -08:00
parent c635497870
commit 09b56b421a
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
output/outmac.c
View File

@ -100,28 +100,6 @@ struct macho_fmt {
uint32_t nlist_size; /* Nlist (symbol) size */ uint32_t nlist_size; /* Nlist (symbol) size */
}; };
static const struct macho_fmt macho32_fmt = {
4,
MH_MAGIC,
CPU_TYPE_I386,
LC_SEGMENT,
MACHO_HEADER_SIZE,
MACHO_SEGCMD_SIZE,
MACHO_SECTCMD_SIZE,
MACHO_NLIST_SIZE
};
static const struct macho_fmt macho64_fmt = {
8,
MH_MAGIC_64,
CPU_TYPE_X86_64,
LC_SEGMENT_64,
MACHO_HEADER64_SIZE,
MACHO_SEGCMD64_SIZE,
MACHO_SECTCMD64_SIZE,
MACHO_NLIST64_SIZE
};
static const struct macho_fmt *fmt; static const struct macho_fmt *fmt;
static void fwriteptr(uint64_t data, FILE * fp) static void fwriteptr(uint64_t data, FILE * fp)
@ -1512,6 +1490,17 @@ static void debug_section_relocs (struct section *s)
} }
#ifdef OF_MACHO32 #ifdef OF_MACHO32
static const struct macho_fmt macho32_fmt = {
4,
MH_MAGIC,
CPU_TYPE_I386,
LC_SEGMENT,
MACHO_HEADER_SIZE,
MACHO_SEGCMD_SIZE,
MACHO_SECTCMD_SIZE,
MACHO_NLIST_SIZE
};
static void macho32_init(void) static void macho32_init(void)
{ {
fmt = &macho32_fmt; fmt = &macho32_fmt;
@ -1542,6 +1531,17 @@ struct ofmt of_macho32 = {
#endif #endif
#ifdef OF_MACHO64 #ifdef OF_MACHO64
static const struct macho_fmt macho64_fmt = {
8,
MH_MAGIC_64,
CPU_TYPE_X86_64,
LC_SEGMENT_64,
MACHO_HEADER64_SIZE,
MACHO_SEGCMD64_SIZE,
MACHO_SECTCMD64_SIZE,
MACHO_NLIST64_SIZE
};
static void macho64_init(void) static void macho64_init(void)
{ {
fmt = &macho64_fmt; fmt = &macho64_fmt;