Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 3024 → Rev 3027

/trunk/boot/tools/pack.py
36,7 → 36,7
 
def usage(prname):
"Print usage syntax"
print prname + " <OBJCOPY> <FORMAT> <OUTPUT_FORMAT> <ARCH> <ALIGNMENT>"
print prname + " <OBJCOPY> <FORMAT> <ARCH> <ALIGNMENT> <UINTPTR>"
 
def main():
if (len(sys.argv) < 6):
43,40 → 43,21
usage(sys.argv[0])
return
if (not sys.argv[5].isdigit()):
if (not sys.argv[4].isdigit()):
print "<ALIGNMENT> must be a number"
return
templatename = "_link.ld.in"
workdir = os.getcwd()
objcopy = sys.argv[1]
format = sys.argv[2]
output_format = sys.argv[3]
arch = sys.argv[4]
align = int(sys.argv[5], 0)
arch = sys.argv[3]
align = int(sys.argv[4], 0)
uintptr = sys.argv[5]
link = file("_link.ld", "w")
workdir = os.getcwd()
header = file("_components.h", "w")
data = file("_components.c", "w")
link.write("OUTPUT_FORMAT(\"" + output_format + "\")\n")
link.write("OUTPUT_ARCH(" + arch + ")\n")
link.write("ENTRY(start)\n\n")
link.write("SECTIONS {\n")
size = os.path.getsize(templatename)
rd = 0
template = file(templatename, "r")
while (rd < size):
buf = template.read(4096)
link.write(buf)
rd += len(buf)
template.close()
link.write("\n")
header.write("#ifndef ___COMPONENTS_H__\n")
header.write("#define ___COMPONENTS_H__\n\n")
85,6 → 66,7
data.write("{\n")
cnt = 0
link = ""
for task in sys.argv[6:]:
basename = os.path.basename(task)
plainname = os.path.splitext(basename)[0]
95,14 → 77,16
print task + " -> " + object
link.write("\t\t. = ALIGN(" + ("%d" % align) + ");\n")
link.write("\t\t*(." + plainname + "_image);\n\n")
if (align > 1):
link += "\t\t. = ALIGN(" + ("%d" % align) + ");\n"
link += "\t\t*(." + plainname + "_image);\n"
header.write("extern int " + symbol + "_start;\n")
header.write("extern int " + symbol + "_end;\n\n")
header.write("#define " + macro + "_START ((void *) &" + symbol + "_start)\n")
header.write("#define " + macro + "_END ((void *) &" + symbol + "_end)\n")
header.write("#define " + macro + "_SIZE ((unsigned int) " + macro + "_END - (unsigned int) " + macro + "_START)\n\n")
header.write("#define " + macro + "_SIZE ((" + uintptr + ") " + macro + "_END - (" + uintptr + ") " + macro + "_START)\n\n")
data.write("\tcomponents[" + ("%d" % cnt) + "].name = \"" + plainname + "\";\n")
data.write("\tcomponents[" + ("%d" % cnt) + "].start = " + macro + "_START;\n")
118,17 → 102,14
basename, os.path.join(workdir, object)])
os.chdir(workdir)
cnt = cnt + 1
cnt += 1
link.write("\t}\n")
link.write("}\n")
header.write("#define COMPONENTS " + ("%d" % cnt) + "\n\n")
header.write("typedef struct {\n")
header.write("\tchar *name;\n\n")
header.write("\tvoid *start;\n")
header.write("\tvoid *end;\n")
header.write("\tunsigned int size;\n")
header.write("\t" + uintptr + " size;\n")
header.write("} component_t;\n\n")
header.write("extern void init_components(component_t *components);\n\n")
header.write("#endif\n")
135,9 → 116,17
data.write("}\n")
link.close()
header.close()
data.close()
linkname = "_link.ld"
link_in = file(linkname + ".in", "r")
template = link_in.read(os.path.getsize(linkname + ".in"))
link_in.close()
link_out = file(linkname, "w")
link_out.write(template.replace("[[COMPONENTS]]", link))
link_out.close()
 
if __name__ == '__main__':
main()
/trunk/boot/arch/sparc64/loader/pack
File deleted
Property changes:
Deleted: svn:executable
-*
\ No newline at end of property
/trunk/boot/arch/sparc64/loader/_link.ld.in
0,0 → 1,23
OUTPUT_FORMAT("elf64-sparc")
ENTRY(start)
 
SECTIONS {
.boot 0x4000: AT (0x4000) {
*(BOOTSTRAP);
*(.text);
*(.rodata);
*(.rodata.*);
*(.data); /* initialized data */
*(.sdata);
*(.sdata2);
*(.sbss);
*(.bss); /* uninitialized static variables */
*(COMMON);
[[COMPONENTS]]
}
/DISCARD/ : {
*(.comment);
*(.note*);
}
}
/trunk/boot/arch/sparc64/loader/Makefile
32,6 → 32,8
## Toolchain configuration
#
 
