a5ffe96617
* util/i386/pc/pupa-setup.c: Include pupa/machine/kernel.h. (setup): Configure the installed partition information and the dl prefix. * loader/i386/pc/chainloader.c (my_mod): New variable. (pupa_chainloader_unload): New function. (pupa_rescue_cmd_chainloader): Refer itself. (PUPA_MOD_INIT): Save its own module in MY_MOD. * kern/i386/pc/startup.S (install_partition): Removed. (version_string): Likewise. (config_file): Likewise. (pupa_install_dos_part): New variable. (pupa_install_bsd_part): Likewise. (pupa_prefix): Likewise. (pupa_chainloader_real_boot): Call pupa_dl_unload_all. * kern/i386/pc/init.c: Include pupa/machine/kernel.h, pupa/dl.h and pupa/misc.h. (make_install_device): New function. (pupa_machine_init): Set the dl prefix. * kern/rescue.c: Include pupa/rescue.h and pupa/dl.h. (buf): Renamed to ... (linebuf): ... this. (pupa_rescue_cmd_prefix): New function. (pupa_rescue_cmd_insmod): Likewise. (pupa_rescue_cmd_rmmod): Likewise. (pupa_rescue_cmd_lsmod): Likewise. (pupa_enter_rescue_mode): Register new commands: prefix, insmod, rmmod and lsmod. * kern/mm.c (pupa_memalign): If failed even after invalidating disk caches, unload unneeded modules and retry. * kern/misc.c (pupa_memmove): New function. (pupa_memcpy): Removed. (pupa_strcpy): New function. (pupa_itoa): Made static. * kern/dl.c (pupa_dl_iterate): New function. (pupa_dl_ref): Likewise. (pupa_dl_unref): Likewise. (pupa_dl_unload): Return if succeeded or not. (pupa_dl_unload_unneeded): New function. (pupa_dl_unload_all): Likewise. (pupa_dl_init): Renamed to ... (pupa_dl_set_prefix): ... this. (pupa_dl_get_prefix): New function. * include/pupa/i386/pc/kernel.h: Include pupa/types.h. (PUPA_KERNEL_MACHINE_INSTALL_DOS_PART): New macro. (PUPA_KERNEL_MACHINE_INSTALL_BSD_PART): Likewise. (PUPA_KERNEL_MACHINE_PREFIX): Likewise. (pupa_install_dos_part): Declared. (pupa_install_bsd_part): Likewise. (pupa_prefix): Likewise. (pupa_boot_drive): Likewise. * include/pupa/types.h: Fix a typo. * include/pupa/misc.h (pupa_memcpy): New macro. Just an alias to pupa_memmove. (pupa_memmove): Declared. (pupa_strcpy): Likewise. * include/pupa/dl.h (PUPA_MOD_INIT): Change the prototype. Now pupa_mod_init takes one argument, its own module. (pupa_dl_unload_unneeded): Declared. (pupa_dl_unload_all): Likewise. (pupa_dl_ref): Likewise. (pupa_dl_unref): Likewise. (pupa_dl_iterate): Likewise. (pupa_dl_init): Renamed to ... (pupa_dl_set_prefix): ... this. (pupa_dl_get_prefix): Declared. * fs/fat.c [!PUPA_UTIL] (my_mod): New variable. (pupa_fat_dir) [!PUPA_UTIL]: Prevent the fat module from being unloaded. (pupa_fat_open) [!PUPA_UTIL]: Refer itself if succeeded. (pupa_fat_close) [!PUPA_UTIL]: Unrefer itself. * configure.ac (tmp_CFLAGS): Added -Wshadow, -Wpointer-arith, -Wmissing-prototypes, -Wundef and -Wstrict-prototypes.
220 lines
7.4 KiB
Text
220 lines
7.4 KiB
Text
2003-01-06 Yoshinori K. Okuji <okuji@enbug.org>
|
|
|
|
* util/i386/pc/pupa-setup.c: Include pupa/machine/kernel.h.
|
|
(setup): Configure the installed partition information and the
|
|
dl prefix.
|
|
|
|
* loader/i386/pc/chainloader.c (my_mod): New variable.
|
|
(pupa_chainloader_unload): New function.
|
|
(pupa_rescue_cmd_chainloader): Refer itself.
|
|
(PUPA_MOD_INIT): Save its own module in MY_MOD.
|
|
|
|
* kern/i386/pc/startup.S (install_partition): Removed.
|
|
(version_string): Likewise.
|
|
(config_file): Likewise.
|
|
(pupa_install_dos_part): New variable.
|
|
(pupa_install_bsd_part): Likewise.
|
|
(pupa_prefix): Likewise.
|
|
(pupa_chainloader_real_boot): Call pupa_dl_unload_all.
|
|
|
|
* kern/i386/pc/init.c: Include pupa/machine/kernel.h, pupa/dl.h
|
|
and pupa/misc.h.
|
|
(make_install_device): New function.
|
|
(pupa_machine_init): Set the dl prefix.
|
|
|
|
* kern/rescue.c: Include pupa/rescue.h and pupa/dl.h.
|
|
(buf): Renamed to ...
|
|
(linebuf): ... this.
|
|
(pupa_rescue_cmd_prefix): New function.
|
|
(pupa_rescue_cmd_insmod): Likewise.
|
|
(pupa_rescue_cmd_rmmod): Likewise.
|
|
(pupa_rescue_cmd_lsmod): Likewise.
|
|
(pupa_enter_rescue_mode): Register new commands: prefix, insmod,
|
|
rmmod and lsmod.
|
|
|
|
* kern/mm.c (pupa_memalign): If failed even after invalidating
|
|
disk caches, unload unneeded modules and retry.
|
|
|
|
* kern/misc.c (pupa_memmove): New function.
|
|
(pupa_memcpy): Removed.
|
|
(pupa_strcpy): New function.
|
|
(pupa_itoa): Made static.
|
|
|
|
* kern/dl.c (pupa_dl_iterate): New function.
|
|
(pupa_dl_ref): Likewise.
|
|
(pupa_dl_unref): Likewise.
|
|
(pupa_dl_unload): Return if succeeded or not.
|
|
(pupa_dl_unload_unneeded): New function.
|
|
(pupa_dl_unload_all): Likewise.
|
|
(pupa_dl_init): Renamed to ...
|
|
(pupa_dl_set_prefix): ... this.
|
|
(pupa_dl_get_prefix): New function.
|
|
|
|
* include/pupa/i386/pc/kernel.h: Include pupa/types.h.
|
|
(PUPA_KERNEL_MACHINE_INSTALL_DOS_PART): New macro.
|
|
(PUPA_KERNEL_MACHINE_INSTALL_BSD_PART): Likewise.
|
|
(PUPA_KERNEL_MACHINE_PREFIX): Likewise.
|
|
(pupa_install_dos_part): Declared.
|
|
(pupa_install_bsd_part): Likewise.
|
|
(pupa_prefix): Likewise.
|
|
(pupa_boot_drive): Likewise.
|
|
|
|
* include/pupa/types.h: Fix a typo.
|
|
|
|
* include/pupa/misc.h (pupa_memcpy): New macro. Just an alias to
|
|
pupa_memmove.
|
|
(pupa_memmove): Declared.
|
|
(pupa_strcpy): Likewise.
|
|
|
|
* include/pupa/dl.h (PUPA_MOD_INIT): Change the prototype. Now
|
|
pupa_mod_init takes one argument, its own module.
|
|
(pupa_dl_unload_unneeded): Declared.
|
|
(pupa_dl_unload_all): Likewise.
|
|
(pupa_dl_ref): Likewise.
|
|
(pupa_dl_unref): Likewise.
|
|
(pupa_dl_iterate): Likewise.
|
|
(pupa_dl_init): Renamed to ...
|
|
(pupa_dl_set_prefix): ... this.
|
|
(pupa_dl_get_prefix): Declared.
|
|
|
|
* fs/fat.c [!PUPA_UTIL] (my_mod): New variable.
|
|
(pupa_fat_dir) [!PUPA_UTIL]: Prevent the fat module from being
|
|
unloaded.
|
|
(pupa_fat_open) [!PUPA_UTIL]: Refer itself if succeeded.
|
|
(pupa_fat_close) [!PUPA_UTIL]: Unrefer itself.
|
|
|
|
* configure.ac (tmp_CFLAGS): Added -Wshadow, -Wpointer-arith,
|
|
-Wmissing-prototypes, -Wundef and -Wstrict-prototypes.
|
|
|
|
2003-01-03 Yoshinori K. Okuji <okuji@enbug.org>
|
|
|
|
* util/i386/pc/pupa-setup.c (setup): Define the internal
|
|
function find_first_partition_start at the top level, because GCC
|
|
3.0.x cannot compile internal functions in deeper scopes
|
|
correctly.
|
|
(find_root_device): Use lstat instead of stat.
|
|
Don't follow symbolic links.
|
|
Fix the path-constructing code.
|
|
|
|
* util/i386/pc/biosdisk.c [__linux__] (BLKFLSBUF): New macro.
|
|
(pupa_util_biosdisk_open) [__linux__]: Get the size of a device
|
|
by a BLKGETSIZE ioctl first, because block devices don't fill
|
|
the member st_mode of the structure stat on Linux.
|
|
[__linux__] (linux_find_partition): Use a temporary buffer
|
|
REAL_DEV for the working space. Copy it to DEV before returning.
|
|
(open_device) [__linux__]: Call ioctl with BLKFLSBUF to make the
|
|
buffer cache consistent.
|
|
(get_os_disk) [__linux__]: Use the length 5 instead of 4 for
|
|
strncmp. The previous value was merely wrong.
|
|
(pupa_util_biosdisk_get_pupa_dev): Use stat instead of lstat.
|
|
|
|
* fs/fat.c (pupa_fat_read_data): Shift 4 instead of 12 when the
|
|
FAT size is 12. The previous value was merely wrong.
|
|
|
|
* kern/main.c (pupa_main): Don't split the starting message from
|
|
newlines.
|
|
|
|
* kern/term.c (pupa_putchar): Put CR after LF instead of before
|
|
LF, because BIOS goes crazy about character attributes in this
|
|
case.
|
|
|
|
2003-01-03 Yoshinori K. Okuji <okuji@enbug.org>
|
|
|
|
* include/i386/pc/util/biosdisk.h: New file.
|
|
* util/i386/pc/biosdisk.c: Likewise.
|
|
* util/i386/pc/pupa-setup.c: Likewise.
|
|
|
|
* Makefile.in (INCLUDE_DISTFILES): Added
|
|
include/pupa/i386/pc/util/biosdisk.h.
|
|
(UTIL_DISTFILES): Added biosdisk.c and pupa-setup.c under the
|
|
directory util/i386/pc.
|
|
(install-local): Added a rule for sbin_UTILITIES.
|
|
(uninstall): Likewise.
|
|
|
|
* util/i386/pc/pupa-mkimage.c (usage): Fix a typo in the doc.
|
|
|
|
* util/misc.c (xrealloc): New function.
|
|
(pupa_malloc): Likewise.
|
|
(pupa_free): Likewise.
|
|
(pupa_realloc): Likewise.
|
|
(pupa_stop): Likewise.
|
|
(pupa_putchar): Likewise.
|
|
|
|
* kern/disk.c (pupa_disk_read): Prevent L from underflowing.
|
|
|
|
* include/pupa/util/misc.h (xrealloc): Declared.
|
|
|
|
* include/pupa/i386/pc/boot.h (PUPA_BOOT_MACHINE_BPB_START): New
|
|
macro.
|
|
(PUPA_BOOT_MACHINE_BPBEND): Renamed to ...
|
|
(PUPA_BOOT_MACHINE_BPB_END): ... this.
|
|
|
|
* include/pupa/fs.h [PUPA_UTIL] (pupa_fat_init): Declared.
|
|
[PUPA_UTIL] (pupa_fat_fini): Likewise.
|
|
|
|
* fs/fat.c [PUPA_UTIL] (pupa_fat_init): Defined. Maybe a better
|
|
way should be implemented.
|
|
[PUPA_UTIL] (pupa_fat_fini): Likewise.
|
|
|
|
* disk/i386/pc/biosdisk.c (pupa_biosdisk_call_hook): Increase
|
|
the size of NAME for safety.
|
|
(pupa_biosdisk_iterate): Search hard disks to 0x90 instead of
|
|
0x88.
|
|
|
|
* conf/i386-pc.rmk (sbin_UTILITIES): New variable.
|
|
(pupa_setup_SOURCES): Likewise.
|
|
|
|
* genmk.rb (Utility#rule): Add $(BUILD_CFLAGS) into the rules.
|
|
|
|
2002-12-28 Yoshinori K. Okuji <okuji@enbug.org>
|
|
|
|
* kern/i386/pc/startup.S (push_get_mmap_entry): Revert to a
|
|
bunch of pushl's from pusha, because this destroys the return
|
|
value.
|
|
|
|
2002-12-28 Yoshinori K. Okuji <okuji@enbug.org>
|
|
|
|
Use -mrtd and -mregparm=3 to reduce the generated code sizes.
|
|
This means that any missing prototypes could be fatal. Also, you
|
|
must take care when writing assembly code. See the comments at
|
|
the beginning of startup.S, for more details.
|
|
|
|
* kern/i386/pc/startup.S (pupa_halt): Modified for the new
|
|
compilation mechanism.
|
|
(pupa_chainloader_real_boot): Likewise.
|
|
(pupa_biosdisk_rw_int13_extensions): Likewise.
|
|
(pupa_biosdisk_rw_standard): Likewise.
|
|
(pupa_biosdisk_check_int13_extensions): Likewise.
|
|
(pupa_biosdisk_get_diskinfo_int13_extensions): Likewise.
|
|
(pupa_biosdisk_get_diskinfo_standard): Likewise.
|
|
(pupa_get_memsize): Likewise.
|
|
(pupa_get_mmap_entry): Likewise.
|
|
(pupa_console_putchar): Likewise.
|
|
(pupa_console_setcursor): Likewise.
|
|
(pupa_getrtsecs): Use pushl instead of push.
|
|
|
|
* kern/i386/pc/init.c (pupa_machine_init): Use the scratch
|
|
memory instead of the stack for a mmap entry, because some
|
|
BIOSes may ignore the maximum size and overflow.
|
|
|
|
* conf/i386-pc.rmk (COMMON_CFLAGS): Added -mrtd and -mregparm=3.
|
|
|
|
* genmk.rb (PModule#rule): Compile automatically generated
|
|
sources with module-specific CFLAGS as well as other sources.
|
|
|
|
2002-12-27 Yoshinori K. Okuji <okuji@enbug.org>
|
|
|
|
* configure.ac: Check ld.
|
|
Replace CFLAGS and CPPFLAGS with BUILD_CFLAGS and BUILD_CPPFLAGS
|
|
respectively, before checking endianness and sizes.
|
|
|
|
* Makefile.in (LD): New variable.
|
|
|
|
2002-12-27 Yoshinori K. Okuji <okuji@enbug.org>
|
|
|
|
* Makefile.in (BUILD_CC): CC -> BUILD_CC.
|
|
|
|
2002-12-27 Yoshinori K. Okuji <okuji@enbug.org>
|
|
|
|
* Changelog: New file.
|
|
|