From 85281c31fea9a7343c7b3232090beec5bdeb4635 Mon Sep 17 00:00:00 2001 From: Robert Pengelly Date: Sun, 16 Mar 2025 12:32:09 +0000 Subject: [PATCH] Added Makefile.wat --- Makefile.unix | 5 ++--- Makefile.w32 | 6 +++--- Makefile.wat | 18 ++++++++++++++++++ hashtab.c | 2 +- hashtab.h | 2 +- pe.c | 8 ++++---- 6 files changed, 29 insertions(+), 12 deletions(-) create mode 100644 Makefile.wat diff --git a/Makefile.unix b/Makefile.unix index 4324f57..a0416b7 100644 --- a/Makefile.unix +++ b/Makefile.unix @@ -1,13 +1,11 @@ #****************************************************************************** # @file Makefile.unix #****************************************************************************** -OBJDIR ?= $(CURDIR) SRCDIR ?= $(CURDIR) - VPATH := $(SRCDIR) CC := gcc -CFLAGS := -D_FILE_OFFSET_BITS=64 -I$(OBJDIR) -I$(SRCDIR)/include -O2 -Wall -Werror -Wextra -ansi -pedantic -std=c90 +CFLAGS := -D_FILE_OFFSET_BITS=64 -O2 -Wall -Werror -Wextra -ansi -pedantic -std=c90 CSRC := aout.c elks.c hashtab.c ld.c lib.c link.c map.c pe.c report.c section.c symbol.c vector.c write7x.c @@ -24,5 +22,6 @@ slink: $(CSRC) endif clean: + if [ -f slink ]; then rm -rf slink; fi if [ -f slink.exe ]; then rm -rf slink.exe; fi diff --git a/Makefile.w32 b/Makefile.w32 index 2067a85..7e70fd9 100644 --- a/Makefile.w32 +++ b/Makefile.w32 @@ -1,21 +1,21 @@ #****************************************************************************** # @file Makefile.w32 #****************************************************************************** -OBJDIR ?= $(CURDIR) SRCDIR ?= $(CURDIR) - VPATH := $(SRCDIR) CC := gcc -CFLAGS := -D_FILE_OFFSET_BITS=64 -I$(OBJDIR) -I$(SRCDIR)/include -O2 -Wall -Werror -Wextra -ansi -pedantic -std=c90 +CFLAGS := -D_FILE_OFFSET_BITS=64 -O2 -Wall -Werror -Wextra -ansi -pedantic -std=c90 CSRC := aout.c elks.c hashtab.c ld.c lib.c link.c map.c pe.c report.c section.c symbol.c vector.c write7x.c all: slink.exe clean: + if exist slink ( del /q slink ) if exist slink.exe ( del /q slink.exe ) slink.exe: $(CSRC) + $(CC) $(CFLAGS) -o $@ $^ diff --git a/Makefile.wat b/Makefile.wat new file mode 100644 index 0000000..96156bb --- /dev/null +++ b/Makefile.wat @@ -0,0 +1,18 @@ +#****************************************************************************** +# @file Makefile.wat +#****************************************************************************** +SRCDIR ?= $(CURDIR) +VPATH := $(SRCDIR) + +SRC := aout.c elks.c hashtab.c ld.c lib.c link.c map.c pe.c report.c section.c symbol.c vector.c write7x.c + +all: slink.exe + +slink.exe: $(SRC) + + wcl -fe=$@ $^ + +clean: + + for /r %%f in (*.obj) do ( if exist %%f ( del /q %%f ) ) + if exist slink.exe ( del /q slink.exe ) diff --git a/hashtab.c b/hashtab.c index 9ddaf7e..f70fe20 100644 --- a/hashtab.c +++ b/hashtab.c @@ -103,7 +103,7 @@ static unsigned int hash_string (const void *p, unsigned int length) { unsigned int result = 0; for (i = 0; i < length; i++) { - result = (((unsigned short) str[i]) << 4) + (result >> 9) + result + (result >> 3) + (((unsigned short) str[i]) << 2) - (result << 24); + result = (((unsigned short) str[i]) << 4) + (result >> 9) + result + (result >> 3) + (((unsigned short) str[i]) << 2) - (result << 12); } return result; diff --git a/hashtab.h b/hashtab.h index 47aab3b..ed8e828 100644 --- a/hashtab.h +++ b/hashtab.h @@ -7,7 +7,7 @@ struct hashtab_name { const char *chars; - int bytes, hash; + unsigned int bytes, hash; }; diff --git a/pe.c b/pe.c index cf1bffa..b49d128 100644 --- a/pe.c +++ b/pe.c @@ -397,9 +397,9 @@ static unsigned long size_of_code = 0; static unsigned long size_of_initialized_data = 0; static unsigned long size_of_uninitialized_data = 0; -static unsigned short translate_section_flags_to_characteristics (int flags) { +static unsigned long translate_section_flags_to_characteristics (int flags) { - unsigned short characteristics = 0; + unsigned long characteristics = 0; if (!(flags & SECTION_FLAG_READONLY)) { characteristics |= IMAGE_SCN_MEM_WRITE; @@ -444,7 +444,7 @@ static unsigned short translate_section_flags_to_characteristics (int flags) { static void write_sections (unsigned char *data) { unsigned char *pos = data + state->size_of_headers; - unsigned short characteristics = 0; + unsigned long characteristics = 0; struct pe_section_table_entry *hdr; struct section *section; @@ -470,7 +470,7 @@ static void write_sections (unsigned char *data) { } characteristics = translate_section_flags_to_characteristics (section->flags); - write721_to_byte_array (hdr->Characteristics, characteristics); + write741_to_byte_array (hdr->Characteristics, characteristics); if (characteristics & IMAGE_SCN_CNT_CODE) { -- 2.34.1