BFD_NAME = elf64-sparc
BFD_ARCH = sparc
TARGET = sparc64-linux-gnu
TOOLCHAIN_DIR = /usr/local/sparc64/bin
 
63,6 → 65,7
 
SOURCES = \
main.c \
_components.c \
../../../generic/printf.c \
../../../generic/string.c \
../../../genarch/balloc.c \
103,10 → 106,10
-makedepend $(DEFS) $(CFLAGS) -f - $(SOURCES) > Makefile.depend 2> /dev/null
 
clean:
-rm -f _components.h _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot boot.disasm Makefile.depend
-rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot image.map image.disasm Makefile.depend
 
_components.h _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS)
./pack $(IMAGE) $(OBJCOPY) $(COMPONENTS)
_components.h _components.c _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS) _link.ld.in
../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 1 "unsigned long" $(COMPONENTS)
 
%.o: %.S
$(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@
115,4 → 118,4
$(CC) $(DEFS) $(CFLAGS) -c $< -o $@
 
disasm: image.boot
$(OBJDUMP) -d image.boot > boot.disasm
$(OBJDUMP) -d image.boot > image.disasm
/trunk/boot/arch/ia64/loader/pack
File deleted
Property changes:
Deleted: svn:executable
-*
\ No newline at end of property
/trunk/boot/arch/ia64/loader/_link.ld.in
0,0 → 1,26
OUTPUT_FORMAT("elf64-ia64-little")
ENTRY(start)
 
SECTIONS {
.boot 0x4400000: AT (0x4400000) {
*(BOOTSTRAP);
[[COMPONENTS]]
. = ALIGN (16384);
*(.text);
*(.rodata);
*(.rodata.*);
*(.data); /* initialized data */
_got = . ;
*(.got .got.*);
*(.sdata);
*(.sdata2);
*(.sbss);
*(.bss); /* uninitialized static variables */
*(COMMON);
}
/DISCARD/ : {
*(.comment);
*(.note*);
}
}
/trunk/boot/arch/ia64/loader/Makefile
32,6 → 32,8
## Toolchain configuration
#
 
BFD_NAME = elf64-ia64-little
BFD_ARCH = ia64
TARGET = ia64-pc-linux-gnu
TOOLCHAIN_DIR = /usr/local/ia64/bin
 
77,6 → 79,7
../../../generic/printf.c \
../../../generic/string.c \
../../../genarch/balloc.c \
_components.c \
asm.S \
boot.S
 
95,7 → 98,6
$(USPACEDIR)/app/tester/tester \
$(USPACEDIR)/app/klog/klog
 
 
OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
COMPONENT_OBJECTS := $(addsuffix .o,$(basename $(notdir $(COMPONENTS))))
 
105,7 → 107,6
 
-include Makefile.depend
 
 
hello.efi: image.boot
make -C gefi/HelenOS PREFIX=$(GEFI_PREFIX)
cp gefi/HelenOS/hello.efi ../../../../
113,17 → 114,17
cp gefi/HelenOS/image.bin ../../../../
 
image.boot: depend _components.h _link.ld $(COMPONENT_OBJECTS) $(OBJECTS)
$(LD) -Map boot.map -no-check-sections -N -T _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) -o $@
$(LD) -Map image.map -no-check-sections -N -T _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) -o $@
 
depend:
-makedepend $(DEFS) $(CFLAGS) -f - $(SOURCES) > Makefile.depend 2> /dev/null
 
clean:
-rm -f _components.h _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot boot.disasm Makefile.depend
-rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot image.map image.disasm Makefile.depend
make -C gefi/HelenOS clean
 
_components.h _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS)
./pack $(IMAGE) $(OBJCOPY) $(COMPONENTS)
_components.h _components.c _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS) _link.ld.in
../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 16384 "unsigned long" $(COMPONENTS)
 
%.o: %.S
$(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@
132,4 → 133,4
$(CC) $(DEFS) $(CFLAGS) -c $< -o $@
 
disasm: image.boot
$(OBJDUMP) -d image.boot > boot.disasm
$(OBJDUMP) -d image.boot > image.disasm
/trunk/boot/arch/arm32/loader/_link.ld.in
1,3 → 1,7
OUTPUT_FORMAT("elf32-littlearm")
ENTRY(start)
 
SECTIONS {
.boot 0x0: AT (0) {
*(BOOTSTRAP);
*(.text);
15,3 → 19,6
 
. = 0x4000;
*(PT); /* page table placed at 0x4000 */
[[COMPONENTS]]
}
}
/trunk/boot/arch/arm32/loader/Makefile
32,7 → 32,6
## Toolchain configuration
#
 
BFD = elf32-littlearm
BFD_NAME = elf32-littlearm
BFD_ARCH = arm
TARGET = arm-linux-gnu
111,8 → 110,8
clean:
-rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot Makefile.depend
 
_components.h _components.c _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS)
../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD) $(BFD_ARCH) 4096 $(COMPONENTS)
_components.h _components.c _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS) _link.ld.in
../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 4096 "unsigned int" $(COMPONENTS)
 
%.o: %.S
$(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@
/trunk/boot/arch/ppc32/loader/_link.ld.in
1,3 → 1,8
OUTPUT_FORMAT("elf32-powerpc")
OUTPUT_ARCH(powerpc:common)
ENTRY(start)
SECTIONS {
.boot 0x10000000: AT (0) {
*(BOOTSTRAP);
*(REALMODE);
11,3 → 16,6
*(.sbss);
*(.bss); /* uninitialized static variables */
*(COMMON); /* global variables */
[[COMPONENTS]]
}
}
/trunk/boot/arch/ppc32/loader/Makefile
32,7 → 32,6
## Toolchain configuration
#
 
BFD = elf32-powerpc
BFD_NAME = elf32-powerpc
BFD_ARCH = powerpc:common
TARGET = ppc-linux-gnu
106,8 → 105,8
clean:
-rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot Makefile.depend
 
_components.h _components.c _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS)
../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD) $(BFD_ARCH) 4096 $(COMPONENTS)
_components.h _components.c _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS) _link.ld.in
../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 4096 "unsigned int" $(COMPONENTS)
 
%.o: %.S
$(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@
/trunk/boot/arch/ppc64/loader/_link.ld.in
1,3 → 1,8
OUTPUT_FORMAT("elf64-powerpc")
OUTPUT_ARCH(powerpc:common64)
ENTRY(start)
SECTIONS {
.boot 0x0000000010000000: AT (0) {
*(BOOTSTRAP);
*(REALMODE);
13,3 → 18,10
*(.sbss);
*(.bss); /* uninitialized static variables */
*(COMMON); /* global variables */
[[COMPONENTS]]
}
/DISCARD/ : {
*(*);
}
}
/trunk/boot/arch/ppc64/loader/Makefile
32,7 → 32,6
## Toolchain configuration
#
 
BFD = elf64-powerpc
BFD_NAME = elf64-powerpc
BFD_ARCH = powerpc:common64
TARGET = ppc64-linux-gnu
106,8 → 105,8
clean:
-rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot Makefile.depend
 
_components.h _components.c _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS)
../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD) $(BFD_ARCH) 4096 $(COMPONENTS)
_components.h _components.c _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS) _link.ld.in
../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 4096 "unsigned long" $(COMPONENTS)
 
%.o: %.S
$(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@
/trunk/boot/arch/mips32/loader/_link.ld.in
File deleted
/trunk/boot/arch/mips32/loader/_link.ld.in.ecoff
0,0 → 1,21
OUTPUT_FORMAT("ecoff-littlemips")
ENTRY(start)
SECTIONS {
.boot 0xbfc00000: AT (0) {
*(BOOTSTRAP);
*(.text);
*(.rodata);
*(.rodata.*);
*(.data); /* initialized data */
*(.sdata);
*(.sdata2);
*(.sbss);
*(.scommon);
*(.bss); /* uninitialized static variables */
*(COMMON); /* global variables */
*(.reginfo);
[[COMPONENTS]]
}
}
/trunk/boot/arch/mips32/loader/_link.ld.in.binary
0,0 → 1,21
OUTPUT_FORMAT("binary")
ENTRY(start)
SECTIONS {
.boot 0xbfc00000: AT (0) {
*(BOOTSTRAP);
*(.text);
*(.rodata);
*(.rodata.*);
*(.data); /* initialized data */
*(.sdata);
*(.sdata2);
*(.sbss);
*(.scommon);
*(.bss); /* uninitialized static variables */
*(COMMON); /* global variables */
*(.reginfo);
[[COMPONENTS]]
}
}
/trunk/boot/arch/mips32/loader/Makefile
33,10 → 33,10
#
 
ifeq ($(IMAGE),binary)
BFD = binary
LD_IN = binary
endif
ifeq ($(IMAGE),ecoff)
BFD = ecoff-littlemips
LD_IN = ecoff
endif
BFD_NAME = elf32-tradlittlemips
BFD_ARCH = mips
108,11 → 108,14
-makedepend $(DEFS) $(CFLAGS) -f - $(SOURCES) > Makefile.depend 2> /dev/null
 
clean:
-rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) $(OBJECTS) image.boot Makefile.depend
-rm -f _components.h _components.c _link.ld _link.ld.in $(COMPONENT_OBJECTS) $(OBJECTS) image.boot Makefile.depend
 
_components.h _components.c _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS)
../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD) $(BFD_ARCH) 4096 $(COMPONENTS)
_components.h _components.c _link.ld $(COMPONENT_OBJECTS): $(COMPONENTS) _link.ld.in
../../../tools/pack.py $(OBJCOPY) $(BFD_NAME) $(BFD_ARCH) 4096 "unsigned int" $(COMPONENTS)
 
_link.ld.in: _link.ld.in.$(LD_IN)
cp $< $@
 
%.o: %.S
$(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@