- OpenBIOS - mail.coreboot.org

adding words to open bios
by G 3 18 Jan '10

18 Jan '10

I'm having a lot of difficulty trying to add my own words to OpenBIOS. I though it would be easy as defining the word and saving it in one of the .fs files. Here is my simple word : testword ." this is a test word" ; I tried adding this word to start.fs, but when I try to compile OpenBIOS r666, I receive this error: john@iBook:~/openbios-devel$ make Building OpenBIOS for ppc Building...error: make[1]: Entering directory `/home/john/openbios-devel/obj-ppc' GEN bootstrap.dict panic: segmentation violation at (nil) dict=0x48131008 here=0x48136624(dict+0x561c) pc=0x4813380c(dict+0x2804) dstackcnt=4 rstackcnt=5 instruction=481312ec dstack: 0x0 0x0 0x0 0x0 0x22 rstack: 0x0 0x48133b6c 0x48133b78 0x481338ac 0x0 0x0 Writing dictionary core file make[1]: *** [bootstrap.dict] Error 1 make[1]: Leaving directory `/home/john/openbios-devel/obj-ppc' make: *** [build] Error 1 Could someone point me into the right direction?

2 1

r666 - trunk/openbios-devel/drivers
by svn＠openbios.org 16 Jan '10

16 Jan '10

Author: blueswirl Date: 2010-01-16 11:35:58 +0100 (Sat, 16 Jan 2010) New Revision: 666 Modified: trunk/openbios-devel/drivers/esp.c Log: ESP: fix breakage by r667, status getting erased by interrupt register read Reading the interrupt status register clears also status register, therefore the interrupt status must be read only after reading the status. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/drivers/esp.c =================================================================== --- trunk/openbios-devel/drivers/esp.c 2010-01-16 08:47:39 UTC (rev 665) +++ trunk/openbios-devel/drivers/esp.c 2010-01-16 10:35:58 UTC (rev 666) @@ -101,12 +101,11 @@ esp->ll->regs[ESP_CMD] = ESP_CMD_SELA | ESP_CMD_DMA; // Wait for DMA to complete. Can this fail? while ((esp->espdma.regs->cond_reg & DMA_HNDL_INTR) == 0) /* no-op */; + // Check status + status = esp->ll->regs[ESP_STATUS]; // Clear interrupts to avoid guests seeing spurious interrupts (void)esp->ll->regs[ESP_INTRPT]; - // Check status - status = esp->ll->regs[ESP_STATUS]; - DPRINTF("do_command: id %d, cmd[0] 0x%x, status 0x%x\n", sd->id, esp->buffer[0], status); // Target didn't want all command data or went to status phase @@ -127,13 +126,11 @@ esp->ll->regs[ESP_CMD] = ESP_CMD_TI | ESP_CMD_DMA; // Wait for DMA to complete while ((esp->espdma.regs->cond_reg & DMA_HNDL_INTR) == 0) /* no-op */; - + // Check status + status = esp->ll->regs[ESP_STATUS]; // Clear interrupts to avoid guests seeing spurious interrupts (void)esp->ll->regs[ESP_INTRPT]; - // Check status - status = esp->ll->regs[ESP_STATUS]; - DPRINTF("do_command_reply: status 0x%x\n", status); if ((status & ESP_STAT_TCNT) != ESP_STAT_TCNT)

1 0

r665 - trunk/openbios-devel/drivers
by svn＠openbios.org 16 Jan '10

16 Jan '10

Author: blueswirl Date: 2010-01-16 09:47:39 +0100 (Sat, 16 Jan 2010) New Revision: 665 Modified: trunk/openbios-devel/drivers/esp.c Log: ESP: fix spurious guest interrupts during boot Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/drivers/esp.c =================================================================== --- trunk/openbios-devel/drivers/esp.c 2010-01-10 18:26:34 UTC (rev 664) +++ trunk/openbios-devel/drivers/esp.c 2010-01-16 08:47:39 UTC (rev 665) @@ -101,6 +101,9 @@ esp->ll->regs[ESP_CMD] = ESP_CMD_SELA | ESP_CMD_DMA; // Wait for DMA to complete. Can this fail? while ((esp->espdma.regs->cond_reg & DMA_HNDL_INTR) == 0) /* no-op */; + // Clear interrupts to avoid guests seeing spurious interrupts + (void)esp->ll->regs[ESP_INTRPT]; + // Check status status = esp->ll->regs[ESP_STATUS]; @@ -124,6 +127,10 @@ esp->ll->regs[ESP_CMD] = ESP_CMD_TI | ESP_CMD_DMA; // Wait for DMA to complete while ((esp->espdma.regs->cond_reg & DMA_HNDL_INTR) == 0) /* no-op */; + + // Clear interrupts to avoid guests seeing spurious interrupts + (void)esp->ll->regs[ESP_INTRPT]; + // Check status status = esp->ll->regs[ESP_STATUS];

1 0

Re: [OpenBIOS] [Qemu-devel] [PATCH 0/9] PPC NewWorld fixery v3
by Blue Swirl 13 Jan '10

13 Jan '10

On Tue, Jan 12, 2010 at 11:58 AM, Alexander Graf <agraf(a)suse.de> wrote: > I'm trying to get the PPC64 system emulation target working finally. > While doing so, I ran into several issues, all related to PCI this time. > > This patchset fixes all the PCI config space access and PCI interrupt > mapping issues I've found on PPC64. Using this and a patched OpenBIOS > version, I can successfully access IDE devices and was booting a guest > into the shell from IDE using serial console. > > To leverage this patch, you also need a few patches to OpenBIOS. I'll > present them to the OpenBIOS list, but in general getting patches into > Qemu is harder than getting them into OpenBIOS. So I want to wait for > the review process here first. > > Find the OpenBIOS patch at: http://alex.csgraf.de/openbios-ppc-u3.patch About the OpenBIOS patch, could you move the PCI_INT_MAP defines to a PPC-specific header and make pci_host_set_interrupt_map() contents surrounded by #ifdef CONFIG_PPC (to make it empty function for other arches)?

2 7

r664 - trunk/openbios-devel/drivers
by svn＠openbios.org 10 Jan '10

10 Jan '10

Author: blueswirl Date: 2010-01-10 19:26:34 +0100 (Sun, 10 Jan 2010) New Revision: 664 Modified: trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/drivers/pci_database.c trunk/openbios-devel/drivers/pci_database.h Log: Sparc64: fix Sabre properties Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/drivers/pci.c =================================================================== --- trunk/openbios-devel/drivers/pci.c 2010-01-09 21:28:28 UTC (rev 663) +++ trunk/openbios-devel/drivers/pci.c 2010-01-10 18:26:34 UTC (rev 664) @@ -348,6 +348,63 @@ return 0; } +int sabre_config_cb(const pci_config_t *config) +{ + phandle_t dev = get_cur_dev(); + uint32_t props[28]; + + props[0] = 0x00000000; + props[1] = 0x00000003; + set_property(dev, "bus-range", (char *)props, 2 * sizeof(props[0])); + props[0] = 0x000001fe; + props[1] = 0x00000000; + props[2] = 0x00000000; + props[3] = 0x00010000; + props[4] = 0x000001fe; + props[5] = 0x01000000; + props[6] = 0x00000000; + props[7] = 0x00000100; + set_property(dev, "reg", (char *)props, 8 * sizeof(props[0])); + props[0] = 0x00000000; + props[1] = 0x00000000; + props[2] = 0x00000000; + props[3] = 0x000001fe; + props[4] = 0x01000000; + props[5] = 0x00000000; + props[6] = 0x01000000; + props[7] = 0x01000000; + props[8] = 0x00000000; + props[9] = 0x00000000; + props[10] = 0x000001fe; + props[11] = 0x02000000; + props[12] = 0x00000000; + props[13] = 0x01000000; + props[14] = 0x02000000; + props[15] = 0x00000000; + props[16] = 0x00000000; + props[17] = 0x000001ff; + props[18] = 0x00000000; + props[19] = 0x00000001; + props[20] = 0x00000000; + props[21] = 0x03000000; + props[22] = 0x00000000; + props[23] = 0x00000000; + props[24] = 0x000001ff; + props[25] = 0x00000000; + props[26] = 0x00000001; + props[27] = 0x00000000; + set_property(dev, "ranges", (char *)props, 28 * sizeof(props[0])); + props[0] = 0xc0000000; + props[1] = 0x20000000; + set_property(dev, "virtual-dma", (char *)props, 2 * sizeof(props[0])); + props[0] = 1; + set_property(dev, "#virtual-dma-size-cells", (char *)props, + sizeof(props[0])); + set_property(dev, "#virtual-dma-addr-cells", (char *)props, + sizeof(props[0])); + return 0; +} + int bridge_config_cb(const pci_config_t *config) { phandle_t aliases; Modified: trunk/openbios-devel/drivers/pci_database.c =================================================================== --- trunk/openbios-devel/drivers/pci_database.c 2010-01-09 21:28:28 UTC (rev 663) +++ trunk/openbios-devel/drivers/pci_database.c 2010-01-10 18:26:34 UTC (rev 664) @@ -313,7 +313,7 @@ PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_SABRE, NULL, "pci", "SUNW,sabre", "pci108e,a000\0pciclass,0\0", 3, 2, 1, - host_config_cb, NULL, + sabre_config_cb, NULL, }, { 0xFFFF, 0xFFFF, Modified: trunk/openbios-devel/drivers/pci_database.h =================================================================== --- trunk/openbios-devel/drivers/pci_database.h 2010-01-09 21:28:28 UTC (rev 663) +++ trunk/openbios-devel/drivers/pci_database.h 2010-01-10 18:26:34 UTC (rev 664) @@ -31,6 +31,7 @@ extern int macio_keylargo_config_cb(const pci_config_t *config); extern int vga_config_cb(const pci_config_t *config); extern int host_config_cb(const pci_config_t *config); +extern int sabre_config_cb(const pci_config_t *config); extern int bridge_config_cb(const pci_config_t *config); extern int ebus_config_cb(const pci_config_t *config);

1 0

r663 - in trunk/openbios-devel: arch/sparc64 include/openbios
by svn＠openbios.org 09 Jan '10

09 Jan '10

Author: blueswirl Date: 2010-01-09 22:28:28 +0100 (Sat, 09 Jan 2010) New Revision: 663 Modified: trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/include/openbios/fw_cfg.h Log: Sparc64: use firmware configuration device for command line storage Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc64/openbios.c =================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c 2010-01-05 20:49:50 UTC (rev 662) +++ trunk/openbios-devel/arch/sparc64/openbios.c 2010-01-09 21:28:28 UTC (rev 663) @@ -280,7 +280,6 @@ uint32_t clock_frequency; uint16_t machine_id; const char *stdin_path, *stdout_path; - const char *kernel_cmdline; fw_cfg_init(); @@ -302,12 +301,12 @@ kernel_size = fw_cfg_read_i32(FW_CFG_KERNEL_SIZE); if (kernel_size) kernel_image = fw_cfg_read_i64(FW_CFG_KERNEL_ADDR); - kernel_cmdline = (const char *) fw_cfg_read_i64(FW_CFG_KERNEL_CMDLINE); - if (kernel_cmdline) { - size = strlen(kernel_cmdline); - if (size > OBIO_CMDLINE_MAX - 1) - size = OBIO_CMDLINE_MAX - 1; - memcpy(&obio_cmdline, kernel_cmdline, size); + + size = fw_cfg_read_i32(FW_CFG_CMDLINE_SIZE); + if (size > OBIO_CMDLINE_MAX - 1) + size = OBIO_CMDLINE_MAX - 1; + if (size) { + fw_cfg_read(FW_CFG_CMDLINE_DATA, obio_cmdline, size); } obio_cmdline[size] = '\0'; qemu_cmdline = (uint64_t)obio_cmdline; Modified: trunk/openbios-devel/include/openbios/fw_cfg.h =================================================================== --- trunk/openbios-devel/include/openbios/fw_cfg.h 2010-01-05 20:49:50 UTC (rev 662) +++ trunk/openbios-devel/include/openbios/fw_cfg.h 2010-01-09 21:28:28 UTC (rev 663) @@ -14,8 +14,24 @@ #define FW_CFG_INITRD_ADDR 0x0a #define FW_CFG_INITRD_SIZE 0x0b #define FW_CFG_BOOT_DEVICE 0x0c -#define FW_CFG_MAX_ENTRY 0x10 +#define FW_CFG_NUMA 0x0d +#define FW_CFG_BOOT_MENU 0x0e +#define FW_CFG_MAX_CPUS 0x0f +#define FW_CFG_KERNEL_ENTRY 0x10 +#define FW_CFG_KERNEL_DATA 0x11 +#define FW_CFG_INITRD_DATA 0x12 +#define FW_CFG_CMDLINE_ADDR 0x13 +#define FW_CFG_CMDLINE_SIZE 0x14 +#define FW_CFG_CMDLINE_DATA 0x15 +#define FW_CFG_SETUP_ADDR 0x16 +#define FW_CFG_SETUP_SIZE 0x17 +#define FW_CFG_SETUP_DATA 0x18 +#define FW_CFG_FILE_DIR 0x19 +#define FW_CFG_FILE_FIRST 0x20 +#define FW_CFG_FILE_SLOTS 0x10 +#define FW_CFG_MAX_ENTRY (FW_CFG_FILE_FIRST+FW_CFG_FILE_SLOTS) + #define FW_CFG_WRITE_CHANNEL 0x4000 #define FW_CFG_ARCH_LOCAL 0x8000 #define FW_CFG_ENTRY_MASK ~(FW_CFG_WRITE_CHANNEL | FW_CFG_ARCH_LOCAL) @@ -23,16 +39,31 @@ #define FW_CFG_INVALID 0xffff #ifndef NO_QEMU_PROTOS +typedef struct FWCfgFile { + uint32_t size; /* file size */ + uint16_t select; /* write this to 0x510 to read it */ + uint16_t reserved; + char name[56]; +} FWCfgFile; + +typedef struct FWCfgFiles { + uint32_t count; + FWCfgFile f[]; +} FWCfgFiles; + typedef void (*FWCfgCallback)(void *opaque, uint8_t *data); -int fw_cfg_add_bytes(void *opaque, uint16_t key, uint8_t *data, uint16_t len); -int fw_cfg_add_i16(void *opaque, uint16_t key, uint16_t value); -int fw_cfg_add_i32(void *opaque, uint16_t key, uint32_t value); -int fw_cfg_add_i64(void *opaque, uint16_t key, uint64_t value); -int fw_cfg_add_callback(void *opaque, uint16_t key, FWCfgCallback callback, +typedef struct _FWCfgState FWCfgState; +int fw_cfg_add_bytes(FWCfgState *s, uint16_t key, uint8_t *data, uint32_t len); +int fw_cfg_add_i16(FWCfgState *s, uint16_t key, uint16_t value); +int fw_cfg_add_i32(FWCfgState *s, uint16_t key, uint32_t value); +int fw_cfg_add_i64(FWCfgState *s, uint16_t key, uint64_t value); +int fw_cfg_add_callback(FWCfgState *s, uint16_t key, FWCfgCallback callback, void *callback_opaque, uint8_t *data, size_t len); -void *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, - target_phys_addr_t crl_addr, target_phys_addr_t data_addr); +int fw_cfg_add_file(FWCfgState *s, const char *dir, const char *filename, + uint8_t *data, uint32_t len); +FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, + target_phys_addr_t crl_addr, target_phys_addr_t data_addr); #endif /* NO_QEMU_PROTOS */

1 0

Adding words to the dictionary
by G 3 08 Jan '10

08 Jan '10

How would I add a word to the forth dictionary?

2 1

Latest SPARC64 & Milax update
by Mark Cave-Ayland 07 Jan '10

07 Jan '10

Hi folks, I'm pleased to report that as of r656, OpenBIOS now successfully executes all of the Fcode from within the Milax 0.3.2 ISO image under Qemu :) The current output from Qemu looks like this: OpenBIOS for Sparc64 Configuration device id QEMU version 1 machine id 0 CPUs: 1 x SUNW,UltraSPARC-II UUID: 00000000-0000-0000-0000-000000000000 Welcome to OpenBIOS v1.0 built on Jan 1 2010 18:04 Type 'help' for detailed information [sparc64] Booting file 'cdrom' with parameters '' Not a bootable ELF image Not a Linux kernel image Not a bootable a.out image Loading FCode image... Loaded 7084 bytes entry point is 0x4000 Evaluating FCode... Unhandled Exception 0xe81ac700ffdba000 PC = 0x00000000ffd12ffc NPC = 0x00000000ffd13000 Stopping execution Stepping through with the debugger shows that it is now dying in the very last line of exec-file which reads: " to load-base init-program" evaluate So it looks as if we're very nearly there. My guess would be that OpenBIOS is dying somewhere within init-program. Does anyone know anything about what init-program should be doing under SPARC64? Has it ever been tested before? ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063 Sirius Labs: http://www.siriusit.co.uk/labs

6 28

(no subject)
by CHRIS PITZER 05 Jan '10

05 Jan '10

I have an old Dell Optiplex GX150 Mini-Tower that only supports 512MB of RAM (maximum) and uses an old Pentium III processor. If I add more RAM than is allowed my system won't boot-It says "memory error". I'm not sure but I think the motherboard hardware would allow more RAM but the Dell Bios prohibit this. So, upon discovering the OpenBios web site I have come to believe that the software it provides can help me. But I have no idea which download or downloads will do the job. Furthermore I have no idea how to use the software. Ideally I would like to (Flash) replace my Dell Bois version A11 with a bois that will allow more RAM and greater control of the processor. Is this what these programs do and how do I use them? Please help if you can.

2 1

r662 - trunk/openbios-devel/arch/sparc64
by svn＠openbios.org 05 Jan '10

05 Jan '10

Author: blueswirl Date: 2010-01-05 21:49:50 +0100 (Tue, 05 Jan 2010) New Revision: 662 Modified: trunk/openbios-devel/arch/sparc64/entry.S Log: Sparc64: clear timer interrupt disable bit (NPT bit when reading tick) Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc64/entry.S =================================================================== --- trunk/openbios-devel/arch/sparc64/entry.S 2010-01-03 08:58:56 UTC (rev 661) +++ trunk/openbios-devel/arch/sparc64/entry.S 2010-01-05 20:49:50 UTC (rev 662) @@ -17,6 +17,8 @@ #define PROM_ADDR 0x1fff0000000 #define CFG_ADDR 0x1fe02000510 +#define HZ 10 * 1000 * 1000 +#define TICK_INT_DIS 0x8000000000000000 .globl entry, _entry @@ -48,7 +50,7 @@ wrpr %g0, 0, %otherwin wrpr %g0, 0, %wstate ! disable timer now - setx 0x8000000000000000, %g2, %g1 + setx TICK_INT_DIS, %g2, %g1 wr %g1, 0, %tick_cmpr ! Disable I/D MMUs and caches @@ -263,8 +265,10 @@ wrpr %g0, (PSTATE_PRIV|PSTATE_PEF|PSTATE_IE), %pstate ! 100 Hz timer + setx TICK_INT_DIS, %g2, %g1 rd %tick, %g2 - set 10 * 1000 * 1000, %g1 + andn %g2, %g1, %g2 + set HZ, %g1 add %g1, %g2, %g1 wr %g1, 0, %tick_cmpr

1 0

(no subject)
by CHRIS PITZER 05 Jan '10

05 Jan '10

C. A. Pitzer

1 0

Implementing local variable support
by G 3 05 Jan '10

05 Jan '10

Hi, I am currently trying to implement local variable support for OpenBIOS. I was just wonder if someone understood this code: { ; dpth } I understand that the two brackets mean this is a local variable, and dpth is the name of the variable, but what does ; mean in this context?

3 2

r661 - trunk/openbios-devel/forth/admin
by svn＠openbios.org 03 Jan '10

03 Jan '10

Author: blueswirl Date: 2010-01-03 09:58:56 +0100 (Sun, 03 Jan 2010) New Revision: 661 Modified: trunk/openbios-devel/forth/admin/nvram.fs Log: Make auto-boot default again Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/forth/admin/nvram.fs =================================================================== --- trunk/openbios-devel/forth/admin/nvram.fs 2010-01-03 08:58:55 UTC (rev 660) +++ trunk/openbios-devel/forth/admin/nvram.fs 2010-01-03 08:58:56 UTC (rev 661) @@ -301,7 +301,7 @@ \ NVRAM variables \ -------------------------------------------------------- \ fcode-debug? input-device output-device -s" false" s" auto-boot?" bool-config \ 7.4.3.5 +s" true" s" auto-boot?" bool-config \ 7.4.3.5 s" boot" s" boot-command" str-config \ 7.4.3.5 s" " s" boot-file" str-config \ 7.4.3.5 s" false" s" diag-switch?" bool-config \ 7.4.3.5

1 0

r660 - trunk/openbios-devel/forth/admin
by svn＠openbios.org 03 Jan '10

03 Jan '10

Author: blueswirl Date: 2010-01-03 09:58:55 +0100 (Sun, 03 Jan 2010) New Revision: 660 Modified: trunk/openbios-devel/forth/admin/nvram.fs Log: Fix non-Sparc64 architecture breakage by r657 Build broke with: GEN openbios.dict undefined word. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/forth/admin/nvram.fs =================================================================== --- trunk/openbios-devel/forth/admin/nvram.fs 2010-01-03 03:44:01 UTC (rev 659) +++ trunk/openbios-devel/forth/admin/nvram.fs 2010-01-03 08:58:55 UTC (rev 660) @@ -376,7 +376,9 @@ \ and execute "<value> to load-base" which will only work if \ load-base is value. Hence we redefine load-base here as a \ value using its normal default. +[IFDEF] CONFIG_SPARC64 load-base value load-base +[THEN] : release-load-area drop

1 0

r659 - trunk/openbios-devel/forth/debugging
by svn＠openbios.org 03 Jan '10

03 Jan '10

Author: mcayland Date: 2010-01-03 04:44:01 +0100 (Sun, 03 Jan 2010) New Revision: 659 Modified: trunk/openbios-devel/forth/debugging/client.fs Log: Add Fcode as a suitable executable payload for init-program. Modified: trunk/openbios-devel/forth/debugging/client.fs =================================================================== --- trunk/openbios-devel/forth/debugging/client.fs 2010-01-02 12:49:30 UTC (rev 658) +++ trunk/openbios-devel/forth/debugging/client.fs 2010-01-03 03:44:01 UTC (rev 659) @@ -262,6 +262,40 @@ then ; +: fcode? + " load-base" evaluate c@ + dup h# f0 = if \ start0 + drop + true + exit + then + dup h# f1 = if \ start1 + drop + true + exit + then + dup h# f2 = if \ start2 + drop + true + exit + then + dup h# f3 = if \ start4 + drop + true + exit + then + h# fd = if \ version1 + true + exit + then + false + ; + +: init-program-fcode + " load-base" evaluate 8 + + 1 byte-load + ; + : init-program ( -- ) elf? if init-program-elf @@ -279,6 +313,10 @@ init-program-bootinfo exit then + fcode? if + init-program-fcode + exit + then ; : (encode-bootpath) ( "{params}<cr>" -- bootpath-str bootpath-len)

1 0

r658 - trunk/openbios-devel/modules
by svn＠openbios.org 02 Jan '10

02 Jan '10

Author: mcayland Date: 2010-01-02 13:49:30 +0100 (Sat, 02 Jan 2010) New Revision: 658 Modified: trunk/openbios-devel/modules/build.xml trunk/openbios-devel/modules/init.c Log: Include the /packages/elf-loader module for SPARC64 which is required by the Fcode contained within the Milax ramdisk. Modified: trunk/openbios-devel/modules/build.xml =================================================================== --- trunk/openbios-devel/modules/build.xml 2010-01-02 12:43:59 UTC (rev 657) +++ trunk/openbios-devel/modules/build.xml 2010-01-02 12:49:30 UTC (rev 658) @@ -25,6 +25,7 @@ <object source="font_8x16.c" condition="FONT_8X16"/> <object source="ofmem_common.c" condition="OFMEM"/> <object source="elf-loader.c" condition="PPC"/> + <object source="elf-loader.c" condition="SPARC64"/> <object source="xcoff-loader.c" condition="PPC"/> <object source="bootinfo-loader.c" condition="PPC"/> </library> Modified: trunk/openbios-devel/modules/init.c =================================================================== --- trunk/openbios-devel/modules/init.c 2010-01-02 12:43:59 UTC (rev 657) +++ trunk/openbios-devel/modules/init.c 2010-01-02 12:49:30 UTC (rev 658) @@ -47,4 +47,7 @@ xcoff_loader_init(); bootinfo_loader_init(); #endif +#ifdef CONFIG_SPARC64 + elf_loader_init(); +#endif }

1 0

r657 - trunk/openbios-devel/forth/admin
by svn＠openbios.org 02 Jan '10

02 Jan '10

Author: mcayland Date: 2010-01-02 13:43:59 +0100 (Sat, 02 Jan 2010) New Revision: 657 Modified: trunk/openbios-devel/forth/admin/nvram.fs Log: Add Stefan's hack for load-base to allow it to be referenced as a value from within Fcode bootloaders such as Milax. Modified: trunk/openbios-devel/forth/admin/nvram.fs =================================================================== --- trunk/openbios-devel/forth/admin/nvram.fs 2010-01-01 18:21:18 UTC (rev 656) +++ trunk/openbios-devel/forth/admin/nvram.fs 2010-01-02 12:43:59 UTC (rev 657) @@ -301,7 +301,7 @@ \ NVRAM variables \ -------------------------------------------------------- \ fcode-debug? input-device output-device -s" true" s" auto-boot?" bool-config \ 7.4.3.5 +s" false" s" auto-boot?" bool-config \ 7.4.3.5 s" boot" s" boot-command" str-config \ 7.4.3.5 s" " s" boot-file" str-config \ 7.4.3.5 s" false" s" diag-switch?" bool-config \ 7.4.3.5 @@ -359,6 +359,7 @@ [IFDEF] CONFIG_SPARC64 \ ---- SPARC64 ---- s" 4000000" s" load-base" int-config +s" false" s" little-endian?" bool-config [THEN] \ --- ??? --- @@ -371,6 +372,12 @@ ['] fcode-debug? to _fcode-debug? ['] diag-switch? to _diag-switch? +\ Hack for load-base: it seems that some Sun bootloaders try +\ and execute "<value> to load-base" which will only work if +\ load-base is value. Hence we redefine load-base here as a +\ value using its normal default. +load-base value load-base + : release-load-area drop ;

1 0

Solaris in Qemu
by Stefan Reinauer 01 Jan '10

01 Jan '10

Hi, just a side note for those who are not on the Qemu mailing list: Artyom Tarasenko used original SUN OBP images in Qemu in order to boot SunOS/Solaris on Sparc32. http://tyom.blogspot.com/2009/12/solaris-under-qemu-how-to.html Nice work! Stefan

1 0

r656 - trunk/openbios-devel/forth/admin
by svn＠openbios.org 01 Jan '10

01 Jan '10

Author: mcayland Date: 2010-01-01 19:21:18 +0100 (Fri, 01 Jan 2010) New Revision: 656 Modified: trunk/openbios-devel/forth/admin/nvram.fs Log: Add load-base NVRAM variable for SPARC64. Modified: trunk/openbios-devel/forth/admin/nvram.fs =================================================================== --- trunk/openbios-devel/forth/admin/nvram.fs 2010-01-01 18:17:15 UTC (rev 655) +++ trunk/openbios-devel/forth/admin/nvram.fs 2010-01-01 18:21:18 UTC (rev 656) @@ -356,6 +356,11 @@ s" false" s" ttyb-rts-dtr-off" bool-config [THEN] +[IFDEF] CONFIG_SPARC64 +\ ---- SPARC64 ---- +s" 4000000" s" load-base" int-config +[THEN] + \ --- ??? --- s" " s" boot-screen" str-config s" " s" boot-script" str-config

1 0

r655 - in trunk/openbios-devel/forth: device packages system
by svn＠openbios.org 01 Jan '10

01 Jan '10

Author: mcayland Date: 2010-01-01 19:17:15 +0100 (Fri, 01 Jan 2010) New Revision: 655 Modified: trunk/openbios-devel/forth/device/builtin.fs trunk/openbios-devel/forth/device/device.fs trunk/openbios-devel/forth/device/tree.fs trunk/openbios-devel/forth/packages/deblocker.fs trunk/openbios-devel/forth/packages/disklabel.fs trunk/openbios-devel/forth/packages/obp-tftp.fs trunk/openbios-devel/forth/packages/packages.fs trunk/openbios-devel/forth/packages/terminal-emulator.fs trunk/openbios-devel/forth/system/ciface.fs Log: Change the new-device word so that subsequent words within a new device are added to the public wordlist and not the private wordlist by default. This is required for executing Milax Fcode which defines package words which need to be externally visible. As a consequence, it is now possible to remove lots of "external" words used building the device tree since this is now the default. Modified: trunk/openbios-devel/forth/device/builtin.fs =================================================================== --- trunk/openbios-devel/forth/device/builtin.fs 2009-12-30 10:54:52 UTC (rev 654) +++ trunk/openbios-devel/forth/device/builtin.fs 2010-01-01 18:17:15 UTC (rev 655) @@ -14,13 +14,11 @@ new-device " builtin" device-name - external : open true ; : close ; new-device " console" device-name - external : open true ; : close ; : write dup >r bounds ?do i c@ (emit) loop r> ; Modified: trunk/openbios-devel/forth/device/device.fs =================================================================== --- trunk/openbios-devel/forth/device/device.fs 2009-12-30 10:54:52 UTC (rev 654) +++ trunk/openbios-devel/forth/device/device.fs 2010-01-01 18:17:15 UTC (rev 655) @@ -85,8 +85,8 @@ to my-self r@ active-package! - \ swtich to private wordlist - private + \ swtich to public wordlist + external r> drop ; Modified: trunk/openbios-devel/forth/device/tree.fs =================================================================== --- trunk/openbios-devel/forth/device/tree.fs 2009-12-30 10:54:52 UTC (rev 654) +++ trunk/openbios-devel/forth/device/tree.fs 2010-01-01 18:17:15 UTC (rev 655) @@ -13,7 +13,6 @@ new-device " OpenBiosTeam,OpenBIOS" device-name 1 encode-int " #address-cells" property - external : open true ; : close ; : decode-unit parse-hex ; @@ -23,7 +22,6 @@ new-device " aliases" device-name - external : open true ; : close ; finish-device @@ -36,7 +34,6 @@ 0 0 " supports-bootinfo" property 1 encode-int " boot-syntax" property - external : selftest ." OpenBIOS selftest... succeded" cr true @@ -58,7 +55,6 @@ \ " -as" encode-string " bootargs" property 0 encode-int " memory" property 0 encode-int " mmu" property - external finish-device \ END Modified: trunk/openbios-devel/forth/packages/deblocker.fs =================================================================== --- trunk/openbios-devel/forth/packages/deblocker.fs 2009-12-30 10:54:52 UTC (rev 654) +++ trunk/openbios-devel/forth/packages/deblocker.fs 2010-01-01 18:17:15 UTC (rev 655) @@ -17,7 +17,6 @@ new-device " deblocker" device-name - external \ open ( -- flag ) \ Prepares the package for subsequent use, allocating the buffers used \ by the deblocking process based upon the values returned by the parent Modified: trunk/openbios-devel/forth/packages/disklabel.fs =================================================================== --- trunk/openbios-devel/forth/packages/disklabel.fs 2009-12-30 10:54:52 UTC (rev 654) +++ trunk/openbios-devel/forth/packages/disklabel.fs 2010-01-01 18:17:15 UTC (rev 655) @@ -14,7 +14,6 @@ new-device " disklabel" device-name - external \ now the methods... finish-device Modified: trunk/openbios-devel/forth/packages/obp-tftp.fs =================================================================== --- trunk/openbios-devel/forth/packages/obp-tftp.fs 2009-12-30 10:54:52 UTC (rev 654) +++ trunk/openbios-devel/forth/packages/obp-tftp.fs 2010-01-01 18:17:15 UTC (rev 655) @@ -14,7 +14,6 @@ new-device " obp-tftp" device-name - external \ now the methods... finish-device Modified: trunk/openbios-devel/forth/packages/packages.fs =================================================================== --- trunk/openbios-devel/forth/packages/packages.fs 2009-12-30 10:54:52 UTC (rev 654) +++ trunk/openbios-devel/forth/packages/packages.fs 2010-01-01 18:17:15 UTC (rev 655) @@ -10,7 +10,6 @@ new-device " packages" device-name - external : open true ; : close ; finish-device Modified: trunk/openbios-devel/forth/packages/terminal-emulator.fs =================================================================== --- trunk/openbios-devel/forth/packages/terminal-emulator.fs 2009-12-30 10:54:52 UTC (rev 654) +++ trunk/openbios-devel/forth/packages/terminal-emulator.fs 2010-01-01 18:17:15 UTC (rev 655) @@ -14,7 +14,6 @@ new-device " terminal-emulator" device-name - external \ now the methods... finish-device Modified: trunk/openbios-devel/forth/system/ciface.fs =================================================================== --- trunk/openbios-devel/forth/system/ciface.fs 2009-12-30 10:54:52 UTC (rev 654) +++ trunk/openbios-devel/forth/system/ciface.fs 2010-01-01 18:17:15 UTC (rev 655) @@ -11,6 +11,8 @@ \ private stuff \ ------------------------------------------------------------- +private + variable callback-function : ?phandle ( phandle -- phandle )

1 0

Re: [OpenBIOS] r648 - in trunk/openbios-devel: arch/sparc64 drivers
by Igor Kovalenko 30 Dec '09

30 Dec '09

On Mon, Dec 28, 2009 at 1:15 PM, <svn(a)openbios.org> wrote: > Author: blueswirl > Date: 2009-12-28 11:15:33 +0100 (Mon, 28 Dec 2009) > New Revision: 648 > > Modified: > trunk/openbios-devel/arch/sparc64/entry.S > trunk/openbios-devel/drivers/pci.c > trunk/openbios-devel/drivers/vga_vbe.c > Log: > Map VGA buffer only during PCI probe > > Also pass physical addresses instead of bus addresses to VGA init. > > Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> > > Modified: trunk/openbios-devel/drivers/vga_vbe.c > =================================================================== > --- trunk/openbios-devel/drivers/vga_vbe.c 2009-12-21 09:57:53 UTC (rev 647) > +++ trunk/openbios-devel/drivers/vga_vbe.c 2009-12-28 10:15:33 UTC (rev 648) > @@ -25,6 +25,7 @@ > #include "asm/io.h" > #include "libc/vsprintf.h" > #include "video_subr.h" > +#include "ofmem.h" > > /* VGA init. We use the Bochs VESA VBE extensions */ > #define VBE_DISPI_INDEX_ID 0x0 > @@ -142,7 +143,10 @@ > depth = d; > linebytes = (width * ((depth + 7) / 8)); > } > +#ifdef CONFIG_SPARC64 > + ofmem_map_page_range(fb, fb, fb_size, 0x36); > #endif > +#endif > > vga_vbe_set_mode(width, height, depth); You pass flags so mapping is unlocked, this can cause problems with translations being evicted from tlb table. Do you see any issues? Linux kernel has it's own idea of address translations, and we still do not switch trap handlers so probably framebuffer should be mapped locked into tlb table (mode=0x76) -- Kind regards, Igor V. Kovalenko

2 6

[PATCH 0/5] v1 alternative implementation of sparc64 boot memory mapping
by Igor V. Kovalenko 30 Dec '09

30 Dec '09

The following series implements alternative approach to solve issue where qemu provides i/o and pci memory spaces within physical RAM address space, which makes low memory addresses unusable. Instead of changing qemu to move i/o and pci spaces out of RAM space we can remap 64M of i/o and pci spaces to above 32bit accessible by client program. Then we map physical RAM at 64M offset to start of virtual memory. A few extra changes are required. At very least we need to find where framebuffer virtual address is placed by startup code, helper change is provided. NOTE: this approach may hide up to 128M from client allocations, therefore default qemu memory size is not sufficient. Please use at least '-m 256' on qemu command line to test with these changes. In my test these series are as efficient as qemu change to remap i/o and pci spaces in allowing milax032sparc.iso to not step over cmd646 registers. Currently milax loader gets a bit further and fails with Can't open /ramdisk-root byte-load: exception caught! v0 -> v1: split ofmem_find_virtual changes into separate patches --- Igor V. Kovalenko (5): sparc64: remap first 64M physical address space sparc64: claim memory mapped by startup code ofmem: helper to find first virtual address map entry ofmem: use helper to access command line parameters from qemu ofmem: use helper to find framebuffer virtual address on sparc64 arch/sparc64/entry.S | 68 +++++++++++++++++++----------------------- arch/sparc64/ofmem_sparc64.c | 2 + arch/sparc64/openbios.c | 19 ++++++++---- include/ofmem.h | 1 + modules/ofmem_common.c | 25 +++++++++++++++ modules/video.c | 9 +++++- 6 files changed, 80 insertions(+), 44 deletions(-) -- Kind regards, Igor V. Kovalenko

5 17

r654 - in trunk/openbios-devel: arch/sparc64 drivers
by svn＠openbios.org 30 Dec '09

30 Dec '09

Author: blueswirl Date: 2009-12-30 11:54:52 +0100 (Wed, 30 Dec 2009) New Revision: 654 Modified: trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/drivers/pc_serial.c Log: Sparc64: fix Linux error about inconsistent console also for serial console Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc64/openbios.c =================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c 2009-12-30 09:49:40 UTC (rev 653) +++ trunk/openbios-devel/arch/sparc64/openbios.c 2009-12-30 10:54:52 UTC (rev 654) @@ -386,7 +386,7 @@ fword("property"); if (fw_cfg_read_i16(FW_CFG_NOGRAPHIC)) { - stdin_path = stdout_path = "/pci/pci/pci/ebus/su"; + stdin_path = stdout_path = "ttya"; } else { stdin_path = "/pci/pci/pci/ebus/kb_ps2"; stdout_path = "/pci/pci/pci/QEMU,VGA"; Modified: trunk/openbios-devel/drivers/pc_serial.c =================================================================== --- trunk/openbios-devel/drivers/pc_serial.c 2009-12-30 09:49:40 UTC (rev 653) +++ trunk/openbios-devel/drivers/pc_serial.c 2009-12-30 10:54:52 UTC (rev 654) @@ -171,6 +171,7 @@ ob_pc_serial_init(const char *path, const char *dev_name, uint64_t base, uint64_t offset, int intr) { + phandle_t aliases; char nodebuff[128]; snprintf(nodebuff, sizeof(nodebuff), "%s/%s", path, dev_name); @@ -192,4 +193,7 @@ fword("encode+"); push_str("reg"); fword("property"); + + aliases = find_dev("/aliases"); + set_property(aliases, "ttya", nodebuff, strlen(nodebuff) + 1); }

1 0

r653 - trunk/openbios-devel/drivers
by svn＠openbios.org 30 Dec '09

30 Dec '09

Author: blueswirl Date: 2009-12-30 10:49:40 +0100 (Wed, 30 Dec 2009) New Revision: 653 Modified: trunk/openbios-devel/drivers/pc_kbd.c Log: Sparc64: fix Linux error about inconsistent console Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/drivers/pc_kbd.c =================================================================== --- trunk/openbios-devel/drivers/pc_kbd.c 2009-12-30 09:49:38 UTC (rev 652) +++ trunk/openbios-devel/drivers/pc_kbd.c 2009-12-30 09:49:40 UTC (rev 653) @@ -204,6 +204,11 @@ push_str("keyboard"); fword("device-type"); + PUSH(-1); + fword("encode-int"); + push_str("keyboard"); + fword("property"); + chosen = find_dev("/chosen"); push_str(nodebuff); fword("open-dev");

1 0

r652 - trunk/openbios-devel/drivers
by svn＠openbios.org 30 Dec '09

30 Dec '09

Author: blueswirl Date: 2009-12-30 10:49:38 +0100 (Wed, 30 Dec 2009) New Revision: 652 Modified: trunk/openbios-devel/drivers/vga_vbe.c Log: Map VGA buffer at client accessible location (Igor Kovalenko) Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/drivers/vga_vbe.c =================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c 2009-12-29 17:36:05 UTC (rev 651) +++ trunk/openbios-devel/drivers/vga_vbe.c 2009-12-30 09:49:38 UTC (rev 652) @@ -144,7 +144,11 @@ linebytes = (width * ((depth + 7) / 8)); } #ifdef CONFIG_SPARC64 - ofmem_map_page_range(fb, fb, fb_size, 0x36); +#define VGA_VADDR 0xfe000000 + ofmem_claim_phys(fb, fb_size, 0); + ofmem_claim_virt(VGA_VADDR, fb_size, 0); + ofmem_map(fb, VGA_VADDR, fb_size, 0x76); + fb = VGA_VADDR; #endif #endif

1 0

r651 - trunk/openbios-devel/arch/sparc64
by svn＠openbios.org 29 Dec '09

29 Dec '09

Author: blueswirl Date: 2009-12-29 18:36:05 +0100 (Tue, 29 Dec 2009) New Revision: 651 Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Log: sparc64: claim memory mapped by startup code - claim both physical and virtual address ranges while walking boot memory mappings Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko(a)gmail.com> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c =================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c 2009-12-29 17:36:03 UTC (rev 650) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c 2009-12-29 17:36:05 UTC (rev 651) @@ -83,6 +83,8 @@ static int remap_page_range( ucell phys, ucell virt, ucell size, ucell mode ) { + ofmem_claim_phys(phys, size, 0); + ofmem_claim_virt(virt, size, 0); ofmem_map_page_range(phys, virt, size, mode); if (!(mode & SPITFIRE_TTE_LOCKED)) { OFMEM_TRACE("remap_page_range clearing translation " FMT_ucellx

1 0

r650 - trunk/openbios-devel/arch/sparc64
by svn＠openbios.org 29 Dec '09

29 Dec '09

Author: blueswirl Date: 2009-12-29 18:36:03 +0100 (Tue, 29 Dec 2009) New Revision: 650 Modified: trunk/openbios-devel/arch/sparc64/entry.S trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Log: Postpone mapping of the memory Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc64/entry.S =================================================================== --- trunk/openbios-devel/arch/sparc64/entry.S 2009-12-28 10:24:32 UTC (rev 649) +++ trunk/openbios-devel/arch/sparc64/entry.S 2009-12-29 17:36:03 UTC (rev 650) @@ -180,26 +180,6 @@ bne 1b add %l2, %g5, %l2 -#if 1 - ! setup 0-16M - mov %g0, %g4 - mov 4, %g6 - set 48, %g7 - set 0x400000, %g5 -1: stxa %g4, [%g7] ASI_DMMU ! vaddr = 0, ctx=0 - set 0xe0000000, %g3 - sllx %g3, 32, %g3 - or %g3, 0x36, %g3 - or %g4, %g3, %g3 - ! valid, 4M, cacheable(I/E/C), priv, writable - ! paddr = 0 - stxa %g3, [%g0] ASI_DTLB_DATA_IN - add %g4, %g5, %g4 - deccc %g6 - bne 1b - nop -#endif - membar #Sync setx _start, %g7, %g4 @@ -224,25 +204,6 @@ bne 1b add %l2, %g5, %l2 -#if 1 - ! setup 0-16M - mov %g0, %g4 - mov 4, %g6 - set 0x400000, %g5 -1: stxa %g4, [%g7] ASI_IMMU ! vaddr = 0, ctx=0 - set 0xe0000000, %g3 - sllx %g3, 32, %g3 - or %g3, 0x34, %g3 - or %g4, %g3, %g3 - ! valid, 4M, cacheable(I/E/C), priv - ! paddr = 0 - stxa %g3, [%g0] ASI_ITLB_DATA_IN - add %g4, %g5, %g4 - deccc %g6 - bne 1b - nop -#endif - flush %g4 mov %g1, %g3 Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c =================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c 2009-12-28 10:24:32 UTC (rev 649) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c 2009-12-29 17:36:03 UTC (rev 650) @@ -100,5 +100,8 @@ /* inherit translations set up by entry.S */ ofmem_walk_boot_map(remap_page_range); + + /* Map the memory */ + ofmem_map_page_range(0, 0, qemu_mem_size, 0x36); }

1 0

r649 - trunk/openbios-devel/config/scripts
by svn＠openbios.org 28 Dec '09

28 Dec '09

Author: blueswirl Date: 2009-12-28 11:24:32 +0100 (Mon, 28 Dec 2009) New Revision: 649 Modified: trunk/openbios-devel/config/scripts/switch-arch Log: Fix a typo Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/config/scripts/switch-arch =================================================================== --- trunk/openbios-devel/config/scripts/switch-arch 2009-12-28 10:15:33 UTC (rev 648) +++ trunk/openbios-devel/config/scripts/switch-arch 2009-12-28 10:24:32 UTC (rev 649) @@ -96,7 +96,7 @@ if [ "$ARCH" = "$HOSTARCH" ]; then return fi - echo "ERROR: no ${1} cross-compiler found !" 1>&2 + echo "ERROR: no ${1} cross-compiler found !" 1>&2 exit 1 }

1 0

r648 - in trunk/openbios-devel: arch/sparc64 drivers
by svn＠openbios.org 28 Dec '09

28 Dec '09

Author: blueswirl Date: 2009-12-28 11:15:33 +0100 (Mon, 28 Dec 2009) New Revision: 648 Modified: trunk/openbios-devel/arch/sparc64/entry.S trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/drivers/vga_vbe.c Log: Map VGA buffer only during PCI probe Also pass physical addresses instead of bus addresses to VGA init. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc64/entry.S =================================================================== --- trunk/openbios-devel/arch/sparc64/entry.S 2009-12-21 09:57:53 UTC (rev 647) +++ trunk/openbios-devel/arch/sparc64/entry.S 2009-12-28 10:15:33 UTC (rev 648) @@ -180,24 +180,6 @@ bne 1b add %l2, %g5, %l2 - ! setup VGA buffer - setx 0x1ff004a0000, %g7, %g4 - mov 2, %g6 - set 48, %g7 - set 0x10000, %g5 -1: stxa %g4, [%g7] ASI_DMMU ! vaddr = 0x1ff004a0000, ctx=0 - set 0xa0000000, %g3 - sllx %g3, 32, %g3 - or %g3, 0x76, %g3 - or %g4, %g3, %g3 - ! valid, 64k, locked, cacheable(I/E/C), priv, writable - ! paddr = 0x1ff004a0000 - stxa %g3, [%g0] ASI_DTLB_DATA_IN - add %g4, %g5, %g4 - deccc %g6 - bne 1b - nop - #if 1 ! setup 0-16M mov %g0, %g4 Modified: trunk/openbios-devel/drivers/pci.c =================================================================== --- trunk/openbios-devel/drivers/pci.c 2009-12-21 09:57:53 UTC (rev 647) +++ trunk/openbios-devel/drivers/pci.c 2009-12-28 10:15:33 UTC (rev 648) @@ -322,6 +322,15 @@ set_property(dev, "ranges", (char *)props, ncells * sizeof(props[0])); } +static unsigned long pci_bus_addr_to_host_addr(uint32_t ba) +{ +#ifdef CONFIG_SPARC64 + return arch->cfg_data + (unsigned long)ba; +#else + return (unsigned long)ba; +#endif +} + int host_config_cb(const pci_config_t *config) { phandle_t aliases; @@ -547,10 +556,11 @@ int vga_config_cb (const pci_config_t *config) { if (config->assigned[0] != 0x00000000) - vga_vbe_init(config->path, config->assigned[0] & ~0x0000000F, - config->sizes[0], - config->assigned[1] & ~0x0000000F, - config->sizes[1]); + vga_vbe_init(config->path, + pci_bus_addr_to_host_addr(config->assigned[0] & ~0x0000000F), + config->sizes[0], + pci_bus_addr_to_host_addr(config->assigned[1] & ~0x0000000F), + config->sizes[1]); return 0; } Modified: trunk/openbios-devel/drivers/vga_vbe.c =================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c 2009-12-21 09:57:53 UTC (rev 647) +++ trunk/openbios-devel/drivers/vga_vbe.c 2009-12-28 10:15:33 UTC (rev 648) @@ -25,6 +25,7 @@ #include "asm/io.h" #include "libc/vsprintf.h" #include "video_subr.h" +#include "ofmem.h" /* VGA init. We use the Bochs VESA VBE extensions */ #define VBE_DISPI_INDEX_ID 0x0 @@ -142,7 +143,10 @@ depth = d; linebytes = (width * ((depth + 7) / 8)); } +#ifdef CONFIG_SPARC64 + ofmem_map_page_range(fb, fb, fb_size, 0x36); #endif +#endif vga_vbe_set_mode(width, height, depth);

1 0

Re: [OpenBIOS] r641 - in trunk/openbios-devel/forth: bootstrap device
by Nick Couchman 27 Dec '09

27 Dec '09

>>> On 2009/12/08 at 18:09, <svn(a)openbios.org> wrote: > Author: mcayland > Date: 2009-12-09 02:09:48 +0100 (Wed, 09 Dec 2009) > New Revision: 641 > > Modified: > trunk/openbios-devel/forth/bootstrap/bootstrap.fs > trunk/openbios-devel/forth/device/fcode.fs > Log: > Revert r638, apply previous patch to extend control flow stack items to 2 > data stack items, and fix the Fcode evaluator to use > this new information to correctly resolve destination (b<mark) references. > See the email archives for further discussion on why > this is required. > > Hopefully this should finally resolve the Fcode backward branch problem; at > least all previous incorrect resolutions now appear > correct and the Fcode evaluator no longer crashes or gets stuck in a loop > while attempting to boot Milax. > Updated and rebuilt OpenBIOS - still getting the same unhandled exception at the same place: (gdb) l *0x00000000ffd10e54 0xffd10e54 is in cfetch (../include/openbios/stack.h:34). 29 typedef ucell phandle_t; 30 31 32 33 34 static inline void PUSH(ucell value) { 35 dstack[++dstackcnt] = (value); 36 } 37 static inline void PUSH_xt( xt_t xt ) { PUSH( (ucell)xt ); } 38 static inline void PUSH_ih( ihandle_t ih ) { PUSH( (ucell)ih ); } What version of Milax are you using? I downloaded the 0.4 ISO and all I get is "Unsupported Image Format" when I try to boot. -Nick -------- This e-mail may contain confidential and privileged material for the sole use of the intended recipient. If this email is not intended for you, or you are not responsible for the delivery of this message to the intended recipient, please note that this message may contain SEAKR Engineering (SEAKR) Privileged/Proprietary Information. In such a case, you are strictly prohibited from downloading, photocopying, distributing or otherwise using this message, its contents or attachments in any way. If you have received this message in error, please notify us immediately by replying to this e-mail and delete the message from your mailbox. Information contained in this message that does not relate to the business of SEAKR is neither endorsed by nor attributable to SEAKR.

8 47

[PATCH 0/3] alternative implementation of sparc64 boot memory mapping
by Igor V. Kovalenko 27 Dec '09

27 Dec '09

The following series implements alternative approach to solve issue where qemu provides i/o and pci memory spaces within physical RAM address space, which makes low memory addresses unusable. Instead of changing qemu to move i/o and pci spaces out of RAM space we can remap 64M of i/o and pci spaces to above 32bit accessible by client program. Then we map physical RAM at 64M offset to start of virtual memory. A few extra changes are required. At very least we need to find where framebuffer virtual address is placed by startup code, helper change is provided. NOTE: this approach may hide up to 128M from client allocations so I tested with 'qemu-system-sparc64 -m 256' In my test these series are as efficient as qemu change to remap i/o and pci spaces in allowing milax032sparc.iso to not step over cmd646 registers. Currently milax loader gets a bit further and fails with Can't open /ramdisk-root byte-load: exception caught! --- Igor V. Kovalenko (3): sparc64: remap first 64M physical address space sparc64: claim memory mapped by startup code ofmem: helper to find first virtual address map entry arch/sparc64/entry.S | 68 +++++++++++++++++++----------------------- arch/sparc64/ofmem_sparc64.c | 2 + arch/sparc64/openbios.c | 19 ++++++++---- include/ofmem.h | 1 + modules/ofmem_common.c | 25 +++++++++++++++ modules/video.c | 9 +++++- 6 files changed, 80 insertions(+), 44 deletions(-) -- Kind regards, Igor V. Kovalenko

3 9

Feature request
by G 3 24 Dec '09

24 Dec '09

I think we should make OpenBIOS more complete by adding support for local variables.

1 0

Re: [OpenBIOS] [Qemu-devel] M68K Or PPC Status Update to Run Mac OS in Qemu
by Alexander Graf 22 Dec '09

22 Dec '09

Mark Cave-Ayland wrote: > Alexander Graf wrote: > >> OpenBIOS is missing an implementation for local variables. See this >> thread: >> http://www.openfirmware.info/pipermail/openbios/2009-July/003796.html >> >> Alex > > How do local variables work? Are they just substitutions for stack > places? I seriously am the last person to know anything about Forth :-). But I'm sure Stefan can help out here. He's been looking into that before. > If you can point me towards a specification for this, I can have a > look and see how feasible it would be to add this to OpenBIOS. 1) http://www.complang.tuwien.ac.at/viewcvs/cgi-bin/viewcvs.cgi/gforth/locals.… 2) http://www.openfirmware.info/FCODE_suite -> see "local value support" -> has an incompatible license -> contains links to documentation IIRC 3) http://www.forthos.org/ -> claims to have local value support, haven't found the sources yet The code BootX executes: http://www.openfirmware.info/pipermail/openbios/2009-July/003812.html Alex

1 0

r647 - trunk/openbios-devel/drivers
by svn＠openbios.org 21 Dec '09

21 Dec '09

Author: agraf Date: 2009-12-21 10:57:53 +0100 (Mon, 21 Dec 2009) New Revision: 647 Modified: trunk/openbios-devel/drivers/escc.c Log: I accidently set props[0] twice instead of going through both elements. Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/drivers/escc.c =================================================================== --- trunk/openbios-devel/drivers/escc.c 2009-12-18 23:38:08 UTC (rev 646) +++ trunk/openbios-devel/drivers/escc.c 2009-12-21 09:57:53 UTC (rev 647) @@ -418,8 +418,8 @@ OLDWORLD(set_property(dnode, "AAPL,interrupts", (char *)&props, 1 * sizeof(cell))); - props[0] = 0; props[0] = (0x24) + offset; + props[1] = 0; NEWWORLD(set_property(dnode, "interrupts", (char *)&props, 2 * sizeof(cell)));

1 0

[PATCH] Make interrupts work on newworld machines
by Alexander Graf 20 Dec '09

20 Dec '09

When running qemu in -M mac99 mode, interrupts failed on me all the time. I finally managed to track things down and it seems like we're missing some properties in several devices. While at it, I also bumped the ESCC IRQs to 0x24 / 0x25, as that's what qemu now maps them on. This patch (plus the qemu set) gets PPC64 Linux booting with console=ttyPZ0. Signed-off-by: Alexander Graf <agraf(a)suse.de> Index: drivers/macio.c =================================================================== --- drivers/macio.c (revision 644) +++ drivers/macio.c (working copy) @@ -145,6 +145,7 @@ static void openpic_init(const char *path, uint32_t addr) { + phandle_t target_node; phandle_t dnode; int props[2]; char buf[128]; @@ -154,7 +155,6 @@ fword("new-device"); push_str("interrupt-controller"); fword("device-name"); - fword("finish-device"); snprintf(buf, sizeof(buf), "%s/interrupt-controller", path); dnode = find_dev(buf); @@ -168,6 +168,21 @@ set_int_property(dnode, "#address-cells", 0); set_property(dnode, "interrupt-controller", "", 0); set_int_property(dnode, "clock-frequency", 4166666); + + fword("finish-device"); + + if (is_newworld()) { + /* patch in interrupt parent */ + dnode = find_dev(buf); + target_node = find_dev("/pci"); + set_int_property(target_node, "interrupt-parent", dnode); + + target_node = find_dev("/pci/mac-io/escc/ch-a"); + set_int_property(target_node, "interrupt-parent", dnode); + + target_node = find_dev("/pci/mac-io/escc/ch-b"); + set_int_property(target_node, "interrupt-parent", dnode); + } } DECLARE_NODE(ob_macio, INSTALL_OPEN, sizeof(int), "Tmac-io"); Index: drivers/escc.c =================================================================== --- drivers/escc.c (revision 644) +++ drivers/escc.c (working copy) @@ -418,6 +418,11 @@ OLDWORLD(set_property(dnode, "AAPL,interrupts", (char *)&props, 1 * sizeof(cell))); + props[0] = 0; + props[0] = (0x24) + offset; + NEWWORLD(set_property(dnode, "interrupts", + (char *)&props, 2 * sizeof(cell))); + device_end(); uart_init_line((unsigned char*)addr + IO_ESCC_OFFSET + offset * 0x20,

4 7

[PATCH] Fix typo in escc interrupt patch
by Alexander Graf 19 Dec '09

19 Dec '09

I accidently set props[0] twice instead of going through both elements. Signed-off-by: Alexander Graf <agraf(a)suse.de> Index: drivers/escc.c =================================================================== --- drivers/escc.c (revision 646) +++ drivers/escc.c (working copy) @@ -418,8 +418,8 @@ OLDWORLD(set_property(dnode, "AAPL,interrupts", (char *)&props, 1 * sizeof(cell))); - props[0] = 0; props[0] = (0x24) + offset; + props[1] = 0; NEWWORLD(set_property(dnode, "interrupts", (char *)&props, 2 * sizeof(cell)));

1 0

r646 - trunk/openbios-devel/drivers
by svn＠openbios.org 19 Dec '09

19 Dec '09

Author: laurent Date: 2009-12-19 00:38:08 +0100 (Sat, 19 Dec 2009) New Revision: 646 Modified: trunk/openbios-devel/drivers/escc.c trunk/openbios-devel/drivers/macio.c Log: When running qemu in -M mac99 mode, interrupts failed on me all the time. I finally managed to track things down and it seems like we're missing some properties in several devices. While at it, I also bumped the ESCC IRQs to 0x24 / 0x25, as that's what qemu now maps them on. This patch (plus the qemu set) gets PPC64 Linux booting with console=ttyPZ0. Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/drivers/escc.c =================================================================== --- trunk/openbios-devel/drivers/escc.c 2009-12-18 20:41:51 UTC (rev 645) +++ trunk/openbios-devel/drivers/escc.c 2009-12-18 23:38:08 UTC (rev 646) @@ -418,6 +418,11 @@ OLDWORLD(set_property(dnode, "AAPL,interrupts", (char *)&props, 1 * sizeof(cell))); + props[0] = 0; + props[0] = (0x24) + offset; + NEWWORLD(set_property(dnode, "interrupts", + (char *)&props, 2 * sizeof(cell))); + device_end(); uart_init_line((unsigned char*)addr + IO_ESCC_OFFSET + offset * 0x20, Modified: trunk/openbios-devel/drivers/macio.c =================================================================== --- trunk/openbios-devel/drivers/macio.c 2009-12-18 20:41:51 UTC (rev 645) +++ trunk/openbios-devel/drivers/macio.c 2009-12-18 23:38:08 UTC (rev 646) @@ -145,6 +145,7 @@ static void openpic_init(const char *path, uint32_t addr) { + phandle_t target_node; phandle_t dnode; int props[2]; char buf[128]; @@ -154,7 +155,6 @@ fword("new-device"); push_str("interrupt-controller"); fword("device-name"); - fword("finish-device"); snprintf(buf, sizeof(buf), "%s/interrupt-controller", path); dnode = find_dev(buf); @@ -168,6 +168,21 @@ set_int_property(dnode, "#address-cells", 0); set_property(dnode, "interrupt-controller", "", 0); set_int_property(dnode, "clock-frequency", 4166666); + + fword("finish-device"); + + if (is_newworld()) { + /* patch in interrupt parent */ + dnode = find_dev(buf); + target_node = find_dev("/pci"); + set_int_property(target_node, "interrupt-parent", dnode); + + target_node = find_dev("/pci/mac-io/escc/ch-a"); + set_int_property(target_node, "interrupt-parent", dnode); + + target_node = find_dev("/pci/mac-io/escc/ch-b"); + set_int_property(target_node, "interrupt-parent", dnode); + } } DECLARE_NODE(ob_macio, INSTALL_OPEN, sizeof(int), "Tmac-io");

1 0

[PATCH] Allow non-cross compilation
by Alexander Graf 18 Dec '09

18 Dec '09

I usually compile openbios on PowerPC for PowerPC. Apparently I'm the only one doing that, as that (really easy) case got broken by the cross compilation overhaul. Let's allow host = target gcc configurations again. Signed-off-by: Alexander Graf <agraf(a)suse.de> Index: config/scripts/switch-arch =================================================================== --- config/scripts/switch-arch (revision 644) +++ config/scripts/switch-arch (working copy) @@ -93,6 +93,9 @@ return fi done + if [ "$ARCH" = "$HOSTARCH" ]; then + return + fi echo "ERROR: no ${1} cross-compiler found !" 1>&2 exit 1 }

2 1

r645 - trunk/openbios-devel/config/scripts
by svn＠openbios.org 18 Dec '09

18 Dec '09

Author: laurent Date: 2009-12-18 21:41:51 +0100 (Fri, 18 Dec 2009) New Revision: 645 Modified: trunk/openbios-devel/config/scripts/switch-arch Log: I usually compile openbios on PowerPC for PowerPC. Apparently I'm the only onedoing that, as that (really easy) case got broken by the cross compilation overhaul. Let's allow host = target gcc configurations again. Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/config/scripts/switch-arch =================================================================== --- trunk/openbios-devel/config/scripts/switch-arch 2009-12-10 00:23:02 UTC (rev 644) +++ trunk/openbios-devel/config/scripts/switch-arch 2009-12-18 20:41:51 UTC (rev 645) @@ -93,6 +93,9 @@ return fi done + if [ "$ARCH" = "$HOSTARCH" ]; then + return + fi echo "ERROR: no ${1} cross-compiler found !" 1>&2 exit 1 }

1 0

Re: [OpenBIOS] r640 - trunk/openbios-devel/arch/sparc64
by Andreas Färber 15 Dec '09

15 Dec '09

Hi, Just updated to this revision from r636 and did a `make`: Building OpenBIOS for ppc sparc32 sparc64 Building...error: GEN openbios.dict undefined word. make[1]: *** [openbios.dict] Error 1 error: GEN openbios.dict undefined word. make[1]: *** [openbios.dict] Error 1 error: GEN openbios.dict undefined word. make[1]: *** [openbios.dict] Error 1 make: *** [build] Error 1 After `make clean` it worked fine. Could there be something wrong with the dependency modelling? In obj-sparc32/rules.mak I found this line: bootstrap-DICTIONARY:=$(bootstrap-DICTIONARY) $(SRCDIR)/forth/ bootstrap/start.fs But I believe bootstrap.dict should also depend on $(SRCDIR)/forth/ bootstrap/bootstrap.fs, which was modified in r638. After a switch- arch, it is then rebuilt before openbios.dict. See attached patch. However, there are some more .fs files in the forth/bootstrap folder that are not referenced in build.xml. Should all such files be added to the build.xml file in their folder, or are they / should they be referenced from somewhere else? Andreas

2 2

Re: [OpenBIOS] Starting QEMU with OpenBIOS for Sparc32
by gabriel omar batistuta 11 Dec '09

11 Dec '09

Thanks for your reply the problem is as follows: Boot hangs after the following console output Loading a.out image... Loaded 7483136 bytes entry point is 0x4000 Jumping to entry point... Host operating system:Windows XP SP2. Version Qemu: Qemu manager for windows V6.0 (qemu 0.9.1). Guest operating system : Solaris 2.4.

1 0

Re: [OpenBIOS] [PATCH] pci: enable io/memory unconditionally
by Laurent Vivier 10 Dec '09

10 Dec '09

>On Thu, Dec 10, 2009 at 01:09:34PM +0100, Laurent Vivier wrote: >> >On Thu, Dec 10, 2009 at 01:20:23AM +0100, Laurent Vivier wrote: >> >> Le mercredi 09 décembre 2009 à 17:53 +0200, Michael S. Tsirkin a écrit : >> >> > VGA adapters need to claim memory and i/o >> >> > transactions even if they do not have any >> >> > i/o or memory bars. E.g. PCI spec, page 297, >> >> > gives an example of such a device: >> >> > >> >> > Programming interface 0000 0000b >> >> > VGA-compatible controller. Memory >> >> > addresses 0A 0000h through 0B >> >> > FFFFh. I/O addresses 3B0h to 3BBh >> >> > and 3C0h to 3DFh and all aliases of >> >> > these addresses. >> >> > >> >> > While bios could check for these devices and special-case them, it is >> >> > easier to fix this by enabling i/o and memory space unconditionally: >> >> > devices that do not support it will just ignore this setting. >> >> > >> >> > Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com> >> >> >> >> Applied, but could you give me an use case where previous behavior >> >> breaks something ? >> >> >> >> Regards, >> >> Laurent >> > >> >qemu uses openbios and implements cirrus vga emulation, >> >which has this device class and no IO bars. >> >> qemu-system-ppc doesn't support cirrus vga emulation (only vga emulation), >moreover openbios is not able to manage cirrus vga card. > >Maybe it will support it in the future :). Are you working on this ? >> So why this modification is needed ? >> (even if it is correct according to the specs, it's why I've applied it) > >It's not fixing any breakage I have observed, if that's what you mean. >I found the issue in bochs bios and seabios with >cirrus vga emulation, so I thought I'd fix up openbios as well. OK, it's fine for me. Thank you. Laurent -- --------------------- Laurent(a)vivier.eu --------------------- "Tout ce qui est impossible reste à accomplir" Jules Verne "Things are only impossible until they're not" Jean-Luc Picard

2 1

Re: [OpenBIOS] [PATCH] pci: enable io/memory unconditionally
by Laurent Vivier 10 Dec '09

10 Dec '09

>On Thu, Dec 10, 2009 at 01:20:23AM +0100, Laurent Vivier wrote: >> Le mercredi 09 décembre 2009 à 17:53 +0200, Michael S. Tsirkin a écrit : >> > VGA adapters need to claim memory and i/o >> > transactions even if they do not have any >> > i/o or memory bars. E.g. PCI spec, page 297, >> > gives an example of such a device: >> > >> > Programming interface 0000 0000b >> > VGA-compatible controller. Memory >> > addresses 0A 0000h through 0B >> > FFFFh. I/O addresses 3B0h to 3BBh >> > and 3C0h to 3DFh and all aliases of >> > these addresses. >> > >> > While bios could check for these devices and special-case them, it is >> > easier to fix this by enabling i/o and memory space unconditionally: >> > devices that do not support it will just ignore this setting. >> > >> > Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com> >> >> Applied, but could you give me an use case where previous behavior >> breaks something ? >> >> Regards, >> Laurent > >qemu uses openbios and implements cirrus vga emulation, >which has this device class and no IO bars. qemu-system-ppc doesn't support cirrus vga emulation (only vga emulation), moreover openbios is not able to manage cirrus vga card. So why this modification is needed ? (even if it is correct according to the specs, it's why I've applied it) Regards, Laurent -- --------------------- Laurent(a)vivier.eu --------------------- "Tout ce qui est impossible reste à accomplir" Jules Verne "Things are only impossible until they're not" Jean-Luc Picard

2 1

[PATCH] pci: enable io/memory unconditionally
by Michael S. Tsirkin 10 Dec '09

10 Dec '09

VGA adapters need to claim memory and i/o transactions even if they do not have any i/o or memory bars. E.g. PCI spec, page 297, gives an example of such a device: Programming interface 0000 0000b VGA-compatible controller. Memory addresses 0A 0000h through 0B FFFFh. I/O addresses 3B0h to 3BBh and 3C0h to 3DFh and all aliases of these addresses. While bios could check for these devices and special-case them, it is easier to fix this by enabling i/o and memory space unconditionally: devices that do not support it will just ignore this setting. Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com> --- Pls Cc me on responses, I'm not on the list. Thanks! Index: drivers/pci.c =================================================================== --- drivers/pci.c (revision 641) +++ drivers/pci.c (working copy) @@ -732,10 +732,6 @@ base = *io_base; min_align = 1 << 7; amask = 0x00000001; - pci_config_write16(addr, PCI_COMMAND, - pci_config_read16(addr, - PCI_COMMAND) | - PCI_COMMAND_IO); } else { /* Memory Space */ base = *mem_base; @@ -744,10 +740,6 @@ if (reg == 6) { smask |= 1; /* ROM */ } - pci_config_write16(addr, PCI_COMMAND, - pci_config_read16(addr, - PCI_COMMAND) | - PCI_COMMAND_MEMORY); } *p_omask = smask & amask; smask &= ~amask; @@ -788,6 +780,7 @@ { uint32_t omask; + uint16_t cmd; int reg; pci_addr config_addr; @@ -807,6 +800,9 @@ ob_pci_configure_bar(addr, config, reg, config_addr, &omask, mem_base, io_base); } + cmd = pci_config_read16(addr, PCI_COMMAND); + cmd |= PCI_COMMAND_IO | PCI_COMMAND_MEMORY; + pci_config_write16(addr, PCI_COMMAND, cmd); } static void ob_scan_pci_bus(int bus, unsigned long *mem_base,

2 2

r644 - trunk/openbios-devel/config/scripts
by svn＠openbios.org 10 Dec '09

10 Dec '09

Author: laurent Date: 2009-12-10 01:23:02 +0100 (Thu, 10 Dec 2009) New Revision: 644 Modified: trunk/openbios-devel/config/scripts/switch-arch Log: Autodetect cross-compiler name. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/config/scripts/switch-arch =================================================================== --- trunk/openbios-devel/config/scripts/switch-arch 2009-12-10 00:17:17 UTC (rev 643) +++ trunk/openbios-devel/config/scripts/switch-arch 2009-12-10 00:23:02 UTC (rev 644) @@ -84,6 +84,19 @@ -e "s/Power Macintosh/ppc/"` } +select_prefix() +{ + for TARGET in ${1}-linux-gnu- ${1}-elf- ${1}-eabi- + do + if type -p ${TARGET}gcc > /dev/null + then + return + fi + done + echo "ERROR: no ${1} cross-compiler found !" 1>&2 + exit 1 +} + if ! test -f utils/dist/debian/rules; then echo "switch-arch must be run from the top-level source directory" >&2 exit 1 @@ -110,31 +123,31 @@ ARCH=`echo $RULES_ARCH | sed s/cross-//g` case $ARCH in amd64) - TARGET="x86_64-linux-gnu-" + select_prefix x86_64 CFLAGS="-fno-builtin" AS_FLAGS= ;; ppc) - TARGET="powerpc-linux-gnu-" + select_prefix powerpc CFLAGS="-msoft-float -fno-builtin-bcopy -fno-builtin-log2" AS_FLAGS= ;; sparc32) - TARGET="sparc-elf-" + select_prefix sparc CFLAGS="-Wa,-xarch=v8 -Wa,-32 -m32 -mcpu=supersparc -fno-builtin" AS_FLAGS="-Wa,-xarch=v8 -Wa,-32" ;; sparc64) - TARGET="sparc64-elf-" + select_prefix sparc64 CFLAGS="-Wa,-xarch=v9b -Wa,-64 -m64 -mcpu=ultrasparc -mcmodel=medany -fno-builtin" AS_FLAGS="-Wa,-xarch=v9b -Wa,-64" ;; x86) - TARGET="i486-linux-gnu-" + select_prefix i486 CFLAGS="-fno-builtin -m32" AS_FLAGS="-Wa,-32" ;;

1 0

r643 - trunk/openbios-devel/drivers
by svn＠openbios.org 10 Dec '09

10 Dec '09

Author: laurent Date: 2009-12-10 01:17:17 +0100 (Thu, 10 Dec 2009) New Revision: 643 Modified: trunk/openbios-devel/drivers/pci.c Log: VGA adapters need to claim memory and i/o transactions even if they do not have any i/o or memory bars. E.g. PCI spec, page 297, gives an example of such a device: Programming interface 0000 0000b VGA-compatible controller. Memory addresses 0A 0000h through 0B FFFFh. I/O addresses 3B0h to 3BBh and 3C0h to 3DFh and all aliases of these addresses. While bios could check for these devices and special-case them, it is easier to fix this by enabling i/o and memory space unconditionally: devices that do not support it will just ignore this setting. Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com> Modified: trunk/openbios-devel/drivers/pci.c =================================================================== --- trunk/openbios-devel/drivers/pci.c 2009-12-09 18:44:01 UTC (rev 642) +++ trunk/openbios-devel/drivers/pci.c 2009-12-10 00:17:17 UTC (rev 643) @@ -732,10 +732,6 @@ base = *io_base; min_align = 1 << 7; amask = 0x00000001; - pci_config_write16(addr, PCI_COMMAND, - pci_config_read16(addr, - PCI_COMMAND) | - PCI_COMMAND_IO); } else { /* Memory Space */ base = *mem_base; @@ -744,10 +740,6 @@ if (reg == 6) { smask |= 1; /* ROM */ } - pci_config_write16(addr, PCI_COMMAND, - pci_config_read16(addr, - PCI_COMMAND) | - PCI_COMMAND_MEMORY); } *p_omask = smask & amask; smask &= ~amask; @@ -788,6 +780,7 @@ { uint32_t omask; + uint16_t cmd; int reg; pci_addr config_addr; @@ -807,6 +800,9 @@ ob_pci_configure_bar(addr, config, reg, config_addr, &omask, mem_base, io_base); } + cmd = pci_config_read16(addr, PCI_COMMAND); + cmd |= PCI_COMMAND_IO | PCI_COMMAND_MEMORY; + pci_config_write16(addr, PCI_COMMAND, cmd); } static void ob_scan_pci_bus(int bus, unsigned long *mem_base,

1 0

Starting QEMU with OpenBIOS for Sparc32
by gabriel omar batistuta 09 Dec '09

09 Dec '09

Can someone with the following question? I'm trying to use Qemu to load a solaris 2.4 on an x86 machine running a Windows XP. I know how to configure both OpenBoot Qemu as to emulate the sistems sparc32. >From already thank you very much.

2 1

Milax and the alarm word
by Mark Cave-Ayland 09 Dec '09

09 Dec '09

Hi all, With the previous commit, I seem to be getting to the point where files are now being read from the ISO into memory. However, on Milax things are still failing because the Fcode tries to set up a callback function repeated every second using the "alarm" word. Does SPARC64 have a way of counting elapsed time (some kind of clock tick register) so that it would be possible to measure this in the main loop? Or alternatively set up some kind of timer interrupt after X ms? Incidentally I notice that the latest Solaris code doesn't seem to use alarm anymore; Nick - does your Nevada boot get any further with current OpenBIOS SVN? ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063 Sirius Labs: http://www.siriusit.co.uk/labs

4 12

r642 - trunk/openbios-devel/forth/device
by svn＠openbios.org 09 Dec '09

09 Dec '09

Author: mcayland Date: 2009-12-09 19:44:01 +0100 (Wed, 09 Dec 2009) New Revision: 642 Modified: trunk/openbios-devel/forth/device/other.fs Log: Correct Forth data stack when the alarm word is used (the implementation is currently missing, but we'll worry about that a bit later). This allows us to proceed further with SPARC64 boot. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/forth/device/other.fs =================================================================== --- trunk/openbios-devel/forth/device/other.fs 2009-12-09 01:09:48 UTC (rev 641) +++ trunk/openbios-devel/forth/device/other.fs 2009-12-09 18:44:01 UTC (rev 642) @@ -96,6 +96,7 @@ ; : alarm ( xt n -- ) + 2drop ; : user-abort ( ... -- ) ( R: ... -- )

1 0

PATCH: RFC: Rework control flow stack words to use 2 data stack items
by Mark Cave-Ayland 09 Dec '09

09 Dec '09

Hi all, After some more debugging this weekend, I've found that r638 is not the correct fix for resolving backwards branches. Re-reading the OF spec lots of times and searching the internet for information on the Forth control flow stack has now changed my understanding of how this should work. Currently, OpenBIOS uses 1 stack item per control flow stack item which works fine when executing control flow words directly in the interpreter. However, Fcode evaluation requires slightly different semantics for bbranch and b?branch (since they can be used as part of different control flow words with slightly different behaviours) and so in order for this to work, we also need to know the *type* of a control flow stack item. In particular, we need to know if it is a source address or a dest address in order to be able to resolve nested control flow statements correctly. Please find attached my current working patch for extending the control flow stack so that each item now takes 2 data stack words: an address, followed by an address type. I have a separate patch for the Fcode evaluator, which when applied in conjunction with this patch actually gets to the point where it attempts to read the file from the ISO image. Nice. However, since this patch involves some reasonably low level tinkering, I'd like to put it out for review first. Please can people with some Forth experience (e.g. Stefan, Tarl, Laurent) take a look at this and check that it's okay to apply? ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063 Sirius Labs: http://www.siriusit.co.uk/labs

1 1

r641 - in trunk/openbios-devel/forth: bootstrap device
by svn＠openbios.org 09 Dec '09

09 Dec '09

Author: mcayland Date: 2009-12-09 02:09:48 +0100 (Wed, 09 Dec 2009) New Revision: 641 Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs trunk/openbios-devel/forth/device/fcode.fs Log: Revert r638, apply previous patch to extend control flow stack items to 2 data stack items, and fix the Fcode evaluator to use this new information to correctly resolve destination (b<mark) references. See the email archives for further discussion on why this is required. Hopefully this should finally resolve the Fcode backward branch problem; at least all previous incorrect resolutions now appear correct and the Fcode evaluator no longer crashes or gets stuck in a loop while attempting to boot Milax. Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs =================================================================== --- trunk/openbios-devel/forth/bootstrap/bootstrap.fs 2009-12-05 10:13:17 UTC (rev 640) +++ trunk/openbios-devel/forth/bootstrap/bootstrap.fs 2009-12-09 01:09:48 UTC (rev 641) @@ -159,15 +159,20 @@ \ 7.3.8.1 Conditional branches \ -: resolve-orig here over /n + - swap ! ; -: (if) ['] do?branch , here 0 , ; compile-only +\ A control stack entry is implemented using 2 data stack items +\ of the form ( addr type ). type can be one of the +\ following: +\ 0 - orig +\ 1 - dest +\ 2 - do-sys + +: resolve-orig here nip over /n + - swap ! ; +: (if) ['] do?branch , here 0 0 , ; compile-only : (then) resolve-orig ; compile-only variable tmp-comp-depth -1 tmp-comp-depth ! variable tmp-comp-buf 0 tmp-comp-buf ! -variable cstack-startdepth -1 cstack-startdepth ! \ start depth of the cstack - : setup-tmp-comp ( -- ) state @ 0 = (if) here tmp-comp-buf @ here! , \ save here and switch to tmp directory @@ -175,20 +180,9 @@ depth tmp-comp-depth ! \ save control depth ] (then) - - \ If start of new execution context, record the location of the bottom - \ of the new cstack (required for backwards Fcode branches) - cstack-startdepth @ -1 = (if) - depth cstack-startdepth ! - (then) ; : execute-tmp-comp ( -- ) - \ If at the end of this execution context, reset cstack location - depth cstack-startdepth @ = (if) - -1 cstack-startdepth ! - (then) - depth tmp-comp-depth @ = (if) -1 tmp-comp-depth ! @@ -200,9 +194,9 @@ (then) ; -: if setup-tmp-comp ['] do?branch , here 0 , ; immediate +: if setup-tmp-comp ['] do?branch , here 0 0 , ; immediate : then resolve-orig execute-tmp-comp ; compile-only -: else ['] dobranch , here 0 , swap resolve-orig ; compile-only +: else ['] dobranch , here 0 0 , 2swap resolve-orig ; compile-only \ \ 7.3.8.3 Conditional loops @@ -215,42 +209,66 @@ : (while) ; : (repeat) ; -: resolve-dest here /n + - , ; +\ resolve-dest requires a loop... +: (resolve-dest) here /n + nip - , ; +: (resolve-begin) setup-tmp-comp ['] (begin) , here 1 ; immediate +: (resolve-until) ['] (until) , ['] do?branch , (resolve-dest) execute-tmp-comp ; compile-only -: begin +: resolve-dest ( dest origN ... orig ) + 2 >r + (resolve-begin) + \ Find topmost control stack entry with a type of 1 (dest) + r> dup dup pick 1 = if + \ Move it to the top + roll + swap 1 - roll + \ Resolve it + (resolve-dest) + 1 \ force exit + else + drop + 2 + >r + 0 + then + (resolve-until) +; + +: begin setup-tmp-comp ['] (begin) , - here + here + 1 ; immediate - -: again + +: again ['] (again) , ['] dobranch , resolve-dest execute-tmp-comp ; compile-only - -: until + +: until ['] (until) , ['] do?branch , - resolve-dest + resolve-dest execute-tmp-comp ; compile-only - + : while setup-tmp-comp ['] (while) , ['] do?branch , - here 0 , swap + here 0 0 , 2swap ; immediate - -: repeat + +: repeat ['] (repeat) , ['] dobranch , resolve-dest resolve-orig execute-tmp-comp ; compile-only + \ \ 7.3.8.4 Counted loops \ @@ -267,13 +285,14 @@ here over - \ -- *leaves leaves here-leaves swap ! \ -- *leaves repeat - here - , + here nip - , leaves ! ; -: do +: do setup-tmp-comp - leaves @ here + leaves @ + here 2 ['] (do) , 0 leaves ! ; immediate @@ -282,7 +301,7 @@ setup-tmp-comp leaves @ ['] (?do) , - here + here 2 here leaves ! 0 , ; immediate @@ -299,6 +318,7 @@ execute-tmp-comp ; immediate + \ Using primitive versions of i and j \ speeds up loops by 300% \ : i r> r@ swap >r ; @@ -325,15 +345,15 @@ 0 ; immediate -: endcase +: endcase ['] drop , - 0 ?do + 0 ?do ['] then execute loop execute-tmp-comp ; immediate -: of +: of 1 + >r ['] over , ['] = , @@ -342,13 +362,12 @@ r> ; immediate -: endof +: endof >r ['] else execute r> ; immediate - \ \ 7.3.8.5 Other control flow commands \ Modified: trunk/openbios-devel/forth/device/fcode.fs =================================================================== --- trunk/openbios-devel/forth/device/fcode.fs 2009-12-05 10:13:17 UTC (rev 640) +++ trunk/openbios-devel/forth/device/fcode.fs 2009-12-09 01:09:48 UTC (rev 641) @@ -451,15 +451,13 @@ : bbranch fcode-offset 0< if \ if we jump backwards, we can forsee where it goes ['] dobranch , - \ Backwards branches are resolved from the bottom of the cstack - depth cstack-startdepth @ 1+ - roll resolve-dest execute-tmp-comp else setup-tmp-comp ['] dobranch , - here + here 0 0 , - swap + 2swap then ; immediate @@ -470,13 +468,11 @@ : b?branch fcode-offset 0< if \ if we jump backwards, we can forsee where it goes ['] do?branch , - \ Backwards branches are resolved from the bottom of the cstack - depth cstack-startdepth @ 1+ - roll resolve-dest execute-tmp-comp else setup-tmp-comp ['] do?branch , - here + here 0 0 , then ; immediate @@ -487,7 +483,7 @@ : b(<mark) setup-tmp-comp - here + here 1 ; immediate

1 0

Re: [OpenBIOS] [Qemu-devel] Staging update (0.12 pending freeze)
by Aurelien Jarno 07 Dec '09

07 Dec '09

On Wed, Dec 02, 2009 at 10:46:11AM -0600, Anthony Liguori wrote: > I've got all of the patches I'm considering for 0.12 currently in > staging. I'm going to work through and test/commit these in a few > chunks over the next few days before freezing the tree. > What are the plans on the OpenBIOS side? The version currently included in QEMU is old compared to the SVN. Is it plan to sync a release of OpenBIOS with QEMU? -- Aurelien Jarno GPG: 1024D/F1BCDB73 aurelien(a)aurel32.net http://www.aurel32.net

2 6

Re: [OpenBIOS] r640 - trunk/openbios-devel/arch/sparc64
by Mark Cave-Ayland 07 Dec '09

07 Dec '09

svn(a)openbios.org wrote: > Author: blueswirl > Date: 2009-12-05 11:13:17 +0100 (Sat, 05 Dec 2009) > New Revision: 640 > > Modified: > trunk/openbios-devel/arch/sparc64/lib.c > Log: > Revert r639, fix mem_claim (Igor Kovalenko) and mem_release Thanks a lot guys - this works, and has enabled me to get much further with my testing over the weekend (see next email). ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063 Sirius Labs: http://www.siriusit.co.uk/labs

1 0

Cross-compiling and testing sparc64 on Mac OS X
by Andreas Färber 06 Dec '09

06 Dec '09

Hello guys, It's awesome seeing you've made some progress towards emulating Solaris/sparc64! However trying myself, compiling on Mac OS X (after making sure that NEED_INT128_T is defined) fails with the following error: HOSTCC host/kernel/bootstrap.o In file included from ../include/openbios/sysinclude.h:7, from ../kernel/bootstrap.c:9: /usr/include/stdlib.h:267: error: syntax error before ‘arc4random’ make[1]: *** [host/kernel/bootstrap.o] Error 1 The return type of arc4random is u_int32_t, which is defined (in my case) in <ppc/types.h>. Not sure what goes wrong there. I thought it could be a name clash with OpenBIOS' __TYPES_H (malc would be furious!), but - luckily - Apple uses __TYPES_H_ for their _types.h. Anyway, not having these functions declared by defining _POSIX_C_SOURCE made the compilation proceed with only one warning: HOSTCC host/kernel/bootstrap.o ../kernel/bootstrap.c: In function ‘interpret_source’: ../kernel/bootstrap.c:529: warning: implicit declaration of function ‘strcasecmp’ If I symlink .../share/qemu/openbios-sparc64 to .../obj-sparc64/ openbios-builtin.elf (or copy it over) I get this at runtime: qemu: fatal: Trap 0x0010 while trap level (5) >= MAXTL (5), Error state pc: 0000000000004200 npc: 0000000000004204 General Registers: %g0: 0000000000000000 %g1: 0000000000000000 %g2: 0000000008000000 %g3: 0000000000000000 %g4: 0000000000000000 %g5: 0000000000000000 %g6: 0000000000000000 %g7: 0000000000000000 Current Register Window: %o0: 00000000ffe00000 %o1: 00000000ffe01000 %o2: 000001fff0100000 %o3: 000001fff0000000 %o4: 0000000000000000 %o5: 0000000000000000 %o6: 0000000000000000 %o7: 000001ff00000000 %l0: 0000000007e80000 %l1: 000001ff00000000 %l2: 000001fff0080000 %l3: 0000000000000000 %l4: 0000000000000000 %l5: 0000000000000000 %l6: 0000000000000000 %l7: 0000000000000000 %i0: 0000000000000000 %i1: 0000000000000000 %i2: 0000000000000000 %i3: 0000000000000000 %i4: 0000000000000000 %i5: 0000000000000000 %i6: 0000000000000000 %i7: 0000000000000000 Floating Point Registers: %f00: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f04: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f08: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f12: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f16: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f20: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f24: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 %f28: 000000000.000000 000000000.000000 000000000.000000 000000000.000000 pstate: 0x00000015 ccr: 0x99 asi: 0x00 tl: 5 fprs: 0 cansave: 6 canrestore: 0 otherwin: 0 wstate 0 cleanwin 6 cwp 7 fsr: 0x00000000 ../qemu-solaris-sparc.command: line 3: 3289 Abort trap / Users/andreas/Q/latest/bin/qemu-system-sparc64 -nographic -boot d - cdrom /Users/andreas/Q/sol-10-u3-ga-sparc-dvd.iso This looks different from what you've posted and is identical with QEMU's version of openbios-sparc64. Same with or without -nographic. Any ideas? Regards, Andreas

3 10

Re: [OpenBIOS] r638 - in trunk/openbios-devel/forth: bootstrap device
by Nick Couchman 05 Dec '09

05 Dec '09

>>> On 2009/12/03 at 08:47, <svn(a)openbios.org> wrote: > Author: mcayland > Date: 2009-12-03 16:47:39 +0100 (Thu, 03 Dec 2009) > New Revision: 638 > > Modified: > trunk/openbios-devel/forth/bootstrap/bootstrap.fs > trunk/openbios-devel/forth/device/fcode.fs > Log: > Fix backwards Fcode branches (bbranch and b?branch). > > According to the specification, the destination for a backwards Fcode branch > must be resolved from the bottom rather than the > top of the cstack. The existing version of the code was simply doing a swap, > and so nesting any branches within a backward branch > would fail since the wrong destination would be resolved from the stack. > > This patch adds a new cstack-startdepth variable to keep track of the cstack > base location within an execution context > (setup-tmp-comp and execute-tmp-comp) and alters the backward branches to make > use of it. > > With this patch in place, Milax under Qemu doesn't crash anymore but sits in > an infinite loop reading sectors from the CDROM. > > The Solaris Nevada code still gets the unhandled exception in cfetch. -Nick -------- This e-mail may contain confidential and privileged material for the sole use of the intended recipient. If this email is not intended for you, or you are not responsible for the delivery of this message to the intended recipient, please note that this message may contain SEAKR Engineering (SEAKR) Privileged/Proprietary Information. In such a case, you are strictly prohibited from downloading, photocopying, distributing or otherwise using this message, its contents or attachments in any way. If you have received this message in error, please notify us immediately by replying to this e-mail and delete the message from your mailbox. Information contained in this message that does not relate to the business of SEAKR is neither endorsed by nor attributable to SEAKR.

5 16

r640 - trunk/openbios-devel/arch/sparc64
by svn＠openbios.org 05 Dec '09

05 Dec '09

Author: blueswirl Date: 2009-12-05 11:13:17 +0100 (Sat, 05 Dec 2009) New Revision: 640 Modified: trunk/openbios-devel/arch/sparc64/lib.c Log: Revert r639, fix mem_claim (Igor Kovalenko) and mem_release Signed-off-by: igor.v.kovalenko(a)gmail.com Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc64/lib.c =================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c 2009-12-04 22:01:12 UTC (rev 639) +++ trunk/openbios-devel/arch/sparc64/lib.c 2009-12-05 10:13:17 UTC (rev 640) @@ -261,6 +261,8 @@ size = POP(); virt = POP(); phys = POP(); + phys <<= 32; + phys |= POP(); ofmem_map(phys, virt, size, mode); } @@ -376,8 +378,8 @@ ofmem_map(phys, phys, size, -1); + PUSH(phys & 0xffffffffUL); PUSH(phys >> 32); - PUSH(phys & 0xffffffffUL); } /* ( phys size --- ) */ @@ -388,6 +390,8 @@ size = POP(); phys = POP(); + phys <<= 32; + phys |= POP(); ofmem_release_phys(phys, size); }

1 0

Re: [OpenBIOS] r639 - trunk/openbios-devel/arch/sparc64
by Nick Couchman 04 Dec '09

04 Dec '09

>>> On 2009/12/04 at 15:01, <svn(a)openbios.org> wrote: > Author: blueswirl > Date: 2009-12-04 23:01:12 +0100 (Fri, 04 Dec 2009) > New Revision: 639 > > Modified: > trunk/openbios-devel/arch/sparc64/lib.c > Log: > Sparc64: fix mmu_map > Awesome...no more unhandled exception! I get this: OpenBIOS for Sparc64 Configuration device id QEMU version 1 machine id 0 CPUs: 1 x SUNW,UltraSPARC-II UUID: 00000000-0000-0000-0000-000000000000 Welcome to OpenBIOS v1.0 built on Dec 4 2009 22:22 Type 'help' for detailed information 0 > boot cdrom [sparc64] Booting file 'cdrom' with parameters '' Not a bootable ELF image Not a Linux kernel image Not a bootable a.out image Loading FCode image... Loaded 7120 bytes entry point is 0x4000 Evaluating FCode... invalid access of +vd Can't mount root byte-load: exception caught! ok 0 > I'm trying to track down in Forth where the +vd is - I'll post, again, if/when I find it! -Nick -------- This e-mail may contain confidential and privileged material for the sole use of the intended recipient. If this email is not intended for you, or you are not responsible for the delivery of this message to the intended recipient, please note that this message may contain SEAKR Engineering (SEAKR) Privileged/Proprietary Information. In such a case, you are strictly prohibited from downloading, photocopying, distributing or otherwise using this message, its contents or attachments in any way. If you have received this message in error, please notify us immediately by replying to this e-mail and delete the message from your mailbox. Information contained in this message that does not relate to the business of SEAKR is neither endorsed by nor attributable to SEAKR.

1 0

r639 - trunk/openbios-devel/arch/sparc64
by svn＠openbios.org 04 Dec '09

04 Dec '09

Author: blueswirl Date: 2009-12-04 23:01:12 +0100 (Fri, 04 Dec 2009) New Revision: 639 Modified: trunk/openbios-devel/arch/sparc64/lib.c Log: Sparc64: fix mmu_map Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc64/lib.c =================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c 2009-12-03 15:47:39 UTC (rev 638) +++ trunk/openbios-devel/arch/sparc64/lib.c 2009-12-04 22:01:12 UTC (rev 639) @@ -261,8 +261,6 @@ size = POP(); virt = POP(); phys = POP(); - phys <<= 32; - phys |= POP(); ofmem_map(phys, virt, size, mode); }

1 0

r638 - in trunk/openbios-devel/forth: bootstrap device
by svn＠openbios.org 03 Dec '09

03 Dec '09

Author: mcayland Date: 2009-12-03 16:47:39 +0100 (Thu, 03 Dec 2009) New Revision: 638 Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs trunk/openbios-devel/forth/device/fcode.fs Log: Fix backwards Fcode branches (bbranch and b?branch). According to the specification, the destination for a backwards Fcode branch must be resolved from the bottom rather than the top of the cstack. The existing version of the code was simply doing a swap, and so nesting any branches within a backward branch would fail since the wrong destination would be resolved from the stack. This patch adds a new cstack-startdepth variable to keep track of the cstack base location within an execution context (setup-tmp-comp and execute-tmp-comp) and alters the backward branches to make use of it. With this patch in place, Milax under Qemu doesn't crash anymore but sits in an infinite loop reading sectors from the CDROM. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs =================================================================== --- trunk/openbios-devel/forth/bootstrap/bootstrap.fs 2009-12-02 10:44:35 UTC (rev 637) +++ trunk/openbios-devel/forth/bootstrap/bootstrap.fs 2009-12-03 15:47:39 UTC (rev 638) @@ -166,6 +166,8 @@ variable tmp-comp-depth -1 tmp-comp-depth ! variable tmp-comp-buf 0 tmp-comp-buf ! +variable cstack-startdepth -1 cstack-startdepth ! \ start depth of the cstack + : setup-tmp-comp ( -- ) state @ 0 = (if) here tmp-comp-buf @ here! , \ save here and switch to tmp directory @@ -173,9 +175,20 @@ depth tmp-comp-depth ! \ save control depth ] (then) + + \ If start of new execution context, record the location of the bottom + \ of the new cstack (required for backwards Fcode branches) + cstack-startdepth @ -1 = (if) + depth cstack-startdepth ! + (then) ; : execute-tmp-comp ( -- ) + \ If at the end of this execution context, reset cstack location + depth cstack-startdepth @ = (if) + -1 cstack-startdepth ! + (then) + depth tmp-comp-depth @ = (if) -1 tmp-comp-depth ! Modified: trunk/openbios-devel/forth/device/fcode.fs =================================================================== --- trunk/openbios-devel/forth/device/fcode.fs 2009-12-02 10:44:35 UTC (rev 637) +++ trunk/openbios-devel/forth/device/fcode.fs 2009-12-03 15:47:39 UTC (rev 638) @@ -451,7 +451,8 @@ : bbranch fcode-offset 0< if \ if we jump backwards, we can forsee where it goes ['] dobranch , - swap + \ Backwards branches are resolved from the bottom of the cstack + depth cstack-startdepth @ 1+ - roll resolve-dest execute-tmp-comp else @@ -469,6 +470,8 @@ : b?branch fcode-offset 0< if \ if we jump backwards, we can forsee where it goes ['] do?branch , + \ Backwards branches are resolved from the bottom of the cstack + depth cstack-startdepth @ 1+ - roll resolve-dest execute-tmp-comp else

1 0

r637 - in trunk/openbios-devel: arch/ppc/briq arch/ppc/mol arch/ppc/pearpc arch/ppc/qemu arch/sparc64 forth/system modules
by svn＠openbios.org 02 Dec '09

02 Dec '09

Author: mcayland Date: 2009-12-02 11:44:35 +0100 (Wed, 02 Dec 2009) New Revision: 637 Modified: trunk/openbios-devel/arch/ppc/briq/methods.c trunk/openbios-devel/arch/ppc/mol/methods.c trunk/openbios-devel/arch/ppc/pearpc/methods.c trunk/openbios-devel/arch/ppc/qemu/methods.c trunk/openbios-devel/arch/sparc64/lib.c trunk/openbios-devel/forth/system/ciface.fs trunk/openbios-devel/modules/client.c Log: In the IEEE 1275-1994 specification the parameters for Client Interface calls are not in forth stack order but in reversed (heh!) order. Our implementation confused this. This second patch is fairly straightforward; probably the only unexpected part is the need to rename the existing /openprom/client-services "claim" and "release" words to "cif-claim" and "cif-release" respectively. This is because we need to use the "claim" and "release" words in forth/system/ciface.fs to reverse the argument order before calling the real underlying words. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/ppc/briq/methods.c =================================================================== --- trunk/openbios-devel/arch/ppc/briq/methods.c 2009-11-29 13:49:47 UTC (rev 636) +++ trunk/openbios-devel/arch/ppc/briq/methods.c 2009-12-02 10:44:35 UTC (rev 637) @@ -309,8 +309,8 @@ }; NODE_METHODS( mmu_ciface ) = { - { "claim", ciface_claim }, - { "release", ciface_release }, + { "cif-claim", ciface_claim }, + { "cif-release", ciface_release }, }; Modified: trunk/openbios-devel/arch/ppc/mol/methods.c =================================================================== --- trunk/openbios-devel/arch/ppc/mol/methods.c 2009-11-29 13:49:47 UTC (rev 636) +++ trunk/openbios-devel/arch/ppc/mol/methods.c 2009-12-02 10:44:35 UTC (rev 637) @@ -447,8 +447,8 @@ }; NODE_METHODS( mmu_ciface ) = { - { "claim", ciface_claim }, - { "release", ciface_release }, + { "cif-claim", ciface_claim }, + { "cif-release", ciface_release }, }; Modified: trunk/openbios-devel/arch/ppc/pearpc/methods.c =================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/methods.c 2009-11-29 13:49:47 UTC (rev 636) +++ trunk/openbios-devel/arch/ppc/pearpc/methods.c 2009-12-02 10:44:35 UTC (rev 637) @@ -311,8 +311,8 @@ }; NODE_METHODS( mmu_ciface ) = { - { "claim", ciface_claim }, - { "release", ciface_release }, + { "cif-claim", ciface_claim }, + { "cif-release", ciface_release }, }; Modified: trunk/openbios-devel/arch/ppc/qemu/methods.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/methods.c 2009-11-29 13:49:47 UTC (rev 636) +++ trunk/openbios-devel/arch/ppc/qemu/methods.c 2009-12-02 10:44:35 UTC (rev 637) @@ -290,8 +290,8 @@ }; NODE_METHODS( mmu_ciface ) = { - { "claim", ciface_claim }, - { "release", ciface_release }, + { "cif-claim", ciface_claim }, + { "cif-release", ciface_release }, }; Modified: trunk/openbios-devel/arch/sparc64/lib.c =================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c 2009-11-29 13:49:47 UTC (rev 636) +++ trunk/openbios-devel/arch/sparc64/lib.c 2009-12-02 10:44:35 UTC (rev 637) @@ -469,6 +469,6 @@ push_str("/openprom/client-services"); fword("find-device"); - bind_func("claim", mmu_claim); - bind_func("release", mmu_release); + bind_func("cif-claim", mmu_claim); + bind_func("cif-release", mmu_release); } Modified: trunk/openbios-devel/forth/system/ciface.fs =================================================================== --- trunk/openbios-devel/forth/system/ciface.fs 2009-11-29 13:49:47 UTC (rev 636) +++ trunk/openbios-devel/forth/system/ciface.fs 2009-12-02 10:44:35 UTC (rev 637) @@ -77,35 +77,31 @@ : child child ; : parent parent ; -: getproplen ( phandle name -- len|-1 ) - \ ." PH " over . dup cstrlen ." GETPROPLEN " 2dup type cr - dup cstrlen - rot ?phandle get-package-property +: getproplen ( name phandle -- len|-1 ) + over cstrlen swap + ?phandle get-package-property if -1 else nip then ; -: getprop ( phandle name buf buflen -- size|-1 ) - \ ." PH " 3 pick . ." GETPROP " 2 pick dup cstrlen type cr - >r >r dup cstrlen - rot +: getprop ( buflen buf name phandle -- size|-1 ) \ detect phandle == -1 dup -1 = if - r> r> 2drop 3drop -1 exit + 2drop 2drop -1 exit then \ return -1 if phandle is 0 (MacOS actually does this) - ?dup 0= if r> r> 2drop 2drop -1 exit then - - ?phandle get-package-property if r> r> 2drop -1 exit then - r> r> - ( prop proplen dest destlen ) - rot dup >r min move r> + ?dup 0= if 2drop 2drop -1 exit then + + over cstrlen swap + ?phandle get-package-property if 2drop -1 exit then + ( buflen buf prop proplen ) + >r swap rot r> min + dup >r move r> ; \ 1 OK, 0 no more prop, -1 prev invalid -: nextprop ( phandle prev buf -- 1|0|-1 ) - rot >r - swap ( buf prev ) +: nextprop ( buf prev phandle -- 1|0|-1 ) + >r dup 0= if 0 else dup cstrlen then ( buf prev prev_len ) @@ -131,11 +127,12 @@ then ; -: setprop ( phandle name buf len -- size ) - dup >r encode-bytes rot dup cstrlen - ( phandle buf len name name_len R: size ) - 4 pick (property) - drop r> +: setprop ( len buf name phandle -- size ) + 3 pick >r + >r >r swap encode-bytes \ ( prop-addr prop-len R: phandle name ) + r> dup cstrlen r> + (property) + r> ; : finddevice ( dev_spec -- phandle|-1 ) @@ -149,39 +146,38 @@ ?ihandle ihandle>phandle ; -: package-to-path ( phandle buf buflen -- length ) - rot +: package-to-path ( buflen buf phandle -- length ) \ XXX improve error checking dup 0= if 3drop -1 exit then + >r swap r> get-package-path ( buf buflen str len ) ci-strcpy ; -: canon ( dev_specifier buf buflen -- len ) - rot dup cstrlen find-dev if - ( buf buflen phandle ) - -rot +: canon ( buflen buf dev_specifier -- len ) + dup cstrlen find-dev if + ( buflen buf phandle ) package-to-path else 2drop -1 then ; -: instance-to-path ( ihandle buf buflen -- length ) - rot +: instance-to-path ( buflen buf ihandle -- length ) \ XXX improve error checking dup 0= if 3drop -1 exit then + >r swap r> get-instance-path \ ." INSTANCE: " 2dup type cr dup . ( buf buflen str len ) ci-strcpy ; -: instance-to-interposed-path ( ihandle buf buflen -- length ) - rot +: instance-to-interposed-path ( buflen buf ihandle -- length ) \ XXX improve error checking dup 0= if 3drop -1 exit then + >r swap r> get-instance-interposed-path ( buf buflen str len ) ci-strcpy @@ -212,20 +208,20 @@ close-dev ; -: read ( ihandle addr len -- actual ) - rot dup ihandle>phandle " read" rot find-method +: read ( len addr ihandle -- actual ) + >r swap r> + dup ihandle>phandle " read" rot find-method if swap call-package else 3drop -1 then ; -: write ( ihandle addr len -- actual ) - rot dup ihandle>phandle " write" rot find-method +: write ( len addr ihandle -- actual ) + >r swap r> + dup ihandle>phandle " write" rot find-method if swap call-package else 3drop -1 then ; -: seek ( ihandle pos_hi pos_lo -- status ) - \ package methods uses ( pos_lo pos_hi -- status ) - swap - rot dup ihandle>phandle " seek" rot find-method +: seek ( pos_lo pos_hi ihandle -- status ) + dup ihandle>phandle " seek" rot find-method if swap call-package else 3drop -1 then ; @@ -234,9 +230,18 @@ \ 6.3.2.4 Memory \ ------------------------------------------------------------- -\ : claim ( virt size align -- baseaddr|-1 ) ; -\ : release ( virt size -- ) ; +: claim ( align size virt -- baseaddr|-1 ) + -rot swap + ciface-ph " cif-claim" rot find-method + if execute else 3drop -1 then +; +: release ( size virt -- ) + swap + ciface-ph " cif-release" rot find-method + if execute else 2drop -1 then +; + \ ------------------------------------------------------------- \ 6.3.2.5 Control transfer \ ------------------------------------------------------------- Modified: trunk/openbios-devel/modules/client.c =================================================================== --- trunk/openbios-devel/modules/client.c 2009-11-29 13:49:47 UTC (rev 636) +++ trunk/openbios-devel/modules/client.c 2009-12-02 10:44:35 UTC (rev 637) @@ -288,7 +288,7 @@ return handle_calls( pb ); dstacksave = dstackcnt; - for( i=0; i<pb->nargs; i++ ) + for( i=pb->nargs-1; i>=0; i-- ) PUSH( pb->args[i] ); push_str( pb->service );

1 0

PATCH v2: Rework CIF interface to handle parameters in reverse order
by Mark Cave-Ayland 01 Dec '09

01 Dec '09

Hi everyone, Here is a second version of the patch which attempts to reverse the argument order of the CIF Forth words so that they can be called correctly from both Forth and C. The patch is fairly straightforward; probably the only unexpected part is the need to rename the existing /openprom/client-services "claim" and "release" words to "cif-claim" and "cif-release" respectively. This is because we need to use the "claim" and "release" words in forth/system/ciface.fs to reverse the argument order before calling the real underlying words. I've tested this on a FC12 PPC CD as well as my SPARC64 Milax CD and with this version of the patch, the CIF words are called correctly in both cases. I'd like to apply this reasonably soon, so please can people test on their setups to make sure it doesn't break anything? Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063 Sirius Labs: http://www.siriusit.co.uk/labs

5 10

(no subject)
by Rafael Buades Delgado 01 Dec '09

01 Dec '09

desactivar power-on passdwor qui tando la pila no se quita

1 0

OpenBIOS built in Mac OS X?
by G 3 30 Nov '09

30 Nov '09

On Nov 29, 2009, at 6:22 PM, openbios-request(a)openbios.org wrote: > It's probably not an OpenBIOS build problem. I was able to execute an > OSX-built OpenBIOS on Linux and OpenSolaris. Executing a Linux-built > OpenBIOS on OSX/ppc failed. Using same GCC 4.4.2 and binutils 2.20. > That still leaves OS differences, the endianness, the bitness, etc. > etc. Maybe Blue has a hunch? > > Andreas You were able to build OpenBIOS on Mac OS X? If so, how? Every attempt I made has failed. I'm using GCC 4.0.1. Could it be a problem with my compiler version?

2 1

(no subject)
by Rafael Buades Delgado 30 Nov '09

30 Nov '09

cd EFI bios

1 0

RFC: fcode-utils portability
by Andreas Färber 29 Nov '09

29 Nov '09

Hello, When compiling the FCode utils on Mac OS X v10.5 I got an error when stripping. A workaround was to run `make STRIP=:`, not stripping at all. I now figured out that it's about the -s option: -s is short for -- strip-all in GNU strip but in Apple's strip -s references a text file with a list of symbols to preserve. I didn't spot an obvious equivalent to --strip-all. http://developer.apple.com/mac/library/documentation/Darwin/Reference/ManPa… Since the fcode-utils use pure Makefiles without prior art of platform- based decisions, I am wondering how to best supply a patch... Should the hardcoded -s be moved to a new STRIPFLAGS variable or into STRIP itself? And more important, how would we set either variable based on platform? Do we assume GNU make so that we can get the platform via $ (shell sh - c 'uname -s 2>/dev/null') or similar, as seen in Git? Creating a configure script seems like overkill for such a tiny fix. Thanks, Andreas

2 2

r636 - in trunk/fcode-utils-devel: . detok romheaders toke
by svn＠openbios.org 29 Nov '09

29 Nov '09

Author: stepan Date: 2009-11-29 14:49:47 +0100 (Sun, 29 Nov 2009) New Revision: 636 Modified: trunk/fcode-utils-devel/Makefile trunk/fcode-utils-devel/detok/Makefile trunk/fcode-utils-devel/romheaders/Makefile trunk/fcode-utils-devel/toke/Makefile Log: slightly rework fcode-utils makefiles: - honor $(MAKE) for those invoking with gmake instead of make - wipe overzealous make distclean - drop -s from strip arguments Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/fcode-utils-devel/Makefile =================================================================== --- trunk/fcode-utils-devel/Makefile 2009-11-26 01:47:36 UTC (rev 635) +++ trunk/fcode-utils-devel/Makefile 2009-11-29 13:49:47 UTC (rev 636) @@ -5,7 +5,7 @@ # This program is part of a free implementation of the IEEE 1275-1994 # Standard for Boot (Initialization Configuration) Firmware. # -# Copyright (C) 2006 coresystems GmbH <info(a)coresystems.de> +# Copyright (C) 2006-2009 coresystems GmbH <info(a)coresystems.de> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -24,26 +24,26 @@ VERSION:=$(shell grep ^\#.*TOKE_VERSION < toke/toke.c |cut -f2 -d\" ) all: - make -C toke - make -C detok - make -C romheaders + $(MAKE) -C toke + $(MAKE) -C detok + $(MAKE) -C romheaders install: - make -C toke install - make -C detok install - make -C romheaders install + $(MAKE) -C toke install + $(MAKE) -C detok install + $(MAKE) -C romheaders install clean: - make -C toke clean - make -C detok clean - make -C romheaders clean - make -C testsuite clean + $(MAKE) -C toke clean + $(MAKE) -C detok clean + $(MAKE) -C romheaders clean + $(MAKE) -C testsuite clean distclean: clean - make -C toke distclean - make -C detok distclean - make -C romheaders distclean - make -C testsuite distclean + $(MAKE) -C toke distclean + $(MAKE) -C detok distclean + $(MAKE) -C romheaders distclean + $(MAKE) -C testsuite distclean find . -name "*.gcda" -exec rm -f \{\} \; find . -name "*.gcno" -exec rm -f \{\} \; @@ -51,8 +51,8 @@ cp toke/toke testsuite cp detok/detok testsuite cp romheaders/romheaders testsuite - make -C testsuite all CygTestLogs=`pwd`/testlogs/testlogs-ppc-linux - #make -C testsuite all CygTestLogs=`pwd`/testlogs/testlogs-x86-cygwin + $(MAKE) -C testsuite all CygTestLogs=`pwd`/testlogs/testlogs-ppc-linux + #$(MAKE) -C testsuite all CygTestLogs=`pwd`/testlogs/testlogs-x86-cygwin # lcov required for html reports coverage: Modified: trunk/fcode-utils-devel/detok/Makefile =================================================================== --- trunk/fcode-utils-devel/detok/Makefile 2009-11-26 01:47:36 UTC (rev 635) +++ trunk/fcode-utils-devel/detok/Makefile 2009-11-29 13:49:47 UTC (rev 636) @@ -6,7 +6,7 @@ # Standard for Boot (Initialization Configuration) Firmware. # # Copyright (C) 2001-2006 Stefan Reinauer <stepan(a)openbios.org> -# Copyright (C) 2006 coresystems GmbH <info(a)coresystems.de> +# Copyright (C) 2006-2009 coresystems GmbH <info(a)coresystems.de> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -24,12 +24,12 @@ PROGRAM = detok -CC = gcc +CC ?= gcc STRIP = strip INCLUDES = -I../shared # Normal Flags: -CFLAGS = -O2 -Wall -Wno-pointer-sign +CFLAGS = -O2 -Wall -Wextra LDFLAGS = # Coverage: @@ -47,12 +47,10 @@ $(PROGRAM): $(OBJS) $(CC) -o $(PROGRAM) $(OBJS) $(LDFLAGS) - $(STRIP) -s $(PROGRAM) + $(STRIP) $(PROGRAM) clean: rm -f $(OBJS) *~ - -distclean: clean rm -f $(PROGRAM) .dependencies .dependencies: *.c Modified: trunk/fcode-utils-devel/romheaders/Makefile =================================================================== --- trunk/fcode-utils-devel/romheaders/Makefile 2009-11-26 01:47:36 UTC (rev 635) +++ trunk/fcode-utils-devel/romheaders/Makefile 2009-11-29 13:49:47 UTC (rev 636) @@ -5,7 +5,8 @@ # This program is part of a free implementation of the IEEE 1275-1994 # Standard for Boot (Initialization Configuration) Firmware. # -# Copyright (C) 2002 Stefan Reinauer, <stepan(a)openbios.net> +# Copyright (C) 2002 Stefan Reinauer, <stepan(a)openbios.org> +# Copyright (C) 2009 coresystems GmbH <info(a)coresystems.de> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -21,8 +22,9 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA # -CC = gcc -CFLAGS= -O2 -Wall -W -ansi -I../shared +CC ?= gcc +STRIP = strip +CFLAGS = -O2 -Wall -W -ansi -I../shared SOURCES = romheaders.c ../shared/classcodes.c @@ -32,10 +34,9 @@ romheaders: $(SOURCES) $(CC) $(CFLAGS) $(SOURCES) -o $@ - strip romheaders + $(STRIP) romheaders clean: rm -f *~ + rm -f romheaders -distclean: clean - rm -f romheaders Modified: trunk/fcode-utils-devel/toke/Makefile =================================================================== --- trunk/fcode-utils-devel/toke/Makefile 2009-11-26 01:47:36 UTC (rev 635) +++ trunk/fcode-utils-devel/toke/Makefile 2009-11-29 13:49:47 UTC (rev 636) @@ -6,7 +6,7 @@ # Standard for Boot (Initialization Configuration) Firmware. # # Copyright (C) 2001-2006 Stefan Reinauer <stepan(a)openbios.org> -# Copyright (C) 2006 coresystems GmbH <info(a)coresystems.de> +# Copyright (C) 2006-2009 coresystems GmbH <info(a)coresystems.de> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -24,12 +24,12 @@ PROGRAM = toke -CC = gcc +CC ?= gcc STRIP = strip INCLUDES = -I../shared # Normal flags -CFLAGS = -O2 -Wall -Wno-pointer-sign -fno-strict-aliasing +CFLAGS = -O2 -Wall -Wextra LDFLAGS = # Coverage: @@ -48,14 +48,12 @@ $(PROGRAM): $(OBJS) $(CC) -o $(PROGRAM) $(OBJS) $(LDFLAGS) - $(STRIP) -s $(PROGRAM) + $(STRIP) $(PROGRAM) clean: rm -f $(OBJS) *~ - -distclean: clean rm -f $(PROGRAM) .dependencies - + .dependencies: *.c @$(CC) $(CFLAGS) $(INCLUDES) -MM *.c > .dependencies

1 0

feature request
by G 3 29 Nov '09

29 Nov '09

There should be a 'make' command option that builds only the qemu target, and not the openbios-unix target. Something like this is what I have in mind: make -qemu_only Whenever I try to build OpenBIOS, I receive a whole bunch of errors with the unix target, but not with the openbios-qemu.elf target for some reason.

2 1

PPC cross-compiler defaults to 'powerpc-linux-gnu-' prefix
by Mark Cave-Ayland 28 Nov '09

28 Nov '09

Hi all, While setting up a PPC cross-compiler environment for OpenBIOS, I noticed that the default cross-compiler prefix is set to 'powerpc-linux-gnu-' as opposed to 'powerpc-elf-'. Is there any particular reason that we need the linux platform version, instead of the elf version which is used by SPARC? The reason I ask is that the Linux platform version is much much harder to compile as you need an extra set of glibc headers and have to bootstrap the gcc build by hand in order to produce the working final compiler. On my tests here everything seems to work fine with just the 'powerpc-elf-' prefix as far as I can tell. ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063 Sirius Labs: http://www.siriusit.co.uk/labs

5 5

Re: [OpenBIOS] PPC cross-compiler defaults to 'powerpc-linux-gnu-'prefix
by Laurent Vivier 26 Nov '09

26 Nov '09

>Hi all, > >While setting up a PPC cross-compiler environment for OpenBIOS, I >noticed that the default cross-compiler prefix is set to >'powerpc-linux-gnu-' as opposed to 'powerpc-elf-'. > >Is there any particular reason that we need the linux platform version, >instead of the elf version which is used by SPARC? The reason I ask is >that the Linux platform version is much much harder to compile as you >need an extra set of glibc headers and have to bootstrap the gcc build >by hand in order to produce the working final compiler. The only reason is because I use "powerpc-linux-gnu-gcc", but I agree it is much harder to produce. But I produce my cross-compile environment from debian packages, which seems simpler. Do you know if there is a "powerpc-elf-gdb" ? >On my tests here everything seems to work fine with just the >'powerpc-elf-' prefix as far as I can tell. If you provide a patch, I agree to apply it. Regards, Laurent -- --------------------- Laurent(a)vivier.eu --------------------- "Tout ce qui est impossible reste à accomplir" Jules Verne "Things are only impossible until they're not" Jean-Luc Picard

5 9

[RFC][PATCH] Select cross-compiler target during configure phase
by Laurent Vivier 26 Nov '09

26 Nov '09

This patch selects cross-compiler prefix from predefined list (*-linux-gnu-, *-elf-, *-eabi-) by testing which one is present on the system when the script switch-arch is run. -- --------------------- laurent(a)vivier.eu ---------------------- "Tout ce qui est impossible reste à accomplir" Jules Verne "Things are only impossible until they're not" Jean-Luc Picard

3 2

r635 - in trunk/openbios-devel: forth/debugging modules
by svn＠openbios.org 26 Nov '09

26 Nov '09

Author: laurent Date: 2009-11-26 02:47:36 +0100 (Thu, 26 Nov 2009) New Revision: 635 Modified: trunk/openbios-devel/forth/debugging/client.fs trunk/openbios-devel/modules/filesystems.c Log: dir command cleanup Modified: trunk/openbios-devel/forth/debugging/client.fs =================================================================== --- trunk/openbios-devel/forth/debugging/client.fs 2009-11-23 21:43:09 UTC (rev 634) +++ trunk/openbios-devel/forth/debugging/client.fs 2009-11-26 01:47:36 UTC (rev 635) @@ -308,20 +308,18 @@ ; : dir ( "{paths}<cr>" -- ) - linefeed parse 2dup + linefeed parse open-dev dup 0= if - 3drop + drop exit then - dup >r - dup ihandle>phandle " dir" rot find-method ( xt 0|1 ) + dup + " dir" rot ['] $call-method catch if - swap call-package - else 3drop cr ." Cannot find dir for this package" then - r> close-dev + close-dev ; : go ( -- ) Modified: trunk/openbios-devel/modules/filesystems.c =================================================================== --- trunk/openbios-devel/modules/filesystems.c 2009-11-23 21:43:09 UTC (rev 634) +++ trunk/openbios-devel/modules/filesystems.c 2009-11-26 01:47:36 UTC (rev 635) @@ -297,16 +297,8 @@ static void files_dir( files_info_t *mi ) { - fs_ops_t *fs = do_open( my_parent() ); - char *path = pop_fstr_copy(); - - if (!path) - return; - - if (fs->dir) - fs->dir(mi->file); - - free(path); + if (mi->fs->dir) + mi->fs->dir(mi->file); } static void

1 0

PATCH: Rework CIF interface to handle parameters in reverse order
by Mark Cave-Ayland 25 Nov '09

25 Nov '09

Hi all, This patch is an attempt at reworking the CIF so that it can be called correctly from both Fcode (Forth) and C. Currently the C arguments are pushed into the stack in reverse order, rather than forward order which is required by Forth words calling the CIF. In order to fix this, we correct the order in which C arguments are placed on the Forth stack by pushing the parameters in forward order. However, this has the side effect of reversing the order in which the parameters to the CIF Forth words are expected and so these must also be altered to take this into account. This patch works as expected from Forth Fcode, but I would like to put it out for testing before I commit to the repository. Blue Swirl/Laurent - please can you test on your setups again? Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063 Sirius Labs: http://www.siriusit.co.uk/labs

3 5

r634 - trunk/openbios-devel/modules
by svn＠openbios.org 23 Nov '09

23 Nov '09

Author: laurent Date: 2009-11-23 22:43:09 +0100 (Mon, 23 Nov 2009) New Revision: 634 Modified: trunk/openbios-devel/modules/cmdline.c Log: Correct command line history management when we move forward (ctrl-n or arrow down). Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/modules/cmdline.c =================================================================== --- trunk/openbios-devel/modules/cmdline.c 2009-11-22 10:21:43 UTC (rev 633) +++ trunk/openbios-devel/modules/cmdline.c 2009-11-23 21:43:09 UTC (rev 634) @@ -357,7 +357,7 @@ go_down: if( !histind ) break; - history_get( ci, --histind ); + history_get( ci, --histind - 1); clearline( pos, n ); emit_str( buf ); pos = n = strlen( buf );

1 0

Re: [OpenBIOS] r624 - trunk/openbios-devel/forth/system
by Laurent Vivier 23 Nov '09

23 Nov '09

Le vendredi 20 novembre 2009 à 20:09 +0100, svn(a)openbios.org a écrit : > Author: stepan > Date: 2009-11-20 20:09:04 +0100 (Fri, 20 Nov 2009) > New Revision: 624 > > Modified: > trunk/openbios-devel/forth/system/ciface.fs > Log: > In the IEEE 1275-1994 specification the parameters for Client Interface calls > are not in forth stack order but in reversed (heh!) order. Our implementation > confused this. > > This might / will need some more work, but get this in so more people can test > easily. This breaks PPC boot. All my ISO disk images (Fedora 10, 11, debian 5.0.0, 4.0r6, openSUSE 11.1, openbsd 4.6, freebsd 7.2 ...) hang. They are yaboot based. My etch HD disk image hangs with this message (it is quik based): call-method AG�@: exception 5401f50 Regards, Laurent -- --------------------- laurent(a)vivier.eu ---------------------- "Tout ce qui est impossible reste à accomplir" Jules Verne "Things are only impossible until they're not" Jean-Luc Picard

6 19

r633 - trunk/openbios-devel/fs/hfs
by svn＠openbios.org 22 Nov '09

22 Nov '09

Author: laurent Date: 2009-11-22 11:21:43 +0100 (Sun, 22 Nov 2009) New Revision: 633 Modified: trunk/openbios-devel/fs/hfs/hfs_fs.c Log: Implements dir method for HFS filesystem. 0 > dir cd:\ 393216 2009-02-15 17:11:17 .disk\ 131072 2009-02-15 17:10:53 css\ 984 2009-02-07 19:35:37 dedication.txt 65536 2009-02-15 17:11:18 dists\ 1966080 2009-02-15 17:11:18 doc\ 65536 2009-02-15 17:10:54 etc\ 458752 2009-02-15 17:11:18 install\ 45447 2009-02-15 17:11:17 md5sum.txt 917504 2009-02-15 17:10:53 pics\ 65536 2009-02-15 17:11:18 pool\ 131072 2009-02-15 17:11:18 ppc\ 8921 2009-02-15 17:11:17 README.html 119979 2009-02-14 20:52:19 README.mirrors.html 60194 2009-02-14 20:52:19 README.mirrors.txt 379 2009-02-15 17:10:54 README.source 5468 2009-02-15 17:11:17 README.txt Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/fs/hfs/hfs_fs.c =================================================================== --- trunk/openbios-devel/fs/hfs/hfs_fs.c 2009-11-22 10:07:23 UTC (rev 632) +++ trunk/openbios-devel/fs/hfs/hfs_fs.c 2009-11-22 10:21:43 UTC (rev 633) @@ -16,6 +16,7 @@ #include "openbios/config.h" #include "openbios/fs.h" +#include "libc/vsprintf.h" #include "libhfs.h" #define MAC_OS_ROM_CREATOR 0x63687270 /* 'chrp' */ @@ -27,6 +28,13 @@ #define SYSTEM_TYPE 0x7A737973 /* 'zsys' */ #define SYSTEM_CREATOR 0x4D414353 /* 'MACS' */ +typedef struct { + enum { FILE, DIR } type; + union { + hfsdir *dir; + hfsfile *file; + }; +} hfscommon; /************************************************************************/ @@ -142,15 +150,22 @@ static void file_close( file_desc_t *fd ) { - hfsfile *file = (hfsfile*)fd; - hfs_close( file ); + hfscommon *common = (hfscommon*)fd; + if (common->type == FILE) + hfs_close( common->file ); + else if (common->type == DIR) + hfs_closedir( common->dir ); + free(common); } static int file_lseek( file_desc_t *fd, off_t offs, int whence ) { - hfsfile *file = (hfsfile*)fd; + hfscommon *common = (hfscommon*)fd; + if (common->type != FILE) + return -1; + switch( whence ) { case SEEK_CUR: whence = HFS_SEEK_CUR; @@ -164,27 +179,32 @@ break; } - return hfs_seek( file, offs, whence ); + return hfs_seek( common->file, offs, whence ); } static int file_read( file_desc_t *fd, void *buf, size_t count ) { - hfsfile *file = (hfsfile*)fd; - return hfs_read( file, buf, count ); + hfscommon *common = (hfscommon*)fd; + if (common->type != FILE) + return -1; + return hfs_read( common->file, buf, count ); } static char * get_path( file_desc_t *fd, char *retbuf, int len ) { char buf[256], buf2[256]; + hfscommon *common = (hfscommon*)fd; hfsvol *vol = hfs_getvol( NULL ); - hfsfile *file = (hfsfile*)fd; hfsdirent ent; int start, ns; ulong id; - hfs_fstat( file, &ent ); + if (common->type != FILE) + return NULL; + + hfs_fstat( common->file, &ent ); start = sizeof(buf) - strlen(ent.name) - 1; if( start <= 0 ) return NULL; @@ -215,28 +235,51 @@ static file_desc_t * -open_path( fs_ops_t *fs, const char *path ) +open_path( fs_ops_t *fs, const char *fullpath ) { hfsvol *vol = (hfsvol*)fs->fs_data; const char *s; char buf[256]; + hfscommon *common; + char *path = strdup(fullpath); if( !strncmp(path, "\\\\", 2) ) { hfsvolent ent; /* \\ is an alias for the (blessed) system folder */ - if( hfs_vstat(vol, &ent) < 0 || hfs_setcwd(vol, ent.blessed) ) + if( hfs_vstat(vol, &ent) < 0 || hfs_setcwd(vol, ent.blessed) ) { + free(path); return NULL; + } path += 2; } else { hfs_chdir( vol, ":" ); } + common = malloc(sizeof(*common)); + if (!common) { + free(path); + return NULL; + } + + if (strcmp(path, "\\") == 0) { + /* root directory is in fact ":" */ + common->dir = hfs_opendir(vol, ":"); + common->type = DIR; + free(path); + return (file_desc_t*)common; + } + + if (path[strlen(path) - 1] == '\\') { + path[strlen(path) - 1] = 0; + } + for( path-- ;; ) { int n; s = ++path; - if( !(path=strchr(s, '\\')) ) + path = strchr(s, '\\'); + if( !path || !path[1]) break; n = MIN( sizeof(buf)-1, (path-s) ); if( !n ) @@ -244,8 +287,11 @@ strncpy( buf, s, n ); buf[n] = 0; - if( hfs_chdir(vol, buf) ) + if( hfs_chdir(vol, buf) ) { + free(common); + free(path); return NULL; + } } /* support the ':filetype' syntax */ @@ -260,23 +306,43 @@ hfs_dirinfo( vol, &id, buf ); hfs_setcwd( vol, id ); - if( !(dir=hfs_opendir(vol, buf)) ) + if( !(dir=hfs_opendir(vol, buf)) ) { + free(common); + free(path); return NULL; + } hfs_setcwd( vol, oldid ); while( !hfs_readdir(dir, &ent) ) { if( ent.flags & HFS_ISDIR ) continue; if( !strncmp(s, ent.u.file.type, 4) ) { - ret = (file_desc_t*)hfs_open( vol, ent.name ); + common->type = FILE; + common->file = hfs_open( vol, ent.name ); + ret = (file_desc_t*)common; break; } } hfs_closedir( dir ); + free(path); return ret; } - return (file_desc_t*)hfs_open( vol, s ); + common->dir = hfs_opendir(vol, s); + if (!common->dir) { + common->file = hfs_open( vol, s ); + if (common->file == NULL) { + free(common); + free(path); + return NULL; + } + common->type = FILE; + free(path); + return (file_desc_t*)common; + } + common->type = DIR; + free(path); + return (file_desc_t*)common; } static void @@ -288,6 +354,75 @@ /* callers responsibility to call free(fs) */ } +static const int days_month[12] = + { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; +static const int days_month_leap[12] = + { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; + +static inline int is_leap(int year) +{ + return ((year % 4 == 0) && (year % 100 != 0)) || (year % 400 == 0); +} + +static void +print_date(time_t sec) +{ + unsigned int second, minute, hour, month, day, year; + int current; + const int *days; + + second = sec % 60; + sec /= 60; + + minute = sec % 60; + sec /= 60; + + hour = sec % 24; + sec /= 24; + + year = sec * 100 / 36525; + sec -= year * 36525 / 100; + year += 1970; + + days = is_leap(year) ? days_month_leap : days_month; + + current = 0; + month = 0; + while (month < 12) { + if (sec <= current + days[month]) { + break; + } + current += days[month]; + month++; + } + month++; + + day = sec - current + 1; + + forth_printf("%d-%02d-%02d %02d:%02d:%02d ", + year, month, day, hour, minute, second); +} + +static void +dir_fs( file_desc_t *fd ) +{ + hfscommon *common = (hfscommon*)fd; + hfsdirent ent; + + if (common->type != DIR) + return; + + forth_printf("\n"); + while( !hfs_readdir(common->dir, &ent) ) { + forth_printf("% 10d ", ent.u.file.dsize); + print_date(ent.mddate); + if( ent.flags & HFS_ISDIR ) + forth_printf("%s\\\n", ent.name); + else + forth_printf("%s\n", ent.name); + } +} + static const char * get_fstype( fs_ops_t *fs ) { @@ -295,6 +430,7 @@ } static const fs_ops_t hfs_ops = { + .dir = dir_fs, .close_fs = close_fs, .open_path = open_path, .search_rom = search_rom,

1 0

r632 - trunk/openbios-devel/fs/ext2
by svn＠openbios.org 22 Nov '09

22 Nov '09

Author: laurent Date: 2009-11-22 11:07:23 +0100 (Sun, 22 Nov 2009) New Revision: 632 Modified: trunk/openbios-devel/fs/ext2/ext2_fs.c Log: Implements dir method for ext2 filesystem. 0 > dir hd:3,\ 4096 2009-08-05 22:20:53 .\ 4096 2009-08-05 22:20:53 ..\ 16384 2009-02-20 10:56:01 lost+found\ 4096 2009-02-20 10:56:59 boot\ 4096 2009-11-10 21:44:03 etc\ 4096 2009-02-20 10:57:14 media\ 11 2009-02-20 10:57:14 cdrom 4096 2007-03-07 23:22:28 selinux\ 4096 2009-02-20 11:12:18 var\ 4096 2009-02-20 11:12:19 usr\ 4096 2008-05-21 08:44:38 sys\ 12288 2009-08-05 22:30:50 lib\ 4096 2009-08-05 22:31:05 sbin\ 4096 2009-02-20 13:00:26 bin\ 40960 2009-02-20 14:32:18 dev\ 4096 2009-02-20 14:30:57 home\ 4096 2006-10-28 13:49:35 mnt\ 4096 2006-10-28 13:49:35 proc\ 4096 2009-05-18 12:40:32 root\ 4096 2009-11-10 21:44:15 tmp\ 4096 2009-02-20 12:30:21 lib64\ 4096 2009-02-20 11:12:17 srv\ 4096 2009-02-20 11:12:18 opt\ 4096 2009-02-20 11:12:18 initrd\ 5349268 2009-02-20 11:51:46 initrd.img-2.6.18-6-powerpc 4405754 2008-12-13 09:58:03 vmlinux-2.6.18-6-powerpc Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/fs/ext2/ext2_fs.c =================================================================== --- trunk/openbios-devel/fs/ext2/ext2_fs.c 2009-11-22 10:03:00 UTC (rev 631) +++ trunk/openbios-devel/fs/ext2/ext2_fs.c 2009-11-22 10:07:23 UTC (rev 632) @@ -9,7 +9,16 @@ #include "libext2.h" #include "ext2_utils.h" #include "openbios/fs.h" +#include "libc/vsprintf.h" +typedef struct { + enum { FILE, DIR } type; + union { + ext2_FILE *file; + ext2_DIR *dir; + }; +} ext2_COMMON; + static void umount( fs_ops_t *fs ) { @@ -18,49 +27,146 @@ ext2_umount( volume ); } +static const int days_month[12] = + { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; +static const int days_month_leap[12] = + { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; + +static inline int is_leap(int year) +{ + return ((year % 4 == 0) && (year % 100 != 0)) || (year % 400 == 0); +} + +static void +print_date(time_t sec) +{ + unsigned int second, minute, hour, month, day, year; + int current; + const int *days; + + second = sec % 60; + sec /= 60; + + minute = sec % 60; + sec /= 60; + + hour = sec % 24; + sec /= 24; + + year = sec * 100 / 36525; + sec -= year * 36525 / 100; + year += 1970; + + days = is_leap(year) ? days_month_leap : days_month; + + current = 0; + month = 0; + while (month < 12) { + if (sec <= current + days[month]) { + break; + } + current += days[month]; + month++; + } + month++; + + day = sec - current + 1; + + forth_printf("%d-%02d-%02d %02d:%02d:%02d ", + year, month, day, hour, minute, second); +} + +static void +dir_fs ( file_desc_t *fd) +{ + ext2_COMMON *common = (ext2_COMMON *)fd; + struct ext2_dir_entry_2 *entry; + struct ext2_inode inode; + + if (common->type != DIR) + return; + + forth_printf("\n"); + while ( (entry = ext2_readdir(common->dir)) ) { + ext2_get_inode(common->dir->volume, entry->inode, &inode); + forth_printf("% 10d ", inode.i_size); + print_date(inode.i_mtime); + if (S_ISDIR(inode.i_mode)) + forth_printf("%s\\\n", entry->name); + else + forth_printf("%s\n", entry->name); + } +} + static file_desc_t * open_path( fs_ops_t *fs, const char *path ) { ext2_VOLUME *volume = (ext2_VOLUME *)fs->fs_data; - ext2_FILE *file; + ext2_COMMON *common; - file = ext2_open(volume, path); + common = (ext2_COMMON*)malloc(sizeof(*common)); + if (common == NULL) + return NULL; - return (file_desc_t *)file; + common->dir = ext2_opendir(volume, path); + if (common->dir == NULL) { + common->file = ext2_open(volume, path); + if (common->file == NULL) { + free(common); + return NULL; + } + common->type = FILE; + return (file_desc_t *)common; + } + common->type = DIR; + return (file_desc_t *)common; } static char * get_path( file_desc_t *fd, char *buf, int size ) { - ext2_FILE *file = (ext2_FILE *)fd; + ext2_COMMON *common =(ext2_COMMON *)fd; - strncpy(buf, file->path, size); + if (common->type != FILE) + return NULL; + strncpy(buf, common->file->path, size); + return buf; } static int file_lseek( file_desc_t *fd, off_t offs, int whence ) { - ext2_FILE *file = (ext2_FILE *)fd; + ext2_COMMON *common =(ext2_COMMON *)fd; - return ext2_lseek(file, offs, whence); + if (common->type != FILE) + return -1; + + return ext2_lseek(common->file, offs, whence); } static void file_close( file_desc_t *fd ) { - ext2_FILE *file = (ext2_FILE *)fd; + ext2_COMMON *common =(ext2_COMMON *)fd; - ext2_close(file); + if (common->type == FILE) + ext2_close(common->file); + else if (common->type == DIR) + ext2_closedir(common->dir); + free(common); } static int file_read( file_desc_t *fd, void *buf, size_t count ) { - ext2_FILE *file = (ext2_FILE *)fd; + ext2_COMMON *common =(ext2_COMMON *)fd; - return ext2_read(file, buf, count); + if (common->type != FILE) + return -1; + + return ext2_read(common->file, buf, count); } static const char * @@ -70,6 +176,7 @@ } static const fs_ops_t ext2_ops = { + .dir = dir_fs, .close_fs = umount, .open_path = open_path,

1 0

r631 - trunk/openbios-devel/fs/iso9660
by svn＠openbios.org 22 Nov '09

22 Nov '09

Author: laurent Date: 2009-11-22 11:03:00 +0100 (Sun, 22 Nov 2009) New Revision: 631 Modified: trunk/openbios-devel/fs/iso9660/iso9660_fs.c Log: Implements dir method for ISO9660 filesystem. 0 > dir cd:\ 2048 2007-02-01 13:50:07 .\ 2048 2007-02-01 13:50:07 ..\ 2048 2007-02-01 13:54:13 ppc\ ok 0 > dir cd:\ppc 2048 2007-02-01 13:54:13 .\ 2048 2007-02-01 13:50:07 ..\ 190 2007-02-01 13:54:13 bootinfo.txt 2048 2007-02-01 13:51:11 chrp\ Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/fs/iso9660/iso9660_fs.c =================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_fs.c 2009-11-22 09:58:01 UTC (rev 630) +++ trunk/openbios-devel/fs/iso9660/iso9660_fs.c 2009-11-22 10:03:00 UTC (rev 631) @@ -6,7 +6,16 @@ #include "libiso9660.h" #include "openbios/fs.h" +#include "libc/vsprintf.h" +typedef struct { + enum { FILE, DIR } type; + union { + iso9660_FILE *file; + iso9660_DIR * dir; + }; +} iso9660_COMMON; + static void umount( fs_ops_t *fs ) { @@ -15,49 +24,102 @@ iso9660_umount( volume ); } +static void +dir_fs ( file_desc_t *fd ) +{ + iso9660_COMMON *common = (iso9660_COMMON *)fd; + struct iso_directory_record *idr; + char name_buf[256]; + + if (common->type != DIR) + return; + + forth_printf("\n"); + while ( (idr = iso9660_readdir(common->dir)) ) { + + forth_printf("% 10d ", isonum_733(idr->size)); + forth_printf("%d-%02d-%02d %02d:%02d:%02d ", + idr->date[0] + 1900, /* year */ + idr->date[1], /* month */ + idr->date[2], /* day */ + idr->date[3], idr->date[4], idr->date[5]); + iso9660_name(common->dir->volume, idr, name_buf); + if (idr->flags[0] & 2) + forth_printf("%s\\\n", name_buf); + else + forth_printf("%s\n", name_buf); + } +} + static file_desc_t * open_path( fs_ops_t *fs, const char *path ) { iso9660_VOLUME *volume = (iso9660_VOLUME *)fs->fs_data; - iso9660_FILE *file; + iso9660_COMMON *common; - file = iso9660_open(volume, path); + common = (iso9660_COMMON *)malloc(sizeof(*common)); + if (common == NULL) + return NULL; - return (file_desc_t *)file; + common->dir = iso9660_opendir(volume, path); + if (common->dir == NULL) { + common->file = iso9660_open(volume, path); + if (common->file == NULL) { + free(common); + return NULL; + } + common->type = FILE; + return (file_desc_t *)common; + } + common->type = DIR; + return (file_desc_t *)common; } static char * get_path( file_desc_t *fd, char *buf, int size ) { - iso9660_FILE *file = (iso9660_FILE*)fd; + iso9660_COMMON *common = (iso9660_COMMON *)fd; - strncpy(buf, file->path, size); + if (common->type != FILE) + return NULL; + strncpy(buf, common->file->path, size); + return buf; } static int file_lseek( file_desc_t *fd, off_t offs, int whence ) { - iso9660_FILE *file = (iso9660_FILE*)fd; + iso9660_COMMON *common = (iso9660_COMMON *)fd; - return iso9660_lseek(file, offs, whence); + if (common->type != FILE) + return -1; + + return iso9660_lseek(common->file, offs, whence); } static void file_close( file_desc_t *fd ) { - iso9660_FILE *file = (iso9660_FILE*)fd; + iso9660_COMMON *common = (iso9660_COMMON *)fd; - iso9660_close(file); + if (common->type == FILE) + iso9660_close(common->file); + else if (common->type == DIR) + iso9660_closedir(common->dir); + free(common); } static int file_read( file_desc_t *fd, void *buf, size_t count ) { - iso9660_FILE *file = (iso9660_FILE*)fd; + iso9660_COMMON *common = (iso9660_COMMON *)fd; - return iso9660_read(file, buf, count); + if (common->type != FILE) + return -1; + + return iso9660_read(common->file, buf, count); } static char * @@ -77,6 +139,7 @@ } static const fs_ops_t iso9660_ops = { + .dir = dir_fs, .close_fs = umount, .open_path = open_path,

1 0

r630 - in trunk/openbios-devel: forth/debugging include/openbios modules
by svn＠openbios.org 22 Nov '09

22 Nov '09

Author: laurent Date: 2009-11-22 10:58:01 +0100 (Sun, 22 Nov 2009) New Revision: 630 Modified: trunk/openbios-devel/forth/debugging/client.fs trunk/openbios-devel/include/openbios/fs.h trunk/openbios-devel/modules/filesystems.c Log: Implement command "dir <path>". This is the generic command, it needs support from the filesystem packages. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/forth/debugging/client.fs =================================================================== --- trunk/openbios-devel/forth/debugging/client.fs 2009-11-22 09:53:54 UTC (rev 629) +++ trunk/openbios-devel/forth/debugging/client.fs 2009-11-22 09:58:01 UTC (rev 630) @@ -307,6 +307,23 @@ init-program ; +: dir ( "{paths}<cr>" -- ) + linefeed parse 2dup + open-dev dup 0= if + 3drop + exit + then + dup >r + dup ihandle>phandle " dir" rot find-method ( xt 0|1 ) + if + swap call-package + else + 3drop + cr ." Cannot find dir for this package" + then + r> close-dev +; + : go ( -- ) state-valid @ not if exit then elf file-type @ = if Modified: trunk/openbios-devel/include/openbios/fs.h =================================================================== --- trunk/openbios-devel/include/openbios/fs.h 2009-11-22 09:53:54 UTC (rev 629) +++ trunk/openbios-devel/include/openbios/fs.h 2009-11-22 09:58:01 UTC (rev 630) @@ -42,6 +42,7 @@ int (*read)( file_desc_t *file, void *buf, size_t count ); int (*lseek)( file_desc_t *file, off_t offset, int whence ); char *(*get_path)( file_desc_t *file, char *buf, int len ); + void (*dir)( file_desc_t *file ); const char *(*get_fstype)( fs_ops_t *fs ); }; Modified: trunk/openbios-devel/modules/filesystems.c =================================================================== --- trunk/openbios-devel/modules/filesystems.c 2009-11-22 09:53:54 UTC (rev 629) +++ trunk/openbios-devel/modules/filesystems.c 2009-11-22 09:58:01 UTC (rev 630) @@ -295,6 +295,21 @@ } static void +files_dir( files_info_t *mi ) +{ + fs_ops_t *fs = do_open( my_parent() ); + char *path = pop_fstr_copy(); + + if (!path) + return; + + if (fs->dir) + fs->dir(mi->file); + + free(path); +} + +static void files_initializer( files_info_t *dummy ) { fword("register-fs-package"); @@ -309,6 +324,7 @@ { "seek", files_seek }, { "tell", files_tell }, { "load", files_load }, + { "dir", files_dir }, { "block-size", files_block_size }, /* special */

1 0

r629 - in trunk/openbios-devel/arch: ppc sparc32 sparc64 unix
by svn＠openbios.org 22 Nov '09

22 Nov '09

Author: laurent Date: 2009-11-22 10:53:54 +0100 (Sun, 22 Nov 2009) New Revision: 629 Modified: trunk/openbios-devel/arch/ppc/build.xml trunk/openbios-devel/arch/sparc32/build.xml trunk/openbios-devel/arch/sparc64/build.xml trunk/openbios-devel/arch/unix/build.xml Log: Change link edition order to move libc after libfs, allowing libfs to use functions from libc. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/arch/ppc/build.xml =================================================================== --- trunk/openbios-devel/arch/ppc/build.xml 2009-11-22 09:50:54 UTC (rev 628) +++ trunk/openbios-devel/arch/ppc/build.xml 2009-11-22 09:53:54 UTC (rev 629) @@ -155,8 +155,8 @@ <external-object source="libbootstrap.a"/> <external-object source="libmodules.a"/> <external-object source="libdrivers.a"/> + <external-object source="libfs.a"/> <external-object source="liblibc.a"/> - <external-object source="libfs.a"/> </executable> <executable name="openbios-pearpc.elf" target="target" condition="PEARPC"> @@ -170,8 +170,8 @@ <external-object source="libbootstrap.a"/> <external-object source="libmodules.a"/> <external-object source="libdrivers.a"/> + <external-object source="libfs.a"/> <external-object source="liblibc.a"/> - <external-object source="libfs.a"/> </executable> <executable name="openbios-qemu.elf" target="target" condition="QEMU"> @@ -185,8 +185,8 @@ <external-object source="libbootstrap.a"/> <external-object source="libmodules.a"/> <external-object source="libdrivers.a"/> + <external-object source="libfs.a"/> <external-object source="liblibc.a"/> - <external-object source="libfs.a"/> <external-object source="libgcc.a"/> </executable> @@ -200,8 +200,8 @@ <external-object source="libbootstrap.a"/> <external-object source="libmodules.a"/> <external-object source="libdrivers.a"/> + <external-object source="libfs.a"/> <external-object source="liblibc.a"/> - <external-object source="libfs.a"/> </executable> </build> Modified: trunk/openbios-devel/arch/sparc32/build.xml =================================================================== --- trunk/openbios-devel/arch/sparc32/build.xml 2009-11-22 09:50:54 UTC (rev 628) +++ trunk/openbios-devel/arch/sparc32/build.xml 2009-11-22 09:53:54 UTC (rev 629) @@ -34,8 +34,8 @@ <external-object source="libbootstrap.a"/> <external-object source="libmodules.a"/> <external-object source="libdrivers.a"/> + <external-object source="libfs.a"/> <external-object source="liblibc.a"/> - <external-object source="libfs.a"/> <external-object source="libgcc.a"/> </executable> @@ -68,8 +68,8 @@ <external-object source="libbootstrap.a"/> <external-object source="libmodules.a"/> <external-object source="libdrivers.a"/> + <external-object source="libfs.a"/> <external-object source="liblibc.a"/> - <external-object source="libfs.a"/> <external-object source="libgcc.a"/> </executable> Modified: trunk/openbios-devel/arch/sparc64/build.xml =================================================================== --- trunk/openbios-devel/arch/sparc64/build.xml 2009-11-22 09:50:54 UTC (rev 628) +++ trunk/openbios-devel/arch/sparc64/build.xml 2009-11-22 09:53:54 UTC (rev 629) @@ -35,8 +35,8 @@ <external-object source="libbootstrap.a"/> <external-object source="libmodules.a"/> <external-object source="libdrivers.a"/> + <external-object source="libfs.a"/> <external-object source="liblibc.a"/> - <external-object source="libfs.a"/> <external-object source="libgcc.a"/> </executable> @@ -70,8 +70,8 @@ <external-object source="libbootstrap.a"/> <external-object source="libmodules.a"/> <external-object source="libdrivers.a"/> + <external-object source="libfs.a"/> <external-object source="liblibc.a"/> - <external-object source="libfs.a"/> <external-object source="libgcc.a"/> </executable> Modified: trunk/openbios-devel/arch/unix/build.xml =================================================================== --- trunk/openbios-devel/arch/unix/build.xml 2009-11-22 09:50:54 UTC (rev 628) +++ trunk/openbios-devel/arch/unix/build.xml 2009-11-22 09:53:54 UTC (rev 629) @@ -15,8 +15,8 @@ <external-object source="libbootstrap.a"/> <external-object source="libmodules.a"/> <external-object source="libdrivers.a"/> + <external-object source="libfs.a"/> <external-object source="liblibc.a"/> - <external-object source="libfs.a"/> </executable> </build>

1 0

r628 - in trunk/openbios-devel: include/libc libc
by svn＠openbios.org 22 Nov '09

22 Nov '09

Author: laurent Date: 2009-11-22 10:50:54 +0100 (Sun, 22 Nov 2009) New Revision: 628 Modified: trunk/openbios-devel/include/libc/vsprintf.h trunk/openbios-devel/libc/extra.c Log: Add a function forth_printf() which prints to openbios stdout. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/include/libc/vsprintf.h =================================================================== --- trunk/openbios-devel/include/libc/vsprintf.h 2009-11-22 09:47:08 UTC (rev 627) +++ trunk/openbios-devel/include/libc/vsprintf.h 2009-11-22 09:50:54 UTC (rev 628) @@ -25,4 +25,6 @@ extern int vsnprintf(char *buf, size_t size, const char *fmt, va_list args); extern int snprintf(char * buf, size_t size, const char *fmt, ...); +extern int forth_printf( const char *fmt, ... ); + #endif /* _H_VSPRINTF */ Modified: trunk/openbios-devel/libc/extra.c =================================================================== --- trunk/openbios-devel/libc/extra.c 2009-11-22 09:47:08 UTC (rev 627) +++ trunk/openbios-devel/libc/extra.c 2009-11-22 09:50:54 UTC (rev 628) @@ -16,6 +16,8 @@ #include "openbios/config.h" #include "libc/string.h" +#include "libc/vsprintf.h" +#include "openbios/bindings.h" /* strncpy without 0-pad */ char * @@ -24,3 +26,24 @@ int len = MIN( n, strlen(src)+1 ); return memcpy( dest, src, len ); } + +/* printf */ + +int forth_printf( const char *fmt, ... ) +{ + char buf[512]; + va_list args; + int i; + + va_start(args, fmt); + i = vsnprintf(buf, sizeof(buf), fmt, args); + va_end(args); + + PUSH((ucell)buf); + PUSH(i); + fword("type"); + + return i; +} + +

1 0

r627 - in trunk/openbios-devel: config/examples config/scripts fs fs/ext2 include/openbios modules
by svn＠openbios.org 22 Nov '09

22 Nov '09

Author: laurent Date: 2009-11-22 10:47:08 +0100 (Sun, 22 Nov 2009) New Revision: 627 Added: trunk/openbios-devel/fs/ext2/ trunk/openbios-devel/fs/ext2/build.xml trunk/openbios-devel/fs/ext2/ext2.h trunk/openbios-devel/fs/ext2/ext2_close.c trunk/openbios-devel/fs/ext2/ext2_closedir.c trunk/openbios-devel/fs/ext2/ext2_fs.c trunk/openbios-devel/fs/ext2/ext2_fs.h trunk/openbios-devel/fs/ext2/ext2_lseek.c trunk/openbios-devel/fs/ext2/ext2_mount.c trunk/openbios-devel/fs/ext2/ext2_open.c trunk/openbios-devel/fs/ext2/ext2_opendir.c trunk/openbios-devel/fs/ext2/ext2_read.c trunk/openbios-devel/fs/ext2/ext2_readdir.c trunk/openbios-devel/fs/ext2/ext2_utils.c trunk/openbios-devel/fs/ext2/ext2_utils.h trunk/openbios-devel/fs/ext2/libext2.h Modified: trunk/openbios-devel/config/examples/cross-ppc_config.xml trunk/openbios-devel/config/examples/ppc_config.xml trunk/openbios-devel/config/scripts/switch-arch trunk/openbios-devel/fs/build.xml trunk/openbios-devel/include/openbios/fs.h trunk/openbios-devel/modules/filesystems.c Log: Add cleaner ext2 filesystem implementation Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/config/examples/cross-ppc_config.xml =================================================================== --- trunk/openbios-devel/config/examples/cross-ppc_config.xml 2009-11-22 09:26:50 UTC (rev 626) +++ trunk/openbios-devel/config/examples/cross-ppc_config.xml 2009-11-22 09:47:08 UTC (rev 627) @@ -51,8 +51,9 @@ <option name="CONFIG_HFS" type="boolean" value="true"/> <option name="CONFIG_HFSP" type="boolean" value="true"/> <option name="CONFIG_ISO9660" type="boolean" value="true"/> + <option name="CONFIG_EXT2" type="boolean" value="true"/> <option name="CONFIG_GRUBFS" type="boolean" value="true"/> - <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="true"/> + <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="false"/> <option name="CONFIG_FSYS_FAT" type="boolean" value="false"/> <option name="CONFIG_FSYS_JFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_MINIX" type="boolean" value="false"/> Modified: trunk/openbios-devel/config/examples/ppc_config.xml =================================================================== --- trunk/openbios-devel/config/examples/ppc_config.xml 2009-11-22 09:26:50 UTC (rev 626) +++ trunk/openbios-devel/config/examples/ppc_config.xml 2009-11-22 09:47:08 UTC (rev 627) @@ -52,8 +52,9 @@ <option name="CONFIG_HFS" type="boolean" value="true"/> <option name="CONFIG_HFSP" type="boolean" value="true"/> <option name="CONFIG_ISO9660" type="boolean" value="true"/> + <option name="CONFIG_EXT2" type="boolean" value="true"/> <option name="CONFIG_GRUBFS" type="boolean" value="true"/> - <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="true"/> + <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="false"/> <option name="CONFIG_FSYS_FAT" type="boolean" value="false"/> <option name="CONFIG_FSYS_JFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_MINIX" type="boolean" value="false"/> Modified: trunk/openbios-devel/config/scripts/switch-arch =================================================================== --- trunk/openbios-devel/config/scripts/switch-arch 2009-11-22 09:26:50 UTC (rev 626) +++ trunk/openbios-devel/config/scripts/switch-arch 2009-11-22 09:47:08 UTC (rev 627) @@ -167,6 +167,7 @@ mkdir -p $OBJDIR/target/fs/hfs mkdir -p $OBJDIR/target/fs/hfsplus mkdir -p $OBJDIR/target/fs/iso9660 + mkdir -p $OBJDIR/target/fs/ext2 mkdir -p $OBJDIR/target/drivers mkdir -p $OBJDIR/target/libc mkdir -p $OBJDIR/host/include Modified: trunk/openbios-devel/fs/build.xml =================================================================== --- trunk/openbios-devel/fs/build.xml 2009-11-22 09:26:50 UTC (rev 626) +++ trunk/openbios-devel/fs/build.xml 2009-11-22 09:47:08 UTC (rev 627) @@ -9,5 +9,6 @@ <include href="hfs/build.xml"/> <include href="hfsplus/build.xml"/> <include href="iso9660/build.xml"/> + <include href="ext2/build.xml"/> </build> Added: trunk/openbios-devel/fs/ext2/build.xml =================================================================== --- trunk/openbios-devel/fs/ext2/build.xml (rev 0) +++ trunk/openbios-devel/fs/ext2/build.xml 2009-11-22 09:47:08 UTC (rev 627) @@ -0,0 +1,14 @@ +<build> + <library name="fs" type="static" target="target"> + <object source="ext2_close.c" condition="EXT2"/> + <object source="ext2_closedir.c" condition="EXT2"/> + <object source="ext2_fs.c" condition="EXT2"/> + <object source="ext2_lseek.c" condition="EXT2"/> + <object source="ext2_mount.c" condition="EXT2"/> + <object source="ext2_open.c" condition="EXT2"/> + <object source="ext2_opendir.c" condition="EXT2"/> + <object source="ext2_read.c" condition="EXT2"/> + <object source="ext2_readdir.c" condition="EXT2"/> + <object source="ext2_utils.c" condition="EXT2"/> + </library> +</build> Added: trunk/openbios-devel/fs/ext2/ext2.h =================================================================== --- trunk/openbios-devel/fs/ext2/ext2.h (rev 0) +++ trunk/openbios-devel/fs/ext2/ext2.h 2009-11-22 09:47:08 UTC (rev 627) @@ -0,0 +1,33 @@ +/* + * + * (c) 2008-2009 Laurent Vivier <Laurent(a)lvivier.info> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#ifndef __EXT2_H__ +#define __EXT2_H__ + +#include "ext2_fs.h" + +typedef struct ext2_VOLUME { + int fd; + struct ext2_super_block *super; + unsigned int current; + char *buffer; +} ext2_VOLUME; + +typedef struct ext2_DIR { + ext2_VOLUME *volume; + struct ext2_inode *inode; + off_t index; +} ext2_DIR; + +typedef struct ext2_FILE { + ext2_VOLUME *volume; + struct ext2_inode *inode; + off_t offset; + char *path; +} ext2_FILE; +#endif /* __LIBEXT2_H__ */ Added: trunk/openbios-devel/fs/ext2/ext2_close.c =================================================================== --- trunk/openbios-devel/fs/ext2/ext2_close.c (rev 0) +++ trunk/openbios-devel/fs/ext2/ext2_close.c 2009-11-22 09:47:08 UTC (rev 627) @@ -0,0 +1,18 @@ +/* + * + * (c) 2008-2009 Laurent Vivier <Laurent(a)lvivier.info> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#include "libext2.h" + +void ext2_close(ext2_FILE *file) +{ + if (file == NULL) + return; + free(file->inode); + free(file->path); + free(file); +} Added: trunk/openbios-devel/fs/ext2/ext2_closedir.c =================================================================== --- trunk/openbios-devel/fs/ext2/ext2_closedir.c (rev 0) +++ trunk/openbios-devel/fs/ext2/ext2_closedir.c 2009-11-22 09:47:08 UTC (rev 627) @@ -0,0 +1,18 @@ +/* + * + * (c) 2008-2009 Laurent Vivier <Laurent(a)lvivier.info> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#include "libext2.h" +#include "ext2.h" + +void ext2_closedir(ext2_DIR *dir) +{ + if (dir == NULL) + return; + free(dir->inode); + free(dir); +} Added: trunk/openbios-devel/fs/ext2/ext2_fs.c =================================================================== --- trunk/openbios-devel/fs/ext2/ext2_fs.c (rev 0) +++ trunk/openbios-devel/fs/ext2/ext2_fs.c 2009-11-22 09:47:08 UTC (rev 627) @@ -0,0 +1,96 @@ +/* + * + * (c) 2008-2009 Laurent Vivier <Laurent(a)lvivier.info> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#include "libext2.h" +#include "ext2_utils.h" +#include "openbios/fs.h" + +static void +umount( fs_ops_t *fs ) +{ + ext2_VOLUME *volume = (ext2_VOLUME *)fs->fs_data; + + ext2_umount( volume ); +} + +static file_desc_t * +open_path( fs_ops_t *fs, const char *path ) +{ + ext2_VOLUME *volume = (ext2_VOLUME *)fs->fs_data; + ext2_FILE *file; + + file = ext2_open(volume, path); + + return (file_desc_t *)file; +} + +static char * +get_path( file_desc_t *fd, char *buf, int size ) +{ + ext2_FILE *file = (ext2_FILE *)fd; + + strncpy(buf, file->path, size); + + return buf; +} + +static int +file_lseek( file_desc_t *fd, off_t offs, int whence ) +{ + ext2_FILE *file = (ext2_FILE *)fd; + + return ext2_lseek(file, offs, whence); +} + +static void +file_close( file_desc_t *fd ) +{ + ext2_FILE *file = (ext2_FILE *)fd; + + ext2_close(file); +} + +static int +file_read( file_desc_t *fd, void *buf, size_t count ) +{ + ext2_FILE *file = (ext2_FILE *)fd; + + return ext2_read(file, buf, count); +} + +static const char * +get_fstype( fs_ops_t *fs) +{ + return "EXT2"; +} + +static const fs_ops_t ext2_ops = { + .close_fs = umount, + + .open_path = open_path, + .get_path = get_path, + .close = file_close, + .read = file_read, + .lseek = file_lseek, + + .get_fstype = get_fstype, +}; + +int fs_ext2_open(int fd, fs_ops_t *fs) +{ + ext2_VOLUME *volume; + + volume = ext2_mount(fd); + if (volume == NULL) + return -1; + + *fs = ext2_ops; + fs->fs_data = volume; + + return 0; +} Added: trunk/openbios-devel/fs/ext2/ext2_fs.h =================================================================== --- trunk/openbios-devel/fs/ext2/ext2_fs.h (rev 0) +++ trunk/openbios-devel/fs/ext2/ext2_fs.h 2009-11-22 09:47:08 UTC (rev 627) @@ -0,0 +1,534 @@ +/* + * This file has been copied from + * linux/include/linux/ext2_fs.h + * + * Copyright (C) 1992, 1993, 1994, 1995 + * Remy Card (card(a)masi.ibp.fr) + * Laboratoire MASI - Institut Blaise Pascal + * Universite Pierre et Marie Curie (Paris VI) + * + * from + * + * linux/include/linux/minix_fs.h + * + * Copyright (C) 1991, 1992 Linus Torvalds + */ + +#ifndef _EXT2_FS_H +#define _EXT2_FS_H + +/* from /usr/include/linux/magic.h */ + +#define EXT2_SUPER_MAGIC 0xEF53 + +/* + * The second extended filesystem constants/structures + */ + +/* + * Define EXT2FS_DEBUG to produce debug messages + */ +#undef EXT2FS_DEBUG + +/* + * Define EXT2_RESERVATION to reserve data blocks for expanding files + */ +#define EXT2_DEFAULT_RESERVE_BLOCKS 8 +/*max window size: 1024(direct blocks) + 3([t,d]indirect blocks) */ +#define EXT2_MAX_RESERVE_BLOCKS 1027 +#define EXT2_RESERVE_WINDOW_NOT_ALLOCATED 0 +/* + * The second extended file system version + */ +#define EXT2FS_DATE "95/08/09" +#define EXT2FS_VERSION "0.5b" + +/* + * Debug code + */ +#ifdef EXT2FS_DEBUG +# define ext2_debug(f, a...) { \ + printk ("EXT2-fs DEBUG (%s, %d): %s:", \ + __FILE__, __LINE__, __FUNCTION__); \ + printk (f, ## a); \ + } +#else +# define ext2_debug(f, a...) /**/ +#endif + +/* + * Special inode numbers + */ +#define EXT2_BAD_INO 1 /* Bad blocks inode */ +#define EXT2_ROOT_INO 2 /* Root inode */ +#define EXT2_BOOT_LOADER_INO 5 /* Boot loader inode */ +#define EXT2_UNDEL_DIR_INO 6 /* Undelete directory inode */ + +/* First non-reserved inode for old ext2 filesystems */ +#define EXT2_GOOD_OLD_FIRST_INO 11 + +/* Assume that user mode programs are passing in an ext2fs superblock, not + * a kernel struct super_block. This will allow us to call the feature-test + * macros from user land. */ +#define EXT2_SB(sb) (sb) + +/* + * Maximal count of links to a file + */ +#define EXT2_LINK_MAX 32000 + +/* + * Macro-instructions used to manage several block sizes + */ +#define EXT2_MIN_BLOCK_SIZE 1024 +#define EXT2_MAX_BLOCK_SIZE 4096 +#define EXT2_MIN_BLOCK_LOG_SIZE 10 +# define EXT2_BLOCK_SIZE(s) (EXT2_MIN_BLOCK_SIZE << (s)->s_log_block_size) +#define EXT2_ADDR_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / sizeof (uint32_t)) +# define EXT2_BLOCK_SIZE_BITS(s) ((s)->s_log_block_size + 10) +#define EXT2_INODE_SIZE(s) (((s)->s_rev_level == EXT2_GOOD_OLD_REV) ? \ + EXT2_GOOD_OLD_INODE_SIZE : \ + (s)->s_inode_size) +#define EXT2_FIRST_INO(s) (((s)->s_rev_level == EXT2_GOOD_OLD_REV) ? \ + EXT2_GOOD_OLD_FIRST_INO : \ + (s)->s_first_ino) + +/* + * Macro-instructions used to manage fragments + */ +#define EXT2_MIN_FRAG_SIZE 1024 +#define EXT2_MAX_FRAG_SIZE 4096 +#define EXT2_MIN_FRAG_LOG_SIZE 10 +# define EXT2_FRAG_SIZE(s) (EXT2_MIN_FRAG_SIZE << (s)->s_log_frag_size) +# define EXT2_FRAGS_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / EXT2_FRAG_SIZE(s)) + +/* + * Structure of a blocks group descriptor + */ +struct ext2_group_desc +{ + uint32_t bg_block_bitmap; /* Blocks bitmap block */ + uint32_t bg_inode_bitmap; /* Inodes bitmap block */ + uint32_t bg_inode_table; /* Inodes table block */ + uint16_t bg_free_blocks_count; /* Free blocks count */ + uint16_t bg_free_inodes_count; /* Free inodes count */ + uint16_t bg_used_dirs_count; /* Directories count */ + uint16_t bg_pad; + uint32_t bg_reserved[3]; +}; + +/* + * Macro-instructions used to manage group descriptors + */ +# define EXT2_BLOCKS_PER_GROUP(s) ((s)->s_blocks_per_group) +# define EXT2_DESC_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / sizeof (struct ext2_group_desc)) +# define EXT2_INODES_PER_GROUP(s) ((s)->s_inodes_per_group) + +/* + * Constants relative to the data blocks + */ +#define EXT2_NDIR_BLOCKS 12 +#define EXT2_IND_BLOCK EXT2_NDIR_BLOCKS +#define EXT2_DIND_BLOCK (EXT2_IND_BLOCK + 1) +#define EXT2_TIND_BLOCK (EXT2_DIND_BLOCK + 1) +#define EXT2_N_BLOCKS (EXT2_TIND_BLOCK + 1) + +/* + * Inode flags (GETFLAGS/SETFLAGS) + */ +#define EXT2_SECRM_FL FS_SECRM_FL /* Secure deletion */ +#define EXT2_UNRM_FL FS_UNRM_FL /* Undelete */ +#define EXT2_COMPR_FL FS_COMPR_FL /* Compress file */ +#define EXT2_SYNC_FL FS_SYNC_FL /* Synchronous updates */ +#define EXT2_IMMUTABLE_FL FS_IMMUTABLE_FL /* Immutable file */ +#define EXT2_APPEND_FL FS_APPEND_FL /* writes to file may only append */ +#define EXT2_NODUMP_FL FS_NODUMP_FL /* do not dump file */ +#define EXT2_NOATIME_FL FS_NOATIME_FL /* do not update atime */ +/* Reserved for compression usage... */ +#define EXT2_DIRTY_FL FS_DIRTY_FL +#define EXT2_COMPRBLK_FL FS_COMPRBLK_FL /* One or more compressed clusters */ +#define EXT2_NOCOMP_FL FS_NOCOMP_FL /* Don't compress */ +#define EXT2_ECOMPR_FL FS_ECOMPR_FL /* Compression error */ +/* End compression flags --- maybe not all used */ +#define EXT2_BTREE_FL FS_BTREE_FL /* btree format dir */ +#define EXT2_INDEX_FL FS_INDEX_FL /* hash-indexed directory */ +#define EXT2_IMAGIC_FL FS_IMAGIC_FL /* AFS directory */ +#define EXT2_JOURNAL_DATA_FL FS_JOURNAL_DATA_FL /* Reserved for ext3 */ +#define EXT2_NOTAIL_FL FS_NOTAIL_FL /* file tail should not be merged */ +#define EXT2_DIRSYNC_FL FS_DIRSYNC_FL /* dirsync behaviour (directories only) */ +#define EXT2_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/ +#define EXT2_RESERVED_FL FS_RESERVED_FL /* reserved for ext2 lib */ + +#define EXT2_FL_USER_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */ +#define EXT2_FL_USER_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */ + +/* + * ioctl commands + */ +#define EXT2_IOC_GETFLAGS FS_IOC_GETFLAGS +#define EXT2_IOC_SETFLAGS FS_IOC_SETFLAGS +#define EXT2_IOC_GETVERSION FS_IOC_GETVERSION +#define EXT2_IOC_SETVERSION FS_IOC_SETVERSION +#define EXT2_IOC_GETRSVSZ _IOR('f', 5, long) +#define EXT2_IOC_SETRSVSZ _IOW('f', 6, long) + +/* + * ioctl commands in 32 bit emulation + */ +#define EXT2_IOC32_GETFLAGS FS_IOC32_GETFLAGS +#define EXT2_IOC32_SETFLAGS FS_IOC32_SETFLAGS +#define EXT2_IOC32_GETVERSION FS_IOC32_GETVERSION +#define EXT2_IOC32_SETVERSION FS_IOC32_SETVERSION + +/* + * Structure of an inode on the disk + */ +struct ext2_inode { + uint16_t i_mode; /* File mode */ + uint16_t i_uid; /* Low 16 bits of Owner Uid */ + uint32_t i_size; /* Size in bytes */ + uint32_t i_atime; /* Access time */ + uint32_t i_ctime; /* Creation time */ + uint32_t i_mtime; /* Modification time */ + uint32_t i_dtime; /* Deletion Time */ + uint16_t i_gid; /* Low 16 bits of Group Id */ + uint16_t i_links_count; /* Links count */ + uint32_t i_blocks; /* Blocks count */ + uint32_t i_flags; /* File flags */ + union { + struct { + uint32_t l_i_reserved1; + } linux1; + struct { + uint32_t h_i_translator; + } hurd1; + struct { + uint32_t m_i_reserved1; + } masix1; + } osd1; /* OS dependent 1 */ + uint32_t i_block[EXT2_N_BLOCKS];/* Pointers to blocks */ + uint32_t i_generation; /* File version (for NFS) */ + uint32_t i_file_acl; /* File ACL */ + uint32_t i_dir_acl; /* Directory ACL */ + uint32_t i_faddr; /* Fragment address */ + union { + struct { + uint8_t l_i_frag; /* Fragment number */ + uint8_t l_i_fsize; /* Fragment size */ + uint16_t i_pad1; + uint16_t l_i_uid_high; /* these 2 fields */ + uint16_t l_i_gid_high; /* were reserved2[0] */ + uint32_t l_i_reserved2; + } linux2; + struct { + uint8_t h_i_frag; /* Fragment number */ + uint8_t h_i_fsize; /* Fragment size */ + uint16_t h_i_mode_high; + uint16_t h_i_uid_high; + uint16_t h_i_gid_high; + uint32_t h_i_author; + } hurd2; + struct { + uint8_t m_i_frag; /* Fragment number */ + uint8_t m_i_fsize; /* Fragment size */ + uint16_t m_pad1; + uint32_t m_i_reserved2[2]; + } masix2; + } osd2; /* OS dependent 2 */ +}; + +#define i_size_high i_dir_acl + +#if defined(__KERNEL__) || defined(__linux__) +#define i_reserved1 osd1.linux1.l_i_reserved1 +#define i_frag osd2.linux2.l_i_frag +#define i_fsize osd2.linux2.l_i_fsize +#define i_uid_low i_uid +#define i_gid_low i_gid +#define i_uid_high osd2.linux2.l_i_uid_high +#define i_gid_high osd2.linux2.l_i_gid_high +#define i_reserved2 osd2.linux2.l_i_reserved2 +#endif + +#ifdef __hurd__ +#define i_translator osd1.hurd1.h_i_translator +#define i_frag osd2.hurd2.h_i_frag; +#define i_fsize osd2.hurd2.h_i_fsize; +#define i_uid_high osd2.hurd2.h_i_uid_high +#define i_gid_high osd2.hurd2.h_i_gid_high +#define i_author osd2.hurd2.h_i_author +#endif + +#ifdef __masix__ +#define i_reserved1 osd1.masix1.m_i_reserved1 +#define i_frag osd2.masix2.m_i_frag +#define i_fsize osd2.masix2.m_i_fsize +#define i_reserved2 osd2.masix2.m_i_reserved2 +#endif + +/* + * File system states + */ +#define EXT2_VALID_FS 0x0001 /* Unmounted cleanly */ +#define EXT2_ERROR_FS 0x0002 /* Errors detected */ + +/* + * Mount flags + */ +#define EXT2_MOUNT_CHECK 0x000001 /* Do mount-time checks */ +#define EXT2_MOUNT_OLDALLOC 0x000002 /* Don't use the new Orlov allocator */ +#define EXT2_MOUNT_GRPID 0x000004 /* Create files with directory's group */ +#define EXT2_MOUNT_DEBUG 0x000008 /* Some debugging messages */ +#define EXT2_MOUNT_ERRORS_CONT 0x000010 /* Continue on errors */ +#define EXT2_MOUNT_ERRORS_RO 0x000020 /* Remount fs ro on errors */ +#define EXT2_MOUNT_ERRORS_PANIC 0x000040 /* Panic on errors */ +#define EXT2_MOUNT_MINIX_DF 0x000080 /* Mimics the Minix statfs */ +#define EXT2_MOUNT_NOBH 0x000100 /* No buffer_heads */ +#define EXT2_MOUNT_NO_UID32 0x000200 /* Disable 32-bit UIDs */ +#define EXT2_MOUNT_XATTR_USER 0x004000 /* Extended user attributes */ +#define EXT2_MOUNT_POSIX_ACL 0x008000 /* POSIX Access Control Lists */ +#define EXT2_MOUNT_XIP 0x010000 /* Execute in place */ +#define EXT2_MOUNT_USRQUOTA 0x020000 /* user quota */ +#define EXT2_MOUNT_GRPQUOTA 0x040000 /* group quota */ +#define EXT2_MOUNT_RESERVATION 0x080000 /* Preallocation */ + + +#define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt +#define set_opt(o, opt) o |= EXT2_MOUNT_##opt +#define test_opt(sb, opt) (EXT2_SB(sb)->s_mount_opt & \ + EXT2_MOUNT_##opt) +/* + * Maximal mount counts between two filesystem checks + */ +#define EXT2_DFL_MAX_MNT_COUNT 20 /* Allow 20 mounts */ +#define EXT2_DFL_CHECKINTERVAL 0 /* Don't use interval check */ + +/* + * Behaviour when detecting errors + */ +#define EXT2_ERRORS_CONTINUE 1 /* Continue execution */ +#define EXT2_ERRORS_RO 2 /* Remount fs read-only */ +#define EXT2_ERRORS_PANIC 3 /* Panic */ +#define EXT2_ERRORS_DEFAULT EXT2_ERRORS_CONTINUE + +/* + * Structure of the super block + */ +struct ext2_super_block { + uint32_t s_inodes_count; /* Inodes count */ + uint32_t s_blocks_count; /* Blocks count */ + uint32_t s_r_blocks_count; /* Reserved blocks count */ + uint32_t s_free_blocks_count; /* Free blocks count */ + uint32_t s_free_inodes_count; /* Free inodes count */ + uint32_t s_first_data_block; /* First Data Block */ + uint32_t s_log_block_size; /* Block size */ + uint32_t s_log_frag_size; /* Fragment size */ + uint32_t s_blocks_per_group; /* # Blocks per group */ + uint32_t s_frags_per_group; /* # Fragments per group */ + uint32_t s_inodes_per_group; /* # Inodes per group */ + uint32_t s_mtime; /* Mount time */ + uint32_t s_wtime; /* Write time */ + uint16_t s_mnt_count; /* Mount count */ + uint16_t s_max_mnt_count; /* Maximal mount count */ + uint16_t s_magic; /* Magic signature */ + uint16_t s_state; /* File system state */ + uint16_t s_errors; /* Behaviour when detecting errors */ + uint16_t s_minor_rev_level; /* minor revision level */ + uint32_t s_lastcheck; /* time of last check */ + uint32_t s_checkinterval; /* max. time between checks */ + uint32_t s_creator_os; /* OS */ + uint32_t s_rev_level; /* Revision level */ + uint16_t s_def_resuid; /* Default uid for reserved blocks */ + uint16_t s_def_resgid; /* Default gid for reserved blocks */ + /* + * These fields are for EXT2_DYNAMIC_REV superblocks only. + * + * Note: the difference between the compatible feature set and + * the incompatible feature set is that if there is a bit set + * in the incompatible feature set that the kernel doesn't + * know about, it should refuse to mount the filesystem. + * + * e2fsck's requirements are more strict; if it doesn't know + * about a feature in either the compatible or incompatible + * feature set, it must abort and not try to meddle with + * things it doesn't understand... + */ + uint32_t s_first_ino; /* First non-reserved inode */ + uint16_t s_inode_size; /* size of inode structure */ + uint16_t s_block_group_nr; /* block group # of this superblock */ + uint32_t s_feature_compat; /* compatible feature set */ + uint32_t s_feature_incompat; /* incompatible feature set */ + uint32_t s_feature_ro_compat; /* readonly-compatible feature set */ + uint8_t s_uuid[16]; /* 128-bit uuid for volume */ + char s_volume_name[16]; /* volume name */ + char s_last_mounted[64]; /* directory where last mounted */ + uint32_t s_algorithm_usage_bitmap; /* For compression */ + /* + * Performance hints. Directory preallocation should only + * happen if the EXT2_COMPAT_PREALLOC flag is on. + */ + uint8_t s_prealloc_blocks; /* Nr of blocks to try to preallocate*/ + uint8_t s_prealloc_dir_blocks; /* Nr to preallocate for dirs */ + uint16_t s_padding1; + /* + * Journaling support valid if EXT3_FEATURE_COMPAT_HAS_JOURNAL set. + */ + uint8_t s_journal_uuid[16]; /* uuid of journal superblock */ + uint32_t s_journal_inum; /* inode number of journal file */ + uint32_t s_journal_dev; /* device number of journal file */ + uint32_t s_last_orphan; /* start of list of inodes to delete */ + uint32_t s_hash_seed[4]; /* HTREE hash seed */ + uint8_t s_def_hash_version; /* Default hash version to use */ + uint8_t s_reserved_char_pad; + uint16_t s_reserved_word_pad; + uint32_t s_default_mount_opts; + uint32_t s_first_meta_bg; /* First metablock block group */ + uint32_t s_reserved[190]; /* Padding to the end of the block */ +}; + +/* + * Codes for operating systems + */ +#define EXT2_OS_LINUX 0 +#define EXT2_OS_HURD 1 +#define EXT2_OS_MASIX 2 +#define EXT2_OS_FREEBSD 3 +#define EXT2_OS_LITES 4 + +/* + * Revision levels + */ +#define EXT2_GOOD_OLD_REV 0 /* The good old (original) format */ +#define EXT2_DYNAMIC_REV 1 /* V2 format w/ dynamic inode sizes */ + +#define EXT2_CURRENT_REV EXT2_GOOD_OLD_REV +#define EXT2_MAX_SUPP_REV EXT2_DYNAMIC_REV + +#define EXT2_GOOD_OLD_INODE_SIZE 128 + +/* + * Feature set definitions + */ + +#define EXT2_HAS_COMPAT_FEATURE(sb,mask) \ + ( EXT2_SB(sb)->s_es->s_feature_compat & cpu_to_le32(mask) ) +#define EXT2_HAS_RO_COMPAT_FEATURE(sb,mask) \ + ( EXT2_SB(sb)->s_es->s_feature_ro_compat & cpu_to_le32(mask) ) +#define EXT2_HAS_INCOMPAT_FEATURE(sb,mask) \ + ( EXT2_SB(sb)->s_es->s_feature_incompat & cpu_to_le32(mask) ) +#define EXT2_SET_COMPAT_FEATURE(sb,mask) \ + EXT2_SB(sb)->s_es->s_feature_compat |= cpu_to_le32(mask) +#define EXT2_SET_RO_COMPAT_FEATURE(sb,mask) \ + EXT2_SB(sb)->s_es->s_feature_ro_compat |= cpu_to_le32(mask) +#define EXT2_SET_INCOMPAT_FEATURE(sb,mask) \ + EXT2_SB(sb)->s_es->s_feature_incompat |= cpu_to_le32(mask) +#define EXT2_CLEAR_COMPAT_FEATURE(sb,mask) \ + EXT2_SB(sb)->s_es->s_feature_compat &= ~cpu_to_le32(mask) +#define EXT2_CLEAR_RO_COMPAT_FEATURE(sb,mask) \ + EXT2_SB(sb)->s_es->s_feature_ro_compat &= ~cpu_to_le32(mask) +#define EXT2_CLEAR_INCOMPAT_FEATURE(sb,mask) \ + EXT2_SB(sb)->s_es->s_feature_incompat &= ~cpu_to_le32(mask) + +#define EXT2_FEATURE_COMPAT_DIR_PREALLOC 0x0001 +#define EXT2_FEATURE_COMPAT_IMAGIC_INODES 0x0002 +#define EXT3_FEATURE_COMPAT_HAS_JOURNAL 0x0004 +#define EXT2_FEATURE_COMPAT_EXT_ATTR 0x0008 +#define EXT2_FEATURE_COMPAT_RESIZE_INO 0x0010 +#define EXT2_FEATURE_COMPAT_DIR_INDEX 0x0020 +#define EXT2_FEATURE_COMPAT_ANY 0xffffffff + +#define EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER 0x0001 +#define EXT2_FEATURE_RO_COMPAT_LARGE_FILE 0x0002 +#define EXT2_FEATURE_RO_COMPAT_BTREE_DIR 0x0004 +#define EXT2_FEATURE_RO_COMPAT_ANY 0xffffffff + +#define EXT2_FEATURE_INCOMPAT_COMPRESSION 0x0001 +#define EXT2_FEATURE_INCOMPAT_FILETYPE 0x0002 +#define EXT3_FEATURE_INCOMPAT_RECOVER 0x0004 +#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV 0x0008 +#define EXT2_FEATURE_INCOMPAT_META_BG 0x0010 +#define EXT2_FEATURE_INCOMPAT_ANY 0xffffffff + +#define EXT2_FEATURE_COMPAT_SUPP EXT2_FEATURE_COMPAT_EXT_ATTR +#define EXT2_FEATURE_INCOMPAT_SUPP (EXT2_FEATURE_INCOMPAT_FILETYPE| \ + EXT2_FEATURE_INCOMPAT_META_BG) +#define EXT2_FEATURE_RO_COMPAT_SUPP (EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER| \ + EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \ + EXT2_FEATURE_RO_COMPAT_BTREE_DIR) +#define EXT2_FEATURE_RO_COMPAT_UNSUPPORTED ~EXT2_FEATURE_RO_COMPAT_SUPP +#define EXT2_FEATURE_INCOMPAT_UNSUPPORTED ~EXT2_FEATURE_INCOMPAT_SUPP + +/* + * Default values for user and/or group using reserved blocks + */ +#define EXT2_DEF_RESUID 0 +#define EXT2_DEF_RESGID 0 + +/* + * Default mount options + */ +#define EXT2_DEFM_DEBUG 0x0001 +#define EXT2_DEFM_BSDGROUPS 0x0002 +#define EXT2_DEFM_XATTR_USER 0x0004 +#define EXT2_DEFM_ACL 0x0008 +#define EXT2_DEFM_UID16 0x0010 + /* Not used by ext2, but reserved for use by ext3 */ +#define EXT3_DEFM_JMODE 0x0060 +#define EXT3_DEFM_JMODE_DATA 0x0020 +#define EXT3_DEFM_JMODE_ORDERED 0x0040 +#define EXT3_DEFM_JMODE_WBACK 0x0060 + +/* + * Structure of a directory entry + */ +#define EXT2_NAME_LEN 255 + +struct ext2_dir_entry { + uint32_t inode; /* Inode number */ + uint16_t rec_len; /* Directory entry length */ + uint16_t name_len; /* Name length */ + char name[EXT2_NAME_LEN]; /* File name */ +}; + +/* + * The new version of the directory entry. Since EXT2 structures are + * stored in intel byte order, and the name_len field could never be + * bigger than 255 chars, it's safe to reclaim the extra byte for the + * file_type field. + */ +struct ext2_dir_entry_2 { + uint32_t inode; /* Inode number */ + uint16_t rec_len; /* Directory entry length */ + uint8_t name_len; /* Name length */ + uint8_t file_type; + char name[EXT2_NAME_LEN]; /* File name */ +}; + +/* + * Ext2 directory file types. Only the low 3 bits are used. The + * other bits are reserved for now. + */ +enum { + EXT2_FT_UNKNOWN, + EXT2_FT_REG_FILE, + EXT2_FT_DIR, + EXT2_FT_CHRDEV, + EXT2_FT_BLKDEV, + EXT2_FT_FIFO, + EXT2_FT_SOCK, + EXT2_FT_SYMLINK, + EXT2_FT_MAX +}; + +/* + * EXT2_DIR_PAD defines the directory entries boundaries + * + * NOTE: It must be a multiple of 4 + */ +#define EXT2_DIR_PAD 4 +#define EXT2_DIR_ROUND (EXT2_DIR_PAD - 1) +#define EXT2_DIR_REC_LEN(name_len) (((name_len) + 8 + EXT2_DIR_ROUND) & \ + ~EXT2_DIR_ROUND) +#define EXT2_MAX_REC_LEN ((1<<16)-1) + +#endif /* _EXT2_FS_H */ Added: trunk/openbios-devel/fs/ext2/ext2_lseek.c =================================================================== --- trunk/openbios-devel/fs/ext2/ext2_lseek.c (rev 0) +++ trunk/openbios-devel/fs/ext2/ext2_lseek.c 2009-11-22 09:47:08 UTC (rev 627) @@ -0,0 +1,38 @@ +/* + * + * (c) 2008-2009 Laurent Vivier <Laurent(a)lvivier.info> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#include "libext2.h" +#include "ext2.h" + +int ext2_lseek(ext2_FILE *file, long offset, int whence) +{ + long new_offset; + + switch(whence) + { + case SEEK_SET: + new_offset = offset; + break; + case SEEK_CUR: + new_offset = file->offset + offset; + break; + case SEEK_END: + new_offset = file->inode->i_size + offset; + break; + default: + return -1; + } + + if ( (new_offset < 0) || + (new_offset > file->inode->i_size) ) + return -1; + + file->offset = new_offset; + + return new_offset; +} Added: trunk/openbios-devel/fs/ext2/ext2_mount.c =================================================================== --- trunk/openbios-devel/fs/ext2/ext2_mount.c (rev 0) +++ trunk/openbios-devel/fs/ext2/ext2_mount.c 2009-11-22 09:47:08 UTC (rev 627) @@ -0,0 +1,62 @@ +/* + * + * (c) 2008-2009 Laurent Vivier <Laurent(a)lvivier.info> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#include "libext2.h" +#include "ext2.h" +#include "ext2_utils.h" + +#define SB_OFFSET (2) + +ext2_VOLUME* ext2_mount(int fd) +{ + ext2_VOLUME *volume; + struct ext2_super_block *super; + char *buffer; + + super = (struct ext2_super_block*)malloc(sizeof(struct ext2_super_block)); + if (super == NULL) + return NULL; + + ext2_get_super(fd, super); + if (super->s_magic != EXT2_SUPER_MAGIC) { + free(super); + return NULL; + } + + buffer = (char*)malloc(EXT2_BLOCK_SIZE(super)); + if (buffer == NULL) { + free(super); + return NULL; + } + + volume = (ext2_VOLUME*)malloc(sizeof(ext2_VOLUME)); + if (volume == NULL) { + free(super); + free(buffer); + return NULL; + } + + volume->buffer = buffer; + volume->fd = fd; + volume->super = super; + + volume->current = -1; + ext2_read_block(volume, 0); + + return volume; +} + +int ext2_umount(ext2_VOLUME* volume) +{ + if (volume == NULL) + return -1; + free(volume->super); + free(volume->buffer); + free(volume); + return 0; +} Added: trunk/openbios-devel/fs/ext2/ext2_open.c =================================================================== --- trunk/openbios-devel/fs/ext2/ext2_open.c (rev 0) +++ trunk/openbios-devel/fs/ext2/ext2_open.c 2009-11-22 09:47:08 UTC (rev 627) @@ -0,0 +1,65 @@ +/* + * + * (c) 2008-2009 Laurent Vivier <Laurent(a)lvivier.info> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#include "libext2.h" +#include "ext2.h" +#include "ext2_utils.h" + +ext2_FILE* ext2_open(ext2_VOLUME *volume, const char* pathname) +{ + ext2_FILE *file; + struct ext2_inode *inode; + int ino; + int ret; + + ino = ext2_seek_name(volume, pathname); + if (ino == 0) + return NULL; + + inode = (struct ext2_inode*)malloc(sizeof(struct ext2_inode)); + if (inode == NULL) + return NULL; + + ret = ext2_get_inode(volume, ino, inode); + if (ret == -1) { + free(inode); + return NULL; + } + if (S_ISLNK(inode->i_mode)) { + static char buffer[1024]; + int i, last = 0; + strcpy(buffer, pathname); + for (i = 0; buffer[i]; i++) + if (buffer[i] == '\\') + last = i; + buffer[last] = '\\'; + strcpy(buffer + last + 1, (char*)inode->i_block); + ino = ext2_seek_name((ext2_VOLUME*)volume, buffer); + if (ino == 0) { + free(inode); + return NULL; + } + ret = ext2_get_inode((ext2_VOLUME*)volume, ino, inode); + if (ret == -1) { + free(inode); + return NULL; + } + } + + file = (ext2_FILE*)malloc(sizeof(ext2_FILE)); + if (file == NULL) { + free(inode); + return NULL; + } + file->volume = volume; + file->inode = inode; + file->offset = 0; + file->path = strdup(pathname); + + return file; +} Added: trunk/openbios-devel/fs/ext2/ext2_opendir.c =================================================================== --- trunk/openbios-devel/fs/ext2/ext2_opendir.c (rev 0) +++ trunk/openbios-devel/fs/ext2/ext2_opendir.c 2009-11-22 09:47:08 UTC (rev 627) @@ -0,0 +1,49 @@ +/* + * + * (c) 2008-2009 Laurent Vivier <Laurent(a)lvivier.info> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#include "libext2.h" +#include "ext2.h" +#include "ext2_utils.h" + +ext2_DIR* ext2_opendir(ext2_VOLUME *volume, const char *name) +{ + ext2_DIR* dir; + int ino; + struct ext2_inode *inode; + int ret; + + ino = ext2_seek_name(volume, name); + if (ino == 0) + return NULL; + + inode = (struct ext2_inode*)malloc(sizeof(struct ext2_inode)); + if (inode == NULL) + return NULL; + + ret = ext2_get_inode(volume, ino, inode); + if (ret == -1) { + free(inode); + return NULL; + } + + if (!S_ISDIR(inode->i_mode)) { + free(inode); + return NULL; + } + + dir = (ext2_DIR*)malloc(sizeof(ext2_DIR)); + if (dir == NULL) { + free(inode); + return NULL; + } + dir->volume = (ext2_VOLUME*)volume; + dir->inode = inode; + dir->index = 0; + + return dir; +} Added: trunk/openbios-devel/fs/ext2/ext2_read.c =================================================================== --- trunk/openbios-devel/fs/ext2/ext2_read.c (rev 0) +++ trunk/openbios-devel/fs/ext2/ext2_read.c 2009-11-22 09:47:08 UTC (rev 627) @@ -0,0 +1,23 @@ +/* + * + * (c) 2008-2009 Laurent Vivier <Laurent(a)lvivier.info> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#include "libext2.h" +#include "ext2.h" +#include "ext2_utils.h" + +size_t ext2_read(ext2_FILE *file, void *buf, size_t count) +{ + int ret; + + ret = ext2_read_data(file->volume, file->inode, file->offset, + buf, count); + if (ret == -1) + return -1; + file->offset += ret; + return ret; +} Added: trunk/openbios-devel/fs/ext2/ext2_readdir.c =================================================================== --- trunk/openbios-devel/fs/ext2/ext2_readdir.c (rev 0) +++ trunk/openbios-devel/fs/ext2/ext2_readdir.c 2009-11-22 09:47:08 UTC (rev 627) @@ -0,0 +1,25 @@ +/* + * + * (c) 2008-2009 Laurent Vivier <Laurent(a)lvivier.info> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#include "libext2.h" +#include "ext2_utils.h" + +static struct ext2_dir_entry_2 entry; + +struct ext2_dir_entry_2 *ext2_readdir(ext2_DIR *dir) +{ + int ret; + + ret = ext2_dir_entry(dir->volume, dir->inode, dir->index, &entry); + if (ret == -1) + return NULL; + dir->index = ret; + + entry.name[entry.name_len] = 0; + return &entry; +} Added: trunk/openbios-devel/fs/ext2/ext2_utils.c =================================================================== --- trunk/openbios-devel/fs/ext2/ext2_utils.c (rev 0) +++ trunk/openbios-devel/fs/ext2/ext2_utils.c 2009-11-22 09:47:08 UTC (rev 627) @@ -0,0 +1,315 @@ +/* + * + * (c) 2008-2009 Laurent Vivier <Laurent(a)lvivier.info> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#include "libext2.h" +#include "ext2_utils.h" +#include "openbios/bindings.h" +#include "libc/diskio.h" +#include "libc/byteorder.h" + +void ext2_get_super(int fd, struct ext2_super_block *super) +{ + seek_io(fd, 2 * 512); + read_io(fd, super, sizeof (*super)); + + super->s_inodes_count = __le32_to_cpu(super->s_inodes_count); + super->s_blocks_count = __le32_to_cpu(super->s_blocks_count); + super->s_r_blocks_count = __le32_to_cpu(super->s_r_blocks_count); + super->s_free_blocks_count = __le32_to_cpu(super->s_free_blocks_count); + super->s_free_inodes_count = __le32_to_cpu(super->s_free_inodes_count); + super->s_first_data_block = __le32_to_cpu(super->s_first_data_block); + super->s_log_block_size = __le32_to_cpu(super->s_log_block_size); + super->s_log_frag_size = __le32_to_cpu(super->s_log_frag_size); + super->s_blocks_per_group = __le32_to_cpu(super->s_blocks_per_group); + super->s_frags_per_group = __le32_to_cpu(super->s_frags_per_group); + super->s_inodes_per_group = __le32_to_cpu(super->s_inodes_per_group); + super->s_mtime = __le32_to_cpu(super->s_mtime); + super->s_wtime = __le32_to_cpu(super->s_wtime); + super->s_mnt_count = __le16_to_cpu(super->s_mnt_count); + super->s_max_mnt_count = __le16_to_cpu(super->s_max_mnt_count); + super->s_magic = __le16_to_cpu(super->s_magic); + super->s_state = __le16_to_cpu(super->s_state); + super->s_errors = __le16_to_cpu(super->s_errors); + super->s_minor_rev_level = __le16_to_cpu(super->s_minor_rev_level); + super->s_lastcheck = __le32_to_cpu(super->s_lastcheck); + super->s_checkinterval = __le32_to_cpu(super->s_checkinterval); + super->s_creator_os = __le32_to_cpu(super->s_creator_os); + super->s_rev_level = __le32_to_cpu(super->s_rev_level); + super->s_def_resuid = __le16_to_cpu(super->s_def_resuid); + super->s_def_resgid = __le16_to_cpu(super->s_def_resgid); + super->s_first_ino = __le32_to_cpu(super->s_first_ino); + super->s_inode_size = __le16_to_cpu(super->s_inode_size); + super->s_block_group_nr = __le16_to_cpu(super->s_block_group_nr); + super->s_feature_compat = __le32_to_cpu(super->s_feature_compat); + super->s_feature_incompat = __le32_to_cpu(super->s_feature_incompat); + super->s_feature_ro_compat = __le32_to_cpu(super->s_feature_ro_compat); + super->s_algorithm_usage_bitmap = + __le32_to_cpu(super->s_algorithm_usage_bitmap); + super->s_journal_inum = __le32_to_cpu(super->s_journal_inum); + super->s_journal_dev = __le32_to_cpu(super->s_journal_dev); + super->s_last_orphan = __le32_to_cpu(super->s_last_orphan); + super->s_hash_seed[0] = __le32_to_cpu(super->s_hash_seed[0]); + super->s_hash_seed[1] = __le32_to_cpu(super->s_hash_seed[1]); + super->s_hash_seed[2] = __le32_to_cpu(super->s_hash_seed[2]); + super->s_hash_seed[3] = __le32_to_cpu(super->s_hash_seed[3]); + super->s_default_mount_opts = + __le32_to_cpu(super->s_default_mount_opts); + super->s_first_meta_bg = __le32_to_cpu(super->s_first_meta_bg); +} + +void ext2_read_block(ext2_VOLUME* volume, unsigned int fsblock) +{ + llong offset; + + if (fsblock == volume->current) + return; + + volume->current = fsblock; + offset = fsblock * EXT2_BLOCK_SIZE(volume->super); + + seek_io(volume->fd, offset); + read_io(volume->fd, volume->buffer, EXT2_BLOCK_SIZE(volume->super)); +} + +void ext2_get_group_desc(ext2_VOLUME* volume, + int group_id, struct ext2_group_desc *gdp) +{ + unsigned int block, offset; + struct ext2_group_desc *le_gdp; + + block = 1 + volume->super->s_first_data_block; + block += group_id / EXT2_DESC_PER_BLOCK(volume->super); + ext2_read_block(volume, block); + + offset = group_id % EXT2_DESC_PER_BLOCK(volume->super); + offset *= sizeof(*gdp); + + le_gdp = (struct ext2_group_desc *)(volume->buffer + offset); + + gdp->bg_block_bitmap = __le32_to_cpu(le_gdp->bg_block_bitmap); + gdp->bg_inode_bitmap = __le32_to_cpu(le_gdp->bg_inode_bitmap); + gdp->bg_inode_table = __le32_to_cpu(le_gdp->bg_inode_table); + gdp->bg_free_blocks_count = __le16_to_cpu(le_gdp->bg_free_blocks_count); + gdp->bg_free_inodes_count = __le16_to_cpu(le_gdp->bg_free_inodes_count); + gdp->bg_used_dirs_count = __le16_to_cpu(le_gdp->bg_used_dirs_count); +} + +int ext2_get_inode(ext2_VOLUME* volume, + unsigned int ino, struct ext2_inode *inode) +{ + struct ext2_group_desc desc; + unsigned int block; + unsigned int group_id; + unsigned int offset; + struct ext2_inode *le_inode; + int i; + + ino--; + + group_id = ino / EXT2_INODES_PER_GROUP(volume->super); + ext2_get_group_desc(volume, group_id, &desc); + + ino %= EXT2_INODES_PER_GROUP(volume->super); + + block = desc.bg_inode_table; + block += ino / (EXT2_BLOCK_SIZE(volume->super) / + EXT2_INODE_SIZE(volume->super)); + ext2_read_block(volume, block); + + offset = ino % (EXT2_BLOCK_SIZE(volume->super) / + EXT2_INODE_SIZE(volume->super)); + offset *= EXT2_INODE_SIZE(volume->super); + + le_inode = (struct ext2_inode *)(volume->buffer + offset); + + inode->i_mode = __le16_to_cpu(le_inode->i_mode); + inode->i_uid = __le16_to_cpu(le_inode->i_uid); + inode->i_size = __le32_to_cpu(le_inode->i_size); + inode->i_atime = __le32_to_cpu(le_inode->i_atime); + inode->i_ctime = __le32_to_cpu(le_inode->i_ctime); + inode->i_mtime = __le32_to_cpu(le_inode->i_mtime); + inode->i_dtime = __le32_to_cpu(le_inode->i_dtime); + inode->i_gid = __le16_to_cpu(le_inode->i_gid); + inode->i_links_count = __le16_to_cpu(le_inode->i_links_count); + inode->i_blocks = __le32_to_cpu(le_inode->i_blocks); + inode->i_flags = __le32_to_cpu(le_inode->i_flags); + if (S_ISLNK(inode->i_mode)) { + memcpy(inode->i_block, le_inode->i_block, EXT2_N_BLOCKS * 4); + } else { + for (i = 0; i < EXT2_N_BLOCKS; i++) + inode->i_block[i] = __le32_to_cpu(le_inode->i_block[i]); + } + inode->i_generation = __le32_to_cpu(le_inode->i_generation); + inode->i_file_acl = __le32_to_cpu(le_inode->i_file_acl); + inode->i_dir_acl = __le32_to_cpu(le_inode->i_dir_acl); + inode->i_faddr = __le32_to_cpu(le_inode->i_faddr); + inode->osd2.linux2.l_i_frag = le_inode->osd2.linux2.l_i_frag; + inode->osd2.linux2.l_i_fsize = le_inode->osd2.linux2.l_i_fsize; + inode->osd2.linux2.l_i_uid_high = + __le16_to_cpu(le_inode->osd2.linux2.l_i_uid_high); + inode->osd2.linux2.l_i_gid_high = + __le16_to_cpu(le_inode->osd2.linux2.l_i_gid_high); + return 0; +} + +unsigned int ext2_get_block_addr(ext2_VOLUME* volume, struct ext2_inode *inode, + unsigned int logical) +{ + unsigned int physical; + unsigned int addr_per_block; + + /* direct */ + + if (logical < EXT2_NDIR_BLOCKS) { + physical = inode->i_block[logical]; + return physical; + } + + /* indirect */ + + logical -= EXT2_NDIR_BLOCKS; + + addr_per_block = EXT2_ADDR_PER_BLOCK (volume->super); + if (logical < addr_per_block) { + ext2_read_block(volume, inode->i_block[EXT2_IND_BLOCK]); + physical = __le32_to_cpu(((unsigned int *)volume->buffer)[logical]); + return physical; + } + + /* double indirect */ + + logical -= addr_per_block; + + if (logical < addr_per_block * addr_per_block) { + ext2_read_block(volume, inode->i_block[EXT2_DIND_BLOCK]); + physical = __le32_to_cpu(((unsigned int *)volume->buffer) + [logical / addr_per_block]); + ext2_read_block(volume, physical); + physical = __le32_to_cpu(((unsigned int *)volume->buffer) + [logical % addr_per_block]); + return physical; + } + + /* triple indirect */ + + logical -= addr_per_block * addr_per_block; + ext2_read_block(volume, inode->i_block[EXT2_DIND_BLOCK]); + physical = __le32_to_cpu(((unsigned int *)volume->buffer) + [logical / (addr_per_block * addr_per_block)]); + ext2_read_block(volume, physical); + logical = logical % (addr_per_block * addr_per_block); + physical = __le32_to_cpu(((unsigned int *)volume->buffer)[logical / addr_per_block]); + ext2_read_block(volume, physical); + physical = __le32_to_cpu(((unsigned int *)volume->buffer)[logical % addr_per_block]); + return physical; +} + +int ext2_read_data(ext2_VOLUME* volume, struct ext2_inode *inode, + off_t offset, char *buffer, size_t length) +{ + unsigned int logical, physical; + int blocksize = EXT2_BLOCK_SIZE(volume->super); + int shift; + size_t read; + + if (offset >= inode->i_size) + return -1; + + if (offset + length >= inode->i_size) + length = inode->i_size - offset; + + read = 0; + logical = offset / blocksize; + shift = offset % blocksize; + + if (shift) { + physical = ext2_get_block_addr(volume, inode, logical); + ext2_read_block(volume, physical); + + if (length < blocksize - shift) { + memcpy(buffer, volume->buffer + shift, length); + return length; + } + read += blocksize - shift; + memcpy(buffer, volume->buffer + shift, read); + + buffer += read; + length -= read; + logical++; + } + + while (length) { + physical = ext2_get_block_addr(volume, inode, logical); + ext2_read_block(volume, physical); + + if (length < blocksize) { + memcpy(buffer, volume->buffer, length); + read += length; + return read; + } + memcpy(buffer, volume->buffer, blocksize); + + buffer += blocksize; + length -= blocksize; + read += blocksize; + logical++; + } + + return read; +} + +off_t ext2_dir_entry(ext2_VOLUME *volume, struct ext2_inode *inode, + off_t index, struct ext2_dir_entry_2 *entry) +{ + int ret; + + ret = ext2_read_data(volume, inode, index, + (char*)entry, sizeof(*entry)); + if (ret == -1) + return -1; + + entry->inode = __le32_to_cpu(entry->inode); + entry->rec_len = __le16_to_cpu(entry->rec_len); + return index + entry->rec_len; +} + +unsigned int ext2_seek_name(ext2_VOLUME *volume, const char *name) +{ + struct ext2_inode inode; + int ret; + unsigned int ino; + off_t index; + struct ext2_dir_entry_2 entry; + + ino = EXT2_ROOT_INO; + while(1) { + while (*name == '\\') + name++; + if (!*name) + break; + ret = ext2_get_inode(volume, ino, &inode); + if (ret == -1) + return 0; + index = 0; + while (1) { + index = ext2_dir_entry(volume, &inode, index, &entry); + if (index == -1) + return 0; + ret = strncmp(name, entry.name, entry.name_len); + if (ret == 0 && + (name[entry.name_len] == 0 || + name[entry.name_len] == '\\')) { + ino = entry.inode; + break; + } + } + name += entry.name_len; + } + + return ino; +} Added: trunk/openbios-devel/fs/ext2/ext2_utils.h =================================================================== --- trunk/openbios-devel/fs/ext2/ext2_utils.h (rev 0) +++ trunk/openbios-devel/fs/ext2/ext2_utils.h 2009-11-22 09:47:08 UTC (rev 627) @@ -0,0 +1,53 @@ +/* + * + * (c) 2008-2009 Laurent Vivier <Laurent(a)lvivier.info> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#ifndef __EXT2_UTILS_H__ +#define __EXT2_UTILS_H__ + +#include "ext2_fs.h" +#include "ext2.h" + +/* from linux/stat.h */ + +#define S_IFMT 00170000 +#define S_IFSOCK 0140000 +#define S_IFLNK 0120000 +#define S_IFREG 0100000 +#define S_IFBLK 0060000 +#define S_IFDIR 0040000 +#define S_IFCHR 0020000 +#define S_IFIFO 0010000 +#define S_ISUID 0004000 +#define S_ISGID 0002000 +#define S_ISVTX 0001000 + +#define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK) +#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) +#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) +#define S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR) +#define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK) +#define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO) +#define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK) + +/* utilities */ + +extern void ext2_get_super(int fd, struct ext2_super_block *super); +extern void ext2_read_block(ext2_VOLUME* volume, unsigned int fsblock); +extern void ext2_get_group_desc(ext2_VOLUME* volume, + int group_id, struct ext2_group_desc *gdp); +extern int ext2_get_inode(ext2_VOLUME* volume, + unsigned int ino, struct ext2_inode *inode); +extern unsigned int ext2_get_block_addr(ext2_VOLUME* volume, + struct ext2_inode *inode, + unsigned int logical); +extern int ext2_read_data(ext2_VOLUME* volume, struct ext2_inode *inode, + off_t offset, char *buffer, size_t length); +extern off_t ext2_dir_entry(ext2_VOLUME *volume, struct ext2_inode *inode, + off_t offset, struct ext2_dir_entry_2 *entry); +extern unsigned int ext2_seek_name(ext2_VOLUME *volume, const char *name); +#endif /* __EXT2_UTILS_H__ */ Added: trunk/openbios-devel/fs/ext2/libext2.h =================================================================== --- trunk/openbios-devel/fs/ext2/libext2.h (rev 0) +++ trunk/openbios-devel/fs/ext2/libext2.h 2009-11-22 09:47:08 UTC (rev 627) @@ -0,0 +1,25 @@ +/* + * + * (c) 2008-2009 Laurent Vivier <Laurent(a)lvivier.info> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#ifndef __LIBEXT2_H__ +#define __LIBEXT2_H__ + +#include "openbios/config.h" +#include "ext2.h" + +extern ext2_VOLUME* ext2_mount(int fd); +extern int ext2_umount(ext2_VOLUME *volume); +extern ext2_DIR* ext2_opendir(ext2_VOLUME *, const char *name); +extern struct ext2_dir_entry_2* ext2_readdir(ext2_DIR* dir); +extern void ext2_closedir(ext2_DIR *dir); +extern ext2_FILE* ext2_open(ext2_VOLUME *, const char* pathname); +extern size_t ext2_read(ext2_FILE *file, void *buf, size_t count); +extern void ext2_close(ext2_FILE *file); +extern int ext2_lseek(ext2_FILE *file, long offset, int whence); + +#endif /* __LIBEXT2_H__ */ Modified: trunk/openbios-devel/include/openbios/fs.h =================================================================== --- trunk/openbios-devel/include/openbios/fs.h 2009-11-22 09:26:50 UTC (rev 626) +++ trunk/openbios-devel/include/openbios/fs.h 2009-11-22 09:47:08 UTC (rev 627) @@ -68,6 +68,12 @@ static inline int fs_iso9660_open( int fd, fs_ops_t *fs ) { return -1; } #endif +#ifdef CONFIG_EXT2 +extern int fs_ext2_open( int fd, fs_ops_t *fs ); +#else +static inline int fs_ext2_open( int fd, fs_ops_t *fs ) { return -1; } +#endif + #ifdef CONFIG_GRUBFS extern int fs_grubfs_open( int fd, fs_ops_t *fs ); #else Modified: trunk/openbios-devel/modules/filesystems.c =================================================================== --- trunk/openbios-devel/modules/filesystems.c 2009-11-22 09:26:50 UTC (rev 626) +++ trunk/openbios-devel/modules/filesystems.c 2009-11-22 09:47:08 UTC (rev 627) @@ -48,6 +48,7 @@ err=fs_hfsp_open(fd, fs); if( err ) err = fs_hfs_open(fd, fs); if( err ) err = fs_iso9660_open(fd, fs); + if( err ) err = fs_ext2_open(fd, fs); if( err ) err = fs_grubfs_open(fd, fs); }

1 0

r626 - in trunk/openbios-devel: config/examples config/scripts fs fs/iso9660 include/openbios modules
by svn＠openbios.org 22 Nov '09

22 Nov '09

Author: laurent Date: 2009-11-22 10:26:50 +0100 (Sun, 22 Nov 2009) New Revision: 626 Added: trunk/openbios-devel/fs/iso9660/ trunk/openbios-devel/fs/iso9660/build.xml trunk/openbios-devel/fs/iso9660/iso9660.h trunk/openbios-devel/fs/iso9660/iso9660_close.c trunk/openbios-devel/fs/iso9660/iso9660_closedir.c trunk/openbios-devel/fs/iso9660/iso9660_fs.c trunk/openbios-devel/fs/iso9660/iso9660_fs.h trunk/openbios-devel/fs/iso9660/iso9660_lseek.c trunk/openbios-devel/fs/iso9660/iso9660_mount.c trunk/openbios-devel/fs/iso9660/iso9660_open.c trunk/openbios-devel/fs/iso9660/iso9660_opendir.c trunk/openbios-devel/fs/iso9660/iso9660_read.c trunk/openbios-devel/fs/iso9660/iso9660_readdir.c trunk/openbios-devel/fs/iso9660/libiso9660.h Modified: trunk/openbios-devel/config/examples/cross-ppc_config.xml trunk/openbios-devel/config/examples/ppc_config.xml trunk/openbios-devel/config/scripts/switch-arch trunk/openbios-devel/fs/build.xml trunk/openbios-devel/include/openbios/fs.h trunk/openbios-devel/modules/filesystems.c Log: Add a cleaner implementation of ISO9660. Enable it for powerpc and cross-powerpc Signed-off-by: Laurent Vivier <Laurent(a)vivier.Eu> Modified: trunk/openbios-devel/config/examples/cross-ppc_config.xml =================================================================== --- trunk/openbios-devel/config/examples/cross-ppc_config.xml 2009-11-22 09:04:27 UTC (rev 625) +++ trunk/openbios-devel/config/examples/cross-ppc_config.xml 2009-11-22 09:26:50 UTC (rev 626) @@ -50,6 +50,7 @@ <option name="CONFIG_FS" type="boolean" value="true"/> <option name="CONFIG_HFS" type="boolean" value="true"/> <option name="CONFIG_HFSP" type="boolean" value="true"/> + <option name="CONFIG_ISO9660" type="boolean" value="true"/> <option name="CONFIG_GRUBFS" type="boolean" value="true"/> <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="true"/> <option name="CONFIG_FSYS_FAT" type="boolean" value="false"/> @@ -58,7 +59,7 @@ <option name="CONFIG_FSYS_REISERFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_XFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_UFS" type="boolean" value="false"/> - <option name="CONFIG_FSYS_ISO9660" type="boolean" value="true"/> + <option name="CONFIG_FSYS_ISO9660" type="boolean" value="false"/> <option name="CONFIG_FSYS_FFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_VSTAFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_NTFS" type="boolean" value="false"/> Modified: trunk/openbios-devel/config/examples/ppc_config.xml =================================================================== --- trunk/openbios-devel/config/examples/ppc_config.xml 2009-11-22 09:04:27 UTC (rev 625) +++ trunk/openbios-devel/config/examples/ppc_config.xml 2009-11-22 09:26:50 UTC (rev 626) @@ -51,6 +51,7 @@ <option name="CONFIG_FS" type="boolean" value="true"/> <option name="CONFIG_HFS" type="boolean" value="true"/> <option name="CONFIG_HFSP" type="boolean" value="true"/> + <option name="CONFIG_ISO9660" type="boolean" value="true"/> <option name="CONFIG_GRUBFS" type="boolean" value="true"/> <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="true"/> <option name="CONFIG_FSYS_FAT" type="boolean" value="false"/> @@ -59,7 +60,7 @@ <option name="CONFIG_FSYS_REISERFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_XFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_UFS" type="boolean" value="false"/> - <option name="CONFIG_FSYS_ISO9660" type="boolean" value="true"/> + <option name="CONFIG_FSYS_ISO9660" type="boolean" value="false"/> <option name="CONFIG_FSYS_FFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_VSTAFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_NTFS" type="boolean" value="false"/> Modified: trunk/openbios-devel/config/scripts/switch-arch =================================================================== --- trunk/openbios-devel/config/scripts/switch-arch 2009-11-22 09:04:27 UTC (rev 625) +++ trunk/openbios-devel/config/scripts/switch-arch 2009-11-22 09:26:50 UTC (rev 626) @@ -166,6 +166,7 @@ mkdir -p $OBJDIR/target/fs/grubfs mkdir -p $OBJDIR/target/fs/hfs mkdir -p $OBJDIR/target/fs/hfsplus + mkdir -p $OBJDIR/target/fs/iso9660 mkdir -p $OBJDIR/target/drivers mkdir -p $OBJDIR/target/libc mkdir -p $OBJDIR/host/include Modified: trunk/openbios-devel/fs/build.xml =================================================================== --- trunk/openbios-devel/fs/build.xml 2009-11-22 09:04:27 UTC (rev 625) +++ trunk/openbios-devel/fs/build.xml 2009-11-22 09:26:50 UTC (rev 626) @@ -8,5 +8,6 @@ <include href="grubfs/build.xml"/> <include href="hfs/build.xml"/> <include href="hfsplus/build.xml"/> + <include href="iso9660/build.xml"/> </build> Added: trunk/openbios-devel/fs/iso9660/build.xml =================================================================== --- trunk/openbios-devel/fs/iso9660/build.xml (rev 0) +++ trunk/openbios-devel/fs/iso9660/build.xml 2009-11-22 09:26:50 UTC (rev 626) @@ -0,0 +1,13 @@ +<build> + <library name="fs" type="static" target="target"> + <object source="iso9660_fs.c" condition="ISO9660"/> + <object source="iso9660_close.c" condition="ISO9660"/> + <object source="iso9660_closedir.c" condition="ISO9660"/> + <object source="iso9660_lseek.c" condition="ISO9660"/> + <object source="iso9660_mount.c" condition="ISO9660"/> + <object source="iso9660_open.c" condition="ISO9660"/> + <object source="iso9660_opendir.c" condition="ISO9660"/> + <object source="iso9660_read.c" condition="ISO9660"/> + <object source="iso9660_readdir.c" condition="ISO9660"/> + </library> +</build> Added: trunk/openbios-devel/fs/iso9660/iso9660.h =================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660.h (rev 0) +++ trunk/openbios-devel/fs/iso9660/iso9660.h 2009-11-22 09:26:50 UTC (rev 626) @@ -0,0 +1,58 @@ +/* + * + * (c) 2005-2009 Laurent Vivier <Laurent(a)vivier.eu> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#ifndef __ISO9660_H__ +#define __ISO9660_H__ + +#include "iso9660_fs.h" + +typedef struct iso9660_VOLUME { + int ucs_level; + struct iso_primary_descriptor *descriptor; + int fd; +} iso9660_VOLUME; + +typedef struct iso9660_DIR { + iso9660_VOLUME *volume; + int extent; + int len; + int index; + unsigned char buffer[ISOFS_BLOCK_SIZE]; +} iso9660_DIR; + +typedef struct iso9660_FILE { + iso9660_VOLUME *volume; + char *path; + int base; /* first extent of the file */ + int size; /* size of the file */ + int offset; + int current; + unsigned char buffer[ISOFS_BLOCK_SIZE]; +} iso9660_FILE; + +static inline int isonum_721(char *p) +{ + return ((p[0] & 0xff) + | ((p[1] & 0xff) << 8)); +} + +static inline int isonum_723(char *p) +{ + return (isonum_721(p)); +} + +static inline int isonum_733(char *p) +{ + return ((p[0] & 0xff) | ((p[1] & 0xff) << 8) | + ((p[2] & 0xff) << 16) | ((p[3] & 0xff) << 24)); +} + +extern struct iso_directory_record *iso9660_get_root_node(iso9660_VOLUME* volume); +extern struct iso_directory_record* iso9660_get_node(iso9660_VOLUME *volume, struct iso_directory_record *dirnode, const char *path); + +#endif /* __ISO9660_H__ */ Added: trunk/openbios-devel/fs/iso9660/iso9660_close.c =================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_close.c (rev 0) +++ trunk/openbios-devel/fs/iso9660/iso9660_close.c 2009-11-22 09:26:50 UTC (rev 626) @@ -0,0 +1,15 @@ +/* + * + * (c) 2005-2009 Laurent Vivier <Laurent(a)vivier.eu> + * + * This file has been copied from EMILE bootloader, http://emile.sf.net + * + */ + +#include "libiso9660.h" + +void iso9660_close(iso9660_FILE *file) +{ + free(file->path); + free(file); +} Added: trunk/openbios-devel/fs/iso9660/iso9660_closedir.c =================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_closedir.c (rev 0) +++ trunk/openbios-devel/fs/iso9660/iso9660_closedir.c 2009-11-22 09:26:50 UTC (rev 626) @@ -0,0 +1,19 @@ +/* + * + * (c) 2005-2009 Laurent Vivier <Laurent(a)vivier.eu> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#include "libiso9660.h" + +int iso9660_closedir(iso9660_DIR *dir) +{ + if (dir == NULL) + return -1; + + free(dir); + + return 0; +} Added: trunk/openbios-devel/fs/iso9660/iso9660_fs.c =================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_fs.c (rev 0) +++ trunk/openbios-devel/fs/iso9660/iso9660_fs.c 2009-11-22 09:26:50 UTC (rev 626) @@ -0,0 +1,104 @@ +/* + * + * (c) 2009 Laurent Vivier <Laurent(a)vivier.eu> + * + */ + +#include "libiso9660.h" +#include "openbios/fs.h" + +static void +umount( fs_ops_t *fs ) +{ + iso9660_VOLUME *volume = (iso9660_VOLUME *)fs->fs_data; + + iso9660_umount( volume ); +} + +static file_desc_t * +open_path( fs_ops_t *fs, const char *path ) +{ + iso9660_VOLUME *volume = (iso9660_VOLUME *)fs->fs_data; + iso9660_FILE *file; + + file = iso9660_open(volume, path); + + return (file_desc_t *)file; +} + +static char * +get_path( file_desc_t *fd, char *buf, int size ) +{ + iso9660_FILE *file = (iso9660_FILE*)fd; + + strncpy(buf, file->path, size); + + return buf; +} + +static int +file_lseek( file_desc_t *fd, off_t offs, int whence ) +{ + iso9660_FILE *file = (iso9660_FILE*)fd; + + return iso9660_lseek(file, offs, whence); +} + +static void +file_close( file_desc_t *fd ) +{ + iso9660_FILE *file = (iso9660_FILE*)fd; + + iso9660_close(file); +} + +static int +file_read( file_desc_t *fd, void *buf, size_t count ) +{ + iso9660_FILE *file = (iso9660_FILE*)fd; + + return iso9660_read(file, buf, count); +} + +static char * +vol_name( fs_ops_t *fs, char *buf, int size ) +{ + iso9660_VOLUME *volume = (iso9660_VOLUME *)fs->fs_data; + + strncpy(buf, volume->descriptor->volume_id, size); + + return buf; +} + +static const char * +get_fstype( fs_ops_t *fs ) +{ + return "ISO9660"; +} + +static const fs_ops_t iso9660_ops = { + .close_fs = umount, + + .open_path = open_path, + .get_path = get_path, + .close = file_close, + .read = file_read, + .lseek = file_lseek, + + .vol_name = vol_name, + .get_fstype = get_fstype, +}; + +int fs_iso9660_open(int fd, fs_ops_t *fs) +{ + iso9660_VOLUME *volume; + + volume = iso9660_mount(fd); + if (volume == NULL) + return -1; + + *fs = iso9660_ops; + fs->fs_data = volume; + + return 0; +} Added: trunk/openbios-devel/fs/iso9660/iso9660_fs.h =================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_fs.h (rev 0) +++ trunk/openbios-devel/fs/iso9660/iso9660_fs.h 2009-11-22 09:26:50 UTC (rev 626) @@ -0,0 +1,161 @@ +#ifndef _ISO9660_FS_H +#define _ISO9660_FS_H + +/* this file has been copied from linux 2.6.26 */ + +/* + * The isofs filesystem constants/structures + */ + +/* This part borrowed from the bsd386 isofs */ +#define ISODCL(from, to) (to - from + 1) + +struct iso_volume_descriptor { + char type[ISODCL(1,1)]; /* 711 */ + char id[ISODCL(2,6)]; + char version[ISODCL(7,7)]; + char data[ISODCL(8,2048)]; +}; + +/* volume descriptor types */ +#define ISO_VD_PRIMARY 1 +#define ISO_VD_SUPPLEMENTARY 2 +#define ISO_VD_END 255 + +#define ISO_STANDARD_ID "CD001" + +struct iso_primary_descriptor { + char type [ISODCL ( 1, 1)]; /* 711 */ + char id [ISODCL ( 2, 6)]; + char version [ISODCL ( 7, 7)]; /* 711 */ + char unused1 [ISODCL ( 8, 8)]; + char system_id [ISODCL ( 9, 40)]; /* achars */ + char volume_id [ISODCL ( 41, 72)]; /* dchars */ + char unused2 [ISODCL ( 73, 80)]; + char volume_space_size [ISODCL ( 81, 88)]; /* 733 */ + char unused3 [ISODCL ( 89, 120)]; + char volume_set_size [ISODCL (121, 124)]; /* 723 */ + char volume_sequence_number [ISODCL (125, 128)]; /* 723 */ + char logical_block_size [ISODCL (129, 132)]; /* 723 */ + char path_table_size [ISODCL (133, 140)]; /* 733 */ + char type_l_path_table [ISODCL (141, 144)]; /* 731 */ + char opt_type_l_path_table [ISODCL (145, 148)]; /* 731 */ + char type_m_path_table [ISODCL (149, 152)]; /* 732 */ + char opt_type_m_path_table [ISODCL (153, 156)]; /* 732 */ + char root_directory_record [ISODCL (157, 190)]; /* 9.1 */ + char volume_set_id [ISODCL (191, 318)]; /* dchars */ + char publisher_id [ISODCL (319, 446)]; /* achars */ + char preparer_id [ISODCL (447, 574)]; /* achars */ + char application_id [ISODCL (575, 702)]; /* achars */ + char copyright_file_id [ISODCL (703, 739)]; /* 7.5 dchars */ + char abstract_file_id [ISODCL (740, 776)]; /* 7.5 dchars */ + char bibliographic_file_id [ISODCL (777, 813)]; /* 7.5 dchars */ + char creation_date [ISODCL (814, 830)]; /* 8.4.26.1 */ + char modification_date [ISODCL (831, 847)]; /* 8.4.26.1 */ + char expiration_date [ISODCL (848, 864)]; /* 8.4.26.1 */ + char effective_date [ISODCL (865, 881)]; /* 8.4.26.1 */ + char file_structure_version [ISODCL (882, 882)]; /* 711 */ + char unused4 [ISODCL (883, 883)]; + char application_data [ISODCL (884, 1395)]; + char unused5 [ISODCL (1396, 2048)]; +}; + +/* Almost the same as the primary descriptor but two fields are specified */ +struct iso_supplementary_descriptor { + char type [ISODCL ( 1, 1)]; /* 711 */ + char id [ISODCL ( 2, 6)]; + char version [ISODCL ( 7, 7)]; /* 711 */ + char flags [ISODCL ( 8, 8)]; /* 853 */ + char system_id [ISODCL ( 9, 40)]; /* achars */ + char volume_id [ISODCL ( 41, 72)]; /* dchars */ + char unused2 [ISODCL ( 73, 80)]; + char volume_space_size [ISODCL ( 81, 88)]; /* 733 */ + char escape [ISODCL ( 89, 120)]; /* 856 */ + char volume_set_size [ISODCL (121, 124)]; /* 723 */ + char volume_sequence_number [ISODCL (125, 128)]; /* 723 */ + char logical_block_size [ISODCL (129, 132)]; /* 723 */ + char path_table_size [ISODCL (133, 140)]; /* 733 */ + char type_l_path_table [ISODCL (141, 144)]; /* 731 */ + char opt_type_l_path_table [ISODCL (145, 148)]; /* 731 */ + char type_m_path_table [ISODCL (149, 152)]; /* 732 */ + char opt_type_m_path_table [ISODCL (153, 156)]; /* 732 */ + char root_directory_record [ISODCL (157, 190)]; /* 9.1 */ + char volume_set_id [ISODCL (191, 318)]; /* dchars */ + char publisher_id [ISODCL (319, 446)]; /* achars */ + char preparer_id [ISODCL (447, 574)]; /* achars */ + char application_id [ISODCL (575, 702)]; /* achars */ + char copyright_file_id [ISODCL (703, 739)]; /* 7.5 dchars */ + char abstract_file_id [ISODCL (740, 776)]; /* 7.5 dchars */ + char bibliographic_file_id [ISODCL (777, 813)]; /* 7.5 dchars */ + char creation_date [ISODCL (814, 830)]; /* 8.4.26.1 */ + char modification_date [ISODCL (831, 847)]; /* 8.4.26.1 */ + char expiration_date [ISODCL (848, 864)]; /* 8.4.26.1 */ + char effective_date [ISODCL (865, 881)]; /* 8.4.26.1 */ + char file_structure_version [ISODCL (882, 882)]; /* 711 */ + char unused4 [ISODCL (883, 883)]; + char application_data [ISODCL (884, 1395)]; + char unused5 [ISODCL (1396, 2048)]; +}; + + +#define HS_STANDARD_ID "CDROM" + +struct hs_volume_descriptor { + char foo [ISODCL ( 1, 8)]; /* 733 */ + char type [ISODCL ( 9, 9)]; /* 711 */ + char id [ISODCL ( 10, 14)]; + char version [ISODCL ( 15, 15)]; /* 711 */ + char data[ISODCL(16,2048)]; +}; + + +struct hs_primary_descriptor { + char foo [ISODCL ( 1, 8)]; /* 733 */ + char type [ISODCL ( 9, 9)]; /* 711 */ + char id [ISODCL ( 10, 14)]; + char version [ISODCL ( 15, 15)]; /* 711 */ + char unused1 [ISODCL ( 16, 16)]; /* 711 */ + char system_id [ISODCL ( 17, 48)]; /* achars */ + char volume_id [ISODCL ( 49, 80)]; /* dchars */ + char unused2 [ISODCL ( 81, 88)]; /* 733 */ + char volume_space_size [ISODCL ( 89, 96)]; /* 733 */ + char unused3 [ISODCL ( 97, 128)]; /* 733 */ + char volume_set_size [ISODCL (129, 132)]; /* 723 */ + char volume_sequence_number [ISODCL (133, 136)]; /* 723 */ + char logical_block_size [ISODCL (137, 140)]; /* 723 */ + char path_table_size [ISODCL (141, 148)]; /* 733 */ + char type_l_path_table [ISODCL (149, 152)]; /* 731 */ + char unused4 [ISODCL (153, 180)]; /* 733 */ + char root_directory_record [ISODCL (181, 214)]; /* 9.1 */ +}; + +/* We use this to help us look up the parent inode numbers. */ + +struct iso_path_table{ + unsigned char name_len[2]; /* 721 */ + char extent[4]; /* 731 */ + char parent[2]; /* 721 */ + char name[0]; +} __attribute__((packed)); + +/* high sierra is identical to iso, except that the date is only 6 bytes, and + there is an extra reserved byte after the flags */ + +struct iso_directory_record { + char length [ISODCL (1, 1)]; /* 711 */ + char ext_attr_length [ISODCL (2, 2)]; /* 711 */ + char extent [ISODCL (3, 10)]; /* 733 */ + char size [ISODCL (11, 18)]; /* 733 */ + char date [ISODCL (19, 25)]; /* 7 by 711 */ + char flags [ISODCL (26, 26)]; + char file_unit_size [ISODCL (27, 27)]; /* 711 */ + char interleave [ISODCL (28, 28)]; /* 711 */ + char volume_sequence_number [ISODCL (29, 32)]; /* 723 */ + unsigned char name_len [ISODCL (33, 33)]; /* 711 */ + char name [0]; +} __attribute__((packed)); + +#define ISOFS_BLOCK_BITS 11 +#define ISOFS_BLOCK_SIZE (1 << ISOFS_BLOCK_BITS) + +#endif /* _ISO9660_FS_H */ Added: trunk/openbios-devel/fs/iso9660/iso9660_lseek.c =================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_lseek.c (rev 0) +++ trunk/openbios-devel/fs/iso9660/iso9660_lseek.c 2009-11-22 09:26:50 UTC (rev 626) @@ -0,0 +1,37 @@ +/* + * + * (c) 2005-2009 Laurent Vivier <Laurent(a)vivier.eu> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#include "libiso9660.h" + +int iso9660_lseek(iso9660_FILE *_file, long offset, int whence) +{ + iso9660_FILE *file = (iso9660_FILE*)_file; + long new_offset; + + switch(whence) + { + case SEEK_SET: + new_offset = offset; + break; + case SEEK_CUR: + new_offset = file->offset + offset; + break; + case SEEK_END: + new_offset = file->size + offset; + break; + default: + return -1; + } + + if ( (new_offset < 0) || (new_offset > file->size) ) + return -1; + + file->offset = new_offset; + + return new_offset; +} Added: trunk/openbios-devel/fs/iso9660/iso9660_mount.c =================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_mount.c (rev 0) +++ trunk/openbios-devel/fs/iso9660/iso9660_mount.c 2009-11-22 09:26:50 UTC (rev 626) @@ -0,0 +1,195 @@ +/* + * + * (c) 2005-2009 Laurent Vivier <Laurent(a)vivier.eu> + * + * This file has been copied from EMILE, http://emile.sf.net + * + * some parts from mkisofs (c) J. Schilling + * + */ + +#include "libiso9660.h" +#include "openbios/bindings.h" +#include "libc/diskio.h" + +void iso9660_name(iso9660_VOLUME *volume, struct iso_directory_record *idr, char *buffer) +{ + int j; + unsigned char uh, ul, uc; + + buffer[0] = 0; + if (idr->name_len[0] == 1 && idr->name[0] == 0) + strcpy(buffer, "."); + else if (idr->name_len[0] == 1 && idr->name[0] == 1) + strcpy(buffer, ".."); + else { + switch (volume->ucs_level) { + case 3: + case 2: + case 1: + /* + * Unicode name. + */ + + for (j = 0; j < (int)idr->name_len[0] / 2; j++) { + uh = idr->name[j*2]; + ul = idr->name[j*2+1]; + + /* + * unicode convertion + * up = unls->unls_uni2cs[uh]; + * + * if (up == NULL) + * uc = '\0'; + * else + * uc = up[ul]; + * + * we use only low byte + */ + + uc = ul; + + buffer[j] = uc ? uc : '_'; + } + buffer[idr->name_len[0]/2] = '\0'; + break; + case 0: + /* + * Normal non-Unicode name. + */ + strncpy(buffer, idr->name, idr->name_len[0]); + buffer[idr->name_len[0]] = 0; + break; + default: + /* + * Don't know how to do these yet. Maybe they are the same + * as one of the above. + */ + break; + } + } +} + +iso9660_VOLUME *iso9660_mount(int fd) +{ + iso9660_VOLUME* volume; + struct iso_primary_descriptor *jpd; + struct iso_primary_descriptor ipd; + int block; + int ucs_level = 0; + + /* read filesystem descriptor */ + + seek_io(fd, 16 * ISOFS_BLOCK_SIZE); + read_io(fd, &ipd, sizeof (ipd)); + + /* + * High sierra: + * + * DESC TYPE == 1 (VD_SFS) offset 8 len 1 + * STR ID == "CDROM" offset 9 len 5 + * STD_VER == 1 offset 14 len 1 + */ + + /* High Sierra format ? */ + + if ((((char *)&ipd)[8] == 1) && + (strncmp(&((char *)&ipd)[9], "CDROM", 5) == 0) && + (((char *)&ipd)[14] == 1)) { + printk("Incompatible format: High Sierra format\n"); + return NULL; + } + + /* + * ISO 9660: + * + * DESC TYPE == 1 (VD_PVD) offset 0 len 1 + * STR ID == "CD001" offset 1 len 5 + * STD_VER == 1 offset 6 len 1 + */ + + /* NOT ISO 9660 format ? */ + + if ((ipd.type[0] != ISO_VD_PRIMARY) || + (strncmp(ipd.id, ISO_STANDARD_ID, sizeof (ipd.id)) != 0) || + (ipd.version[0] != 1)) { + return NULL; + } + + /* UCS info */ + + block = 16; + + jpd = (struct iso_primary_descriptor *) + malloc(sizeof(struct iso_primary_descriptor)); + if (jpd == NULL) + return NULL; + + memcpy(jpd, &ipd, sizeof (ipd)); + while ((uint8_t)jpd->type[0] != ISO_VD_END) { + + /* + * If Joliet UCS escape sequence found, we may be wrong + */ + + if (jpd->unused3[0] == '%' && + jpd->unused3[1] == '/' && + (jpd->unused3[3] == '\0' || + jpd->unused3[3] == ' ') && + (jpd->unused3[2] == '@' || + jpd->unused3[2] == 'C' || + jpd->unused3[2] == 'E')) { + + if (jpd->version[0] != 1) + break; + } + + block++; + seek_io(fd, block * ISOFS_BLOCK_SIZE); + read_io(fd, jpd, sizeof (*jpd)); + } + + ucs_level = 0; + if (((unsigned char) jpd->type[0] == ISO_VD_END)) { + memcpy(jpd, &ipd, sizeof (ipd)); + } else { + switch (jpd->unused3[2]) { + case '@': + ucs_level = 1; + break; + case 'C': + ucs_level = 2; + break; + case 'E': + ucs_level = 3; + break; + } + + if (ucs_level && jpd->unused3[3] == ' ') + printk("Warning: Joliet escape sequence uses illegal space at offset 3\n"); + } + + volume = (iso9660_VOLUME*)malloc(sizeof(iso9660_VOLUME)); + if (volume == NULL) + return NULL; + + volume->descriptor = jpd; + volume->ucs_level = ucs_level; + volume->fd = fd; + + return volume; +} + +int iso9660_umount(iso9660_VOLUME* volume) +{ + if (volume == NULL) + return -1; + free(volume->descriptor); + free(volume); + return 0; +} + +struct iso_directory_record *iso9660_get_root_node(iso9660_VOLUME* volume) +{ + return (struct iso_directory_record *)volume->descriptor->root_directory_record; +} Added: trunk/openbios-devel/fs/iso9660/iso9660_open.c =================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_open.c (rev 0) +++ trunk/openbios-devel/fs/iso9660/iso9660_open.c 2009-11-22 09:26:50 UTC (rev 626) @@ -0,0 +1,39 @@ +/* + * + * (c) 2005-2009 Laurent Vivier <Laurent(a)vivier.eu> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#include "libiso9660.h" + +iso9660_FILE* iso9660_open(iso9660_VOLUME *volume, const char* pathname) +{ + struct iso_directory_record *root; + struct iso_directory_record *idr; + iso9660_FILE *file; + + root = iso9660_get_root_node(volume); + if (root == NULL) + return NULL; + + idr = iso9660_get_node(volume, root, pathname); + if (idr == NULL) + return NULL; + + file = (iso9660_FILE*)malloc(sizeof(iso9660_FILE)); + if (file == NULL) + return NULL; + + file->base = isonum_733((char *)idr->extent); + file->size = isonum_733((char *)idr->size); + file->offset = 0; + file->current = -1; + file->volume = volume; + file->path = strdup(pathname); + + free(idr); + + return file; +} Added: trunk/openbios-devel/fs/iso9660/iso9660_opendir.c =================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_opendir.c (rev 0) +++ trunk/openbios-devel/fs/iso9660/iso9660_opendir.c 2009-11-22 09:26:50 UTC (rev 626) @@ -0,0 +1,133 @@ +/* + * + * (c) 2005-2009 Laurent Vivier <Laurent(a)vivier.eu> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#include "libiso9660.h" + +static inline int iso9660_is_directory(struct iso_directory_record * idr) +{ + return ((idr->flags[0] & 2) != 0); +} + +static iso9660_DIR* iso9660_opendir_node(iso9660_VOLUME *volume, struct iso_directory_record *node) +{ + iso9660_DIR *dir; + + dir = (iso9660_DIR*)malloc(sizeof(iso9660_DIR)); + if (dir == NULL) + return NULL; + + dir->extent = isonum_733((char *)node->extent); + dir->len = isonum_733((char *)node->size); + dir->index = sizeof (dir->buffer); + dir->volume = volume; + + return dir; +} + +static struct iso_directory_record* idr_new(struct iso_directory_record* idr) +{ + struct iso_directory_record* result; + int size = sizeof(*idr) + (int)idr->name_len[0]; + + result = (struct iso_directory_record*)malloc(size); + memcpy(result, idr, size); + + return result; +} + +static struct iso_directory_record * seek_name(iso9660_VOLUME *volume, + struct iso_directory_record *idr, + char *name) +{ + struct iso_directory_record *result; + char name_buf[256]; + iso9660_DIR *dir; + + dir = iso9660_opendir_node(volume, idr); + if (dir == NULL) + return NULL; + + while ((idr = iso9660_readdir(dir)) != NULL) + { + iso9660_name(volume, idr, name_buf); + if (strcmp(name, name_buf) == 0) + { + result = idr_new(idr); + iso9660_closedir(dir); + return result; + } + } + iso9660_closedir(dir); + return NULL; +} + +struct iso_directory_record* iso9660_get_node( + iso9660_VOLUME *volume, + struct iso_directory_record *dirnode, + const char *path) +{ + struct iso_directory_record* result; + struct iso_directory_record* current; + char name[256]; + int i; + + current = idr_new(dirnode); + while(1) + { + /* ignore head '\' */ + + while (*path && *path == '\\') + path++; + + if (*path == 0) + break; + + /* extract first path component */ + + i = 0; + while (*path && *path != '\\') + name[i++] = *path++; + name[i] = 0; + + /* seek first component in current directory */ + + result = seek_name(volume, current, name); + if (result == NULL) + return NULL; + + free(current); + current = result; + } + return current; +} + +iso9660_DIR* iso9660_opendir(iso9660_VOLUME *volume, const char *name) +{ + iso9660_DIR *dir; + struct iso_directory_record *node; + + node = iso9660_get_root_node((iso9660_VOLUME*)volume); + if (node == NULL) + return NULL; + + node = iso9660_get_node((iso9660_VOLUME*)volume, node, name); + if (node == NULL) + return NULL; + if (!iso9660_is_directory(node)) { + free(node); + return NULL; + } + + dir = iso9660_opendir_node((iso9660_VOLUME*)volume, node); + + free(node); + + dir->volume = (iso9660_VOLUME*)volume; + + return dir; +} Added: trunk/openbios-devel/fs/iso9660/iso9660_read.c =================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_read.c (rev 0) +++ trunk/openbios-devel/fs/iso9660/iso9660_read.c 2009-11-22 09:26:50 UTC (rev 626) @@ -0,0 +1,74 @@ +/* + * + * (c) 2005-2009 Laurent Vivier <Laurent(a)vivier.eu> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#include "libiso9660.h" +#include "openbios/bindings.h" +#include "libc/diskio.h" + +size_t iso9660_read(iso9660_FILE *_file, char *buf, size_t count) +{ + iso9660_FILE *file = (iso9660_FILE*)_file; + size_t read = 0; + + if ( count > (file->size - file->offset) ) + count = file->size - file->offset; + + while (count > 0) + { + size_t part; + int offset_extent; + int offset_index; + + offset_extent = file->base + + (file->offset / ISOFS_BLOCK_SIZE); + offset_index = file->offset % ISOFS_BLOCK_SIZE; + + if (file->current != offset_extent) + { + if ( (offset_index == 0) && + (count >= ISOFS_BLOCK_SIZE) ) + { + /* direct i/o */ + + int extents_nb; + + extents_nb = count / ISOFS_BLOCK_SIZE; + + part = extents_nb * ISOFS_BLOCK_SIZE; + + seek_io(file->volume->fd, + offset_extent * ISOFS_BLOCK_SIZE); + read_io(file->volume->fd, buf + read, part); + + file->offset += part; + count -= part; + read += part; + + continue; + } + + file->current = offset_extent; + seek_io(file->volume->fd, + offset_extent * ISOFS_BLOCK_SIZE); + read_io(file->volume->fd, file->buffer, + ISOFS_BLOCK_SIZE); + } + + part = ISOFS_BLOCK_SIZE - offset_index; + if (count < part) + part = count; + + memcpy(buf + read, file->buffer + offset_index, part); + + file->offset += part; + count -= part; + read += part; + } + + return read; +} Added: trunk/openbios-devel/fs/iso9660/iso9660_readdir.c =================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_readdir.c (rev 0) +++ trunk/openbios-devel/fs/iso9660/iso9660_readdir.c 2009-11-22 09:26:50 UTC (rev 626) @@ -0,0 +1,50 @@ +/* + * + * (c) 2005-2009 Laurent Vivier <Laurent(a)vivier.eu> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#include "libiso9660.h" +#include "openbios/bindings.h" +#include "libc/diskio.h" + +#define offsetof(t,m) ((long)&(((t *)0)->m)) + +static void read_extent(iso9660_DIR *dir) +{ + seek_io(dir->volume->fd, dir->extent * ISOFS_BLOCK_SIZE); + read_io(dir->volume->fd, dir->buffer, ISOFS_BLOCK_SIZE); + + dir->len -= ISOFS_BLOCK_SIZE; + dir->extent ++; + dir->index = 0; +} + +struct iso_directory_record *iso9660_readdir(iso9660_DIR *dir) +{ + struct iso_directory_record *idr; + + if (dir->index > + ISOFS_BLOCK_SIZE - offsetof(struct iso_directory_record, name[0])) + { + if (dir->len <= 0) + return NULL; + + read_extent(dir); + } + + idr = (struct iso_directory_record *) &dir->buffer[dir->index]; + if (idr->length[0] == 0) { + if (dir->len <= 0) + return NULL; + + read_extent(dir); + idr = (struct iso_directory_record *) &dir->buffer[dir->index]; + } + + dir->index += dir->buffer[dir->index]; + + return idr; +} Added: trunk/openbios-devel/fs/iso9660/libiso9660.h =================================================================== --- trunk/openbios-devel/fs/iso9660/libiso9660.h (rev 0) +++ trunk/openbios-devel/fs/iso9660/libiso9660.h 2009-11-22 09:26:50 UTC (rev 626) @@ -0,0 +1,26 @@ +/* + * + * (c) 2005-2009 Laurent Vivier <Laurent(a)vivier.eu> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#ifndef __LIBISO9660_H__ +#define __LIBISO9660_H__ + +#include "openbios/config.h" +#include "iso9660.h" + +extern iso9660_VOLUME* iso9660_mount(int fd); +extern int iso9660_umount(iso9660_VOLUME *volume); +extern iso9660_DIR* iso9660_opendir(iso9660_VOLUME *, const char *name); +extern iso9660_FILE* iso9660_open(iso9660_VOLUME *, const char *pathname); +extern int iso9660_closedir(iso9660_DIR *dir); +extern struct iso_directory_record *iso9660_readdir(iso9660_DIR *dir); +extern size_t iso9660_read(iso9660_FILE *file, char *buf, size_t count); +extern void iso9660_close(iso9660_FILE *file); +extern int iso9660_lseek(iso9660_FILE *file, long offset, int whence); +extern void iso9660_name(iso9660_VOLUME *volume, struct iso_directory_record * idr, char *buffer); + +#endif /* __LIBISO9660_H__ */ Modified: trunk/openbios-devel/include/openbios/fs.h =================================================================== --- trunk/openbios-devel/include/openbios/fs.h 2009-11-22 09:04:27 UTC (rev 625) +++ trunk/openbios-devel/include/openbios/fs.h 2009-11-22 09:26:50 UTC (rev 626) @@ -62,6 +62,12 @@ static inline int fs_hfs_open( int fd, fs_ops_t *fs ) { return -1; } #endif +#ifdef CONFIG_ISO9660 +extern int fs_iso9660_open( int fd, fs_ops_t *fs ); +#else +static inline int fs_iso9660_open( int fd, fs_ops_t *fs ) { return -1; } +#endif + #ifdef CONFIG_GRUBFS extern int fs_grubfs_open( int fd, fs_ops_t *fs ); #else Modified: trunk/openbios-devel/modules/filesystems.c =================================================================== --- trunk/openbios-devel/modules/filesystems.c 2009-11-22 09:04:27 UTC (rev 625) +++ trunk/openbios-devel/modules/filesystems.c 2009-11-22 09:26:50 UTC (rev 626) @@ -47,6 +47,7 @@ if( !err ) { err=fs_hfsp_open(fd, fs); if( err ) err = fs_hfs_open(fd, fs); + if( err ) err = fs_iso9660_open(fd, fs); if( err ) err = fs_grubfs_open(fd, fs); }

1 0

r625 - trunk/openbios-devel/forth/system
by svn＠openbios.org 22 Nov '09

22 Nov '09

Author: laurent Date: 2009-11-22 10:04:27 +0100 (Sun, 22 Nov 2009) New Revision: 625 Modified: trunk/openbios-devel/forth/system/ciface.fs Log: Revert commit r624 (breaks ppc and sparc64 boot) Modified: trunk/openbios-devel/forth/system/ciface.fs =================================================================== --- trunk/openbios-devel/forth/system/ciface.fs 2009-11-20 19:09:04 UTC (rev 624) +++ trunk/openbios-devel/forth/system/ciface.fs 2009-11-22 09:04:27 UTC (rev 625) @@ -189,12 +189,14 @@ : call-method ( ihandle method -- xxxx catch-result ) dup 0= if ." call of null method" -1 exit then + dup >r + dup cstrlen \ ." call-method " 2dup type cr - rot ?ihandle ['] $call-method catch if + rot ?ihandle ['] $call-method catch dup if \ not necessary an error but very useful for debugging... ." call-method " r@ dup cstrlen type ." : exception " dup . cr then - \ r> drop + r> drop ; @@ -210,16 +212,21 @@ close-dev ; -: read ( len addr ihandle -- actual ) - rot swap " read" call-method +: read ( ihandle addr len -- actual ) + rot dup ihandle>phandle " read" rot find-method + if swap call-package else 3drop -1 then ; -: write ( len addr ihandle -- actual ) - rot swap " write" call-method +: write ( ihandle addr len -- actual ) + rot dup ihandle>phandle " write" rot find-method + if swap call-package else 3drop -1 then ; -: seek ( pos_lo pos_hi ihandle -- status ) - " seek" call-method +: seek ( ihandle pos_hi pos_lo -- status ) + \ package methods uses ( pos_lo pos_hi -- status ) + swap + rot dup ihandle>phandle " seek" rot find-method + if swap call-package else 3drop -1 then ; @@ -254,7 +261,7 @@ : interpret ( xxx cmdstring -- ??? catch-reult ) dup cstrlen - \ ." INTERPRET: --- " 2dup type + \ ." INTERPRETE: --- " 2dup type ['] evaluate catch dup if \ this is not necessary an error... ." interpret: exception " dup . ." caught" cr

1 0

Re: [OpenBIOS] Sparc64 OpenBIOS
by Nick Couchman 20 Nov '09

20 Nov '09

>>> On 2009/11/17 at 10:37, Tarl Neustaedter <Tarl.Neustaedter(a)Sun.COM> wrote: > [...] >> Based on that output, it's hard for me to tell what about "open-package'" > failed >> > > Yup. What I spot: > > : mount-root ( Empty ) > 00000000ffe35d28: boot-dev$ ( ffe357a8 6 ) > 00000000ffe35d30: fs-pkg$ ( ffe357a8 6 ffe317c0 10 ) > 00000000ffe35d38: $open-package > : $open-package ( ffe357a8 6 ffe317c0 10 ) > > It looks like fs-pkg$ names the package it's opening. I'm guessing > that's hsfs-file-system, but you should probably verify that's what is > in that string (do a "2dup type" before calling $open-package). If > that's correct, then rather than descending into open-package, you > probably want to put a breakpoint at "open" in > /packages/hsfs-file-system, which is where that will end up after much > wandering around. Then proceed from there - you really don't want to > trace through instance creation. Okay, I was able to do a "2dup type" and verify that hsfs-file-system is the name of the file that it's trying to open. Again, forgive my ignorance (being new to this whole development process), but what's the best way to insert a breakpoint where you've suggested? Thanks! -Nick > > The reason you weren't able to see all that (which would have been > overwhelming) is a bit further down: > > 00000000ffe135f0: (lit) ( 1 ffe2fe38 ffe4b1d8 ffe4b548 ffe135e0 4 ffe4b558 > ffe13310 ) > 00000000ffe13600: catch ( 1 ffe2fe38 ffe4b1d8 ffe4b548 ffffffffffffffff 0 ) > > > That's basically a subroutine call to ffe13310, which it didn't show. -------- This e-mail may contain confidential and privileged material for the sole use of the intended recipient. If this email is not intended for you, or you are not responsible for the delivery of this message to the intended recipient, please note that this message may contain SEAKR Engineering (SEAKR) Privileged/Proprietary Information. In such a case, you are strictly prohibited from downloading, photocopying, distributing or otherwise using this message, its contents or attachments in any way. If you have received this message in error, please notify us immediately by replying to this e-mail and delete the message from your mailbox. Information contained in this message that does not relate to the business of SEAKR is neither endorsed by nor attributable to SEAKR.

7 45

r624 - trunk/openbios-devel/forth/system
by svn＠openbios.org 20 Nov '09

20 Nov '09

Author: stepan Date: 2009-11-20 20:09:04 +0100 (Fri, 20 Nov 2009) New Revision: 624 Modified: trunk/openbios-devel/forth/system/ciface.fs Log: In the IEEE 1275-1994 specification the parameters for Client Interface calls are not in forth stack order but in reversed (heh!) order. Our implementation confused this. This might / will need some more work, but get this in so more people can test easily. >From Mark Cave-Ayland and me. Modified: trunk/openbios-devel/forth/system/ciface.fs =================================================================== --- trunk/openbios-devel/forth/system/ciface.fs 2009-11-20 19:04:41 UTC (rev 623) +++ trunk/openbios-devel/forth/system/ciface.fs 2009-11-20 19:09:04 UTC (rev 624) @@ -189,14 +189,12 @@ : call-method ( ihandle method -- xxxx catch-result ) dup 0= if ." call of null method" -1 exit then - dup >r - dup cstrlen \ ." call-method " 2dup type cr - rot ?ihandle ['] $call-method catch dup if + rot ?ihandle ['] $call-method catch if \ not necessary an error but very useful for debugging... ." call-method " r@ dup cstrlen type ." : exception " dup . cr then - r> drop + \ r> drop ; @@ -212,21 +210,16 @@ close-dev ; -: read ( ihandle addr len -- actual ) - rot dup ihandle>phandle " read" rot find-method - if swap call-package else 3drop -1 then +: read ( len addr ihandle -- actual ) + rot swap " read" call-method ; -: write ( ihandle addr len -- actual ) - rot dup ihandle>phandle " write" rot find-method - if swap call-package else 3drop -1 then +: write ( len addr ihandle -- actual ) + rot swap " write" call-method ; -: seek ( ihandle pos_hi pos_lo -- status ) - \ package methods uses ( pos_lo pos_hi -- status ) - swap - rot dup ihandle>phandle " seek" rot find-method - if swap call-package else 3drop -1 then +: seek ( pos_lo pos_hi ihandle -- status ) + " seek" call-method ; @@ -261,7 +254,7 @@ : interpret ( xxx cmdstring -- ??? catch-reult ) dup cstrlen - \ ." INTERPRETE: --- " 2dup type + \ ." INTERPRET: --- " 2dup type ['] evaluate catch dup if \ this is not necessary an error... ." interpret: exception " dup . ." caught" cr

1 0

r623 - trunk/openbios-devel/kernel
by svn＠openbios.org 20 Nov '09

20 Nov '09

Author: stepan Date: 2009-11-20 20:04:41 +0100 (Fri, 20 Nov 2009) New Revision: 623 Modified: trunk/openbios-devel/kernel/bootstrap.c trunk/openbios-devel/kernel/dict.c Log: Another nice patch from Mark Cave-Ayland: This patch corrects a couple of (minor) bugs in the Forth source debugger; firstly the number of wordlists is held in #order, rather than #vocs which is the total number of wordlists which can be held simultaneously. Secondly, the initial interruptforth setting in kernel/bootstrap.c is actually wrong, but since this is reset by enterforth() it is not needed anyway. Hence this line can simply be removed. Modified: trunk/openbios-devel/kernel/bootstrap.c =================================================================== --- trunk/openbios-devel/kernel/bootstrap.c 2009-11-20 19:03:46 UTC (rev 622) +++ trunk/openbios-devel/kernel/bootstrap.c 2009-11-20 19:04:41 UTC (rev 623) @@ -909,7 +909,6 @@ if (verbose) printk("Jumping to dictionary..."); - interruptforth = 1; enterforth((xt_t)PC); } Modified: trunk/openbios-devel/kernel/dict.c =================================================================== --- trunk/openbios-devel/kernel/dict.c 2009-11-20 19:03:46 UTC (rev 622) +++ trunk/openbios-devel/kernel/dict.c 2009-11-20 19:04:41 UTC (rev 623) @@ -173,7 +173,7 @@ if (read_ucell(cell2pointer(usesvocab))) { /* Vocabularies are in use, so search each one in turn */ - ucell numvocabs = findword("#vocs") + sizeof(cell); + ucell numvocabs = findword("#order") + sizeof(cell); for (i = 0; i < read_ucell(cell2pointer(numvocabs)); i++) { ucell vocabs = findword("vocabularies") + 2 * sizeof(cell); @@ -228,7 +228,7 @@ if (read_ucell(cell2pointer(usesvocab))) { /* Vocabularies are in use, so search each one in turn */ - ucell numvocabs = findword("#vocs") + sizeof(cell); + ucell numvocabs = findword("#order") + sizeof(cell); for (i = 0; i < read_ucell(cell2pointer(numvocabs)); i++) { ucell vocabs = findword("vocabularies") + 2 * sizeof(cell);

1 0

r622 - in trunk/openbios-devel/kernel: . include
by svn＠openbios.org 20 Nov '09

20 Nov '09

Author: stepan Date: 2009-11-20 20:03:46 +0100 (Fri, 20 Nov 2009) New Revision: 622 Modified: trunk/openbios-devel/kernel/dict.c trunk/openbios-devel/kernel/include/dict.h Log: findsemis_wordlist is only used by findsemis() so let's remove it from the "API" Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/openbios-devel/kernel/dict.c =================================================================== --- trunk/openbios-devel/kernel/dict.c 2009-11-20 18:54:38 UTC (rev 621) +++ trunk/openbios-devel/kernel/dict.c 2009-11-20 19:03:46 UTC (rev 622) @@ -128,7 +128,7 @@ * from the NFA. */ -ucell findsemis_wordlist(ucell xt, ucell wordlist) +static ucell findsemis_wordlist(ucell xt, ucell wordlist) { ucell tmplfa, nextlfa, nextcfa; Modified: trunk/openbios-devel/kernel/include/dict.h =================================================================== --- trunk/openbios-devel/kernel/include/dict.h 2009-11-20 18:54:38 UTC (rev 621) +++ trunk/openbios-devel/kernel/include/dict.h 2009-11-20 19:03:46 UTC (rev 622) @@ -41,7 +41,6 @@ void dump_header(dictionary_header_t *header); ucell fstrlen(ucell fstr); void fstrncpy(char *dest, ucell src, unsigned int maxlen); -ucell findsemis_wordlist(ucell xt, ucell wordlist); ucell findsemis(ucell xt); ucell findxtfromcell_wordlist(ucell incell, ucell wordlist); ucell findxtfromcell(ucell incell);

1 0

r621 - trunk/openbios-devel/forth/lib
by svn＠openbios.org 20 Nov '09

20 Nov '09

Author: stepan Date: 2009-11-20 19:54:38 +0100 (Fri, 20 Nov 2009) New Revision: 621 Modified: trunk/openbios-devel/forth/lib/64bit.fs Log: - drop commented out functions, they're in others.fs already - fix another stack diagram typo Modified: trunk/openbios-devel/forth/lib/64bit.fs =================================================================== --- trunk/openbios-devel/forth/lib/64bit.fs 2009-11-20 16:37:41 UTC (rev 620) +++ trunk/openbios-devel/forth/lib/64bit.fs 2009-11-20 18:54:38 UTC (rev 621) @@ -53,7 +53,7 @@ unaligned-x@ \ for now ; -: x! ( oaddr o -- ) +: x! ( o oaddr -- ) unaligned-x! \ for now ; @@ -65,22 +65,6 @@ x! ; -\ : rx@ ( oaddr - o ) -\ compile? if -\ h# 22e get-token if compile, else execute then -\ else -\ h# 22e get-token drop execute -\ then -\ ; immediate - -\ : rx! ( o oaddr -- ) -\ compile? if -\ h# 22f get-token if compile, else execute then -\ else -\ h# 22f get-token drop execute -\ then -\ ; immediate - : x, ( o -- ) here /x allot x! ;

1 0

r620 - in trunk/openbios-devel: forth/lib kernel
by svn＠openbios.org 20 Nov '09

20 Nov '09

Author: stepan Date: 2009-11-20 17:37:41 +0100 (Fri, 20 Nov 2009) New Revision: 620 Modified: trunk/openbios-devel/forth/lib/64bit.fs trunk/openbios-devel/kernel/cross.h Log: improve x@ and x! functions, at least x@?\194?\160reads back what x! wrote, now. Modified: trunk/openbios-devel/forth/lib/64bit.fs =================================================================== --- trunk/openbios-devel/forth/lib/64bit.fs 2009-11-20 15:58:55 UTC (rev 619) +++ trunk/openbios-devel/forth/lib/64bit.fs 2009-11-20 16:37:41 UTC (rev 620) @@ -20,6 +20,10 @@ then ; +: 64>32 ( 64bitsigned -- 32bitsigned ) + h# ffffffff and +; + : lxjoin ( quad.lo quad.hi -- o ) d# 32 lshift or ; @@ -37,12 +41,12 @@ ; : unaligned-x@ ( addr - o ) - dup la+ unaligned-l@ swap unaligned-l@ lxjoin + dup la1+ unaligned-l@ 64>32 swap unaligned-l@ 64>32 lxjoin ; -: unaligned-x! ( oaddr o -- ) - 2dup d# 32 rshift unaligned-l! - swap la+ swap h# ffffffff and unaligned-l! +: unaligned-x! ( o oaddr -- ) + >r dup d# 32 rshift r@ unaligned-l! + h# ffffffff and r> la1+ unaligned-l! ; : x@ ( oaddr -- o ) Modified: trunk/openbios-devel/kernel/cross.h =================================================================== --- trunk/openbios-devel/kernel/cross.h 2009-11-20 15:58:55 UTC (rev 619) +++ trunk/openbios-devel/kernel/cross.h 2009-11-20 16:37:41 UTC (rev 620) @@ -77,11 +77,11 @@ (unaligned_read_word(addr)|(unaligned_read_word((u8 *)addr+2)<<16)) #define unaligned_write_word(addr, value) \ - write_byte(addr, value & 0xff); write_byte((u8 *)addr+1, value>>8) + write_byte(addr, (value & 0xff)); write_byte((u8 *)(addr+1), (value>>8)) #define unaligned_write_long(addr, value) \ - unaligned_write_word(addr, value & 0xffff); \ - unaligned_write_word(addr + 2, value >> 16) + unaligned_write_word(addr, (value & 0xffff)); \ + unaligned_write_word((addr + 2), (value >> 16)) #endif @@ -93,11 +93,11 @@ ((unaligned_read_word(addr)<<16)|unaligned_read_word((u8 *)addr+2)) #define unaligned_write_word(addr, value) \ - write_byte(addr, value >> 8); write_byte((u8 *)addr+1, value & 0xff) + write_byte(addr, (value >> 8)); write_byte((u8 *)(addr+1), (value & 0xff)) #define unaligned_write_long(addr, value) \ - unaligned_write_word(addr, value >> 16); \ - unaligned_write_word(addr + 2, value & 0xffff) + unaligned_write_word(addr, (value >> 16)); \ + unaligned_write_word((addr + 2), (value & 0xffff)) #endif /* bit width handling */

1 0

r619 - trunk/openbios-devel/forth/debugging
by svn＠openbios.org 20 Nov '09

20 Nov '09

Author: stepan Date: 2009-11-20 16:58:55 +0100 (Fri, 20 Nov 2009) New Revision: 619 Modified: trunk/openbios-devel/forth/debugging/see.fs Log: actually print value of a (lit) Modified: trunk/openbios-devel/forth/debugging/see.fs =================================================================== --- trunk/openbios-devel/forth/debugging/see.fs 2009-11-20 15:42:28 UTC (rev 618) +++ trunk/openbios-devel/forth/debugging/see.fs 2009-11-20 15:58:55 UTC (rev 619) @@ -71,8 +71,9 @@ endof ['] (lit) of - ." (lit)" + ." ( lit ) h# " drop 1 cells + + dup @ u. endof ['] (") of

1 0

r618 - trunk/openbios-devel/forth/device
by svn＠openbios.org 20 Nov '09

20 Nov '09

Author: stepan Date: 2009-11-20 16:42:28 +0100 (Fri, 20 Nov 2009) New Revision: 618 Modified: trunk/openbios-devel/forth/device/other.fs Log: fix ms Modified: trunk/openbios-devel/forth/device/other.fs =================================================================== --- trunk/openbios-devel/forth/device/other.fs 2009-11-20 15:40:53 UTC (rev 617) +++ trunk/openbios-devel/forth/device/other.fs 2009-11-20 15:42:28 UTC (rev 618) @@ -92,6 +92,7 @@ : ms ( n -- ) get-msecs + begin dup get-msecs < until + drop ; : alarm ( xt n -- )

1 0

r617 - trunk/openbios-devel/forth/device
by svn＠openbios.org 20 Nov '09

20 Nov '09

Author: stepan Date: 2009-11-20 16:40:53 +0100 (Fri, 20 Nov 2009) New Revision: 617 Modified: trunk/openbios-devel/forth/device/fcode.fs trunk/openbios-devel/forth/device/other.fs trunk/openbios-devel/forth/device/table.fs Log: - hook up new 64bit words into fcode table. - dummy implementations for peek, poke, ms and get-msecs Modified: trunk/openbios-devel/forth/device/fcode.fs =================================================================== --- trunk/openbios-devel/forth/device/fcode.fs 2009-11-20 15:38:29 UTC (rev 616) +++ trunk/openbios-devel/forth/device/fcode.fs 2009-11-20 15:40:53 UTC (rev 617) @@ -368,12 +368,21 @@ \ b(lit) ( -- n1 ) \ Numeric literal FCode. Followed by FCode-num32. +64bit? [IF] : b(lit) + fcode-num32 32>64 + state @ if + ['] (lit) , , + then + ; immediate +[ELSE] +: b(lit) fcode-num32 state @ if ['] (lit) , , then ; immediate +[THEN] \ b(') ( -- xt ) Modified: trunk/openbios-devel/forth/device/other.fs =================================================================== --- trunk/openbios-devel/forth/device/other.fs 2009-11-20 15:38:29 UTC (rev 616) +++ trunk/openbios-devel/forth/device/other.fs 2009-11-20 15:40:53 UTC (rev 617) @@ -21,21 +21,27 @@ \ 5.3.7.1 Peek/poke : cpeek ( addr -- false | byte true ) + c@ true ; : wpeek ( waddr -- false | w true ) + w@ true ; : lpeek ( qaddr -- false | quad true ) + l@ true ; : cpoke ( byte addr -- okay? ) + c! true ; : wpoke ( w waddr -- okay? ) + w! true ; : lpoke ( quad qaddr -- okay? ) + l! true ; @@ -59,13 +65,33 @@ : rl! ( quad qaddr -- ) ; - +: rx@ ( oaddr - o ) + state @ if + h# 22e get-token if , else execute then + else + h# 22e get-token drop execute + then + ; immediate + +: rx! ( o oaddr -- ) + state @ if + h# 22f get-token if , else execute then + else + h# 22f get-token drop execute + then + ; immediate + \ 5.3.7.3 Time +0 value dummy-msecs + : get-msecs ( -- n ) + dummy-msecs dup 1+ to dummy-msecs ; : ms ( n -- ) + get-msecs + + begin dup get-msecs < until ; : alarm ( xt n -- ) Modified: trunk/openbios-devel/forth/device/table.fs =================================================================== --- trunk/openbios-devel/forth/device/table.fs 2009-11-20 15:38:29 UTC (rev 616) +++ trunk/openbios-devel/forth/device/table.fs 2009-11-20 15:40:53 UTC (rev 617) @@ -380,7 +380,13 @@ ['], lbflip ['], lbflips ['], adr-mask - 6 n['], reserved-fcode \ 22a-22f + 4 n['], reserved-fcode \ 22a-22d +64bit? [IF] + ['], (rx@) + ['], (rx!) +[ELSE] + 2 n['], reserved-fcode \ 22e-22f +[THEN] ['], rb@ ['], rb! ['], rw@ @@ -398,9 +404,34 @@ ['], byte-load ['], set-args ['], left-parse-string \ 240 +64bit? [IF] + ['], bxjoin + ['], <l@ + ['], lxjoin + ['], wxjoin + ['], x, + ['], x@ + ['], x! + ['], /x + ['], /x* +\ ['], /xa+ +\ ['], /xa1+ + ['], xbflip + ['], xbflips + ['], xbsplit + ['], xlflip + ['], xlflips + ['], xlsplit + ['], xwflip + ['], xwflips + ['], xwsplit +[ELSE] 7 n['], reserved-fcode \ 241-247 (Part of IEEE1275 64-bit draft standard) ['], /x + c n['], reserved-fcode \ 249-254 (Part of IEEE1275 64-bit draft standard) +[THEN] + here fcode-master-table - constant fcode-master-table-size

1 0

r616 - trunk/openbios-devel/forth/lib
by svn＠openbios.org 20 Nov '09

20 Nov '09

Author: stepan Date: 2009-11-20 16:38:29 +0100 (Fri, 20 Nov 2009) New Revision: 616 Added: trunk/openbios-devel/forth/lib/64bit.fs Modified: trunk/openbios-devel/forth/lib/build.xml Log: Add 64bit extensions from 12756d5 Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Added: trunk/openbios-devel/forth/lib/64bit.fs =================================================================== --- trunk/openbios-devel/forth/lib/64bit.fs (rev 0) +++ trunk/openbios-devel/forth/lib/64bit.fs 2009-11-20 15:38:29 UTC (rev 616) @@ -0,0 +1,140 @@ +\ +\ Copyright (C) 2009 Stefan Reinauer +\ +\ See the file "COPYING" for further information about +\ the copyright and warranty status of this work. +\ + +\ Implementation of IEEE Draft Std P1275.6/D5 +\ Standard for Boot (Initialization Configuration) Firmware +\ 64 Bit Extensions + + +cell /x = constant 64bit? + +64bit? [IF] + +: 32>64 ( 32bitsigned -- 64bitsigned ) + dup 80000000 and if \ is it negative? + ffffffff00000000 or \ then set all high bits + then +; + +: lxjoin ( quad.lo quad.hi -- o ) + d# 32 lshift or +; + +: wxjoin ( w.lo w.2 w.3 w.hi -- o ) + wljoin >r wljoin r> lxjoin +; + +: bxjoin ( b.lo b.2 b.3 b.4 b.5 b.6 b.7 b.hi -- o ) + bljoin >r bljoin r> lxjoin +; + +: <l@ ( qaddr -- n ) + l@ 32>64 +; + +: unaligned-x@ ( addr - o ) + dup la+ unaligned-l@ swap unaligned-l@ lxjoin +; + +: unaligned-x! ( oaddr o -- ) + 2dup d# 32 rshift unaligned-l! + swap la+ swap h# ffffffff and unaligned-l! +; + +: x@ ( oaddr -- o ) + unaligned-x@ \ for now +; + +: x! ( oaddr o -- ) + unaligned-x! \ for now +; + +: (rx@) ( oaddr - o ) + x@ +; + +: (rx!) ( o oaddr -- ) + x! +; + +\ : rx@ ( oaddr - o ) +\ compile? if +\ h# 22e get-token if compile, else execute then +\ else +\ h# 22e get-token drop execute +\ then +\ ; immediate + +\ : rx! ( o oaddr -- ) +\ compile? if +\ h# 22f get-token if compile, else execute then +\ else +\ h# 22f get-token drop execute +\ then +\ ; immediate + +: x, ( o -- ) + here /x allot x! +; + +: /x* ( nu1 -- nu2 ) + /x * +; + +: xa+ ( addr1 index -- addr2 ) + /x* + +; + +: xa1+ ( addr1 -- addr2 ) + /x + +; + +: xlsplit ( o -- quad.lo quad.hi ) + dup h# ffffffff and swap d# 32 rshift +; + +: xwsplit ( o -- w.lo w.2 w.3 w.hi ) + xlsplit >r lwsplit r> lwsplit +; + +: xbsplit ( o -- b.lo b.2 b.3 b.4 b.5 b.6 b.7 b.hi ) + xlsplit >r lbsplit r> lbsplit +; + +: xlflip ( oct1 -- oct2 ) + xlsplit swap lxjoin +; + +: xlflips ( oaddr len -- ) + bounds ?do + i unaligned-x@ xlflip i unaligned-x! + /x +loop +; + +: xwflip ( oct1 -- oct2 ) + xlsplit lwflip swap lwflip lxjoin +; + +: xwflips ( oaddr len -- ) + bounds ?do + i unaligned-x@ xwflip i unaligned-x! /x + +loop +; + +: xbflip ( oct1 -- oct2 ) + xlsplit lbflip swap lbflip lxjoin +; + +: xbflips ( oaddr len -- ) + bounds ?do + i unaligned-x@ xbflip i unaligned-x! + /x +loop +; + +\ : b(lit) b(lit) 32>64 ; + +[THEN] Modified: trunk/openbios-devel/forth/lib/build.xml =================================================================== --- trunk/openbios-devel/forth/lib/build.xml 2009-11-20 15:30:52 UTC (rev 615) +++ trunk/openbios-devel/forth/lib/build.xml 2009-11-20 15:38:29 UTC (rev 616) @@ -15,6 +15,7 @@ <object source="creation.fs"/> <object source="split.fs"/> <object source="lists.fs"/> + <object source="64bit.fs"/> </dictionary> </build>

1 0

r615 - trunk/openbios-devel
by svn＠openbios.org 20 Nov '09

20 Nov '09

Author: stepan Date: 2009-11-20 16:30:52 +0100 (Fri, 20 Nov 2009) New Revision: 615 Modified: trunk/openbios-devel/Makefile Log: workaround: fix long broken "make run" at least for the case that there's only one target Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/openbios-devel/Makefile =================================================================== --- trunk/openbios-devel/Makefile 2009-11-20 11:14:10 UTC (rev 614) +++ trunk/openbios-devel/Makefile 2009-11-20 15:30:52 UTC (rev 615) @@ -31,7 +31,9 @@ run: @echo "Running..." - @$(ODIR)/openbios-unix $(ODIR)/openbios-unix.dict + @for dir in $(ODIRS); do \ + $$dir/openbios-unix $$dir/openbios-unix.dict; \ + done # The following two targets will only work on x86 so far.

1 0

r614 - trunk/openbios-devel/kernel
by svn＠openbios.org 20 Nov '09

20 Nov '09

Author: stepan Date: 2009-11-20 12:14:10 +0100 (Fri, 20 Nov 2009) New Revision: 614 Modified: trunk/openbios-devel/kernel/primitives.c Log: fix typo Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/openbios-devel/kernel/primitives.c =================================================================== --- trunk/openbios-devel/kernel/primitives.c 2009-11-17 16:54:24 UTC (rev 613) +++ trunk/openbios-devel/kernel/primitives.c 2009-11-20 11:14:10 UTC (rev 614) @@ -129,8 +129,8 @@ docbranch, /* do?branch */ unalignedwordread, /* unaligned-w@ */ unalignedwordwrite, /* unaligned-w! */ - unalignedlongread, /* unaligned-w@ */ - unalignedlongwrite, /* unaligned-w! */ + unalignedlongread, /* unaligned-l@ */ + unalignedlongwrite, /* unaligned-l! */ iocfetch, /* ioc@ */ iowfetch, /* iow@ */ iolfetch, /* iol@ */

1 0

Re: [OpenBIOS] Sparc64 OpenBIOS
by Nick Couchman 18 Nov '09

18 Nov '09

>>> On 2009/11/17 at 11:17, Stefan Reinauer <stepan(a)coresystems.de> wrote: > Nick Couchman wrote: >> So, on the Nevada b127 boot attempt (and on Solaris 10 - output is > identical), here's the output from "see do-boot" (note that "boot -H cdrom" > doesn't seem to make this word available - I have to do a real boot before it > loads it and I can see what it's attempting to do): >> > Did you try boot cdrom -H instead? Ah, this seems to work better - didn't realize that the order of arguments mattered. Thanks! > >> FCode UFS Reader 1.12 00/07/17 15:48:16. >> Loading: /platform//ufsboot >> Loading: /platform/sun4u/ufsboot >> Boot load failed. >> ok >> > > You should see more with > > 0 > true to fcode-debug? Hmmm...I set this in the openbios/forth/admin/nvram.fs file before compiling. If I try doing this command before a boot, I get the following: 0 > true to fcode-debug? ok 0 > boot cdrom -H [sparc64] Booting file 'cdrom' with parameters '-H' Not a bootable ELF image Not a Linux kernel image Not a bootable a.out image Loading FCode image... Loaded 7120 bytes entry point is 0x4000 Evaluating FCode... Unhandled Exception 0x0000000000000034 PC = 0x00000000ffd0f05c NPC = 0x00000000ffd0f060 Stopping execution Thanks! -Nick > > before attempting to boot here. > > It looks a whole lot like it tries to read a machine type but that > fails, so it's reading /platform//ufsboot first, and then falls back to > /platform/sun4u/ufsboot... > > Stefan > > > -- > coresystems GmbH * Brahmsstr. 16 * D-79104 Freiburg i. Br. > Tel.: +49 761 7668825 * Fax: +49 761 7664613 > Email: info(a)coresystems.de * http://www.coresystems.de/ > Registergericht: Amtsgericht Freiburg * HRB 7656 > Geschäftsführer: Stefan Reinauer * Ust-IdNr.: DE245674866 -------- This e-mail may contain confidential and privileged material for the sole use of the intended recipient. If this email is not intended for you, or you are not responsible for the delivery of this message to the intended recipient, please note that this message may contain SEAKR Engineering (SEAKR) Privileged/Proprietary Information. In such a case, you are strictly prohibited from downloading, photocopying, distributing or otherwise using this message, its contents or attachments in any way. If you have received this message in error, please notify us immediately by replying to this e-mail and delete the message from your mailbox. Information contained in this message that does not relate to the business of SEAKR is neither endorsed by nor attributable to SEAKR.

2 2

Re: [OpenBIOS] Sparc64 OpenBIOS
by Nick Couchman 18 Nov '09

18 Nov '09

>>> On 2009/11/18 at 03:10, Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> wrote: > Nick Couchman wrote: > >> Also...I'm running into a problem when I try to do "see open-package" - I get > an "Unhandled Exception": >> >> 0 > see open-package >> : open-package >> create-instance dup 0= if >> 3drop 0 exit >r strdup r@ >in.arguments 2! (lit) (lit) then >> Unhandled Exception 0x6f70656dffffe000 >> PC = 0x00000000ffd10e3c NPC = 0x00000000ffd10e40 >> Stopping execution >> >> Maybe this has something to do with me trying to view the function outside > of its execution context, but just seems weird that most/all of the other > ones work fine, and this one generates this error. >> >> -Nick > > This is actually the bug I picked up on earlier which Stefan has now > committed to SVN as r613. If you "svn up", you should find that this bug > has gone away. Interesting...I'm having some weird file caching issue with my openbios-devel source code. I had to completely wipe out the tree and grab it from svn before this would work correctly. Yes, does seem to be fixed, now - thank you! -Nick > > > HTH, > > Mark. -------- This e-mail may contain confidential and privileged material for the sole use of the intended recipient. If this email is not intended for you, or you are not responsible for the delivery of this message to the intended recipient, please note that this message may contain SEAKR Engineering (SEAKR) Privileged/Proprietary Information. In such a case, you are strictly prohibited from downloading, photocopying, distributing or otherwise using this message, its contents or attachments in any way. If you have received this message in error, please notify us immediately by replying to this e-mail and delete the message from your mailbox. Information contained in this message that does not relate to the business of SEAKR is neither endorsed by nor attributable to SEAKR.

1 0

Re: [OpenBIOS] Sparc64 OpenBIOS
by Nick Couchman 18 Nov '09

18 Nov '09

>>> On 2009/11/17 at 11:20, Stefan Reinauer <stepan(a)coresystems.de> wrote: > Nick Couchman wrote: >> 00000000ffe38958: mount-root >> > Here you want to debug mount-root 0 > debug mount-root Stepper keys: <space>/<enter> Up Down Trace Rstack Forth ok 0 > mount-root : mount-root ( Empty ) 00000000ffe3d0a8: boot-dev$ ( ffe3cb28 6 ) 00000000ffe3d0b0: fs-pkg$ ( ffe3cb28 6 ffe38b40 10 ) 00000000ffe3d0b8: $open-package seek failed ( 0 ) 00000000ffe3d0c0: (lit) ( 0 ffe3caa8 ) 00000000ffe3d0d0: (to) ( Empty ) 00000000ffe3d0d8: fs-ih ( 0 ) 00000000ffe3d0e0: 0= ( ffffffffffffffff ) 00000000ffe3d0e8: do?branch ( Empty ) 00000000ffe3d0f8: (") ( ffe3d108 10 ) 00000000ffe3d118: die Can't mount root Aborted. 0 > >> seek failed >> >> Can't mount root >> Aborted. >> 0 > >> >> Again, not sure why it can't mount-root, but that seems to be the issue. > And, here's the output from a debug do-boot for Solaris 9: >> >> 00000000ffe36ba0: plat-booter$ ( 6000 ffe359f0 12 ) >> > > Try debugging plat-booter$... It looks wrong to me. 00000000ffe36920: plat-booter$ : plat-booter$ ( 6000 ) 00000000ffe35bd0: clear-booter-name ( 6000 ) 00000000ffe35bd8: alternate-booter? ( 6000 0 ) 00000000ffe35be0: 0= ( 6000 ffffffffffffffff ) 00000000ffe35be8: do?branch ( 6000 ) 00000000ffe35bf8: (") ( 6000 ffe35c08 7 ) 00000000ffe35c10: over ( 6000 ffe35c08 7 ffe35c08 ) 00000000ffe35c18: c@ ( 6000 ffe35c08 7 75 ) 00000000ffe35c20: (lit) ( 6000 ffe35c08 7 75 2f ) 00000000ffe35c30: <> ( 6000 ffe35c08 7 ffffffffffffffff ) 00000000ffe35c38: do?branch ( 6000 ffe35c08 7 ) 00000000ffe35c48: (") ( 6000 ffe35c08 7 ffe35c58 a ) 00000000ffe35c68: $cat-booter-name ( 6000 ffe35c08 7 ) 00000000ffe35c70: root$ ( 6000 ffe35c08 7 ffe35980 1 ) 00000000ffe35c78: $cat-booter-name ( 6000 ffe35c08 7 ) 00000000ffe35c80: $cat-booter-name ( 6000 ) 00000000ffe35c88: booter-name$ ( 6000 ffe35770 12 ) 00000000ffe35c90: (semis) [ Finished plat-booter$ ] ( 6000 ffe35770 12 ) 00000000ffe36928: diagnostic-mode? ( 6000 ffe35770 12 ffffffffffffffff ) > >> 00000000ffe36c70: type /platform/sun4u/ufsboot ( 6000 ffe359f0 17 ) >> 00000000ffe36c78: cr >> ( 6000 ffe359f0 17 ) >> 00000000ffe36c80: get-file ( ffffffffffffffff ) >> > And get-file... 00000000ffe36978: cr ( 6000 ffe35770 12 ) 00000000ffe36980: get-file : get-file ( 6000 ffe35770 12 ) 00000000ffe36278: fname>devname$ ( 6000 ffe35de8 19 ) 00000000ffe36280: ufs-fopen ( 6000 0 ) 00000000ffe36288: ?dup ( 6000 0 ) 00000000ffe36290: do?branch ( 6000 ) 00000000ffe36358: drop ( Empty ) 00000000ffe36360: -1 ( ffffffffffffffff ) 00000000ffe36368: (semis) [ Finished get-file ] ( ffffffffffffffff ) 00000000ffe36988: do?branch ( Empty ) -Nick > > Stefan > > -- > coresystems GmbH * Brahmsstr. 16 * D-79104 Freiburg i. Br. > Tel.: +49 761 7668825 * Fax: +49 761 7664613 > Email: info(a)coresystems.de * http://www.coresystems.de/ > Registergericht: Amtsgericht Freiburg * HRB 7656 > Geschäftsführer: Stefan Reinauer * Ust-IdNr.: DE245674866 -------- This e-mail may contain confidential and privileged material for the sole use of the intended recipient. If this email is not intended for you, or you are not responsible for the delivery of this message to the intended recipient, please note that this message may contain SEAKR Engineering (SEAKR) Privileged/Proprietary Information. In such a case, you are strictly prohibited from downloading, photocopying, distributing or otherwise using this message, its contents or attachments in any way. If you have received this message in error, please notify us immediately by replying to this e-mail and delete the message from your mailbox. Information contained in this message that does not relate to the business of SEAKR is neither endorsed by nor attributable to SEAKR.

1 0

Re: [OpenBIOS] Sparc64 OpenBIOS
by Nick Couchman 18 Nov '09

18 Nov '09

Also...I'm running into a problem when I try to do "see open-package" - I get an "Unhandled Exception": 0 > see open-package : open-package create-instance dup 0= if 3drop 0 exit >r strdup r@ >in.arguments 2! (lit) (lit) then Unhandled Exception 0x6f70656dffffe000 PC = 0x00000000ffd10e3c NPC = 0x00000000ffd10e40 Stopping execution Maybe this has something to do with me trying to view the function outside of its execution context, but just seems weird that most/all of the other ones work fine, and this one generates this error. -Nick >>> On 2009/11/17 at 08:12, Tarl Neustaedter <Tarl.Neustaedter(a)Sun.COM> wrote: > [...] >> I also figured out that for some of the words to become available I have to > actually execute a real boot - not sure why. >> > > The primary booter you are reading from blocks 1-15 of the boot > partition create a bunch of words (most importantly, do-boot). It also > creates a package, probably /package/hsfs-file-system > >> Here's the output from "do-boot" once I turn on debugging for Solaris Nevada > B127: >> >> 0 > do-boot >> : do-boot ( Empty ) >> 00000000ffe388e8: parse-bootargs ( Empty ) >> 00000000ffe388f0: halt? ( 0 ) >> 00000000ffe388f8: do?branch ( Empty ) >> 00000000ffe38948: get-bootdev ( Empty ) >> 00000000ffe38950: load-pkg ( Empty ) >> 00000000ffe38958: mount-root >> seek failed >> >> Can't mount root >> Aborted. >> 0 > >> >> Again, not sure why it can't mount-root, but that seems to be the issue. > > Yup. The seek failed indicates it wasn't able to read something it > needed to read. So the next step is to do > the above, only instead of calling mount-root, figure out what > mount-root has in it, and execute those one-by-one at the ok prompt. Or > use the debugger to single step through it. > > Somewhere in there either you are coming up with some bad disk > addresses, or the HBA driver is failing a read. The alternative would be > to debug the HBA driver and see what disk reads you are being asked to > do, and try to trace backwards. -------- This e-mail may contain confidential and privileged material for the sole use of the intended recipient. If this email is not intended for you, or you are not responsible for the delivery of this message to the intended recipient, please note that this message may contain SEAKR Engineering (SEAKR) Privileged/Proprietary Information. In such a case, you are strictly prohibited from downloading, photocopying, distributing or otherwise using this message, its contents or attachments in any way. If you have received this message in error, please notify us immediately by replying to this e-mail and delete the message from your mailbox. Information contained in this message that does not relate to the business of SEAKR is neither endorsed by nor attributable to SEAKR.

2 1

Re: [OpenBIOS] Sparc64 OpenBIOS
by Nick Couchman 17 Nov '09

17 Nov '09

>>> On 2009/11/16 at 07:51, Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> wrote: > > Hi Nick, > > By default the OpenBIOS fcode evaluator creates headerless words, and so > they won't appear in any wordlists which are visible to the system. > > In order to make the words visible, you need to open up > forth/admin/nvram.fs and change the value of fcode-debug? from false to > true in the NVRAM variables section. If you then rebuild OpenBIOS, the > words generated by the Fcode evaluator will then show up in the relevant > package when you type "words". I also figured out that for some of the words to become available I have to actually execute a real boot - not sure why. > > Incidentally, I see that Blue Swirl has also committed the Forth source > debugger over the weekend, so you should be able to do "debug do-boot" > followed by "do-boot" and then step through the process to see where it > fails. Here's the output from "do-boot" once I turn on debugging for Solaris Nevada B127: 0 > do-boot : do-boot ( Empty ) 00000000ffe388e8: parse-bootargs ( Empty ) 00000000ffe388f0: halt? ( 0 ) 00000000ffe388f8: do?branch ( Empty ) 00000000ffe38948: get-bootdev ( Empty ) 00000000ffe38950: load-pkg ( Empty ) 00000000ffe38958: mount-root seek failed Can't mount root Aborted. 0 > Again, not sure why it can't mount-root, but that seems to be the issue. And, here's the output from a debug do-boot for Solaris 9: 0 > do-boot : do-boot ( Empty ) 00000000ffe36b30: sign-on FCode UFS Reader 1.12 00/07/17 15:48:16. ( Empty ) 00000000ffe36b38: real-devname ( Empty ) 00000000ffe36b40: halt? ( 0 ) 00000000ffe36b48: do?branch ( Empty ) 00000000ffe36b98: loader-base ( 6000 ) 00000000ffe36ba0: plat-booter$ ( 6000 ffe359f0 12 ) 00000000ffe36ba8: diagnostic-mode? ( 6000 ffe359f0 12 ffffffffffffffff ) 00000000ffe36bb0: do?branch ( 6000 ffe359f0 12 ) 00000000ffe36bc0: (") ( 6000 ffe359f0 12 ffe36bd0 9 ) 00000000ffe36be0: type Loading: ( 6000 ffe359f0 12 ) 00000000ffe36be8: 2dup ( 6000 ffe359f0 12 ffe359f0 12 ) 00000000ffe36bf0: type /platform//ufsboot ( 6000 ffe359f0 12 ) 00000000ffe36bf8: cr ( 6000 ffe359f0 12 ) 00000000ffe36c00: get-file ( ffffffffffffffff ) 00000000ffe36c08: do?branch ( Empty ) 00000000ffe36c18: loader-base ( 6000 ) 00000000ffe36c20: def-booter$ ( 6000 ffe359f0 17 ) 00000000ffe36c28: diagnostic-mode? ( 6000 ffe359f0 17 ffffffffffffffff ) 00000000ffe36c30: do?branch ( 6000 ffe359f0 17 ) 00000000ffe36c40: (") ( 6000 ffe359f0 17 ffe36c50 9 ) 00000000ffe36c60: type Loading: ( 6000 ffe359f0 17 ) 00000000ffe36c68: 2dup ( 6000 ffe359f0 17 ffe359f0 17 ) 00000000ffe36c70: type /platform/sun4u/ufsboot ( 6000 ffe359f0 17 ) 00000000ffe36c78: cr ( 6000 ffe359f0 17 ) 00000000ffe36c80: get-file ( ffffffffffffffff ) 00000000ffe36c88: do?branch ( Empty ) 00000000ffe36c98: (") ( ffe36ca8 11 ) 00000000ffe36cc0: type Boot load failed. ( Empty ) 00000000ffe36cc8: cr ( Empty ) 00000000ffe36cd0: exit ok -Nick > > > HTH, > > Mark. -------- This e-mail may contain confidential and privileged material for the sole use of the intended recipient. If this email is not intended for you, or you are not responsible for the delivery of this message to the intended recipient, please note that this message may contain SEAKR Engineering (SEAKR) Privileged/Proprietary Information. In such a case, you are strictly prohibited from downloading, photocopying, distributing or otherwise using this message, its contents or attachments in any way. If you have received this message in error, please notify us immediately by replying to this e-mail and delete the message from your mailbox. Information contained in this message that does not relate to the business of SEAKR is neither endorsed by nor attributable to SEAKR.

3 2

Re: [OpenBIOS] Sparc64 OpenBIOS
by Nick Couchman 17 Nov '09

17 Nov '09

So, on the Nevada b127 boot attempt (and on Solaris 10 - output is identical), here's the output from "see do-boot" (note that "boot -H cdrom" doesn't seem to make this word available - I have to do a real boot before it loads it and I can see what it's attempting to do): 0 > see do-boot : do-boot parse-bootargs halt? if " Halted with -H flag. " type cr exit get-bootdev load-pkg mount-root zflag? nested? invert and if fs-name$ open-zfs-fs load-file setup-props exec-file ; ok So, then I type the following: 0 > parse-bootargs ok 0 > get-bootdev ok 0 > load-pkg ok 0 > mount-root seek failed Can't mount root Aborted. 0 > Looks like maybe it's failing on mounting the root device? For Opensolaris, I get "Unsupported image format" and the "do-boot" word doesn't ever become available. For Solaris 9, the error is: FCode UFS Reader 1.12 00/07/17 15:48:16. Loading: /platform//ufsboot Loading: /platform/sun4u/ufsboot Boot load failed. ok and do-boot looks like this: 0 > see do-boot : do-boot sign-on real-devname halt? if " Halted with -H flag. " type cr exit loader-base plat-booter$ diagnostic-mode? if " Loading: " type 2dup type cr get-file if loader-base def-booter$ diagnostic-mode? if " Loading: " type 2dup type cr get-file if " Boot load failed." type cr exit execit ; ok In this case, it looks like there are some variables in there, and I'm not sure what to put for them or what it's expecting, nor am I sure what steps I need to try or what to skip. Thanks - Nick >>> On 2009/11/15 at 15:46, Tarl Neustaedter <Tarl.Neustaedter(a)Sun.COM> wrote: > Nick Couchman wrote: >> [...] >> I also tried the "boot -H" option and I get the following: >> 0 > boot -H cdrom >> [sparc64] Booting file '-H' with parameters 'cdrom' >> ok >> >> >> I assume this is the point where I really need the debugger and the > breakpoints so that I can step through the rest of the boot process > piece-by-piece. >> > > > Ah - cool. What I'd suggest doing is, right after getting to the ok > prompt on boot -H: > > ok see do-boot > > What you should see is something like what's in the boot.fth from > opensolaris: > http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/psm/stand/boo… > lks/common/boot.fth > > 657 : do-boot ( -- ) > 658 parse-bootargs > 659 halt? if > 660 ." Halted with -H flag. " cr > 661 exit > 662 then > 663 get-bootdev > 664 load-pkg > 665 mount-root > 666 zflag? nested? invert and if > 667 fs-name$ open-zfs-fs > 668 then > 669 load-file ( virt ) > 670 setup-props > 671 exec-file ( ) > 672 ; > > So, we've already parsed bootargs, let's do the rest of the method > manually (skipping zflag stuff, because I presume on a cdrom you don't > have zfs). > > ok false to halt? \ undo the -H flag just for the heck of it > ok get-bootdev > ok load-pkg > ok mount-root > ok load-file > ok setup-props > ok exec-file > > Somewhere in there you'll see failures, which will give you a better > feel for what's going wrong. Once you figure out which one it is, repeat > the process, but manually executing the method which caused problems. > This would be easier with a debugger, but it's still possible without it. -------- This e-mail may contain confidential and privileged material for the sole use of the intended recipient. If this email is not intended for you, or you are not responsible for the delivery of this message to the intended recipient, please note that this message may contain SEAKR Engineering (SEAKR) Privileged/Proprietary Information. In such a case, you are strictly prohibited from downloading, photocopying, distributing or otherwise using this message, its contents or attachments in any way. If you have received this message in error, please notify us immediately by replying to this e-mail and delete the message from your mailbox. Information contained in this message that does not relate to the business of SEAKR is neither endorsed by nor attributable to SEAKR.

2 1

Re: [OpenBIOS] Sparc64 OpenBIOS
by Nick Couchman 17 Nov '09

17 Nov '09

>>> On 2009/11/17 at 08:12, Tarl Neustaedter <Tarl.Neustaedter(a)Sun.COM> wrote: > Yup. The seek failed indicates it wasn't able to read something it > needed to read. So the next step is to do > the above, only instead of calling mount-root, figure out what > mount-root has in it, and execute those one-by-one at the ok prompt. Or > use the debugger to single step through it. Here's that output: 0 > mount-root : mount-root ( Empty ) 00000000ffe35d28: boot-dev$ ( ffe357a8 6 ) 00000000ffe35d30: fs-pkg$ ( ffe357a8 6 ffe317c0 10 ) 00000000ffe35d38: $open-package seek failed ( 0 ) 00000000ffe35d40: (lit) ( 0 ffe35728 ) 00000000ffe35d50: (to) ( Empty ) 00000000ffe35d58: fs-ih ( 0 ) 00000000ffe35d60: 0= ( ffffffffffffffff ) 00000000ffe35d68: do?branch ( Empty ) 00000000ffe35d78: (") ( ffe35d88 10 ) 00000000ffe35d98: die Can't mount root Aborted. 0 > So, I added debug for "$open-package" which led to "open-package", which I also debugged - here's the output from mount-root after turning on all that debugging: 0 > mount-root : mount-root ( Empty ) 00000000ffe35d28: boot-dev$ ( ffe357a8 6 ) 00000000ffe35d30: fs-pkg$ ( ffe357a8 6 ffe317c0 10 ) 00000000ffe35d38: $open-package : $open-package ( ffe357a8 6 ffe317c0 10 ) 00000000ffe13690: find-package ( ffe357a8 6 ffe32558 ffffffffffffffff ) 00000000ffe13698: do?branch ( ffe357a8 6 ffe32558 ) 00000000ffe136a8: open-package : open-package ( ffe357a8 6 ffe32558 ) 00000000ffe13548: create-instance ( ffe357a8 6 ffe4ad30 ) 00000000ffe13550: dup ( ffe357a8 6 ffe4ad30 ffe4ad30 ) 00000000ffe13558: 0= ( ffe357a8 6 ffe4ad30 0 ) 00000000ffe13560: do?branch ( ffe357a8 6 ffe4ad30 ) 00000000ffe13588: >r ( ffe357a8 6 ) 00000000ffe13590: strdup ( ffe493a0 6 ) 00000000ffe13598: r@ ( ffe493a0 6 ffe4ad30 ) 00000000ffe135a0: >in.arguments ( ffe493a0 6 ffe4ad78 ) 00000000ffe135a8: 2! ( Empty ) 00000000ffe135b0: (lit) ( ffe135e0 ) 00000000ffe135c0: (lit) ( ffe135e0 4 ) 00000000ffe135d0: dobranch ( ffe135e0 4 ) 00000000ffe135e8: r@ ( ffe135e0 4 ffe4ad30 ) 00000000ffe135f0: (lit) ( ffe135e0 4 ffe4ad30 ffe13310 ) 00000000ffe13600: catch : open-package ( 1 ffe2fe38 ffe4b1d8 ffe4b548 0 0 ffe2b238 ) 00000000ffe13548: create-instance ( 1 ffe2fe38 ffe4b1d8 ffe4b548 0 0 ffe4b558 ) 00000000ffe13550: dup ( 1 ffe2fe38 ffe4b1d8 ffe4b548 0 0 ffe4b558 ffe4b558 ) 00000000ffe13558: 0= ( 1 ffe2fe38 ffe4b1d8 ffe4b548 0 0 ffe4b558 0 ) 00000000ffe13560: do?branch ( 1 ffe2fe38 ffe4b1d8 ffe4b548 0 0 ffe4b558 ) 00000000ffe13588: >r ( 1 ffe2fe38 ffe4b1d8 ffe4b548 0 0 ) 00000000ffe13590: strdup ( 1 ffe2fe38 ffe4b1d8 ffe4b548 0 0 ) 00000000ffe13598: r@ ( 1 ffe2fe38 ffe4b1d8 ffe4b548 0 0 ffe4b558 ) 00000000ffe135a0: >in.arguments ( 1 ffe2fe38 ffe4b1d8 ffe4b548 0 0 ffe4b5a0 ) 00000000ffe135a8: 2! ( 1 ffe2fe38 ffe4b1d8 ffe4b548 ) 00000000ffe135b0: (lit) ( 1 ffe2fe38 ffe4b1d8 ffe4b548 ffe135e0 ) 00000000ffe135c0: (lit) ( 1 ffe2fe38 ffe4b1d8 ffe4b548 ffe135e0 4 ) 00000000ffe135d0: dobranch ( 1 ffe2fe38 ffe4b1d8 ffe4b548 ffe135e0 4 ) 00000000ffe135e8: r@ ( 1 ffe2fe38 ffe4b1d8 ffe4b548 ffe135e0 4 ffe4b558 ) 00000000ffe135f0: (lit) ( 1 ffe2fe38 ffe4b1d8 ffe4b548 ffe135e0 4 ffe4b558 ffe13310 ) 00000000ffe13600: catch ( 1 ffe2fe38 ffe4b1d8 ffe4b548 ffffffffffffffff 0 ) 00000000ffe13608: do?branch ( 1 ffe2fe38 ffe4b1d8 ffe4b548 ffffffffffffffff ) 00000000ffe13628: do?branch ( 1 ffe2fe38 ffe4b1d8 ffe4b548 ) 00000000ffe13638: r> ( 1 ffe2fe38 ffe4b1d8 ffe4b548 ffe4b558 ) 00000000ffe13640: dobranch ( 1 ffe2fe38 ffe4b1d8 ffe4b548 ffe4b558 ) 00000000ffe13668: (semis) [ Finished open-package ] seek failed ( 8006000 800 4 ffffffffffffffff ) 00000000ffe13608: do?branch ( 8006000 800 4 ) 00000000ffe13618: 3drop ( Empty ) 00000000ffe13620: false ( 0 ) 00000000ffe13628: do?branch ( Empty ) 00000000ffe13650: r> ( ffe4ad30 ) 00000000ffe13658: destroy-instance ( Empty ) 00000000ffe13660: false ( 0 ) 00000000ffe13668: (semis) [ Finished open-package ] ( 0 ) 00000000ffe136b0: dobranch ( 0 ) 00000000ffe136d0: (semis) [ Finished $open-package ] ( 0 ) 00000000ffe35d40: (lit) ( 0 ffe35728 ) 00000000ffe35d50: (to) ( Empty ) 00000000ffe35d58: fs-ih ( 0 ) 00000000ffe35d60: 0= ( ffffffffffffffff ) 00000000ffe35d68: do?branch ( Empty ) 00000000ffe35d78: (") ( ffe35d88 10 ) 00000000ffe35d98: die Can't mount root Aborted. Based on that output, it's hard for me to tell what about "open-package'" failed > > Somewhere in there either you are coming up with some bad disk > addresses, or the HBA driver is failing a read. The alternative would be > to debug the HBA driver and see what disk reads you are being asked to > do, and try to trace backwards. I'm already headed down this path, so I'll stick there, now, unless you have some hints for going about debugging the HBA driver, which I would assume I would do from the Qemu source code side... -Nick -------- This e-mail may contain confidential and privileged material for the sole use of the intended recipient. If this email is not intended for you, or you are not responsible for the delivery of this message to the intended recipient, please note that this message may contain SEAKR Engineering (SEAKR) Privileged/Proprietary Information. In such a case, you are strictly prohibited from downloading, photocopying, distributing or otherwise using this message, its contents or attachments in any way. If you have received this message in error, please notify us immediately by replying to this e-mail and delete the message from your mailbox. Information contained in this message that does not relate to the business of SEAKR is neither endorsed by nor attributable to SEAKR.

2 2

see "" literals crash fix patch
by Mark Cave-Ayland 17 Nov '09

17 Nov '09

Hi all, Whilst playing around with a SPARC64 image, I noticed that the see word was still crashing on words containing "" literals as per my earlier report here: http://lists.openbios.org/pipermail/openbios/2009-January/003432.html Is there any reason why Stefan's patch posted as part of this thread has not been applied to SVN? Many thanks, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063 Sirius Labs: http://www.siriusit.co.uk/labs

2 1

r613 - in trunk/openbios-devel/forth: admin bootstrap
by svn＠openbios.org 17 Nov '09

17 Nov '09

Author: stepan Date: 2009-11-17 17:54:24 +0100 (Tue, 17 Nov 2009) New Revision: 613 Modified: trunk/openbios-devel/forth/admin/nvram.fs trunk/openbios-devel/forth/bootstrap/bootstrap.fs Log: This patch replaces the string definitions in nvram.fs by the simpler version s" that does not contain a complex parser for " "(0a) type of strings. Also use handle-text in " instead of the hand crafted version. This fixes strings in "see". Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/openbios-devel/forth/admin/nvram.fs =================================================================== --- trunk/openbios-devel/forth/admin/nvram.fs 2009-11-15 21:19:59 UTC (rev 612) +++ trunk/openbios-devel/forth/admin/nvram.fs 2009-11-17 16:54:24 UTC (rev 613) @@ -39,7 +39,7 @@ dup >cf.name 2@ $create , does> @ dup >cf.name 2@ - " /options" find-dev if + s" /options" find-dev if get-package-property if 0 -1 then ( configp prop-str prop-len ) \ drop trailing zero @@ -120,14 +120,14 @@ \ ------------------------------------------------------------ : exec-secmode-conf ( str len -- n ) - 2dup " command" strcmp 0= if 2drop 1 exit then - 2dup " full" strcmp 0= if 2drop 2 exit then + 2dup s" command" strcmp 0= if 2drop 1 exit then + 2dup s" full" strcmp 0= if 2drop 2 exit then 2drop 0 ; : check-secmode-conf ( str len -- str len valid? ) - 2dup " none" strcmp 0= if true exit then - 2dup " command" strcmp 0= if true exit then - 2dup " full" strcmp 0= if true exit then + 2dup s" none" strcmp 0= if true exit then + 2dup s" command" strcmp 0= if true exit then + 2dup s" full" strcmp 0= if true exit then false ; @@ -141,18 +141,18 @@ \ ------------------------------------------------------------ : exec-bool-conf ( str len -- value ) - 2dup " true" strcmp 0= if 2drop true exit then - 2dup " false" strcmp 0= if 2drop false exit then - 2dup " TRUE" strcmp 0= if 2drop false exit then - 2dup " FALSE" strcmp 0= if 2drop false exit then + 2dup s" true" strcmp 0= if 2drop true exit then + 2dup s" false" strcmp 0= if 2drop false exit then + 2dup s" TRUE" strcmp 0= if 2drop false exit then + 2dup s" FALSE" strcmp 0= if 2drop false exit then parse-hex 0<> ; : check-bool-conf ( name len -- str len valid? ) - 2dup " true" strcmp 0= if true exit then - 2dup " false" strcmp 0= if true exit then - 2dup " TRUE" strcmp 0= if 2drop " true" true exit then - 2dup " FALSE" strcmp 0= if 2drop " false" true exit then + 2dup s" true" strcmp 0= if true exit then + 2dup s" false" strcmp 0= if true exit then + 2dup s" TRUE" strcmp 0= if 2drop s" true" true exit then + 2dup s" FALSE" strcmp 0= if 2drop s" false" true exit then false ; @@ -181,7 +181,7 @@ then 2swap encode-string 2swap - " /options" find-package drop + s" /options" find-package drop encode-property ; @@ -199,7 +199,7 @@ linefeed parse 2drop active-package - " /options" find-device + s" /options" find-device .properties active-package! ; @@ -272,7 +272,7 @@ dup if 1- then then ( name len value-str len ) - 2swap " =" 2swap + 2swap s" =" 2swap pocket tmpstrcat tmpstrcat drop 2dup + 0 swap c! 1+ @@ -281,7 +281,7 @@ : nvram-store-configs ( data len -- ) 2 - \ make room for two trailing zeros - " /options" find-dev 0= if 2drop exit then + s" /options" find-dev 0= if 2drop exit then >r config-root ( data len configptr R: phandle ) @@ -301,66 +301,66 @@ \ NVRAM variables \ -------------------------------------------------------- \ fcode-debug? input-device output-device -" true" " auto-boot?" bool-config \ 7.4.3.5 -" boot" " boot-command" str-config \ 7.4.3.5 -" " " boot-file" str-config \ 7.4.3.5 -" false" " diag-switch?" bool-config \ 7.4.3.5 -no-conf-def " diag-device" str-config \ 7.4.3.5 -no-conf-def " diag-file" str-config \ 7.4.3.5 -" false" " fcode-debug?" bool-config \ 7.7 -" " " nvramrc" str-config \ 7.4.4.2 -" false" " oem-banner?" bool-config -" " " oem-banner" str-config -" false" " oem-logo?" bool-config -no-conf-def " oem-logo" str-config -" false" " use-nvramrc?" bool-config \ 7.4.4.2 -" keyboard" " input-device" str-config \ 7.4.5 -" screen" " output-device" str-config \ 7.4.5 -" 80" " screen-#columns" int-config \ 7.4.5 -" 24" " screen-#rows" int-config \ 7.4.5 -" 0" " selftest-#megs" int-config -no-conf-def " security-mode" secmode-config +s" true" s" auto-boot?" bool-config \ 7.4.3.5 +s" boot" s" boot-command" str-config \ 7.4.3.5 +s" " s" boot-file" str-config \ 7.4.3.5 +s" false" s" diag-switch?" bool-config \ 7.4.3.5 +no-conf-def s" diag-device" str-config \ 7.4.3.5 +no-conf-def s" diag-file" str-config \ 7.4.3.5 +s" false" s" fcode-debug?" bool-config \ 7.7 +s" " s" nvramrc" str-config \ 7.4.4.2 +s" false" s" oem-banner?" bool-config +s" " s" oem-banner" str-config +s" false" s" oem-logo?" bool-config +no-conf-def s" oem-logo" str-config +s" false" s" use-nvramrc?" bool-config \ 7.4.4.2 +s" keyboard" s" input-device" str-config \ 7.4.5 +s" screen" s" output-device" str-config \ 7.4.5 +s" 80" s" screen-#columns" int-config \ 7.4.5 +s" 24" s" screen-#rows" int-config \ 7.4.5 +s" 0" s" selftest-#megs" int-config +no-conf-def s" security-mode" secmode-config \ --- devices --- -" -1" " pci-probe-mask" int-config -" false" " default-mac-address" bool-config -" false" " skip-netboot?" bool-config -" true" " scroll-lock" bool-config +s" -1" s" pci-probe-mask" int-config +s" false" s" default-mac-address" bool-config +s" false" s" skip-netboot?" bool-config +s" true" s" scroll-lock" bool-config [IFDEF] CONFIG_PPC \ ---- PPC ---- -" disk" " boot-device" str-config \ 7.4.3.5 -" false" " little-endian?" bool-config -" false" " real-mode?" bool-config -" -1" " real-base" int-config -" -1" " real-size" int-config -" 4000000" " load-base" int-config -" -1" " virt-base" int-config -" -1" " virt-size" int-config +s" disk" s" boot-device" str-config \ 7.4.3.5 +s" false" s" little-endian?" bool-config +s" false" s" real-mode?" bool-config +s" -1" s" real-base" int-config +s" -1" s" real-size" int-config +s" 4000000" s" load-base" int-config +s" -1" s" virt-base" int-config +s" -1" s" virt-size" int-config [THEN] [IFDEF] CONFIG_X86 \ ---- X86 ---- -" disk" " boot-device" str-config \ 7.4.3.5 -" true" " little-endian?" bool-config +s" disk" s" boot-device" str-config \ 7.4.3.5 +s" true" s" little-endian?" bool-config [THEN] [IFDEF] CONFIG_SPARC32 \ ---- SPARC32 ---- -" true" " tpe-link-test?" bool-config -" 9600,8,n,1,-" " ttya-mode" str-config -" true" " ttya-ignore-cd" bool-config -" false" " ttya-rts-dtr-off" bool-config -" 9600,8,n,1,-" " ttyb-mode" str-config -" true" " ttyb-ignore-cd" bool-config -" false" " ttyb-rts-dtr-off" bool-config +s" true" s" tpe-link-test?" bool-config +s" 9600,8,n,1,-" s" ttya-mode" str-config +s" true" s" ttya-ignore-cd" bool-config +s" false" s" ttya-rts-dtr-off" bool-config +s" 9600,8,n,1,-" s" ttyb-mode" str-config +s" true" s" ttyb-ignore-cd" bool-config +s" false" s" ttyb-rts-dtr-off" bool-config [THEN] \ --- ??? --- -" " " boot-screen" str-config -" " " boot-script" str-config -" false" " use-generic?" bool-config -" " " boot-args" str-config \ ??? +s" " s" boot-screen" str-config +s" " s" boot-script" str-config +s" false" s" use-generic?" bool-config +s" " s" boot-args" str-config \ ??? \ defers ['] fcode-debug? to _fcode-debug? Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs =================================================================== --- trunk/openbios-devel/forth/bootstrap/bootstrap.fs 2009-11-15 21:19:59 UTC (rev 612) +++ trunk/openbios-devel/forth/bootstrap/bootstrap.fs 2009-11-17 16:54:24 UTC (rev 613) @@ -1307,14 +1307,7 @@ +loop repeat over - - state @ if - ['] (lit) , here 5 cells + , - ['] (lit) , dup , - ['] dobranch , - here -rot - /n allot - ", null-align resolve-orig - then + handle-text ; immediate

1 0

PATCH: Minor debugger patch
by Mark Cave-Ayland 17 Nov '09

17 Nov '09

Hi all, This patch corrects a couple of (minor) bugs in the Forth source debugger; firstly the number of wordlists is held in #order, rather than #vocs which is the total number of wordlists which can be held simultaneously. Secondly, the initial interruptforth setting in kernel/bootstrap.c is actually wrong, but since this is reset by enterforth() it is not needed anyway. Hence this line can simply be removed. ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063 Sirius Labs: http://www.siriusit.co.uk/labs

1 0

Re: [OpenBIOS] Sparc64 OpenBIOS
by Nick Couchman 16 Nov '09

16 Nov '09

> Ah - cool. What I'd suggest doing is, right after getting to the ok > prompt on boot -H: > > ok see do-boot Hmmm...not really working for me. I don't know that I'm actually at the "ok" prompt - I see the word "ok" output to the screen, but the prompt is actually "0> " and not okay. When I try "see do-boot", I get "do-boot: undefined word." Furthermore, almost none of the other commands work, either - get-bootdev, load-pkg, etc., all return "undefined word." Just to make sure I didn't leave anything out before, I'm running qemu-system-sparc64 (from the Qemu git repo), using OpenBIOS built from the svn repository. If there's something else I should be trying, please let me know. Thanks, Nick > > What you should see is something like what's in the boot.fth from > opensolaris: > http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/psm/stand/boo… > lks/common/boot.fth > > 657 : do-boot ( -- ) > 658 parse-bootargs > 659 halt? if > 660 ." Halted with -H flag. " cr > 661 exit > 662 then > 663 get-bootdev > 664 load-pkg > 665 mount-root > 666 zflag? nested? invert and if > 667 fs-name$ open-zfs-fs > 668 then > 669 load-file ( virt ) > 670 setup-props > 671 exec-file ( ) > 672 ; > > So, we've already parsed bootargs, let's do the rest of the method > manually (skipping zflag stuff, because I presume on a cdrom you don't > have zfs). > > ok false to halt? \ undo the -H flag just for the heck of it > ok get-bootdev > ok load-pkg > ok mount-root > ok load-file > ok setup-props > ok exec-file > > Somewhere in there you'll see failures, which will give you a better > feel for what's going wrong. Once you figure out which one it is, repeat > the process, but manually executing the method which caused problems. > This would be easier with a debugger, but it's still possible without it. -------- This e-mail may contain confidential and privileged material for the sole use of the intended recipient. If this email is not intended for you, or you are not responsible for the delivery of this message to the intended recipient, please note that this message may contain SEAKR Engineering (SEAKR) Privileged/Proprietary Information. In such a case, you are strictly prohibited from downloading, photocopying, distributing or otherwise using this message, its contents or attachments in any way. If you have received this message in error, please notify us immediately by replying to this e-mail and delete the message from your mailbox. Information contained in this message that does not relate to the business of SEAKR is neither endorsed by nor attributable to SEAKR.

2 1

Re: [OpenBIOS] Sparc64 OpenBIOS
by Nick Couchman 15 Nov '09

15 Nov '09

>>> On 2009/11/14 at 12:33, Tarl Neustaedter <Tarl.Neustaedter(a)Sun.COM> wrote: > Nick Couchman wrote: >> I have a pretty old version of the Solaris Nevada code that I tried to boot, > and I got a different error: open isn't unique. I'll post actual output here > in a little while. >> > > Hmm. That's interesting. I wonder if we're getting a conflict between > packages in openbios and what the boot blocks are creating. You might > find it easier to debug the Solaris Nevada version, depending on just > how old it is. Among other things, under OpenSolaris you can find the > code for the boot blocks (which changed drastically from Solaris 10 to > Nevada), so you aren't quite struggling in the dark. > > Also, the Nevada version of the bootblocks responds to the "-H" > argument, indicating that after loading the filesystem into /packages, > it returns to the OK prompt rather than immediately trying to do the > boot itself. That lets you set up breakpoints in the filesystem code > before executing them. I grabbed the newest Nevada ISO (b127) and tried to boot off that - the error is the same as Solaris 10: 0 > boot cdrom [sparc64] Booting file 'cdrom' with parameters '' Not a bootable ELF image Not a Linux kernel image Not a bootable a.out image Loading FCode image... Loaded 7120 bytes entry point is 0x4000 Evaluating FCode... seek failed Can't mount root byte-load: exception caught! ok I also tried the "boot -H" option and I get the following: 0 > boot -H cdrom [sparc64] Booting file '-H' with parameters 'cdrom' ok I assume this is the point where I really need the debugger and the breakpoints so that I can step through the rest of the boot process piece-by-piece. -Nick >> I'm pretty new to Qemu and OpenBIOS - what's the best way to go about > debugging this? GDB? Qemu's built-in debugging? >> > > Probably best to wait for the forth debugger that is being discussed. > Without breakpoints, you need to basically patch in breakpoints, which > is doable but time-consuming. -------- This e-mail may contain confidential and privileged material for the sole use of the intended recipient. If this email is not intended for you, or you are not responsible for the delivery of this message to the intended recipient, please note that this message may contain SEAKR Engineering (SEAKR) Privileged/Proprietary Information. In such a case, you are strictly prohibited from downloading, photocopying, distributing or otherwise using this message, its contents or attachments in any way. If you have received this message in error, please notify us immediately by replying to this e-mail and delete the message from your mailbox. Information contained in this message that does not relate to the business of SEAKR is neither endorsed by nor attributable to SEAKR.

3 2

r612 - trunk/openbios-devel/Documentation
by svn＠openbios.org 15 Nov '09

15 Nov '09

Author: blueswirl Date: 2009-11-15 22:19:59 +0100 (Sun, 15 Nov 2009) New Revision: 612 Added: trunk/openbios-devel/Documentation/README.debugger Log: Document the debugger Add a description of the debug syntax and run-time use, with an example of a debugging session. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Added: trunk/openbios-devel/Documentation/README.debugger =================================================================== --- trunk/openbios-devel/Documentation/README.debugger (rev 0) +++ trunk/openbios-devel/Documentation/README.debugger 2009-11-15 21:19:59 UTC (rev 612) @@ -0,0 +1,50 @@ +The following Forth words can be used for debugging: + + debug <xt> - Mark word for debugging + debug-off - Unmark all words for debugging + resume - Return from subordinate Forth interpreter + +The source debugger also implements the following commands when it has been activated: + + Up - Unmark current word for debugging, mark parent and continue + Down - Mark next word for debugging + Trace - Continue execution until end of word displaying + debug information + Rstack - Display contents of the Rstack + Forth - Launch subordinate Forth interpreter + +An example session: +0 > see boot +: boot + linefeed parse cr " platform-boot" $find if + execute then + 2drop cr " Booting " type type cr " ... not supported on this system." type cr + ; + ok +0 > debug boot +Stepper keys: <space>/<enter> Up Down Trace Rstack Forth + ok +0 > boot +: boot ( Empty ) +00000000ffe26b08: linefeed ( a ) +00000000ffe26b10: parse ( ffec6e24 0 ) +00000000ffe26b18: cr + ( ffec6e24 0 ) +00000000ffe26b20: (") ( ffec6e24 0 ffe26b30 d ) +00000000ffe26b40: $find ( ffec6e24 0 ffe31710 ffffffffffffffff ) +00000000ffe26b48: do?branch ( ffec6e24 0 ffe31710 ) +00000000ffe26b58: execute [sparc64] Booting file 'cdrom' with parameters '' +Not a bootable ELF image +Not a Linux kernel image +Not a bootable a.out image +Loading FCode image... +Loaded 5936 bytes +entry point is 0x4000 +Evaluating FCode... +open isn't unique. +Boot load failed. + ( Empty ) +00000000ffe26b60: dobranch ( Empty ) +00000000ffe26bf8: (semis) +[ Finished boot ] ok +0 >

1 0

r611 - in trunk/openbios-devel: arch/unix/gui_qt arch/unix/plugins/plugin_qt forth/bootstrap forth/debugging forth/lib include/openbios kernel kernel/include modules
by svn＠openbios.org 15 Nov '09

15 Nov '09

Author: blueswirl Date: 2009-11-15 22:03:51 +0100 (Sun, 15 Nov 2009) New Revision: 611 Modified: trunk/openbios-devel/arch/unix/gui_qt/gui-qt.cpp trunk/openbios-devel/arch/unix/plugins/plugin_qt/plugin_qt.cpp trunk/openbios-devel/forth/bootstrap/interpreter.fs trunk/openbios-devel/forth/debugging/firmware.fs trunk/openbios-devel/forth/lib/vocabulary.fs trunk/openbios-devel/include/openbios/kernel.h trunk/openbios-devel/include/openbios/stack.h trunk/openbios-devel/kernel/bootstrap.c trunk/openbios-devel/kernel/dict.c trunk/openbios-devel/kernel/include/dict.h trunk/openbios-devel/kernel/internal.c trunk/openbios-devel/kernel/primitives.c trunk/openbios-devel/kernel/stack.c trunk/openbios-devel/modules/cmdline.c Log: Reworked version of Forth Source debugger (Mark Cave-Ayland) This patch implements the following Forth words: debug <xt> - Mark word for debugging debug-off - Unmark all words for debugging resume - Return from subordinate Forth interpreter The source debugger also implements the following commands when it has been activated: Up - Unmark current word for debugging, mark parent and continue Down - Mark next word for debugging Trace - Continue execution until end of word displaying debug information Rstack - Display contents of the Rstack Forth - Launch subordinate Forth interpreter Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/unix/gui_qt/gui-qt.cpp =================================================================== --- trunk/openbios-devel/arch/unix/gui_qt/gui-qt.cpp 2009-11-12 01:15:02 UTC (rev 610) +++ trunk/openbios-devel/arch/unix/gui_qt/gui-qt.cpp 2009-11-15 21:03:51 UTC (rev 611) @@ -108,7 +108,7 @@ extern volatile int runforth; gui_running=0; - runforth=0; + interruptforth=1; qApp->quit(); } Modified: trunk/openbios-devel/arch/unix/plugins/plugin_qt/plugin_qt.cpp =================================================================== --- trunk/openbios-devel/arch/unix/plugins/plugin_qt/plugin_qt.cpp 2009-11-12 01:15:02 UTC (rev 610) +++ trunk/openbios-devel/arch/unix/plugins/plugin_qt/plugin_qt.cpp 2009-11-15 21:03:51 UTC (rev 611) @@ -105,10 +105,10 @@ void FrameBufferWidget::quit() { extern volatile int gui_running; - extern volatile int runforth; + extern volatile int interruptforth; gui_running=0; - runforth=0; + interruptforth=1; qApp->quit(); } Modified: trunk/openbios-devel/forth/bootstrap/interpreter.fs =================================================================== --- trunk/openbios-devel/forth/bootstrap/interpreter.fs 2009-11-12 01:15:02 UTC (rev 610) +++ trunk/openbios-devel/forth/bootstrap/interpreter.fs 2009-11-15 21:03:51 UTC (rev 611) @@ -12,6 +12,7 @@ \ 0 value interactive? +0 value terminate? : exit? interactive? 0= if @@ -122,7 +123,8 @@ refill ['] interpret catch print-status - again + terminate? + until ; ['] outer-interpreter (to) \ Modified: trunk/openbios-devel/forth/debugging/firmware.fs =================================================================== --- trunk/openbios-devel/forth/debugging/firmware.fs 2009-11-12 01:15:02 UTC (rev 610) +++ trunk/openbios-devel/forth/debugging/firmware.fs 2009-11-15 21:03:51 UTC (rev 611) @@ -62,13 +62,18 @@ \ 7.5.3.4 Forth source-level debugger - + : debug ( "old-name< >" -- ) + parse-word \ Look up word CFA in dictionary + $find + 0 = if + ." could not locate word for debugging" + 2drop + else + (debug + then ; -: (debug ( xt -- ) - ; - : stepping ( -- ) ; @@ -76,7 +81,10 @@ ; : debug-off ( -- ) + (debug-off) ; : resume ( -- ) + \ Set interpreter termination flag + 1 to terminate? ; Modified: trunk/openbios-devel/forth/lib/vocabulary.fs =================================================================== --- trunk/openbios-devel/forth/lib/vocabulary.fs 2009-11-12 01:15:02 UTC (rev 610) +++ trunk/openbios-devel/forth/lib/vocabulary.fs 2009-11-15 21:03:51 UTC (rev 611) @@ -62,9 +62,9 @@ \ which new definitions will be placed. cr get-order 0 ?do - ." wordlist " i (.) type 2e emit space . cr + ." wordlist " i (.) type 2e emit space u. cr loop - cr ." definitions: " current @ . cr + cr ." definitions: " current @ u. cr ; Modified: trunk/openbios-devel/include/openbios/kernel.h =================================================================== --- trunk/openbios-devel/include/openbios/kernel.h 2009-11-12 01:15:02 UTC (rev 610) +++ trunk/openbios-devel/include/openbios/kernel.h 2009-11-15 21:03:51 UTC (rev 611) @@ -21,7 +21,12 @@ #include "openbios/stack.h" #include "asm/io.h" -extern volatile int runforth; +/* Interrupt status */ +#define FORTH_INTSTAT_CLR 0x0 +#define FORTH_INTSTAT_STOP 0x1 +#define FORTH_INTSTAT_DBG 0x2 + +extern volatile int interruptforth; extern int enterforth( xt_t xt ); extern void panic(const char *error) __attribute__ ((noreturn)); Modified: trunk/openbios-devel/include/openbios/stack.h =================================================================== --- trunk/openbios-devel/include/openbios/stack.h 2009-11-12 01:15:02 UTC (rev 610) +++ trunk/openbios-devel/include/openbios/stack.h 2009-11-15 21:03:51 UTC (rev 611) @@ -18,6 +18,8 @@ extern int rstackcnt; extern cell rstack[rstacksize]; +extern int dbgrstackcnt; + //typedef struct opaque_xt *xt_t; //typedef struct opaque_ihandle *ihandle_t; //typedef struct opaque_phandle *phandle_t; Modified: trunk/openbios-devel/kernel/bootstrap.c =================================================================== --- trunk/openbios-devel/kernel/bootstrap.c 2009-11-12 01:15:02 UTC (rev 610) +++ trunk/openbios-devel/kernel/bootstrap.c 2009-11-15 21:03:51 UTC (rev 611) @@ -78,7 +78,7 @@ "here", "here!", "dobranch", "do?branch", "unaligned-w@", "unaligned-w!", "unaligned-l@", "unaligned-l!", "ioc@", "iow@", "iol@", "ioc!", "iow!", "iol!", "i", "j", "call", "sys-debug", - "$include", "$encode-file" + "$include", "$encode-file", "(debug", "(debug-off)" }; static void init_trampoline(void) @@ -743,7 +743,7 @@ { int tmp; if( cursrc < 1 ) { - runforth = 0; + interruptforth |= FORTH_INTSTAT_STOP; /* return -1 in order to exit the loop in key() */ return -1; } @@ -763,7 +763,7 @@ int tmp; if( cursrc < 1 ) { - runforth = 0; + interruptforth |= FORTH_INTSTAT_STOP; return 0; } @@ -909,7 +909,7 @@ if (verbose) printk("Jumping to dictionary..."); - runforth=-1; + interruptforth = 1; enterforth((xt_t)PC); } Modified: trunk/openbios-devel/kernel/dict.c =================================================================== --- trunk/openbios-devel/kernel/dict.c 2009-11-12 01:15:02 UTC (rev 610) +++ trunk/openbios-devel/kernel/dict.c 2009-11-15 21:03:51 UTC (rev 611) @@ -50,7 +50,7 @@ /* fstrlen - returns length of a forth string. */ -static ucell fstrlen(ucell fstr) +ucell fstrlen(ucell fstr) { fstr -= pointer2cell(dict)+1; //fstr -= pointer2cell(dict); FIXME @@ -78,6 +78,18 @@ return 0; } +/* fstrncpy - copy a forth string to a destination (with NULL termination) */ + +void fstrncpy(char *dest, ucell src, unsigned int maxlen) +{ + int len = fstrlen(src); + + if (fstrlen(src) >= maxlen) len = maxlen - 1; + memcpy(dest, cell2pointer(src), len); + *(dest + len) = '\0'; +} + + /* findword * looks up a given word in the dictionary. This function * is used by the c based interpreter and to find the "initialize" @@ -109,6 +121,131 @@ } +/* findsemis_wordlist + * Given a DOCOL xt and a wordlist, find the address of the semis + * word at the end of the word definition. We do this by finding + * the word before this in the dictionary, then counting back one + * from the NFA. + */ + +ucell findsemis_wordlist(ucell xt, ucell wordlist) +{ + ucell tmplfa, nextlfa, nextcfa; + + if (!wordlist) + return 0; + + tmplfa = read_ucell(cell2pointer(wordlist)); + nextcfa = lfa2cfa(tmplfa); + + /* Catch the special case where the lfa of the word we + * want is the last word in the dictionary; in that case + * the end of the word is given by "here" - 1 */ + if (nextcfa == xt) + return pointer2cell(dict) + dicthead - sizeof(cell); + + while (tmplfa) { + + /* Peek ahead and see if the next CFA in the list is the + * one we are searching for */ + nextlfa = read_ucell(cell2pointer(tmplfa)); + nextcfa = lfa2cfa(nextlfa); + + /* If so, count back 1 cell from the current NFA */ + if (nextcfa == xt) + return lfa2nfa(tmplfa) - sizeof(cell); + + tmplfa = nextlfa; + } + + return 0; +} + + +/* findsemis + * Given a DOCOL xt, find the address of the semis word at the end + * of the word definition by searching all vocabularies */ + +ucell findsemis(ucell xt) +{ + ucell usesvocab = findword("vocabularies?") + sizeof(cell); + unsigned int i; + + if (read_ucell(cell2pointer(usesvocab))) { + /* Vocabularies are in use, so search each one in turn */ + ucell numvocabs = findword("#vocs") + sizeof(cell); + + for (i = 0; i < read_ucell(cell2pointer(numvocabs)); i++) { + ucell vocabs = findword("vocabularies") + 2 * sizeof(cell); + ucell semis = findsemis_wordlist(xt, read_cell(cell2pointer(vocabs + (i * sizeof(cell))))); + + /* If we get a non-zero result, we found the xt in this vocab */ + if (semis) + return semis; + } + } else { + /* Vocabularies not in use */ + return findsemis_wordlist(xt, read_ucell(last)); + } + + return 0; +} + + +/* findxtfromcell_wordlist + * Given a cell and a wordlist, determine the CFA of the word containing + * the cell or 0 if we are unable to return a suitable CFA + */ + +ucell findxtfromcell_wordlist(ucell incell, ucell wordlist) +{ + ucell tmplfa; + + if (!wordlist) + return 0; + + tmplfa = read_ucell(cell2pointer(wordlist)); + while (tmplfa) { + if (tmplfa < incell) + return lfa2cfa(tmplfa); + + tmplfa = read_ucell(cell2pointer(tmplfa)); + } + + return 0; +} + + +/* findxtfromcell + * Given a cell, determine the CFA of the word containing + * the cell by searching all vocabularies + */ + +ucell findxtfromcell(ucell incell) +{ + ucell usesvocab = findword("vocabularies?") + sizeof(cell); + unsigned int i; + + if (read_ucell(cell2pointer(usesvocab))) { + /* Vocabularies are in use, so search each one in turn */ + ucell numvocabs = findword("#vocs") + sizeof(cell); + + for (i = 0; i < read_ucell(cell2pointer(numvocabs)); i++) { + ucell vocabs = findword("vocabularies") + 2 * sizeof(cell); + ucell semis = findxtfromcell_wordlist(incell, read_cell(cell2pointer(vocabs + (i * sizeof(cell))))); + + /* If we get a non-zero result, we found the xt in this vocab */ + if (semis) + return semis; + } + } else { + /* Vocabularies not in use */ + return findxtfromcell_wordlist(incell, read_ucell(last)); + } + + return 0; +} + void dump_header(dictionary_header_t *header) { printk("OpenBIOS dictionary:\n"); Modified: trunk/openbios-devel/kernel/include/dict.h =================================================================== --- trunk/openbios-devel/kernel/include/dict.h 2009-11-12 01:15:02 UTC (rev 610) +++ trunk/openbios-devel/kernel/include/dict.h 2009-11-15 21:03:51 UTC (rev 611) @@ -11,13 +11,15 @@ #define DICTID "OpenBIOS" -#define DOCOL 1 -#define DOLIT 2 -#define DOCON 3 -#define DOVAR 4 -#define DODFR 5 -#define DODOES 6 +#define DOSEMIS 0 +#define DOCOL 1 +#define DOLIT 2 +#define DOCON 3 +#define DOVAR 4 +#define DODFR 5 +#define DODOES 6 +#define MAXNFALEN 128 /* The header is 28/32 bytes on 32/64bit platforms */ @@ -37,6 +39,12 @@ ucell lfa2nfa(ucell ilfa); ucell load_dictionary(const char *data, ucell len); void dump_header(dictionary_header_t *header); +ucell fstrlen(ucell fstr); +void fstrncpy(char *dest, ucell src, unsigned int maxlen); +ucell findsemis_wordlist(ucell xt, ucell wordlist); +ucell findsemis(ucell xt); +ucell findxtfromcell_wordlist(ucell incell, ucell wordlist); +ucell findxtfromcell(ucell incell); /* program counter */ extern ucell PC; Modified: trunk/openbios-devel/kernel/internal.c =================================================================== --- trunk/openbios-devel/kernel/internal.c 2009-11-12 01:15:02 UTC (rev 610) +++ trunk/openbios-devel/kernel/internal.c 2009-11-15 21:03:51 UTC (rev 611) @@ -13,12 +13,39 @@ * - address pointed by CFA is executed by CPU */ +#ifndef FCOMPILER +#include "libc/vsprintf.h" +#else +#include <stdarg.h> +#endif + typedef void forth_word(void); static forth_word * const words[]; ucell PC; -volatile int runforth = 0; +volatile int interruptforth = 0; +#define DEBUG_MODE_NONE 0 +#define DEBUG_MODE_STEP 1 +#define DEBUG_MODE_TRACE 2 +#define DEBUG_MODE_STEPUP 3 + +#define DEBUG_BANNER "\nStepper keys: <space>/<enter> Up Down Trace Rstack Forth\n" + +/* Empty linked list of debug xts */ +struct debug_xt { + ucell xt_docol; + ucell xt_semis; + int mode; + struct debug_xt *next; +}; + +static struct debug_xt debug_xt_eol = { (ucell)0, (ucell)0, 0, NULL}; +static struct debug_xt *debug_xt_list = &debug_xt_eol; + +/* Static buffer for xt name */ +char xtname[MAXNFALEN]; + #ifndef FCOMPILER /* instead of pointing to an explicit 0 variable we * point behind the pointer. @@ -70,6 +97,8 @@ processxt(read_ucell(cell2pointer(read_ucell(cell2pointer(PC))))); } +static inline void next_dbg(void); + int enterforth(xt_t xt) { ucell *_cfa = (ucell*)cell2pointer(xt); @@ -84,13 +113,26 @@ rstackcnt = 0; tmp = rstackcnt; - runforth = 1; + interruptforth = FORTH_INTSTAT_CLR; PUSHR(PC); PC = pointer2cell(_cfa); - while (rstackcnt > tmp && runforth) { - dbg_interp_printk("enterforth: NEXT\n"); - next(); + + while (rstackcnt > tmp && !(interruptforth & FORTH_INTSTAT_STOP)) { + if (debug_xt_list->next == NULL) { + while (rstackcnt > tmp && !interruptforth) { + dbg_interp_printk("enterforth: NEXT\n"); + next(); + } + } else { + while (rstackcnt > tmp && !interruptforth) { + dbg_interp_printk("enterforth: NEXT_DBG\n"); + next_dbg(); + } + } + + /* Always clear the debug mode change flag */ + interruptforth = interruptforth & (~FORTH_INTSTAT_DBG); } #if 0 @@ -367,3 +409,366 @@ { string_relay( &encode_file ); } + + +/* + * Debug support functions + */ + +static +int printf_console( const char *fmt, ... ) +{ + cell tmp; + + char buf[512]; + va_list args; + int i; + + va_start(args, fmt); + i = vsnprintf(buf, sizeof(buf), fmt, args); + va_end(args); + + /* Push to the Forth interpreter for console output */ + tmp = rstackcnt; + + PUSH(pointer2cell(buf)); + PUSH((int)strlen(buf)); + trampoline[1] = findword("type"); + + PUSHR(PC); + PC = pointer2cell(trampoline); + + while (rstackcnt > tmp) { + dbg_interp_printk("printf_console: NEXT\n"); + next(); + } + + return i; +} + +static void +display_dbg_dstack ( void ) +{ + /* Display dstack contents between parentheses */ + int i; + + if (dstackcnt == 0) { + printf_console(" ( Empty ) "); + return; + } else { + printf_console(" ( "); + for (i = 1; i <= dstackcnt; i++) { + if (i != 1) + printf_console(" "); + printf_console("%" FMT_CELL_x, dstack[i]); + } + printf_console(" ) "); + } +} + +static void +display_dbg_rstack ( void ) +{ + /* Display rstack contents between parentheses */ + int i; + + if (rstackcnt == 0) { + printf_console(" ( Empty ) "); + return; + } else { + printf_console("\nR: ( "); + for (i = 1; i <= rstackcnt; i++) { + if (i != 1) + printf_console(" "); + printf_console("%" FMT_CELL_x, rstack[i]); + } + printf_console(" ) \n"); + } +} + +static int +add_debug_xt( ucell xt ) +{ + struct debug_xt *debug_xt_item; + + /* If the xt CFA isn't DOCOL then issue a warning and do nothing */ + if (read_ucell(cell2pointer(xt)) != DOCOL) { + printf_console("\nprimitive words cannot be debugged\n"); + return 0; + } + + /* If this xt is already in the list, do nothing but indicate success */ + for (debug_xt_item = debug_xt_list; debug_xt_item->next != NULL; debug_xt_item = debug_xt_item->next) + if (debug_xt_item->xt_docol == xt) + return 1; + + /* We already have the CFA (PC) indicating the starting cell of the word, however we also + need the ending cell too (we cannot rely on the rstack as it can be arbitrarily + changed by a forth word). Hence the use of findsemis() */ + + /* Otherwise add to the head of the linked list */ + debug_xt_item = malloc(sizeof(struct debug_xt)); + debug_xt_item->xt_docol = xt; + debug_xt_item->xt_semis = findsemis(xt); + debug_xt_item->mode = DEBUG_MODE_NONE; + debug_xt_item->next = debug_xt_list; + debug_xt_list = debug_xt_item; + + /* Indicate debug mode change */ + interruptforth |= FORTH_INTSTAT_DBG; + + /* Success */ + return 1; +} + +static void +del_debug_xt( ucell xt ) +{ + struct debug_xt *debug_xt_item, *tmp_xt_item; + + /* Handle the case where the xt is at the head of the list */ + if (debug_xt_list->xt_docol == xt) { + tmp_xt_item = debug_xt_list; + debug_xt_list = debug_xt_list->next; + free(tmp_xt_item); + + return; + } + + /* Otherwise find this xt in the linked list and remove it */ + for (debug_xt_item = debug_xt_list; debug_xt_item->next != NULL; debug_xt_item = debug_xt_item->next) { + if (debug_xt_item->next->xt_docol == xt) { + tmp_xt_item = debug_xt_item->next; + debug_xt_item->next = debug_xt_item->next->next; + free(tmp_xt_item); + } + } + + /* If the list is now empty, indicate debug mode change */ + if (debug_xt_list->next == NULL) + interruptforth |= FORTH_INTSTAT_DBG; +} + +static void +do_source_dbg( struct debug_xt *debug_xt_item ) +{ + /* Forth source debugger implementation */ + char k, done = 0; + + /* Display current dstack */ + display_dbg_dstack(); + printf_console("\n"); + + fstrncpy(xtname, lfa2nfa(read_ucell(cell2pointer(PC)) - sizeof(cell)), MAXNFALEN); + printf_console("%p: %s ", cell2pointer(PC), xtname); + + /* If in trace mode, we just carry on */ + if (debug_xt_item->mode == DEBUG_MODE_TRACE) + return; + + /* Otherwise in step mode, prompt for a keypress */ + while (!availchar()); + k = getchar(); + + /* Only proceed if done is true */ + while (!done) + { + switch (k) { + + case ' ': + case '\n': + /* Perform a single step */ + done = 1; + break; + + case 'u': + case 'U': + /* Up - unmark current word for debug, mark its caller for + * debugging and finish executing current word */ + + /* Since this word could alter the rstack during its execution, + * we only know the caller when (semis) is called for this xt. + * Hence we mark the xt as a special DEBUG_MODE_STEPUP which + * means we run as normal, but schedule the xt for deletion + * at its corresponding (semis) word when we know the rstack + * will be set to its final parent value */ + debug_xt_item->mode = DEBUG_MODE_STEPUP; + done = 1; + break; + + case 'd': + case 'D': + /* Down - mark current word for debug and step into it */ + done = add_debug_xt(read_ucell(cell2pointer(PC))); + if (!done) { + while (!availchar()); + k = getchar(); + } + break; + + case 't': + case 'T': + /* Trace mode */ + debug_xt_item->mode = DEBUG_MODE_TRACE; + done = 1; + break; + + case 'r': + case 'R': + /* Display rstack */ + display_dbg_rstack(); + done = 0; + while (!availchar()); + k = getchar(); + break; + + case 'f': + case 'F': + /* Start subordinate Forth interpreter */ + PUSHR(PC - sizeof(cell)); + PC = pointer2cell(findword("outer-interpreter")) + sizeof(ucell); + + /* Save rstack position for when we return */ + dbgrstackcnt = rstackcnt; + done = 1; + break; + + default: + /* Display debug banner */ + printk(DEBUG_BANNER); + while (!availchar()); + k = getchar(); + } + } +} + +static void docol_dbg(void) +{ /* DOCOL */ + struct debug_xt *debug_xt_item; + + PUSHR(PC); + PC = read_ucell(cell2pointer(PC)); + + /* If current xt is in our debug xt list, display word name */ + debug_xt_item = debug_xt_list; + while (debug_xt_item->next) { + if (debug_xt_item->xt_docol == PC) { + fstrncpy(xtname, lfa2nfa(PC - sizeof(cell)), MAXNFALEN); + printf_console("\n: %s ", xtname); + + /* Step mode is the default */ + debug_xt_item->mode = DEBUG_MODE_STEP; + } + + debug_xt_item = debug_xt_item->next; + } + + dbg_interp_printk("docol_dbg: %s\n", cell2pointer( lfa2nfa(PC - sizeof(cell)) )); +} + +static void semis_dbg(void) +{ + struct debug_xt *debug_xt_item, *debug_xt_up = NULL; + + /* If current semis is in our debug xt list, disable debug mode */ + debug_xt_item = debug_xt_list; + while (debug_xt_item->next) { + if (debug_xt_item->xt_semis == PC) { + if (debug_xt_item->mode != DEBUG_MODE_STEPUP) { + /* Handle the normal case */ + fstrncpy(xtname, lfa2nfa(debug_xt_item->xt_docol - sizeof(cell)), MAXNFALEN); + printf_console("\n[ Finished %s ] ", xtname); + + /* Reset to step mode in case we were in trace mode */ + debug_xt_item->mode = DEBUG_MODE_STEP; + } else { + /* This word requires execution of the debugger "Up" + * semantics. However we can't do this here since we + * are iterating through the debug list, and we need + * to change it. So we do it afterwards. + */ + debug_xt_up = debug_xt_item; + } + } + + debug_xt_item = debug_xt_item->next; + } + + /* Execute debugger "Up" semantics if required */ + if (debug_xt_up) { + /* Only add the parent word if it is not within the trampoline */ + if (rstack[rstackcnt] != (cell)pointer2cell(&trampoline[1])) { + del_debug_xt(debug_xt_up->xt_docol); + add_debug_xt(findxtfromcell(rstack[rstackcnt])); + + fstrncpy(xtname, lfa2nfa(findxtfromcell(rstack[rstackcnt]) - sizeof(cell)), MAXNFALEN); + printf_console("\n[ Up to %s ] ", xtname); + } else { + fstrncpy(xtname, lfa2nfa(findxtfromcell(debug_xt_up->xt_docol) - sizeof(cell)), MAXNFALEN); + printf_console("\n[ Finished %s (Unable to go up, hit trampoline) ] ", xtname); + + del_debug_xt(debug_xt_up->xt_docol); + } + + debug_xt_up = NULL; + } + + PC = POPR(); +} + +static inline void next_dbg(void) +{ + struct debug_xt *debug_xt_item; + void (*tokenp) (void); + + PC += sizeof(ucell); + + /* If the PC lies within a debug range, run the source debugger */ + debug_xt_item = debug_xt_list; + while (debug_xt_item->next) { + if (PC >= debug_xt_item->xt_docol && PC <= debug_xt_item->xt_semis && + debug_xt_item->mode != DEBUG_MODE_STEPUP) { + do_source_dbg(debug_xt_item); + } + + debug_xt_item = debug_xt_item->next; + } + + dbg_interp_printk("next_dbg: PC is now %x\n", PC); + + /* Intercept DOCOL and SEMIS and redirect to debug versions */ + if (read_ucell(cell2pointer(read_ucell(cell2pointer(PC)))) == DOCOL) { + tokenp = docol_dbg; + tokenp(); + } else if (read_ucell(cell2pointer(read_ucell(cell2pointer(PC)))) == DOSEMIS) { + tokenp = semis_dbg; + tokenp(); + } else { + /* Otherwise process as normal */ + processxt(read_ucell(cell2pointer(read_ucell(cell2pointer(PC))))); + } +} + +static void +do_debug_xt( void ) +{ + ucell xt = POP(); + + /* Add to the debug list */ + if (add_debug_xt(xt)) { + /* Display debug banner */ + printf_console(DEBUG_BANNER); + + /* Indicate change to debug mode */ + interruptforth |= FORTH_INTSTAT_DBG; + } +} + +static void +do_debug_off( void ) +{ + /* Empty the debug xt linked list */ + while (debug_xt_list->next != NULL) + del_debug_xt(debug_xt_list->xt_docol); +} + Modified: trunk/openbios-devel/kernel/primitives.c =================================================================== --- trunk/openbios-devel/kernel/primitives.c 2009-11-12 01:15:02 UTC (rev 610) +++ trunk/openbios-devel/kernel/primitives.c 2009-11-15 21:03:51 UTC (rev 611) @@ -143,4 +143,6 @@ sysdebug, /* sys-debug */ do_include, /* $include */ do_encode_file, /* $encode-file */ + do_debug_xt, /* (debug */ + do_debug_off, /* (debug-off) */ }; Modified: trunk/openbios-devel/kernel/stack.c =================================================================== --- trunk/openbios-devel/kernel/stack.c 2009-11-12 01:15:02 UTC (rev 610) +++ trunk/openbios-devel/kernel/stack.c 2009-11-15 21:03:51 UTC (rev 611) @@ -19,6 +19,9 @@ int rstackcnt = 0; cell rstack[rstacksize]; +/* Rstack value saved before entering forth interpreter in debugger */ +int dbgrstackcnt = 0; + #if defined(CONFIG_DEBUG_DSTACK) || defined(FCOMPILER) void printdstack(void) { Modified: trunk/openbios-devel/modules/cmdline.c =================================================================== --- trunk/openbios-devel/modules/cmdline.c 2009-11-12 01:15:02 UTC (rev 610) +++ trunk/openbios-devel/modules/cmdline.c 2009-11-15 21:03:51 UTC (rev 611) @@ -179,6 +179,7 @@ { int cur_added=0, histind=0, ch, i, pos=0, n=0, prompt=1; char *buf = ci->buf; + int terminate = 0; buf = ci->buf; selfword("prepare"); @@ -187,10 +188,11 @@ #ifdef NOLEAVE for (;;) #else - while (rstackcnt) + while (rstackcnt && !terminate) #endif { int drop = 0; + terminate = 0; if( prompt ) { fword("print-prompt"); @@ -254,6 +256,12 @@ emit(' '); PUSH( feval(buf) ); fword("print-status"); + + /* Leave the interpreter if terminate? value set */ + fword("terminate?"); + if (POP()) + terminate = 1; + prompt = 1; break; @@ -384,7 +392,14 @@ move_cursor( 1-emit_str(&buf[pos++]) ); } } - /* won't come here; if we ever do we should close ourselves */ + + /* we only get here if terminate? is non-zero; this should + * only ever be done for a subordinate forth interpreter + * e.g. for debugging */ + + /* Reset stack and terminate? */ + rstackcnt = dbgrstackcnt; + feval("0 to terminate?"); } NODE_METHODS( cmdline ) = {

1 0

Re: [OpenBIOS] Sparc64 OpenBIOS
by Nick Couchman 15 Nov '09

15 Nov '09

Here's the output from the Nevada v66 version of Solaris: OpenBIOS for Sparc64 Configuration device id QEMU version 1 machine id 0 CPUs: 1 x SUNW,UltraSPARC-II UUID: 00000000-0000-0000-0000-000000000000 Welcome to OpenBIOS v1.0 built on Oct 20 2009 21:00 Type 'help' for detailed information [sparc64] Booting file 'disk' with parameters '' Not a bootable ELF image Not a Linux kernel image Not a bootable a.out image Not a bootable FCode image Not a bootable ELF image Not a Linux kernel image Not a bootable a.out image Not a bootable FCode image Unsupported image format 0 > boot cdrom [sparc64] Booting file 'cdrom' with parameters '' Not a bootable ELF image Not a Linux kernel image Not a bootable a.out image Not a bootable FCode image Not a bootable ELF image Not a Linux kernel image Not a bootable a.out image Loading FCode image... Loaded 5936 bytes entry point is 0x4000 Evaluating FCode... open isn't unique. Boot load failed. ok 0 > -Nick >>> On 2009/11/14 at 08:35, "Nick Couchman" <Nick.Couchman(a)seakr.com> wrote: > I have a pretty old version of the Solaris Nevada code that I tried to boot, > and I got a different error: open isn't unique. I'll post actual output here > in a little while. > > I'm pretty new to Qemu and OpenBIOS - what's the best way to go about > debugging this? GDB? Qemu's built-in debugging? > > Thanks, > Nick > >>>> On 2009/11/13 at 11:38, Tarl Neustaedter <Tarl.Neustaedter(a)Sun.COM> wrote: >> Nick Couchman wrote: >>> So, forgive the ignorant question, but does this look to be an OpenBIOS >> issue or a Qemu issue? >>> >> >> Until you figure out why the seek is failing, you won't know. >> >> Minor comment about "seek"; this is in the forth engine file support, >> and "seek" actually translates to scsi (or atapi) reads. It will >> pre-load about 8k of data for future reads, so when debugging this, if >> you put a breakpoint in your HBA code where scsi commands get issued, >> you may be able to figure out what mistake it's making. > > > > -------- > This e-mail may contain confidential and privileged material for the sole use > of the intended recipient. If this email is not intended for you, or you are > not responsible for the delivery of this message to the intended recipient, > please note that this message may contain SEAKR Engineering (SEAKR) > Privileged/Proprietary Information. In such a case, you are strictly > prohibited from downloading, photocopying, distributing or otherwise using > this message, its contents or attachments in any way. If you have received > this message in error, please notify us immediately by replying to this e-mail > and delete the message from your mailbox. Information contained in this > message that does not relate to the business of SEAKR is neither endorsed by > nor attributable to SEAKR. -------- This e-mail may contain confidential and privileged material for the sole use of the intended recipient. If this email is not intended for you, or you are not responsible for the delivery of this message to the intended recipient, please note that this message may contain SEAKR Engineering (SEAKR) Privileged/Proprietary Information. In such a case, you are strictly prohibited from downloading, photocopying, distributing or otherwise using this message, its contents or attachments in any way. If you have received this message in error, please notify us immediately by replying to this e-mail and delete the message from your mailbox. Information contained in this message that does not relate to the business of SEAKR is neither endorsed by nor attributable to SEAKR.

2 1

Re: [OpenBIOS] Sparc64 OpenBIOS
by Nick Couchman 14 Nov '09

14 Nov '09

I have a pretty old version of the Solaris Nevada code that I tried to boot, and I got a different error: open isn't unique. I'll post actual output here in a little while. I'm pretty new to Qemu and OpenBIOS - what's the best way to go about debugging this? GDB? Qemu's built-in debugging? Thanks, Nick >>> On 2009/11/13 at 11:38, Tarl Neustaedter <Tarl.Neustaedter(a)Sun.COM> wrote: > Nick Couchman wrote: >> So, forgive the ignorant question, but does this look to be an OpenBIOS > issue or a Qemu issue? >> > > Until you figure out why the seek is failing, you won't know. > > Minor comment about "seek"; this is in the forth engine file support, > and "seek" actually translates to scsi (or atapi) reads. It will > pre-load about 8k of data for future reads, so when debugging this, if > you put a breakpoint in your HBA code where scsi commands get issued, > you may be able to figure out what mistake it's making. -------- This e-mail may contain confidential and privileged material for the sole use of the intended recipient. If this email is not intended for you, or you are not responsible for the delivery of this message to the intended recipient, please note that this message may contain SEAKR Engineering (SEAKR) Privileged/Proprietary Information. In such a case, you are strictly prohibited from downloading, photocopying, distributing or otherwise using this message, its contents or attachments in any way. If you have received this message in error, please notify us immediately by replying to this e-mail and delete the message from your mailbox. Information contained in this message that does not relate to the business of SEAKR is neither endorsed by nor attributable to SEAKR.

3 3

PATCH: Reworked version of Forth Source debugger
by Mark Cave-Ayland 14 Nov '09

14 Nov '09

Hi everyone, Please find attached the latest version of my Forth source debugger patch which I believe is ready for commit review. This patch implements the following Forth words: debug <xt> - Mark word for debugging debug-off - Unmark all words for debugging resume - Return from subordinate Forth interpreter The source debugger also implements the following commands when it has been activated: Up - Unmark current word for debugging, mark parent and continue Down - Mark next word for debugging Trace - Continue execution until end of word displaying debug information Rstack - Display contents of the Rstack Forth - Launch subordinate Forth interpreter The patch has been reworked in its current form to minimise the impact the debugger has on the performance of the Forth kernel by changing the "runforth" flag to an "interruptforth" bitmask. If interruptforth is 0 then execution continues as normal; if interruptforth is non-zero then we should behave accordingly. Currently two interruptforth bitmasks are defined: FORTH_INTSTAT_STOP - The interpreter should stop immediately FORTH_INTSTAT_DBG - The debugger should be enabled/disabled depending upon the contents of the global debug xt list. The main loop of enterforth() has now been changed to be a nested while loop which either launches next() or next_dbg() depending upon whether any breakpoints have been set. Since the majority of the execution time is spent within the inner loop, then the only change is a small penalty incurred whilst calling enterforth(). The reason the patch has been designed to work by intercepting the PC within next() is because several Forth words within OpenBIOS will pop items from the rstack before pushing a new one. Hence a debugger which uses the Rstack to determine whether or debug should be enabled will always fail on these words since any extra debugging context would be lost. I've measured the performance on my laptop here, and interestingly enough I now get better performance with the patch rather than without, which I guess is due to some compiler optimisation that the new nested loops can invoke. Current SVN benchmark (40th Fibonacci number): build@zeno:~/src/openbios/openbios-devel$ time echo "28 fib-rec u. bye" | ./obj-x86/openbios-unix ./obj-x86/openbios-x86.dict Welcome to OpenBIOS v1.0 built on Nov 14 2009 12:37 Type 'help' for detailed information [unix] Booting default not supported. 0 > 28 fib-rec u. bye 6197ecb Farewell! ok real 0m52.724s user 0m52.395s sys 0m0.316s Current SVN + source debugger patch (40th Fibonacci number): build@zeno:~/src/openbios/openbios-devel.tst$ time echo "28 fib-rec u. bye" | ./obj-x86/openbios-unix ./obj-x86/openbios-x86.dict Welcome to OpenBIOS v1.0 built on Nov 14 2009 12:39 Type 'help' for detailed information [unix] Booting default not supported. 0 > 28 fib-rec u. bye 6197ecb Farewell! ok real 0m48.880s user 0m48.519s sys 0m0.188s Since the last version, I've also included the code tested by myself/Laurent to ensure that the debugger works on a graphical display and tidied up all outstanding compilation warnings. ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063 Sirius Labs: http://www.siriusit.co.uk/labs

2 1

Re: [OpenBIOS] Sparc64 OpenBIOS
by Nick Couchman 13 Nov '09

13 Nov '09

So, forgive the ignorant question, but does this look to be an OpenBIOS issue or a Qemu issue? Thanks, Nick >>> On 2009/11/12 at 18:39, Tarl Neustaedter <Tarl.Neustaedter(a)Sun.COM> wrote: > Nick Couchman wrote: >> [...] >> >> 0 > boot cdrom >> [sparc64] Booting file 'cdrom' with parameters '' >> Not a bootable ELF image >> Not a Linux kernel image >> Not a bootable a.out image >> Loading FCode image... >> Loaded 7420 bytes >> entry point is 0x4000 >> Evaluating FCode... >> >> seek failed >> >> Can't mount root >> >> byte-load: exception caught! >> ok >> 0 > >> >> This is a Solaris 10 SPARC disc - it looks like it finds the boot code it > needs fine, but can't load it for some reason. Any hints or any thing else I > can do to help debug the situation would be great. >> > > What the Solaris 10 boot-blocks do (which is different in > OpenSolaris/Nevada, and somewhat varies between updates of Solaris 10) is: > > - create /packages/ufs-file-system (or hsfs-file-system) > - call do-boot, which it has just defined. > > At the point above, where it has failed and you are at the ok prompt, > you should be able to see do-boot, which includes something like: > > : do-boot > 4000 loadbase! > loadbase " hsfsboot" get-file if > ." Boot load failed" cr xit > then > reloc&go > ; > > It's pretty clear you are dying in get-file, which is also external at > this point, and you can debug it. > > The "seek failed" message comes from an attempt to read a block that > isn't within the partition boundaries. Either there is something wrong > with the HBA driver for the cdrom, or something is going wrong chasing > down hsfs data pointers. -------- This e-mail may contain confidential and privileged material for the sole use of the intended recipient. If this email is not intended for you, or you are not responsible for the delivery of this message to the intended recipient, please note that this message may contain SEAKR Engineering (SEAKR) Privileged/Proprietary Information. In such a case, you are strictly prohibited from downloading, photocopying, distributing or otherwise using this message, its contents or attachments in any way. If you have received this message in error, please notify us immediately by replying to this e-mail and delete the message from your mailbox. Information contained in this message that does not relate to the business of SEAKR is neither endorsed by nor attributable to SEAKR.

2 1

Sparc64 OpenBIOS
by Nick Couchman 13 Nov '09

13 Nov '09

I'm attempting to use OpenBIOS on Sparc64 with Qemu, and am getting some errors trying to boot. Here's the output that I get: Welcome to OpenBIOS v1.0 built on Oct 20 2009 21:00 Type 'help' for detailed information [sparc64] Booting file 'disk' with parameters '' Not a bootable ELF image Not a Linux kernel image Not a bootable a.out image Not a bootable FCode image Not a bootable ELF image Not a Linux kernel image Not a bootable a.out image Not a bootable FCode image Unsupported image format 0 > boot cdrom [sparc64] Booting file 'cdrom' with parameters '' Not a bootable ELF image Not a Linux kernel image Not a bootable a.out image Loading FCode image... Loaded 7420 bytes entry point is 0x4000 Evaluating FCode... seek failed Can't mount root byte-load: exception caught! ok 0 > This is a Solaris 10 SPARC disc - it looks like it finds the boot code it needs fine, but can't load it for some reason. Any hints or any thing else I can do to help debug the situation would be great. Thanks - Nick -------- This e-mail may contain confidential and privileged material for the sole use of the intended recipient. If this email is not intended for you, or you are not responsible for the delivery of this message to the intended recipient, please note that this message may contain SEAKR Engineering (SEAKR) Privileged/Proprietary Information. In such a case, you are strictly prohibited from downloading, photocopying, distributing or otherwise using this message, its contents or attachments in any way. If you have received this message in error, please notify us immediately by replying to this e-mail and delete the message from your mailbox. Information contained in this message that does not relate to the business of SEAKR is neither endorsed by nor attributable to SEAKR.

2 1

r610 - trunk/openbios-devel/modules
by svn＠openbios.org 12 Nov '09

12 Nov '09

Author: laurent Date: 2009-11-12 02:15:02 +0100 (Thu, 12 Nov 2009) New Revision: 610 Modified: trunk/openbios-devel/modules/client.c Log: Disable traces commited in previous commit by error Modified: trunk/openbios-devel/modules/client.c =================================================================== --- trunk/openbios-devel/modules/client.c 2009-11-12 01:11:04 UTC (rev 609) +++ trunk/openbios-devel/modules/client.c 2009-11-12 01:15:02 UTC (rev 610) @@ -19,7 +19,7 @@ #include "openbios/of.h" /* Uncomment to enable debug printout of client interface calls */ -#define DEBUG_CIF +//#define DEBUG_CIF //#define DUMP_IO /* OF client interface. r3 points to the argument array. On return,

1 0

r609 - in trunk/openbios-devel: forth/system modules
by svn＠openbios.org 12 Nov '09

12 Nov '09

Author: laurent Date: 2009-11-12 02:11:04 +0100 (Thu, 12 Nov 2009) New Revision: 609 Modified: trunk/openbios-devel/forth/system/ciface.fs trunk/openbios-devel/modules/client.c Log: Implement Client Interface method "test-method" defined in "PowerPC Microprocessor CHRP binding", Chapter 10.5.2. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/forth/system/ciface.fs =================================================================== --- trunk/openbios-devel/forth/system/ciface.fs 2009-11-12 00:57:32 UTC (rev 608) +++ trunk/openbios-devel/forth/system/ciface.fs 2009-11-12 01:11:04 UTC (rev 609) @@ -303,6 +303,18 @@ outer-interpreter ; +[IFDEF] CONFIG_PPC +\ PowerPC Microprocessor CHRP binding +\ 10.5.2. Client Interface + +( phandle cstring-method -- missing ) + +: test-method + dup cstrlen rot + find-method 0= if -1 else drop 0 then +; +[THEN] + finish-device device-end Modified: trunk/openbios-devel/modules/client.c =================================================================== --- trunk/openbios-devel/modules/client.c 2009-11-12 00:57:32 UTC (rev 608) +++ trunk/openbios-devel/modules/client.c 2009-11-12 01:11:04 UTC (rev 609) @@ -19,7 +19,7 @@ #include "openbios/of.h" /* Uncomment to enable debug printout of client interface calls */ -//#define DEBUG_CIF +#define DEBUG_CIF //#define DUMP_IO /* OF client interface. r3 points to the argument array. On return, @@ -143,6 +143,9 @@ printk("enter()\n"); } else if (strcmp(pb->service, "exit") == 0) { printk("exit()\n"); + } else if (strcmp(pb->service, "test-method") == 0) { + printk("test-method(0x%08lx, \"%s\") = ", + pb->args[0], (char*)pb->args[1]); } else { printk("of_client_interface: %s ", pb->service ); for( i = 0; i < pb->nargs; i++ ) @@ -212,6 +215,8 @@ /* do nothing */ } else if (strcmp(pb->service, "exit") == 0) { /* do nothing */ + } else if (strcmp(pb->service, "test-method") == 0) { + printk("0x%08lx\n", pb->args[pb->nargs]); } else { printk("of_client_interface return:"); for (i = 0; i < pb->nret; i++) {

1 0

r608 - trunk/openbios-devel/modules
by svn＠openbios.org 12 Nov '09

12 Nov '09

Author: laurent Date: 2009-11-12 01:57:32 +0100 (Thu, 12 Nov 2009) New Revision: 608 Modified: trunk/openbios-devel/modules/client.c Log: Client interface clean-up Allow to not display client interface calls to read/write/seek to have clearer traces. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/modules/client.c =================================================================== --- trunk/openbios-devel/modules/client.c 2009-11-10 22:13:54 UTC (rev 607) +++ trunk/openbios-devel/modules/client.c 2009-11-12 00:57:32 UTC (rev 608) @@ -20,6 +20,7 @@ /* Uncomment to enable debug printout of client interface calls */ //#define DEBUG_CIF +//#define DUMP_IO /* OF client interface. r3 points to the argument array. On return, * r3 should contain 0==true or -1==false. r4-r12,cr0,cr1 may @@ -72,7 +73,6 @@ static void dump_service(prom_args_t *pb) { int i; - printk("[ nargs %ld nret %ld ] ", pb->nargs, pb->nret); if (strcmp(pb->service, "test") == 0) { printk("test(\"%s\") = ", (char*)pb->args[0]); } else if (strcmp(pb->service, "peer") == 0) { @@ -115,16 +115,22 @@ } else if (strcmp(pb->service, "close") == 0) { printk("close(0x%08lx)\n", pb->args[0]); } else if (strcmp(pb->service, "read") == 0) { +#ifdef DUMP_IO printk("read(0x%08lx, 0x%08lx, %ld) = ", pb->args[0], pb->args[1], pb->args[2]); +#endif } else if (strcmp(pb->service, "write") == 0) { +#ifdef DUMP_IO printk("write(0x%08lx, 0x%08lx, %ld)\n", pb->args[0], pb->args[1], pb->args[2]); memdump((char*)pb->args[1], pb->args[2]); printk(" = "); +#endif } else if (strcmp(pb->service, "seek") == 0) { +#ifdef DUMP_IO printk("seek(0x%08lx, 0x%08lx, 0x%08lx) = ", pb->args[0], pb->args[1], pb->args[2]); +#endif } else if (strcmp(pb->service, "claim") == 0) { printk("claim(0x8%lx, %ld, %ld) = ", pb->args[0], pb->args[1], pb->args[2]); @@ -184,12 +190,18 @@ } else if (strcmp(pb->service, "close") == 0) { /* do nothing */ } else if (strcmp(pb->service, "read") == 0) { +#ifdef DUMP_IO printk("%ld\n", pb->args[pb->nargs]); memdump((char*)pb->args[1], pb->args[pb->nargs]); +#endif } else if (strcmp(pb->service, "write") == 0) { +#ifdef DUMP_IO printk("%ld\n", pb->args[pb->nargs]); +#endif } else if (strcmp(pb->service, "seek") == 0) { +#ifdef DUMP_IO printk("%ld\n", pb->args[pb->nargs]); +#endif } else if (strcmp(pb->service, "claim") == 0) { printk("0x%08lx\n", pb->args[pb->nargs]); } else if (strcmp(pb->service, "release") == 0) {

1 0

Feature request
by G 3 11 Nov '09

11 Nov '09

I ask that the ability to move the cursor using the arrow keys be added to OpenBIOS. This feature would make editing text in the console a lot easier.

3 2

r607 - trunk/openbios-devel/arch/ppc/qemu
by svn＠openbios.org 10 Nov '09

10 Nov '09

Author: laurent Date: 2009-11-10 22:13:54 +0000 (Tue, 10 Nov 2009) New Revision: 607 Modified: trunk/openbios-devel/arch/ppc/qemu/init.c Log: Add "64-bit" property for PowerPC 970fx. (allows Fedora bootloader to load the good kernel, 32-bit or 64-bit) Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c 2009-11-10 21:57:00 UTC (rev 606) +++ trunk/openbios-devel/arch/ppc/qemu/init.c 2009-11-10 22:13:54 UTC (rev 607) @@ -273,6 +273,12 @@ fword("encode-int"); push_str("reg"); fword("property"); + + PUSH(0); + PUSH(0); + fword("encode-bytes"); + push_str("64-bit"); + fword("property"); fword("finish-device");

1 0

r606 - trunk/openbios-devel/drivers
by svn＠openbios.org 10 Nov '09

10 Nov '09

Author: laurent Date: 2009-11-10 21:57:00 +0000 (Tue, 10 Nov 2009) New Revision: 606 Modified: trunk/openbios-devel/drivers/cuda.c Log: Define methods get-time and set-time of /pci/mac-io/via-cuda/rtc. We can now have date&time from our openbios command line interface... Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/drivers/cuda.c =================================================================== --- trunk/openbios-devel/drivers/cuda.c 2009-11-10 21:52:40 UTC (rev 605) +++ trunk/openbios-devel/drivers/cuda.c 2009-11-10 21:57:00 UTC (rev 606) @@ -58,7 +58,9 @@ #define CUDA_PACKET 1 /* CUDA commands (2nd byte) */ -#define CUDA_POWERDOWN 0xa +#define CUDA_GET_TIME 0x03 +#define CUDA_SET_TIME 0x09 +#define CUDA_POWERDOWN 0x0a #define CUDA_RESET_SYSTEM 0x11 static uint8_t cuda_readb (cuda_t *dev, int reg) @@ -233,8 +235,115 @@ RET(-1); } +/* + * get-time ( -- second minute hour day month year ) + * + */ + +static const int days_month[12] = + { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; +static const int days_month_leap[12] = + { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; + +static inline int is_leap(int year) +{ + return ((year % 4 == 0) && (year % 100 != 0)) || (year % 400 == 0); +} + +static void +rtc_get_time(int *idx) +{ + uint8_t cmdbuf[2], obuf[64]; + ucell second, minute, hour, day, month, year; + uint32_t now; + int current; + const int *days; + + cmdbuf[0] = CUDA_GET_TIME; + cuda_request(main_cuda, CUDA_PACKET, cmdbuf, sizeof(cmdbuf), obuf); + + /* seconds since 01/01/1904 */ + + now = (obuf[3] << 24) + (obuf[4] << 16) + (obuf[5] << 8) + obuf[6]; + + second = now % 60; + now /= 60; + + minute = now % 60; + now /= 60; + + hour = now % 24; + now /= 24; + + year = now * 100 / 36525; + now -= year * 36525 / 100; + year += 1904; + + days = is_leap(year) ? days_month_leap : days_month; + + current = 0; + month = 0; + while (month < 12) { + if (now <= current + days[month]) { + break; + } + current += days[month]; + month++; + } + month++; + + day = now - current; + + PUSH(second); + PUSH(minute); + PUSH(hour); + PUSH(day); + PUSH(month); + PUSH(year); +} + +/* + * set-time ( second minute hour day month year -- ) + * + */ + +static void +rtc_set_time(int *idx) +{ + uint8_t cmdbuf[5], obuf[3]; + ucell second, minute, hour, day, month, year; + const int *days; + uint32_t now; + unsigned int nb_days; + int i; + + year = POP(); + month = POP(); + day = POP(); + hour = POP(); + minute = POP(); + second = POP(); + + days = is_leap(year) ? days_month_leap : days_month; + nb_days = (year - 1904) * 36525 / 100 + day; + for (i = 0; i < month - 1; i++) + nb_days += days[i]; + + now = (((nb_days * 24) + hour) * 60 + minute) * 60 + second; + + cmdbuf[0] = CUDA_SET_TIME; + cmdbuf[1] = now >> 24; + cmdbuf[2] = now >> 16; + cmdbuf[3] = now >> 8; + cmdbuf[4] = now; + + cuda_request(main_cuda, CUDA_PACKET, cmdbuf, sizeof(cmdbuf), obuf); +} + NODE_METHODS(rtc) = { { "open", rtc_open }, + { "get-time", rtc_get_time }, + { "set-time", rtc_set_time }, }; static void

1 0

r605 - trunk/openbios-devel/drivers
by svn＠openbios.org 10 Nov '09

10 Nov '09

Author: laurent Date: 2009-11-10 21:52:40 +0000 (Tue, 10 Nov 2009) New Revision: 605 Modified: trunk/openbios-devel/drivers/cuda.c Log: Remove broken and useless cuda unit decode/encode methods. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/drivers/cuda.c =================================================================== --- trunk/openbios-devel/drivers/cuda.c 2009-11-10 21:50:36 UTC (rev 604) +++ trunk/openbios-devel/drivers/cuda.c 2009-11-10 21:52:40 UTC (rev 605) @@ -219,25 +219,10 @@ { } -static void -ob_cuda_decode_unit(void *private) -{ - PUSH(0); - fword("decode-unit-pci-bus"); -} - -static void -ob_cuda_encode_unit(void *private) -{ - fword("encode-unit-pci"); -} - NODE_METHODS(ob_cuda) = { { NULL, ob_cuda_initialize }, { "open", ob_cuda_open }, { "close", ob_cuda_close }, - { "decode-unit", ob_cuda_decode_unit }, - { "encode-unit", ob_cuda_encode_unit }, }; DECLARE_UNNAMED_NODE(rtc, INSTALL_OPEN, sizeof(int));

1 0

r604 - trunk/openbios-devel/drivers
by svn＠openbios.org 10 Nov '09

10 Nov '09

Author: laurent Date: 2009-11-10 21:50:36 +0000 (Tue, 10 Nov 2009) New Revision: 604 Modified: trunk/openbios-devel/drivers/macio.c Log: Define methods to decode/encode mac-io units. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/drivers/macio.c =================================================================== --- trunk/openbios-devel/drivers/macio.c 2009-11-10 21:39:42 UTC (rev 603) +++ trunk/openbios-devel/drivers/macio.c 2009-11-10 21:50:36 UTC (rev 604) @@ -170,11 +170,49 @@ set_int_property(dnode, "clock-frequency", 4166666); } +DECLARE_NODE(ob_macio, INSTALL_OPEN, sizeof(int), "Tmac-io"); + +/* ( str len -- addr ) */ + +static void +ob_macio_decode_unit(void *private) +{ + ucell addr; + + const char *arg = pop_fstr_copy(); + + addr = strtol(arg, NULL, 16); + + free((char*)arg); + + PUSH(addr); +} + +/* ( addr -- str len ) */ + +static void +ob_macio_encode_unit(void *private) +{ + char buf[8]; + + ucell addr = POP(); + + snprintf(buf, sizeof(buf), "%x", addr); + + push_str(buf); +} + +NODE_METHODS(ob_macio) = { + { "decode-unit", ob_macio_decode_unit }, + { "encode-unit", ob_macio_encode_unit }, +}; + void ob_macio_heathrow_init(const char *path, uint32_t addr) { phandle_t aliases; + REGISTER_NODE(ob_macio); aliases = find_dev("/aliases"); set_property(aliases, "mac-io", path, strlen(path) + 1);

1 0

r603 - in trunk/openbios-devel: drivers forth/util include/libc libc
by svn＠openbios.org 10 Nov '09

10 Nov '09

Author: laurent Date: 2009-11-10 21:39:42 +0000 (Tue, 10 Nov 2009) New Revision: 603 Modified: trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/forth/util/pci.fs trunk/openbios-devel/include/libc/string.h trunk/openbios-devel/libc/misc.c Log: Fully decode PCI unit name attribute. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/drivers/pci.c =================================================================== --- trunk/openbios-devel/drivers/pci.c 2009-11-10 21:34:21 UTC (rev 602) +++ trunk/openbios-devel/drivers/pci.c 2009-11-10 21:39:42 UTC (rev 603) @@ -91,8 +91,106 @@ static void ob_pci_decode_unit(int *idx) { - PUSH(0); - fword("decode-unit-pci-bus"); + ucell hi, mid, lo; + const char *arg = pop_fstr_copy(); + int dev, fn, reg, ss, n, p, t; + int bus = 0; /* no information */ + char *ptr; + + dev = 0; + fn = 0; + reg = 0; + ss = 0; + n = 0; + p = 0; + t = 0; + + ptr = (char*)arg; + if (*ptr == 'n') { + n = IS_NOT_RELOCATABLE; + ptr++; + } + if (*ptr == 'i') { + ss = IO_SPACE; + ptr++; + if (*ptr == 't') { + t = IS_ALIASED; + ptr++; + } + + /* DD,F,RR,NNNNNNNN */ + + dev = strtol(ptr, &ptr, 16); + ptr++; + fn = strtol(ptr, &ptr, 16); + ptr++; + reg = strtol(ptr, &ptr, 16); + ptr++; + lo = strtol(ptr, &ptr, 16); + mid = 0; + + } else if (*ptr == 'm') { + ss = MEMORY_SPACE_32; + ptr++; + if (*ptr == 't') { + t = IS_ALIASED; + ptr++; + } + if (*ptr == 'p') { + p = IS_PREFETCHABLE; + ptr++; + } + + /* DD,F,RR,NNNNNNNN */ + + dev = strtol(ptr, &ptr, 16); + ptr++; + fn = strtol(ptr, &ptr, 16); + ptr++; + reg = strtol(ptr, &ptr, 16); + ptr++; + lo = strtol(ptr, &ptr, 16); + mid = 0; + + } else if (*ptr == 'x') { + unsigned long long addr64; + ss = MEMORY_SPACE_64; + ptr++; + if (*ptr == 'p') { + p = IS_PREFETCHABLE; + ptr++; + } + + /* DD,F,RR,NNNNNNNNNNNNNNNN */ + + dev = strtol(ptr, &ptr, 16); + ptr++; + fn = strtol(ptr, &ptr, 16); + ptr++; + reg = strtol(ptr, &ptr, 16); + ptr++; + addr64 = strtoll(ptr, &ptr, 16); + lo = (ucell)addr64; + mid = addr64 >> 32; + + } else { + ss = CONFIGURATION_SPACE; + /* "DD" or "DD,FF" */ + dev = strtol(ptr, &ptr, 16); + if (*ptr == ',') { + ptr++; + fn = strtol(ptr, NULL, 16); + } + lo = 0; + mid = 0; + } + free((char*)arg); + + hi = n | p | t | (ss << 24) | (bus << 16) | (dev << 11) | (fn << 8) | reg; + + PUSH(lo); + PUSH(mid); + PUSH(hi); } /* ( phys.lo phy.mid phys.hi -- str len ) */ @@ -122,7 +220,7 @@ if (fn == 0) /* DD */ snprintf(buf, sizeof(buf), "%x", dev); else /* DD,F */ - snprintf(buf, sizeof(buf), "%x,%d", dev, fn); + snprintf(buf, sizeof(buf), "%x,%x", dev, fn); break; case IO_SPACE: Modified: trunk/openbios-devel/forth/util/pci.fs =================================================================== --- trunk/openbios-devel/forth/util/pci.fs 2009-11-10 21:34:21 UTC (rev 602) +++ trunk/openbios-devel/forth/util/pci.fs 2009-11-10 21:39:42 UTC (rev 603) @@ -90,17 +90,3 @@ \ : test-pci \ 0 2 0 dump-pci-device \ ; - -\ only forth - -: decode-unit-pci-bus ( str len bus -- phys.lo phys.mid phys.hi ) - -rot ascii , left-split - ( addr-R len-R addr-L len-L ) - parse-hex b << f800 and - -rot parse-hex 8 << 700 and - or - ( bus phys.hi ) - swap ff and 10 << or - 0 0 rot -; - Modified: trunk/openbios-devel/include/libc/string.h =================================================================== --- trunk/openbios-devel/include/libc/string.h 2009-11-10 21:34:21 UTC (rev 602) +++ trunk/openbios-devel/include/libc/string.h 2009-11-10 21:39:42 UTC (rev 603) @@ -23,7 +23,9 @@ #define atol(nptr) strtol(nptr, NULL, 10 ) extern long strtol( const char *nptr, char **endptr, int base ); +extern long long int strtoll( const char *nptr, char **endptr, int base ); + extern int strnicmp(const char *s1, const char *s2, size_t len); extern char *strcpy(char * dest,const char *src); extern char *strncpy(char * dest,const char *src,size_t count); Modified: trunk/openbios-devel/libc/misc.c =================================================================== --- trunk/openbios-devel/libc/misc.c 2009-11-10 21:34:21 UTC (rev 602) +++ trunk/openbios-devel/libc/misc.c 2009-11-10 21:39:42 UTC (rev 603) @@ -76,6 +76,41 @@ return sum * sign; } +long long int +strtoll( const char *nptr, char **endptr, int base ) +{ + long long int sum; + int n, sign=1; + while( isspace(*nptr) ) + nptr++; + + if( *nptr == '-' || *nptr == '+' ) + sign = (*nptr++ == '-') ? -1 : 1; + + if( base == 16 || base == 0) { + if( !base ) + base = (nptr[0] == '0')? 8 : 10; + if( nptr[0] == '0' && nptr[1] == 'x' ) { + nptr += 2; + base = 16; + } + } + for( sum=0 ;; nptr++ ) { + char ch = *nptr; + if( !isalnum(ch) ) + break; + n = isdigit(ch) ? ch - '0' : toupper(ch) - 'A' + 10; + if( n >= base || n < 0 ) + break; + sum *= base; + sum += n; + } + if( endptr ) + *endptr = (char*)nptr; + + return sum * sign; +} + // Propolice support long __guard[8] = { #ifdef CONFIG_BIG_ENDIAN

1 0

r602 - trunk/openbios-devel/forth/debugging
by svn＠openbios.org 10 Nov '09

10 Nov '09

Author: laurent Date: 2009-11-10 21:34:21 +0000 (Tue, 10 Nov 2009) New Revision: 602 Modified: trunk/openbios-devel/forth/debugging/client.fs Log: Correctly encode strings of bootpath and bootargs properties. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/forth/debugging/client.fs =================================================================== --- trunk/openbios-devel/forth/debugging/client.fs 2009-11-09 19:39:26 UTC (rev 601) +++ trunk/openbios-devel/forth/debugging/client.fs 2009-11-10 21:34:21 UTC (rev 602) @@ -282,11 +282,11 @@ ; : (encode-bootpath) ( "{params}<cr>" -- bootpath-str bootpath-len) - bl parse 2dup + bl parse 2dup encode-string " /chosen" (find-dev) if " bootpath" rot (property) then - linefeed parse + linefeed parse encode-string " /chosen" (find-dev) if " bootargs" rot (property) then

1 0

r601 - trunk/openbios-devel/drivers
by svn＠openbios.org 09 Nov '09

09 Nov '09

Author: laurent Date: 2009-11-09 19:39:26 +0000 (Mon, 09 Nov 2009) New Revision: 601 Modified: trunk/openbios-devel/drivers/cuda.c Log: Move "bind_func("poweroff", ppc32_poweroff)" from ob_cuda_initialize() to cuda_init() because it is a global word and if it is binded into the node initialization it breaks some other words ("decode-unit", "encode-unit"). Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/drivers/cuda.c =================================================================== --- trunk/openbios-devel/drivers/cuda.c 2009-11-08 23:43:19 UTC (rev 600) +++ trunk/openbios-devel/drivers/cuda.c 2009-11-09 19:39:26 UTC (rev 601) @@ -206,10 +206,6 @@ bind_func("ppc32-reset-all", ppc32_reset_all); push_str("' ppc32-reset-all to reset-all"); fword("eval"); - - PUSH(0); - fword("active-package!"); - bind_func("poweroff", ppc32_poweroff); } static void @@ -307,5 +303,8 @@ main_cuda = cuda; + device_end(); + bind_func("poweroff", ppc32_poweroff); + return cuda; }

1 0

PATCH: Implement Forth source debugger for OpenBIOS
by Mark Cave-Ayland 09 Nov '09

09 Nov '09

Hi all, Whilst spending some time working on debugging SPARC64 support with Qemu/OpenBIOS, it became readily apparent that progress was being hampered by the lack of debugging facilities in OpenBIOS (see http://lists.openbios.org/pipermail/openbios/2009-August/003949.html). Hence I've been working on adding a source debugger to OpenBIOS which should enable developers to step/trace through Forth words in order to locate bugs in the lower level Forth OpenBIOS code. The attached patch implements a Forth Source Debugger based upon the IEEE-1275 specification; it is not a comprehensive implementation but has already proved to be very useful in my tests here. A sample session using the debugger goes something like this: Welcome to OpenBIOS v1.0 built on Oct 31 2009 10:09 Type 'help' for detailed information [unix] Booting default not supported. 0 > : bar ." test " ; ok 0 > debug bar Stepper keys: <space>/<enter> Up Down Trace Rstack Forth ok 0 > bar : bar ( Empty ) 0xf7e11f0c: (") : (") ( Empty ) 0xf7dfd928: r> ( f7e11f0c ) 0xf7dfd92c: dup ( f7e11f0c f7e11f0c ) 0xf7dfd930: 2 ( f7e11f0c f7e11f0c 2 ) 0xf7dfd934: cells ( f7e11f0c f7e11f0c 8 ) 0xf7dfd938: + ( f7e11f0c f7e11f14 ) 0xf7dfd93c: over ( f7e11f0c f7e11f14 f7e11f0c ) 0xf7dfd940: cell+ ( f7e11f0c f7e11f14 f7e11f10 ) 0xf7dfd944: @ ( f7e11f0c f7e11f14 5 ) 0xf7dfd948: rot ( f7e11f14 5 f7e11f0c ) 0xf7dfd94c: over ( f7e11f14 5 f7e11f0c 5 ) 0xf7dfd950: + ( f7e11f14 5 f7e11f11 ) 0xf7dfd954: aligned ( f7e11f14 5 f7e11f14 ) 0xf7dfd958: cell+ ( f7e11f14 5 f7e11f18 ) 0xf7dfd95c: >r ( f7e11f14 5 ) 0xf7dfd960: (semis) [ Finished (") ] ( f7e11f14 5 ) 0xf7e11f1c: type test ( Empty ) 0xf7e11f20: (semis) [ Finished bar ] ok 0 > bar : bar ( Empty ) 0xf7e11f0c: (") : (") ( Empty ) 0xf7dfd928: r> [ Up to bar ] ( f7e11f14 5 ) 0xf7e11f1c: type test ( Empty ) 0xf7e11f20: (semis) [ Finished bar ] ok 0 > As eluded to in earlier posts to the list, my initial attempts at adding debug support were focused on storing additional information in the rstack. Unfortunately this created extra problems in debugging some of the more interesting Forth words, since they would manipulate the return stack and cause the debugger to get confused. My final implementation works in a much more simple way; when the debug word is invoked with the name of the word to debug, the start and end addresses of the word are added to a debug linked list. Then in the next() function, we iterate through the linked list to see if the current PC lies within one of the functions within. If this is the case, we enter the source debugger in step/trace mode as appropriate. Having given the patch a reasonably good test here, I'm quite pleased with the additional functionality it provides. The only minor downsides I can see are that the patch adds extra work in docol(), semis() and next() in order to update the debug linked list. I've tried to wrap most of the complexity in conditional while() statements so that it is only invoked while the debugger is active, and so should have a minimal impact on normal runtime performance (which seems to be the case here). Please test the patch and let me know if it requires extra work in order for it to be considered ready for committing to the OpenBIOS SVN repository. ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063 Sirius Labs: http://www.siriusit.co.uk/labs

5 11

r600 - trunk/openbios-devel/arch/ppc/qemu
by svn＠openbios.org 09 Nov '09

09 Nov '09

Author: laurent Date: 2009-11-08 23:43:19 +0000 (Sun, 08 Nov 2009) New Revision: 600 Modified: trunk/openbios-devel/arch/ppc/qemu/main.c Log: Correct typo Modified: trunk/openbios-devel/arch/ppc/qemu/main.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c 2009-11-07 21:53:45 UTC (rev 599) +++ trunk/openbios-devel/arch/ppc/qemu/main.c 2009-11-08 23:43:19 UTC (rev 600) @@ -132,7 +132,7 @@ partition, directory, filename); ELF_DPRINTF("bootpath %s bootargs %s\n", path, args); - set_property( chosen_ph, "bootpath", path, strlen(spec)+1 ); + set_property( chosen_ph, "bootpath", path, strlen(path)+1 ); if (args) set_property( chosen_ph, "bootargs", args, strlen(args)+1 ); }

1 0

r599 - trunk/openbios-devel/arch/ppc/qemu
by svn＠openbios.org 07 Nov '09

07 Nov '09

Author: laurent Date: 2009-11-07 21:53:45 +0000 (Sat, 07 Nov 2009) New Revision: 599 Modified: trunk/openbios-devel/arch/ppc/qemu/init.c Log: ppc/qemu: correctly manage property "available" of package "/memory" Instead of hardcoding values during init, call ofmem_register() with "/memory" phandle. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c 2009-11-06 21:59:24 UTC (rev 598) +++ trunk/openbios-devel/arch/ppc/qemu/init.c 2009-11-07 21:53:45 UTC (rev 599) @@ -613,28 +613,12 @@ push_str("reg"); fword("property"); - /* available memory */ - - PUSH(0); - fword("encode-int"); - PUSH((unsigned long)get_ram_bottom()); - fword("encode-int"); - fword("encode+"); - PUSH((unsigned long)get_ram_top()); - fword("encode-int"); - fword("encode+"); - PUSH(ram_size); - fword("encode-int"); - fword("encode+"); - push_str("available"); - fword("property"); - cpu = id_cpu(); cpu->initfn(cpu); printk("CPU type %s\n", cpu->name); snprintf(buf, sizeof(buf), "/cpus/%s", cpu->name); - ofmem_register(0, find_dev(buf)); + ofmem_register(find_dev("/memory"), find_dev(buf)); node_methods_init(buf); #ifdef USE_RTAS

1 0

r598 - trunk/openbios-devel/modules
by svn＠openbios.org 06 Nov '09

06 Nov '09

Author: laurent Date: 2009-11-06 21:59:24 +0000 (Fri, 06 Nov 2009) New Revision: 598 Modified: trunk/openbios-devel/modules/client.c Log: Client Interface: manage arguments number overflow Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/modules/client.c =================================================================== --- trunk/openbios-devel/modules/client.c 2009-11-06 21:23:32 UTC (rev 597) +++ trunk/openbios-devel/modules/client.c 2009-11-06 21:59:24 UTC (rev 598) @@ -29,11 +29,12 @@ * (it doesn't) or if the function is unimplemented. */ +#define PROM_MAX_ARGS 10 typedef struct prom_args { const char *service; long nargs; long nret; - ulong args[10]; /* MAX NUM ARGS! */ + ulong args[PROM_MAX_ARGS]; } prom_args_t; #ifdef DEBUG_CIF @@ -258,7 +259,8 @@ prom_args_t *pb = (prom_args_t*)params; int val, i, dstacksave; - if( pb->nargs < 0 || pb->nret < 0 ) + if( pb->nargs < 0 || pb->nret < 0 || + pb->nargs + pb->nret > PROM_MAX_ARGS) return -1; #ifdef DEBUG_CIF dump_service(pb);

1 0

r597 - trunk/openbios-devel/drivers
by svn＠openbios.org 06 Nov '09

06 Nov '09

Author: laurent Date: 2009-11-06 21:23:32 +0000 (Fri, 06 Nov 2009) New Revision: 597 Modified: trunk/openbios-devel/drivers/adb_kbd.c trunk/openbios-devel/drivers/kbd.c trunk/openbios-devel/drivers/kbd.h Log: ADB: Manage arrow keys and more. Manage more keyboard keys by emiting escape sequences. This allows to manage key up, key down, key left, key right, home, end ... (F1 to F16, HELP, ... are not tested) Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/drivers/adb_kbd.c =================================================================== --- trunk/openbios-devel/drivers/adb_kbd.c 2009-11-05 21:39:58 UTC (rev 596) +++ trunk/openbios-devel/drivers/adb_kbd.c 2009-11-06 21:23:32 UTC (rev 597) @@ -49,11 +49,48 @@ { "read", keyboard_read }, }; -/* ADB US keyboard translation map - * XXX: for now, only shift modifier is defined - */ +/* VT100 escape sequences */ +enum { + KEY_UP = 0, KEY_DOWN, KEY_RIGHT, KEY_LEFT, KEY_PAGE_UP, KEY_PAGE_DOWN, + KEY_DELETE, KEY_HOME, KEY_END, KEY_HELP, + KEY_F1, KEY_F2, KEY_F3, KEY_F4, KEY_F5, KEY_F6, KEY_F7, KEY_F8, + KEY_F9, KEY_F10, KEY_F11, KEY_F12, KEY_F13, KEY_F14, KEY_F15, KEY_F16 +}; +#define ADB_MAX_SEQUENCE_LEN 16 + +static const char *ADB_sequences[] = { + [KEY_UP] = "A[", + [KEY_DOWN] = "B[", + [KEY_RIGHT] = "C[", + [KEY_LEFT] = "D[", + [KEY_PAGE_UP] = "~5[", + [KEY_PAGE_DOWN] = "~6[", + [KEY_DELETE] = "~3[", + [KEY_HOME] = "HO", + [KEY_END] = "FO", + [KEY_HELP] = "~2[", + [KEY_F1] = "PO", + [KEY_F2] = "QO", + [KEY_F3] = "RO", + [KEY_F4] = "SO", + [KEY_F5] = "~15[", + [KEY_F6] = "~17[", + [KEY_F7] = "~18[", + [KEY_F8] = "~19[", + [KEY_F9] = "~20[", + [KEY_F10] = "~21[", + [KEY_F11] = "~23[", + [KEY_F12] = "~24[", + [KEY_F13] = "~25[", + [KEY_F14] = "~26[", + [KEY_F15] = "~28[", + [KEY_F15] = "~29[", +}; + +/* ADB US keyboard translation map */ + static const keymap_t ADB_kbd_us[] = { /* 0x00 */ { KBD_SH_CAPS, { 0x61, 0x41, 0x01, -1, -1, -1, -1, -1, @@ -275,14 +312,14 @@ /* 0x3A : option */ { KBD_MOD_MAP_LOPT, }, /* 0x3B : left */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_LEFT)), }, /* 0x3C : right */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_RIGHT)), }, /* 0x3D : down */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_DOWN)), }, /* 0x3E : up */ + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_UP)), }, { KBD_MAP_NONE, }, - { KBD_MAP_NONE, }, /* 0x40 */ { KBD_MAP_NONE, }, { KBD_SH_NUML, { 0x7F, 0x2E, -1, -1, -1, -1, -1, -1, @@ -368,55 +405,55 @@ { KBD_MOD_MAP(0x2F), }, { KBD_MAP_NONE, }, /* 0x60 : F5 */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_F5)), }, /* 0x61 : F6 */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_F6)), }, /* 0x62 : F7 */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_F7)), }, /* 0x63 : F3 */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_F3)), }, /* 0x64 : F8 */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_F8)), }, /* 0x65 : F9 */ + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_F9)), }, { KBD_MAP_NONE, }, - { KBD_MAP_NONE, }, /* 0x67 : F11 */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_F11)), }, /* 0x68 */ { KBD_MAP_NONE, }, /* 0x69 : F13 */ + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_F13)), }, { KBD_MAP_NONE, }, - { KBD_MAP_NONE, }, /* 0x6B : F14 */ + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_F14)), }, { KBD_MAP_NONE, }, - { KBD_MAP_NONE, }, /* 0x6D : F10 */ + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_F10)), }, { KBD_MAP_NONE, }, - { KBD_MAP_NONE, }, /* 0x6F : F12 */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_F12)), }, /* 0x70 */ { KBD_MAP_NONE, }, /* 0x71 : F15 */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_F15)), }, /* 0x72 : help */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_HELP)), }, /* 0x73 : home */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_HOME)), }, /* 0x74 : page up */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_PAGE_UP)), }, /* 0x75 : del */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_DELETE)), }, /* 0x76 : F4 */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_F4)), }, /* 0x77 : end */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_END)), }, /* 0x78 : F2 */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_F2)), }, /* 0x79 : page down */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_PAGE_UP)), }, /* 0x7A : F1 */ - { KBD_MAP_NONE, }, + { KBD_MOD_MAP(KBD_SEQUENCE(KEY_F1)), }, /* 0x7B : right shift */ { KBD_MOD_MAP_RSHIFT, }, /* 0x7C : right option */ @@ -432,6 +469,8 @@ struct adb_kbd_t { kbd_t kbd; int next_key; + char sequence[ADB_MAX_SEQUENCE_LEN]; + int len; }; static adb_dev_t *my_adb_dev = NULL; @@ -445,6 +484,13 @@ int ret; kbd = (void *)dev->state; + + if (kbd->len > 0) { + ret = kbd->sequence[kbd->len-- - 1]; + ADB_DPRINTF("Buffered %d (%02x)\n", ret, ret); + return ret; + } + /* Get saved state */ ret = -1; for (key = -1; key == -1; ) { @@ -457,7 +503,12 @@ kbd->next_key = buffer[1] == 0xFF ? -1 : buffer[1]; key = buffer[0]; } - ret = kbd_translate_key(&kbd->kbd, key & 0x7F, key >> 7); + ret = kbd_translate_key(&kbd->kbd, key & 0x7F, key >> 7, kbd->sequence); + if (ret > 0) { + kbd->len = ret; + ret = kbd->sequence[kbd->len-- - 1]; + } + ADB_DPRINTF("Translated %d (%02x) into %d (%02x)\n", key, key, ret, ret); } @@ -477,8 +528,9 @@ if (kbd != NULL) { memset(kbd, 0, sizeof(adb_kbd_t)); kbd_set_keymap(&kbd->kbd, sizeof(ADB_kbd_us) / sizeof(keymap_t), - ADB_kbd_us); + ADB_kbd_us, ADB_sequences); kbd->next_key = -1; + kbd->len = 0; dev->state = (int32_t)kbd; my_adb_dev = dev; } Modified: trunk/openbios-devel/drivers/kbd.c =================================================================== --- trunk/openbios-devel/drivers/kbd.c 2009-11-05 21:39:58 UTC (rev 596) +++ trunk/openbios-devel/drivers/kbd.c 2009-11-06 21:23:32 UTC (rev 597) @@ -20,6 +20,7 @@ */ #include "openbios/config.h" +#include "libc/string.h" #include "asm/types.h" #include "kbd.h" @@ -31,15 +32,16 @@ #define KBD_DPRINTF(fmt, args...) do { } while (0) #endif -int kbd_set_keymap (kbd_t *kbd, int nb_keys, const keymap_t *keymap) +int kbd_set_keymap (kbd_t *kbd, int nb_keys, const keymap_t *keymap, const char **sequences) { kbd->nb_keys = nb_keys; kbd->keymap = keymap; + kbd->sequences = sequences; return 0; } -int kbd_translate_key (kbd_t *kbd, int keycode, int up_down) +int kbd_translate_key (kbd_t *kbd, int keycode, int up_down, char *sequence) { const keymap_t *keyt; int mod_state, key, type; @@ -70,9 +72,17 @@ case KBD_TYPE_REGULAR: if (!up_down) { /* We don't care about up events on "normal" keys */ - ret = key; + *sequence = key; + ret = 1; } break; + case KBD_TYPE_SEQUENCE: + if (!up_down) { + /* We don't care about up events on "normal" keys */ + ret = strlen(kbd->sequences[key]); + memcpy(sequence, kbd->sequences[key], ret); + } + break; case KBD_TYPE_LOCK: if (!up_down) { kbd->mod_state ^= key; Modified: trunk/openbios-devel/drivers/kbd.h =================================================================== --- trunk/openbios-devel/drivers/kbd.h 2009-11-05 21:39:58 UTC (rev 596) +++ trunk/openbios-devel/drivers/kbd.h 2009-11-06 21:23:32 UTC (rev 597) @@ -35,6 +35,7 @@ */ int nb_keys; const keymap_t *keymap; + const char **sequences; }; /* Modifiers */ @@ -62,12 +63,15 @@ } kbd_lck_shifts; enum { - KBD_TYPE_REGULAR = 0 << 24, - KBD_TYPE_LMOD = 1 << 24, - KBD_TYPE_RMOD = 2 << 24, - KBD_TYPE_LOCK = 3 << 24, + KBD_TYPE_REGULAR = 0 << 24, + KBD_TYPE_LMOD = 1 << 24, + KBD_TYPE_RMOD = 2 << 24, + KBD_TYPE_LOCK = 3 << 24, + KBD_TYPE_SEQUENCE = 4 << 24, }; +#define KBD_SEQUENCE(sequence) (KBD_TYPE_SEQUENCE | (sequence)) + #define KBD_MOD_MAP(mod) \ KBD_SH_NONE, { (mod), (mod), (mod), (mod), (mod), (mod), (mod), (mod), \ (mod), (mod), (mod), (mod), (mod), (mod), (mod), (mod), \ @@ -97,7 +101,8 @@ }; void *kbd_new (int len); -int kbd_set_keymap (kbd_t *kbd, int nb_keys, const keymap_t *keymap); -int kbd_translate_key (kbd_t *kbd, int keycode, int up_down); +int kbd_set_keymap (kbd_t *kbd, int nb_keys, const keymap_t *keymap, + const char **sequences); +int kbd_translate_key (kbd_t *kbd, int keycode, int up_down, char *sequence); #endif /* !defined (__OHW_KBD_H__) */

1 0

r596 - trunk/openbios-devel/modules
by svn＠openbios.org 05 Nov '09

05 Nov '09

Author: laurent Date: 2009-11-05 21:39:58 +0000 (Thu, 05 Nov 2009) New Revision: 596 Modified: trunk/openbios-devel/modules/cmdline.c Log: Allow to move on command line and in history using the arrow keys. (with -nographic) Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/modules/cmdline.c =================================================================== --- trunk/openbios-devel/modules/cmdline.c 2009-11-05 20:51:15 UTC (rev 595) +++ trunk/openbios-devel/modules/cmdline.c 2009-11-05 21:39:58 UTC (rev 596) @@ -198,7 +198,8 @@ cur_added = prompt = histind = pos = n = 0; } - switch( (ch=key()) ) { + ch = key(); + switch( ch ) { case 27: switch( key() ) { case 'f': @@ -217,6 +218,30 @@ move_cursor( -1 ); pos--; } + break; + case '[': + switch( key() ) { + case 'A': + goto go_up; + case 'B': + goto go_down; + case 'C': + goto go_right; + case 'D': + goto go_left; + case '3': + key(); + goto delete; + } + break; + case 'O': + switch(key()) { + case 'F': + goto go_end; + case 'H': + goto go_home; + } + break; } break; case '\n': @@ -240,6 +265,7 @@ break; case 4: /* ^d */ +delete: if( pos == n ) break; emit( buf[pos++] ); @@ -260,17 +286,20 @@ break; case 1: /* ^a */ +go_home: move_cursor( -pos ); pos = 0; break; case 5: /* ^e */ +go_end: pos += emit_str( &buf[pos] ); break; //case 68: /* left */ // drop = 1; case 2: /* ^b */ +go_left: if( pos ) { move_cursor( -1 ); pos--; @@ -280,6 +309,7 @@ //case 67: /* right */ // drop = 1; case 6: /* ^f */ +go_right: if( pos < n ) emit( buf[pos++] ); break; @@ -316,6 +346,7 @@ //case 66: /* down */ // drop = 1; case 14: /* ^n */ +go_down: if( !histind ) break; history_get( ci, --histind ); @@ -331,6 +362,7 @@ //case 65: /* up */ // drop = 1; case 16: /* ^p */ +go_up: if( !histind && add_to_history(ci, ci->buf) ) { cur_added = 1; histind++;

1 0

r595 - trunk/openbios-devel/drivers
by svn＠openbios.org 05 Nov '09

05 Nov '09

Author: laurent Date: 2009-11-05 20:51:15 +0000 (Thu, 05 Nov 2009) New Revision: 595 Modified: trunk/openbios-devel/drivers/adb_kbd.c Log: Add management of "ctrl-" for ADB keyboard. On PPC, allow to navigate through command line history and current line with: ctrl-p, ctrl-n, ctrl-f, ctrl-b, ctrl-d, ctrl-c, ctrl-k, ctrl-y... Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/drivers/adb_kbd.c =================================================================== --- trunk/openbios-devel/drivers/adb_kbd.c 2009-11-05 20:22:21 UTC (rev 594) +++ trunk/openbios-devel/drivers/adb_kbd.c 2009-11-05 20:51:15 UTC (rev 595) @@ -56,77 +56,77 @@ static const keymap_t ADB_kbd_us[] = { /* 0x00 */ - { KBD_SH_CAPS, { 0x61, 0x41, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x61, 0x41, 0x01, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x73, 0x53, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x73, 0x53, 0x13, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x64, 0x44, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x64, 0x44, 0x04, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x66, 0x46, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x66, 0x46, 0x06, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x68, 0x48, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x68, 0x48, 0x08, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x67, 0x47, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x67, 0x47, 0x07, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x7A, 0x5A, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x7A, 0x5A, 0x1A, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x78, 0x58, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x78, 0x58, 0x18, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, /* 0x08 */ - { KBD_SH_CAPS, { 0x63, 0x43, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x63, 0x43, 0x03, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x76, 0x56, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x76, 0x56, 0x16, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x60, 0x40, -1, -1, -1, -1, -1, -1, /* ? */ + { KBD_SH_CAPS, { 0x60, 0x40, 0x00, -1, -1, -1, -1, -1, /* ? */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x62, 0x42, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x62, 0x42, 0x02, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x71, 0x51, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x71, 0x51, 0x11, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x77, 0x57, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x77, 0x57, 0x17, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x65, 0x45, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x65, 0x45, 0x05, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x72, 0x52, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x72, 0x52, 0x12, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, /* 0x10 */ - { KBD_SH_CAPS, { 0x79, 0x59, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x79, 0x59, 0x19, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x74, 0x54, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x74, 0x54, 0x14, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, @@ -134,7 +134,7 @@ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x32, 0x40, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x32, 0x40, 0x00, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, @@ -146,7 +146,7 @@ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x36, 0x5E, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x36, 0x5E, 0x1E, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, @@ -167,7 +167,7 @@ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x2D, 0x5F, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x2D, 0x5F, 0x1F, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, @@ -183,12 +183,12 @@ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x6F, 0x4F, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x6F, 0x4F, 0x0F, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, /* 0x20 */ - { KBD_SH_CAPS, { 0x75, 0x55, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x75, 0x55, 0x15, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, @@ -196,20 +196,20 @@ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x69, 0x49, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x69, 0x49, 0x09, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x70, 0x50, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x70, 0x50, 0x10, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, { KBD_MOD_MAP(0x0D), }, - { KBD_SH_CAPS, { 0x6C, 0x4C, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x6C, 0x4C, 0x0C, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x6A, 0x4A, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x6A, 0x4A, 0x0A, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, @@ -218,7 +218,7 @@ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, /* 0x28 */ - { KBD_SH_CAPS, { 0x6B, 0x4B, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x6B, 0x4B, 0x0B, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, @@ -238,11 +238,11 @@ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x6E, 0x4E, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x6E, 0x4E, 0x0E, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x6D, 0x4D, -1, -1, -1, -1, -1, -1, + { KBD_SH_CAPS, { 0x6D, 0x4D, 0x0D, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }, },

1 0

r594 - trunk/openbios-devel/drivers
by svn＠openbios.org 05 Nov '09

05 Nov '09

Author: laurent Date: 2009-11-05 20:22:21 +0000 (Thu, 05 Nov 2009) New Revision: 594 Modified: trunk/openbios-devel/drivers/kbd.c Log: printk() needs openbios/config.h Modified: trunk/openbios-devel/drivers/kbd.c =================================================================== --- trunk/openbios-devel/drivers/kbd.c 2009-11-02 22:35:59 UTC (rev 593) +++ trunk/openbios-devel/drivers/kbd.c 2009-11-05 20:22:21 UTC (rev 594) @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA */ +#include "openbios/config.h" #include "asm/types.h" #include "kbd.h"

1 0

Re: [OpenBIOS] PATCH: Implement Forth source debugger for OpenBIOS
by Laurent Vivier 04 Nov '09

04 Nov '09

>Laurent Vivier wrote: > >(lots cut) > >> 4- forth/admin/iocontrol.fs:install-console >> >> ... >> ['] io-emit to emit >> ... >> >> where io-emit is: >> >> : io-emit ( char -- ) >> io-out-char c! >> io-out-char 1 " write" stdout @ $call-method drop >> ; >> >> And stdout is defined in arch/ppc/qemu/init.c:arch_of_init() (see 2- ) > >Thank you - now I see that the defer word "emit" is not set to execute >the C function emit, which is what was confusing me. In fact the C function "emit()" is linked to the forth function "(emit)" which is set to the defer forth word "emit", and the forth word "emit" is redefined later to use the good package method. Regards, Laurent -- --------------------- Laurent(a)vivier.eu --------------------- "Tout ce qui est impossible reste à accomplir" Jules Verne "Things are only impossible until they're not" Jean-Luc Picard

1 0

Re: [OpenBIOS] PATCH: Implement Forth source debugger for OpenBIOS
by Laurent Vivier 04 Nov '09

04 Nov '09

>Laurent Vivier wrote: > >>> In the meantime, I've looked again at the v2 patch I posted and I still >>> can't work out why the debugging output by printk() doesn't appear on a >>> VNC display for Qemu SPARC64, while it appears fine when Qemu SPARC64 is >>> invoked in -nographic mode. Can anyone shed any light on this? >> >> Because "printk()" are sent to serial and must use only for debug purpose. >> You must use forth words like "emit" or "type" to send characters to >display. For instance, look at "modules/cmdline.c": >> >> static void >> emit( int ch ) >> { >> PUSH( ch ); >> fword("emit"); >> } >> >> static int >> emit_str( const char *str ) >> { >> int n = 0; >> while( *str ) { >> n++; >> emit( *str++ ); >> } >> return n; >> } > >Yeah, I did consider that this might be the case but it still doesn't >seem to make sense looking at the code. The source for the forth emit >word can be found in kernel/forth.c: > > >/* > * emit ( char -- ) > */ > >static void emit(void) >{ >#ifndef FCOMPILER > cell tmp = POP(); > putchar(tmp); >#else > (void) POP(); >#endif >} > > >while for SPARC64 the source for printk() can be found in >arch/sparc64/lib.c: > > >/* Format a string and print it on the screen, just like the libc > * function printf. > */ >int printk( const char *fmt, ... ) >{ > char *p, buf[512]; > va_list args; > int i; > > va_start(args, fmt); > i = vsnprintf(buf, sizeof(buf), fmt, args); > va_end(args); > > for( p=buf; *p; p++ ) > putchar(*p); > return i; >} > > >Both of these use putchar() in order to write characters out to the >console, and yet one of them works in a graphical terminal and one of >them doesn't... > But "emit" is redefined later to "io-emit" which use "stdout" which can be serial or graphic: 0- arch/ppc/qemu/start.S:_entry (this is the bootstrap) ... bl entry ... 1- arch/ppc/qemu/init.c:entry() ... initialize_forth(); ... 2- arch/ppc/qemu/kernel.c:initialize_forth() ... PUSH_xt( bind_noname_func(arch_of_init) ); fword("PREPOST-initializer"); PC = (ucell)findword("initialize-of"); ... 3- forth/system/main.fs:initialize-of ... install-console ... 4- forth/admin/iocontrol.fs:install-console ... ['] io-emit to emit ... where io-emit is: : io-emit ( char -- ) io-out-char c! io-out-char 1 " write" stdout @ $call-method drop ; And stdout is defined in arch/ppc/qemu/init.c:arch_of_init() (see 2- ) Regards, Laurent -- --------------------- Laurent(a)vivier.eu --------------------- "Tout ce qui est impossible reste à accomplir" Jules Verne "Things are only impossible until they're not" Jean-Luc Picard

2 1

Re: [OpenBIOS] PATCH: Implement Forth source debugger for OpenBIOS
by Laurent Vivier 04 Nov '09

04 Nov '09

>Blue Swirl wrote: > >> That's possible. >> >> But I think the performance hit could be avoided almost entirely. Make >> non-debug and debug versions of "semis" and "docol". On startup >> construct the "words" table, while building select the non-debug >> versions, unless some magic diagnostic switch is on. "next" or >> "enterforth" may still need a test. >> >> Maybe the switch to debug table could even happen during execution by >> user command. > >Indeed. I had a similar inspiration earlier this evening, with the only >problem being how to switch code into next() without causing a >performance hit. However, I think I've just worked out a cute little >hack that would solve this. I'm at a conference over the next few days, >so it might not be until next week that I get a chance re-work the patch >and resubmit. > >In the meantime, I've looked again at the v2 patch I posted and I still >can't work out why the debugging output by printk() doesn't appear on a >VNC display for Qemu SPARC64, while it appears fine when Qemu SPARC64 is >invoked in -nographic mode. Can anyone shed any light on this? Because "printk()" are sent to serial and must use only for debug purpose. You must use forth words like "emit" or "type" to send characters to display. For instance, look at "modules/cmdline.c": static void emit( int ch ) { PUSH( ch ); fword("emit"); } static int emit_str( const char *str ) { int n = 0; while( *str ) { n++; emit( *str++ ); } return n; } I think we could use also a "fword(type)" instead of the "emit_str()" (see forth/bootstrap/bootstrap.fs). Regards, Laurent -- --------------------- Laurent(a)vivier.eu --------------------- "Tout ce qui est impossible reste à accomplir" Jules Verne "Things are only impossible until they're not" Jean-Luc Picard

2 1

r593 - trunk/openbios-devel/modules
by svn＠openbios.org 02 Nov '09

02 Nov '09

Author: laurent Date: 2009-11-02 23:35:59 +0100 (Mon, 02 Nov 2009) New Revision: 593 Modified: trunk/openbios-devel/modules/filesystems.c Log: load: manage file size smaller than 512 bytes Allow to load bootinfo scripts of haiku and FreeBSD. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/modules/filesystems.c =================================================================== --- trunk/openbios-devel/modules/filesystems.c 2009-11-02 22:17:40 UTC (rev 592) +++ trunk/openbios-devel/modules/filesystems.c 2009-11-02 22:35:59 UTC (rev 593) @@ -259,11 +259,13 @@ size = 0; while(1) { ret = mi->fs->read( mi->file, buf, 512 ); - if (ret != 512) + if (ret <= 0) break; buf += ret; mi->filepos += ret; size += ret; + if (ret != 512) + break; } PUSH( size ); }

1 0

r592 - trunk/openbios-devel/modules
by svn＠openbios.org 02 Nov '09

02 Nov '09

Author: laurent Date: 2009-11-02 23:17:40 +0100 (Mon, 02 Nov 2009) New Revision: 592 Modified: trunk/openbios-devel/modules/client.c Log: client interface: add verbosity in traces Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/modules/client.c =================================================================== --- trunk/openbios-devel/modules/client.c 2009-11-01 23:27:35 UTC (rev 591) +++ trunk/openbios-devel/modules/client.c 2009-11-02 22:17:40 UTC (rev 592) @@ -36,7 +36,179 @@ ulong args[10]; /* MAX NUM ARGS! */ } prom_args_t; +#ifdef DEBUG_CIF +static void memdump(const char *mem, unsigned long size) +{ + int i; + + if (size == (unsigned long) -1) + return; + for (i = 0; i < size; i += 16) { + int j; + + printk("0x%08lx ", (unsigned long)mem + i); + + for (j = 0; j < 16 && i + j < size; j++) + printk(" %02x", *(unsigned char*)(mem + i + j)); + + for ( ; j < 16; j++) + printk(" __"); + + printk(" "); + + for (j = 0; j < 16 && i + j < size; j++) { + unsigned char c = *(mem + i + j); + if (isprint(c)) + printk("%c", c); + else + printk("."); + } + printk("\n"); + } +} + +static void dump_service(prom_args_t *pb) +{ + int i; + printk("[ nargs %ld nret %ld ] ", pb->nargs, pb->nret); + if (strcmp(pb->service, "test") == 0) { + printk("test(\"%s\") = ", (char*)pb->args[0]); + } else if (strcmp(pb->service, "peer") == 0) { + printk("peer(0x%08lx) = ", pb->args[0]); + } else if (strcmp(pb->service, "child") == 0) { + printk("child(0x%08lx) = ", pb->args[0]); + } else if (strcmp(pb->service, "parent") == 0) { + printk("parent(0x%08lx) = ", pb->args[0]); + } else if (strcmp(pb->service, "instance-to-package") == 0) { + printk("instance-to-package(0x%08lx) = ", pb->args[0]); + } else if (strcmp(pb->service, "getproplen") == 0) { + printk("getproplen(0x%08lx, \"%s\") = ", + pb->args[0], (char*)pb->args[1]); + } else if (strcmp(pb->service, "getprop") == 0) { + printk("getprop(0x%08lx, \"%s\", 0x%08lx, %ld) = ", + pb->args[0], (char*)pb->args[1], + pb->args[2], pb->args[3]); + } else if (strcmp(pb->service, "nextprop") == 0) { + printk("nextprop(0x%08lx, \"%s\", 0x%08lx) = ", + pb->args[0], (char*)pb->args[1], pb->args[2]); + } else if (strcmp(pb->service, "setprop") == 0) { + printk("setprop(0x%08lx, \"%s\", 0x%08lx, %ld)\n", + pb->args[0], (char*)pb->args[1], + pb->args[2], pb->args[3]); + memdump((char*)pb->args[2], pb->args[3]); + printk(" = "); + } else if (strcmp(pb->service, "canon") == 0) { + printk("canon(\"%s\", 0x%08lx, %ld)\n", + (char*)pb->args[0], pb->args[1], pb->args[2]); + } else if (strcmp(pb->service, "finddevice") == 0) { + printk("finddevice(\"%s\") = ", (char*)pb->args[0]); + } else if (strcmp(pb->service, "instance-to-path") == 0) { + printk("instance-to-path(0x%08lx, 0x%08lx, %ld) = ", + pb->args[0], pb->args[1], pb->args[2]); + } else if (strcmp(pb->service, "package-to-path") == 0) { + printk("package-to-path(0x%08lx, 0x%08lx, %ld) = ", + pb->args[0], pb->args[1], pb->args[2]); + } else if (strcmp(pb->service, "open") == 0) { + printk("open(\"%s\") = ", (char*)pb->args[0]); + } else if (strcmp(pb->service, "close") == 0) { + printk("close(0x%08lx)\n", pb->args[0]); + } else if (strcmp(pb->service, "read") == 0) { + printk("read(0x%08lx, 0x%08lx, %ld) = ", + pb->args[0], pb->args[1], pb->args[2]); + } else if (strcmp(pb->service, "write") == 0) { + printk("write(0x%08lx, 0x%08lx, %ld)\n", + pb->args[0], pb->args[1], pb->args[2]); + memdump((char*)pb->args[1], pb->args[2]); + printk(" = "); + } else if (strcmp(pb->service, "seek") == 0) { + printk("seek(0x%08lx, 0x%08lx, 0x%08lx) = ", + pb->args[0], pb->args[1], pb->args[2]); + } else if (strcmp(pb->service, "claim") == 0) { + printk("claim(0x8%lx, %ld, %ld) = ", + pb->args[0], pb->args[1], pb->args[2]); + } else if (strcmp(pb->service, "release") == 0) { + printk("release(0x8%lx, %ld)\n", + pb->args[0], pb->args[1]); + } else if (strcmp(pb->service, "boot") == 0) { + printk("boot \"%s\"\n", (char*)pb->args[0]); + } else if (strcmp(pb->service, "enter") == 0) { + printk("enter()\n"); + } else if (strcmp(pb->service, "exit") == 0) { + printk("exit()\n"); + } else { + printk("of_client_interface: %s ", pb->service ); + for( i = 0; i < pb->nargs; i++ ) + printk("%lx ", pb->args[i] ); + printk("\n"); + } +} + +static void dump_return(prom_args_t *pb) +{ + int i; + if (strcmp(pb->service, "test") == 0) { + printk(" %ld\n", pb->args[pb->nargs]); + } else if (strcmp(pb->service, "peer") == 0) { + printk("0x%08lx\n", pb->args[pb->nargs]); + } else if (strcmp(pb->service, "child") == 0) { + printk("0x%08lx\n", pb->args[pb->nargs]); + } else if (strcmp(pb->service, "parent") == 0) { + printk("0x%08lx\n", pb->args[pb->nargs]); + } else if (strcmp(pb->service, "instance-to-package") == 0) { + printk("0x%08lx\n", pb->args[pb->nargs]); + } else if (strcmp(pb->service, "getproplen") == 0) { + printk("0x%08lx\n", pb->args[pb->nargs]); + } else if (strcmp(pb->service, "getprop") == 0) { + printk("%ld\n", pb->args[pb->nargs]); + memdump((char*)pb->args[2], pb->args[pb->nargs]); + } else if (strcmp(pb->service, "nextprop") == 0) { + printk("%ld\n", pb->args[pb->nargs]); + memdump((char*)pb->args[2], pb->args[pb->nargs]); + } else if (strcmp(pb->service, "setprop") == 0) { + printk("%ld\n", pb->args[pb->nargs]); + } else if (strcmp(pb->service, "canon") == 0) { + printk("%ld\n", pb->args[pb->nargs]); + memdump((char*)pb->args[1], pb->args[pb->nargs]); + } else if (strcmp(pb->service, "finddevice") == 0) { + printk("0x%08lx\n", pb->args[pb->nargs]); + } else if (strcmp(pb->service, "instance-to-path") == 0) { + printk("%ld\n", pb->args[pb->nargs]); + memdump((char*)pb->args[1], pb->args[pb->nargs]); + } else if (strcmp(pb->service, "package-to-path") == 0) { + printk("%ld\n", pb->args[pb->nargs]); + memdump((char*)pb->args[1], pb->args[pb->nargs]); + } else if (strcmp(pb->service, "open") == 0) { + printk("0x%08lx\n", pb->args[pb->nargs]); + } else if (strcmp(pb->service, "close") == 0) { + /* do nothing */ + } else if (strcmp(pb->service, "read") == 0) { + printk("%ld\n", pb->args[pb->nargs]); + memdump((char*)pb->args[1], pb->args[pb->nargs]); + } else if (strcmp(pb->service, "write") == 0) { + printk("%ld\n", pb->args[pb->nargs]); + } else if (strcmp(pb->service, "seek") == 0) { + printk("%ld\n", pb->args[pb->nargs]); + } else if (strcmp(pb->service, "claim") == 0) { + printk("0x%08lx\n", pb->args[pb->nargs]); + } else if (strcmp(pb->service, "release") == 0) { + /* do nothing */ + } else if (strcmp(pb->service, "boot") == 0) { + /* do nothing */ + } else if (strcmp(pb->service, "enter") == 0) { + /* do nothing */ + } else if (strcmp(pb->service, "exit") == 0) { + /* do nothing */ + } else { + printk("of_client_interface return:"); + for (i = 0; i < pb->nret; i++) { + printk("%lx ", pb->args[pb->nargs + i]); + } + printk("\n"); + } +} +#endif + /* call-method, interpret */ static int handle_calls( prom_args_t *pb ) @@ -89,10 +261,7 @@ if( pb->nargs < 0 || pb->nret < 0 ) return -1; #ifdef DEBUG_CIF - printk("of_client_interface: %s ", pb->service ); - for( i=0; i<pb->nargs; i++ ) - printk("%lx ", pb->args[i] ); - printk("\n"); + dump_service(pb); #endif /* call-method exceptions are special */ @@ -124,11 +293,7 @@ dstackcnt = dstacksave; } - printk("of_client_interface return:"); - for (i = 0; i < pb->nret; i++) { - printk("%lx ", pb->args[pb->nargs + i]); - } - printk("\n"); + dump_return(pb); #endif return 0; }

1 0

r591 - trunk/openbios-devel/arch/ppc/qemu
by svn＠openbios.org 02 Nov '09

02 Nov '09

Author: laurent Date: 2009-11-02 00:27:35 +0100 (Mon, 02 Nov 2009) New Revision: 591 Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c Log: ppc: replace ofmem_claim_phys() + ofmem_claim_virt() by ofmem_map(). This is needed by haiku-ppc bootloader (but it is not enough). Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c 2009-10-19 23:02:10 UTC (rev 590) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c 2009-11-01 23:27:35 UTC (rev 591) @@ -401,8 +401,6 @@ { ofmem_t *ofmem = ofmem_arch_get_private(); - ofmem_claim_phys( 0, get_ram_bottom(), 0 ); - ofmem_claim_virt( 0, get_ram_bottom(), 0 ); - ofmem_claim_phys( get_ram_top(), ofmem->ramsize - get_ram_top(), 0); - ofmem_claim_virt( get_ram_top(), ofmem->ramsize - get_ram_top(), 0); + ofmem_map( 0, 0, get_ram_bottom(), 0 ); + ofmem_map( get_ram_top(), get_ram_top(), ofmem->ramsize - get_ram_top(), 0); }

1 0

r590 - trunk/openbios-devel/arch/ppc/qemu
by svn＠openbios.org 20 Oct '09

20 Oct '09

Author: laurent Date: 2009-10-20 01:02:10 +0200 (Tue, 20 Oct 2009) New Revision: 590 Modified: trunk/openbios-devel/arch/ppc/qemu/main.c Log: ppc: if "\\:tbxi" (mac) fails, try "ppc\bootinfo.txt" (chrp). This is needed to load the bootloader of OpenBSD. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/arch/ppc/qemu/main.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c 2009-09-21 23:12:02 UTC (rev 589) +++ trunk/openbios-devel/arch/ppc/qemu/main.c 2009-10-19 23:02:10 UTC (rev 590) @@ -205,8 +205,12 @@ static void newworld_boot( void ) { - static const char * const chrp_path = "\\\\:tbxi" ; + static const char * const chrp_path[] = { "\\\\:tbxi", + "ppc\\bootinfo.txt", + NULL + }; char *path = pop_fstr_copy(), *param; + int i; param = strchr(path, ' '); if (param) { @@ -237,7 +241,8 @@ param = pop_fstr_copy(); } try_path(path, NULL, param); - try_path(path, chrp_path, param); + for (i = 0; chrp_path[i]; i++) + try_path(path, chrp_path[i], param); } else { uint16_t boot_device = fw_cfg_read_i16(FW_CFG_BOOT_DEVICE); switch (boot_device) { @@ -249,12 +254,14 @@ path = strdup("cd:"); break; } - try_path(path, chrp_path, param); + for (i = 0; chrp_path[i]; i++) + try_path(path, chrp_path[i], param); } } else { NEWWORLD_DPRINTF("Entering boot, path %s\n", path); try_path(path, NULL, param); - try_path(path, chrp_path, param); + for (i = 0; chrp_path[i]; i++) + try_path(path, chrp_path[i], param); } printk("*** Boot failure! No secondary bootloader specified ***\n"); }

1 0

OpenBIOS version 1.1?
by G 3 14 Oct '09

14 Oct '09

Is there a roadmap or plan that states when version 1.1 of OpenBIOS will be declared? I'm wondering this because a lot of features have been added to OpenBIOS since version 1.0 was released (7 months ago).

2 1

Support for 16 head harddisk on OLD Interactive Unix configured for 15 head harddisk
by Hanusz L. 06 Oct '09

06 Oct '09

Hello, I have an old system running Interactive Unix on a 15 head harddisk (4Gb). I would like to clone this system to a 16 head harddisk because it is now difficult to find 15 head harddisks. The problem is that I cannot modify the system which think it has a 15 head harddisk. I suppose that Interactive unix use the Int13 interrupt mechanism to access the disk (am I wrong ?). I wonder if there is a possibility to modify openbios so that a 16 head harddisk is used and is simulated as a 15 head harddisk by the bios ? I would probably have to modify the drivers/ide.c file to do a conversion. My questions are: - Can openbios boot Interactive Unix ? - What implementation should I use ? Thanks for any help, Leszek Hanusz ##################################################################################### This e-mail message has been scanned for Viruses and Content and cleared by Mailsecurity software #####################################################################################

2 1

r589 - trunk/openbios-devel/arch/ppc/qemu
by svn＠openbios.org 22 Sep '09

22 Sep '09

Author: laurent Date: 2009-09-22 01:12:02 +0200 (Tue, 22 Sep 2009) New Revision: 589 Modified: trunk/openbios-devel/arch/ppc/qemu/main.c Log: ppc: simplify boot by using load and go. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/arch/ppc/qemu/main.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c 2009-09-21 23:00:42 UTC (rev 588) +++ trunk/openbios-devel/arch/ppc/qemu/main.c 2009-09-21 23:12:02 UTC (rev 589) @@ -39,81 +39,16 @@ #define NEWWORLD_DPRINTF(fmt, args...) SUBSYS_DPRINTF("NEWWORLD", fmt, ##args) static void -load(const char *path) +load(const char *path, const char *param) { char buffer[1024]; - sprintf(buffer, "load %s", path); + if (param) + sprintf(buffer, "load %s %s", path, param); + else + sprintf(buffer, "load %s", path); feval(buffer); } -static void -transfer_control_to_elf( ulong elf_entry ) -{ - ELF_DPRINTF("Starting ELF boot loader\n"); - call_elf( 0, 0, elf_entry ); - - fatal_error("call_elf returned unexpectedly\n"); -} - -static int -load_elf_rom( ulong *elf_entry, int fd ) -{ - int i, lszz_offs, elf_offs; - char *addr; - Elf_ehdr ehdr; - Elf_phdr *phdr; - size_t s; - - ELF_DPRINTF("Loading '%s' from '%s'\n", get_file_path(fd), - get_volume_name(fd) ); - - /* the ELF-image (usually) starts at offset 0x4000 */ - if( (elf_offs=find_elf(fd)) < 0 ) { - ELF_DPRINTF("----> %s is not an ELF image\n", get_file_path(fd)); - return -1; - } - if( !(phdr=elf_readhdrs(fd, elf_offs, &ehdr)) ) { - ELF_DPRINTF("elf_readhdrs failed\n"); - return -1; - } - - *elf_entry = ehdr.e_entry; - - /* load segments. Compressed ROM-image assumed to be located immediately - * after the last segment */ - lszz_offs = elf_offs; - for( i=0; i<ehdr.e_phnum; i++ ) { - /* p_memsz, p_flags */ - s = MIN( phdr[i].p_filesz, phdr[i].p_memsz ); - seek_io( fd, elf_offs + phdr[i].p_offset ); - - ELF_DPRINTF("filesz: %08lX memsz: %08lX p_offset: %08lX p_vaddr %08lX\n", - (ulong)phdr[i].p_filesz, (ulong)phdr[i].p_memsz, (ulong)phdr[i].p_offset, - (ulong)phdr[i].p_vaddr ); - - if( phdr[i].p_vaddr != phdr[i].p_paddr ) - ELF_DPRINTF("WARNING: ELF segment virtual addr != physical addr\n"); - lszz_offs = MAX( lszz_offs, elf_offs + phdr[i].p_offset + phdr[i].p_filesz ); - if( !s ) - continue; - if( ofmem_claim( phdr[i].p_vaddr, phdr[i].p_memsz, 0 ) == -1 ) - fatal_error("Claim failed!\n"); - - addr = (char*)phdr[i].p_vaddr; - if( read_io(fd, addr, s) != s ) { - ELF_DPRINTF("read failed\n"); - return -1; - } - - flush_icache_range( addr, addr+s ); - - ELF_DPRINTF("ELF ROM-section loaded at %08lX (size %08lX)\n", - (ulong)phdr[i].p_vaddr, (ulong)phdr[i].p_memsz ); - } - free( phdr ); - return lszz_offs; -} - static char * get_device( const char *path ) { @@ -206,60 +141,21 @@ /* qemu booting */ /************************************************************************/ static void -try_path(const char *path, const char *param) +try_path(const char *device, const char* filename, const char *param) { - ulong elf_entry; - int fd, ret; + char path[1024]; + if (filename) + snprintf(path, sizeof(path), "%s%s", device, filename); + else + snprintf(path, sizeof(path), "%s", device); + ELF_DPRINTF("Trying %s %s\n", path, param); - if ((fd = open_io(path)) == -1) { - ELF_DPRINTF("Can't open %s\n", path); - return; - } - ret = load_elf_rom( &elf_entry, fd ); - if (ret < 0) - return; - close_io( fd ); - encode_bootpath( path, param ); + load(path, param); update_nvram(); ELF_DPRINTF("Transfering control to %s %s\n", path, param); - transfer_control_to_elf( elf_entry ); - /* won't come here */ -} - -static void -try_chrp_script(const char *of_path, const char *param, const char *script_path) -{ - char path[1024]; - char *device, *filename, *directory; - int partition; - int size; - - device = get_device(of_path); - partition = get_partition(of_path); - filename = get_filename(of_path, &directory); - - CHRP_DPRINTF("device %s partition %d filename %s\n", device, partition, filename); - - /* read boot script */ - - if (partition == -1) - snprintf(path, sizeof(path), "%s:,%s", - device, script_path); - else - snprintf(path, sizeof(path), "%s:%d,%s", - device, partition, script_path); - - CHRP_DPRINTF("Trying %s\n", path); - load(path); - feval("load-size"); - size = POP(); - if (size == 0) { - ELF_DPRINTF("Can't open %s\n", of_path); - return; - } feval("go"); } @@ -340,8 +236,8 @@ POP(); param = pop_fstr_copy(); } - try_path(path, param); - try_chrp_script(path, param, chrp_path); + try_path(path, NULL, param); + try_path(path, chrp_path, param); } else { uint16_t boot_device = fw_cfg_read_i16(FW_CFG_BOOT_DEVICE); switch (boot_device) { @@ -353,12 +249,12 @@ path = strdup("cd:"); break; } - try_chrp_script(path, param, chrp_path); + try_path(path, chrp_path, param); } } else { NEWWORLD_DPRINTF("Entering boot, path %s\n", path); - try_path(path, param); - try_chrp_script(path, param, chrp_path); + try_path(path, NULL, param); + try_path(path, chrp_path, param); } printk("*** Boot failure! No secondary bootloader specified ***\n"); }

1 0

r588 - trunk/openbios-devel/modules
by svn＠openbios.org 22 Sep '09

22 Sep '09

Author: laurent Date: 2009-09-22 01:00:42 +0200 (Tue, 22 Sep 2009) New Revision: 588 Modified: trunk/openbios-devel/modules/mac-parts.c Log: mac-parts: better management of comma. from "PowerPC Microprocessor CHRP binding", "11.1.2. Open Method Algorithm": "If the argument string contains a comma, or if the argument string begins with a decimal digit, the partition component is deemed to be present." Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/modules/mac-parts.c =================================================================== --- trunk/openbios-devel/modules/mac-parts.c 2009-09-21 22:44:21 UTC (rev 587) +++ trunk/openbios-devel/modules/mac-parts.c 2009-09-21 23:00:42 UTC (rev 588) @@ -54,14 +54,20 @@ DPRINTF("partition %s\n", str); if( str ) { char *tmp; + char *comma = strchr(str, ','); parnum = atol(str); if( *str == 0 || *str == ',' ) parnum = -1; - tmp = str; - while (*tmp && *tmp != ',') - tmp++; - if (*tmp == ',') - tmp++; + if (comma) { + tmp = comma + 1; + } else { + if (*str >= '0' && *str <= '9') { + tmp = (char*)""; + } else { + tmp = str; + parnum = -1; + } + } if (strcmp(tmp, "%BOOT") == 0) want_bootcode = 1; free(str);

1 0

r587 - in trunk/openbios-devel: forth/debugging modules
by svn＠openbios.org 22 Sep '09

22 Sep '09

Author: laurent Date: 2009-09-22 00:44:21 +0200 (Tue, 22 Sep 2009) New Revision: 587 Modified: trunk/openbios-devel/forth/debugging/client.fs trunk/openbios-devel/modules/bootinfo-loader.c trunk/openbios-devel/modules/elf-loader.c trunk/openbios-devel/modules/xcoff-loader.c Log: Manage state-valid. "go" can be done only if init-program has set state-valid to true. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/forth/debugging/client.fs =================================================================== --- trunk/openbios-devel/forth/debugging/client.fs 2009-09-21 15:30:50 UTC (rev 586) +++ trunk/openbios-devel/forth/debugging/client.fs 2009-09-21 22:44:21 UTC (rev 587) @@ -17,6 +17,9 @@ \ 7.6.2 Program download and execute +variable state-valid +0 state-valid ! + variable file-size : !load-size file-size ! ; @@ -305,6 +308,7 @@ ; : go ( -- ) + state-valid @ not if exit then elf file-type @ = if [IFDEF] CONFIG_PPC elf-entry @ " (go)" evaluate @@ -332,10 +336,7 @@ then ; -: state-valid ( -- a-addr ) - ; - \ 7.6.3 Abort and resume \ already defined !? Modified: trunk/openbios-devel/modules/bootinfo-loader.c =================================================================== --- trunk/openbios-devel/modules/bootinfo-loader.c 2009-09-21 15:30:50 UTC (rev 586) +++ trunk/openbios-devel/modules/bootinfo-loader.c 2009-09-21 22:44:21 UTC (rev 587) @@ -124,6 +124,8 @@ char *tmp; char bootpath[1024]; + feval("0 state-valid !"); + chosen = find_dev("/chosen"); tmp = get_property(chosen, "bootpath", &proplen); memcpy(bootpath, tmp, proplen); @@ -179,9 +181,7 @@ DPRINTF("got bootscript %s\n", bootscript); - /* FIXME: should initialize saved-program-state. */ - push_str(bootscript); - feval("bootinfo-size ! bootinfo-entry !"); + feval("-1 state-valid !"); break; } else if (strcasecmp(tagbuf, "/chrp-boot") == 0) @@ -230,6 +230,9 @@ bootscript[scriptlen++] = c; } } + /* FIXME: should initialize saved-program-state. */ + push_str(bootscript); + feval("bootinfo-size ! bootinfo-entry !"); } NODE_METHODS( bootinfo_loader ) = { Modified: trunk/openbios-devel/modules/elf-loader.c =================================================================== --- trunk/openbios-devel/modules/elf-loader.c 2009-09-21 15:30:50 UTC (rev 586) +++ trunk/openbios-devel/modules/elf-loader.c 2009-09-21 22:44:21 UTC (rev 587) @@ -50,6 +50,8 @@ size_t size; char *addr; + feval("0 state-valid !"); + feval("load-base"); base = (char*)POP(); @@ -78,6 +80,7 @@ /* FIXME: should initialize saved-program-state. */ PUSH(ehdr->e_entry); feval("elf-entry !"); + feval("-1 state-valid !"); } NODE_METHODS( elf_loader ) = { Modified: trunk/openbios-devel/modules/xcoff-loader.c =================================================================== --- trunk/openbios-devel/modules/xcoff-loader.c 2009-09-21 15:30:50 UTC (rev 586) +++ trunk/openbios-devel/modules/xcoff-loader.c 2009-09-21 22:44:21 UTC (rev 587) @@ -47,6 +47,8 @@ uint32_t offset; int i; + feval("0 state-valid !"); + feval("load-base"); base = (char*)POP(); @@ -128,6 +130,8 @@ DPRINTF("XCOFF entry point: %x\n", *(uint32_t*)ahdr->entry); PUSH(*(uint32_t*)ahdr->entry); feval("xcoff-entry !"); + + feval("-1 state-valid !"); } NODE_METHODS( xcoff_loader ) = {

1 0

r586 - trunk/openbios-devel/modules
by svn＠openbios.org 21 Sep '09

21 Sep '09

Author: blueswirl Date: 2009-09-21 17:30:50 +0200 (Mon, 21 Sep 2009) New Revision: 586 Modified: trunk/openbios-devel/modules/bootinfo-loader.c Log: Fix accidental system header use in r584 Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/modules/bootinfo-loader.c =================================================================== --- trunk/openbios-devel/modules/bootinfo-loader.c 2009-09-20 20:18:15 UTC (rev 585) +++ trunk/openbios-devel/modules/bootinfo-loader.c 2009-09-21 15:30:50 UTC (rev 586) @@ -18,7 +18,7 @@ #include "openbios/bindings.h" #include "modules.h" #include "ofmem.h" -#include "stdio.h" +#include "libc/vsprintf.h" //#define DEBUG_BOOTINFO

1 0

Re: [OpenBIOS] r579 - trunk/openbios-devel/modules
by Segher Boessenkool 21 Sep '09

21 Sep '09

> +#ifdef CONFIG_PPC > + flush_icache_range( addr, addr + size ); > +#endif I'm not sure what your flush_icache_range() does exactly, but at a minimum it is misnamed: you need to flush the dcache for this range to memory (dcbst is enough), do a sync, invalidate the icache (icbi), do another sync, do an isync. Segher

3 4

r585 - trunk/openbios-devel/config/scripts
by svn＠openbios.org 20 Sep '09

20 Sep '09

Author: laurent Date: 2009-09-20 22:18:15 +0200 (Sun, 20 Sep 2009) New Revision: 585 Modified: trunk/openbios-devel/config/scripts/switch-arch Log: Revert commit of local change (sparc-elf / sparc-linux-gnu ) Modified: trunk/openbios-devel/config/scripts/switch-arch =================================================================== --- trunk/openbios-devel/config/scripts/switch-arch 2009-09-20 20:15:46 UTC (rev 584) +++ trunk/openbios-devel/config/scripts/switch-arch 2009-09-20 20:18:15 UTC (rev 585) @@ -122,7 +122,7 @@ ;; sparc32) - TARGET="sparc-linux-gnu-" + TARGET="sparc-elf-" CFLAGS="-Wa,-xarch=v8 -Wa,-32 -m32 -mcpu=supersparc -fno-builtin" AS_FLAGS="-Wa,-xarch=v8 -Wa,-32" ;;

1 0

r584 - in trunk/openbios-devel: arch/ppc/qemu config/scripts forth/debugging modules
by svn＠openbios.org 20 Sep '09

20 Sep '09

Author: laurent Date: 2009-09-20 22:15:46 +0200 (Sun, 20 Sep 2009) New Revision: 584 Added: trunk/openbios-devel/modules/bootinfo-loader.c Modified: trunk/openbios-devel/arch/ppc/qemu/main.c trunk/openbios-devel/config/scripts/switch-arch trunk/openbios-devel/forth/debugging/client.fs trunk/openbios-devel/modules/build.xml trunk/openbios-devel/modules/init.c trunk/openbios-devel/modules/modules.h Log: Add bootinfo-loader. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/arch/ppc/qemu/main.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c 2009-09-20 19:32:30 UTC (rev 583) +++ trunk/openbios-devel/arch/ppc/qemu/main.c 2009-09-20 20:15:46 UTC (rev 584) @@ -229,27 +229,13 @@ /* won't come here */ } -/* - Parse SGML structure like: - <chrp-boot> - <description>Debian/GNU Linux Installation on IBM CHRP hardware</description> - <os-name>Debian/GNU Linux for PowerPC</os-name> - <boot-script>boot &device;:\install\yaboot</boot-script> - <icon size=64,64 color-space=3,3,2> - - CHRP system bindings are described at: - http://playground.sun.com/1275/bindings/chrp/chrp1_7a.ps -*/ static void try_chrp_script(const char *of_path, const char *param, const char *script_path) { - int tag, taglen, script, scriptlen, entity, chrp; - char tagbuf[128], path[1024], c; + char path[1024]; char *device, *filename, *directory; int partition; - int current, size; - char *base; - char *bootscript; + int size; device = get_device(of_path); partition = get_partition(of_path); @@ -274,98 +260,7 @@ ELF_DPRINTF("Can't open %s\n", of_path); return; } - bootscript = malloc(size); - if (bootscript == NULL) { - ELF_DPRINTF("Can't malloc %d bytes\n", size); - return; - } - feval("load-base"); - base = (char*)POP(); - - chrp = 0; - tag = 0; - taglen = 0; - script = 0; - scriptlen = 0; - entity = 0; - current = 0; - while (current < size) { - - c = base[current++]; - - if (c == '<') { - script = 0; - tag = 1; - taglen = 0; - } else if (c == '>') { - tag = 0; - tagbuf[taglen] = '\0'; - if (strcasecmp(tagbuf, "chrp-boot") == 0) { - chrp = 1; - } else if (chrp == 1) { - if (strcasecmp(tagbuf, "boot-script") == 0) { - script = 1; - scriptlen = 0; - } else if (strcasecmp(tagbuf, "/boot-script") == 0) { - - script = 0; - bootscript[scriptlen] = '\0'; - - CHRP_DPRINTF("got bootscript %s\n", bootscript); - - encode_bootpath(of_path, param); - - feval(bootscript); - - break; - } else if (strcasecmp(tagbuf, "/chrp-boot") == 0) - break; - } - } else if (tag && taglen < sizeof(tagbuf)) { - tagbuf[taglen++] = c; - } else if (script && c == '&') { - entity = 1; - taglen = 0; - } else if (entity && c ==';') { - entity = 0; - tagbuf[taglen] = '\0'; - if (strcasecmp(tagbuf, "lt") == 0) { - bootscript[scriptlen++] = '<'; - } else if (strcasecmp(tagbuf, "gt") == 0) { - bootscript[scriptlen++] = '>'; - } else if (strcasecmp(tagbuf, "device") == 0) { - strcpy(bootscript + scriptlen, device); - scriptlen += strlen(device); - } else if (strcasecmp(tagbuf, "partition") == 0) { - if (partition != -1) - sprintf(bootscript + scriptlen, "%d", partition); - else - *(bootscript + scriptlen) = 0; - scriptlen = strlen(bootscript); - } else if (strcasecmp(tagbuf, "directory") == 0) { - strcpy(bootscript + scriptlen, directory); - scriptlen += strlen(directory); - } else if (strcasecmp(tagbuf, "filename") == 0) { - strcpy(bootscript + scriptlen, filename); - scriptlen += strlen(filename); - } else if (strcasecmp(tagbuf, "full-path") == 0) { - strcpy(bootscript + scriptlen, of_path); - scriptlen += strlen(of_path); - } else { /* unknown, keep it */ - bootscript[scriptlen] = '&'; - strcpy(bootscript + scriptlen + 1, tagbuf); - scriptlen += taglen + 1; - bootscript[scriptlen] = ';'; - scriptlen++; - } - } else if (entity && taglen < sizeof(tagbuf)) { - tagbuf[taglen++] = c; - } else if (script && scriptlen < size) { - bootscript[scriptlen++] = c; - } - } - - free(bootscript); + feval("go"); } #define OLDWORLD_BOOTCODE_BASEADDR (0x3f4000) Modified: trunk/openbios-devel/config/scripts/switch-arch =================================================================== --- trunk/openbios-devel/config/scripts/switch-arch 2009-09-20 19:32:30 UTC (rev 583) +++ trunk/openbios-devel/config/scripts/switch-arch 2009-09-20 20:15:46 UTC (rev 584) @@ -122,7 +122,7 @@ ;; sparc32) - TARGET="sparc-elf-" + TARGET="sparc-linux-gnu-" CFLAGS="-Wa,-xarch=v8 -Wa,-32 -m32 -mcpu=supersparc -fno-builtin" AS_FLAGS="-Wa,-xarch=v8 -Wa,-32" ;; Modified: trunk/openbios-devel/forth/debugging/client.fs =================================================================== --- trunk/openbios-devel/forth/debugging/client.fs 2009-09-20 19:32:30 UTC (rev 583) +++ trunk/openbios-devel/forth/debugging/client.fs 2009-09-20 20:15:46 UTC (rev 584) @@ -181,6 +181,8 @@ variable elf-entry variable xcoff-entry +variable bootinfo-entry +variable bootinfo-size : init-program-elf elf file-type ! @@ -317,7 +319,15 @@ ." go is not yet implemented" [THEN] else - ." go is not yet implemented" + bootinfo file-type @ = if +[IFDEF] CONFIG_PPC + bootinfo-entry @ bootinfo-size @ evaluate +[ELSE] + ." go is not yet implemented" +[THEN] + else + ." go is not yet implemented" + then then then ; Added: trunk/openbios-devel/modules/bootinfo-loader.c =================================================================== --- trunk/openbios-devel/modules/bootinfo-loader.c (rev 0) +++ trunk/openbios-devel/modules/bootinfo-loader.c 2009-09-20 20:15:46 UTC (rev 584) @@ -0,0 +1,242 @@ +/* + * + * <bootinfo-loader.c> + * + * bootinfo file loader + * + * Copyright (C) 2009 Laurent Vivier (Laurent(a)vivier.eu) + * + * Original XML parser by Blue Swirl <blauwirbel(a)gmail.com> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 + * + */ + +#include "openbios/config.h" +#include "openbios/bindings.h" +#include "modules.h" +#include "ofmem.h" +#include "stdio.h" + +//#define DEBUG_BOOTINFO + +#ifdef DEBUG_BOOTINFO +#define DPRINTF(fmt, args...) \ + do { printk("%s: " fmt, __func__ , ##args); } while (0) +#else +#define DPRINTF(fmt, args...) \ + do { } while (0) +#endif + +DECLARE_NODE(bootinfo_loader, INSTALL_OPEN, 0, "+/packages/bootinfo-loader" ); + +static char * +get_device( const char *path ) +{ + int i; + static char buf[1024]; + + for (i = 0; i < sizeof(buf) && path[i] && path[i] != ':'; i++) + buf[i] = path[i]; + buf[i] = 0; + + return buf; +} + +static int +get_partition( const char *path ) +{ + while ( *path && *path != ':' ) + path++; + + if (!*path) + return -1; + path++; + + if (!strchr(path, ',')) /* check if there is a ',' */ + return -1; + + return atol(path); +} + +static char * +get_filename( const char * path , char **dirname) +{ + static char buf[1024]; + char *filename; + + while ( *path && *path != ':' ) + path++; + + if (!*path) { + *dirname = NULL; + return NULL; + } + path++; + + while ( *path && isdigit(*path) ) + path++; + + if (*path == ',') + path++; + + strncpy(buf, path, sizeof(buf)); + buf[sizeof(buf) - 1] = 0; + + filename = strrchr(buf, '\\'); + if (filename) { + *dirname = buf; + (*filename++) = 0; + } else { + *dirname = NULL; + filename = buf; + } + + return filename; +} + +/* + Parse SGML structure like: + <chrp-boot> + <description>Debian/GNU Linux Installation on IBM CHRP hardware</description> + <os-name>Debian/GNU Linux for PowerPC</os-name> + <boot-script>boot &device;:\install\yaboot</boot-script> + <icon size=64,64 color-space=3,3,2> + + CHRP system bindings are described at: + http://playground.sun.com/1275/bindings/chrp/chrp1_7a.ps +*/ + +static void +bootinfo_loader_init_program( void *dummy ) +{ + char *base; + int proplen; + phandle_t chosen; + int tag, taglen, script, scriptlen, entity, chrp; + char tagbuf[128], c; + char *device, *filename, *directory; + int partition; + int current, size; + char *bootscript; + char *tmp; + char bootpath[1024]; + + chosen = find_dev("/chosen"); + tmp = get_property(chosen, "bootpath", &proplen); + memcpy(bootpath, tmp, proplen); + bootpath[proplen] = 0; + + DPRINTF("bootpath %s\n", bootpath); + + device = get_device(bootpath); + partition = get_partition(bootpath); + filename = get_filename(bootpath, &directory); + + feval("load-base"); + base = (char*)POP(); + + feval("load-size"); + size = POP(); + + bootscript = malloc(size); + if (bootscript == NULL) { + DPRINTF("Can't malloc %d bytes\n", size); + return; + } + + chrp = 0; + tag = 0; + taglen = 0; + script = 0; + scriptlen = 0; + entity = 0; + current = 0; + while (current < size) { + + c = base[current++]; + + if (c == '<') { + script = 0; + tag = 1; + taglen = 0; + } else if (c == '>') { + tag = 0; + tagbuf[taglen] = '\0'; + if (strcasecmp(tagbuf, "chrp-boot") == 0) { + chrp = 1; + } else if (chrp == 1) { + if (strcasecmp(tagbuf, "boot-script") == 0) { + script = 1; + scriptlen = 0; + } else if (strcasecmp(tagbuf, "/boot-script") == 0) { + + script = 0; + bootscript[scriptlen] = '\0'; + + DPRINTF("got bootscript %s\n", + bootscript); + + /* FIXME: should initialize saved-program-state. */ + push_str(bootscript); + feval("bootinfo-size ! bootinfo-entry !"); + + break; + } else if (strcasecmp(tagbuf, "/chrp-boot") == 0) + break; + } + } else if (tag && taglen < sizeof(tagbuf)) { + tagbuf[taglen++] = c; + } else if (script && c == '&') { + entity = 1; + taglen = 0; + } else if (entity && c ==';') { + entity = 0; + tagbuf[taglen] = '\0'; + if (strcasecmp(tagbuf, "lt") == 0) { + bootscript[scriptlen++] = '<'; + } else if (strcasecmp(tagbuf, "gt") == 0) { + bootscript[scriptlen++] = '>'; + } else if (strcasecmp(tagbuf, "device") == 0) { + strcpy(bootscript + scriptlen, device); + scriptlen += strlen(device); + } else if (strcasecmp(tagbuf, "partition") == 0) { + if (partition != -1) + sprintf(bootscript + scriptlen, "%d", partition); + else + *(bootscript + scriptlen) = 0; + scriptlen = strlen(bootscript); + } else if (strcasecmp(tagbuf, "directory") == 0) { + strcpy(bootscript + scriptlen, directory); + scriptlen += strlen(directory); + } else if (strcasecmp(tagbuf, "filename") == 0) { + strcpy(bootscript + scriptlen, filename); + scriptlen += strlen(filename); + } else if (strcasecmp(tagbuf, "full-path") == 0) { + strcpy(bootscript + scriptlen, bootpath); + scriptlen += strlen(bootpath); + } else { /* unknown, keep it */ + bootscript[scriptlen] = '&'; + strcpy(bootscript + scriptlen + 1, tagbuf); + scriptlen += taglen + 1; + bootscript[scriptlen] = ';'; + scriptlen++; + } + } else if (entity && taglen < sizeof(tagbuf)) { + tagbuf[taglen++] = c; + } else if (script && scriptlen < size) { + bootscript[scriptlen++] = c; + } + } +} + +NODE_METHODS( bootinfo_loader ) = { + { "init-program", bootinfo_loader_init_program }, +}; + +void bootinfo_loader_init( void ) +{ + REGISTER_NODE( bootinfo_loader ); +} Modified: trunk/openbios-devel/modules/build.xml =================================================================== --- trunk/openbios-devel/modules/build.xml 2009-09-20 19:32:30 UTC (rev 583) +++ trunk/openbios-devel/modules/build.xml 2009-09-20 20:15:46 UTC (rev 584) @@ -26,6 +26,7 @@ <object source="ofmem_common.c" condition="OFMEM"/> <object source="elf-loader.c" condition="PPC"/> <object source="xcoff-loader.c" condition="PPC"/> + <object source="bootinfo-loader.c" condition="PPC"/> </library> <dictionary name="openbios" target="forth"> Modified: trunk/openbios-devel/modules/init.c =================================================================== --- trunk/openbios-devel/modules/init.c 2009-09-20 19:32:30 UTC (rev 583) +++ trunk/openbios-devel/modules/init.c 2009-09-20 20:15:46 UTC (rev 584) @@ -45,5 +45,6 @@ #ifdef CONFIG_PPC elf_loader_init(); xcoff_loader_init(); + bootinfo_loader_init(); #endif } Modified: trunk/openbios-devel/modules/modules.h =================================================================== --- trunk/openbios-devel/modules/modules.h 2009-09-20 19:32:30 UTC (rev 583) +++ trunk/openbios-devel/modules/modules.h 2009-09-20 20:15:46 UTC (rev 584) @@ -26,5 +26,6 @@ extern void cmdline_init( void ); extern void elf_loader_init( void ); extern void xcoff_loader_init( void ); +extern void bootinfo_loader_init( void ); #endif /* _H_MODULES */

1 0

r583 - trunk/openbios-devel/forth/debugging
by svn＠openbios.org 20 Sep '09

20 Sep '09

Author: laurent Date: 2009-09-20 21:32:30 +0200 (Sun, 20 Sep 2009) New Revision: 583 Modified: trunk/openbios-devel/forth/debugging/client.fs Log: When "load" is used, correctly set bootpath and bootargs. Signed-off-by: Laurent Vivier <Laurent(a)Vivier.eu> Modified: trunk/openbios-devel/forth/debugging/client.fs =================================================================== --- trunk/openbios-devel/forth/debugging/client.fs 2009-09-20 04:20:48 UTC (rev 582) +++ trunk/openbios-devel/forth/debugging/client.fs 2009-09-20 19:32:30 UTC (rev 583) @@ -276,16 +276,19 @@ then ; -: encode-bootpath ( str len -- ) - \ FIXME: need to extract bootargs from bootpath and set it in /chosen +: (encode-bootpath) ( "{params}<cr>" -- bootpath-str bootpath-len) + bl parse 2dup " /chosen" (find-dev) if " bootpath" rot (property) then + linefeed parse + " /chosen" (find-dev) if + " bootargs" rot (property) + then ; : load ( "{params}<cr>" -- ) - linefeed parse ( str len ) - 2dup encode-bootpath + (encode-bootpath) open-dev ( ihandle ) dup 0= if drop

1 0

r582 - in trunk/openbios-devel/forth: admin device
by svn＠openbios.org 20 Sep '09

20 Sep '09

Author: laurent Date: 2009-09-20 06:20:48 +0200 (Sun, 20 Sep 2009) New Revision: 582 Modified: trunk/openbios-devel/forth/admin/devices.fs trunk/openbios-devel/forth/device/pathres.fs Log: According to IEEE Std 1275-1994, "CORE REQUIREMENTS AND PRACTICES", Annexe H.8, "User interface name changes", "select-dev" and "unselect-dev" have been obsoleted and replaced by "open-dev" and "device-end". But some scripts (like BootX) are using the obsoleted name, so we need to define them. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/forth/admin/devices.fs =================================================================== --- trunk/openbios-devel/forth/admin/devices.fs 2009-09-19 21:44:05 UTC (rev 581) +++ trunk/openbios-devel/forth/admin/devices.fs 2009-09-20 04:20:48 UTC (rev 582) @@ -45,6 +45,10 @@ : device-end ( -- ) 0 active-package! ; + +: unselect-dev ( -- ) + device-end +; : ?active-package ( -- phandle ) active-package dup 0= abort" no active device" Modified: trunk/openbios-devel/forth/device/pathres.fs =================================================================== --- trunk/openbios-devel/forth/device/pathres.fs 2009-09-19 21:44:05 UTC (rev 581) +++ trunk/openbios-devel/forth/device/pathres.fs 2009-09-20 04:20:48 UTC (rev 582) @@ -471,6 +471,10 @@ ( ihandle ) ; +: select-dev ( dev-str dev-len -- ihandle | 0 ) + open-dev +; + : execute-device-method ( ... dev-str dev-len met-str met-len -- ... false | ?? true ) 2swap

1 0

r581 - in trunk/openbios-devel: forth/debugging include/openbios modules
by svn＠openbios.org 19 Sep '09

19 Sep '09

Author: laurent Date: 2009-09-19 23:44:05 +0200 (Sat, 19 Sep 2009) New Revision: 581 Added: trunk/openbios-devel/include/openbios/xcoff.h trunk/openbios-devel/modules/xcoff-loader.c Modified: trunk/openbios-devel/forth/debugging/client.fs trunk/openbios-devel/modules/build.xml trunk/openbios-devel/modules/init.c trunk/openbios-devel/modules/modules.h Log: Implements XCOFF loader (to be able to boot Apple BootX bootloader) Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/forth/debugging/client.fs =================================================================== --- trunk/openbios-devel/forth/debugging/client.fs 2009-09-18 23:32:59 UTC (rev 580) +++ trunk/openbios-devel/forth/debugging/client.fs 2009-09-19 21:44:05 UTC (rev 581) @@ -180,6 +180,7 @@ ; variable elf-entry +variable xcoff-entry : init-program-elf elf file-type ! @@ -302,9 +303,19 @@ elf file-type @ = if [IFDEF] CONFIG_PPC elf-entry @ " (go)" evaluate +[ELSE] + ." go is not yet implemented" [THEN] else - ." go is not yet implemented" + xcoff file-type @ = if +[IFDEF] CONFIG_PPC + xcoff-entry @ " (go)" evaluate +[ELSE] + ." go is not yet implemented" +[THEN] + else + ." go is not yet implemented" + then then ; Added: trunk/openbios-devel/include/openbios/xcoff.h =================================================================== --- trunk/openbios-devel/include/openbios/xcoff.h (rev 0) +++ trunk/openbios-devel/include/openbios/xcoff.h 2009-09-19 21:44:05 UTC (rev 581) @@ -0,0 +1,98 @@ +#ifndef XCOFF_H +#define XCOFF_H + +/* XCOFF executable loader */ + +typedef struct COFF_filehdr_t { + uint16_t f_magic; /* magic number */ + uint16_t f_nscns; /* number of sections */ + uint32_t f_timdat; /* time & date stamp */ + uint32_t f_symptr; /* file pointer to symtab */ + uint32_t f_nsyms; /* number of symtab entries */ + uint16_t f_opthdr; /* sizeof(optional hdr) */ + uint16_t f_flags; /* flags */ +} COFF_filehdr_t; + +/* IBM RS/6000 */ + +#define U802WRMAGIC 0x02DA /* writeable text segments **chh** */ +#define U802ROMAGIC 0x02DF /* readonly sharable text segments */ +#define U802TOCMAGIC 0x02E1 /* readonly text segments and TOC */ +#define U802TOMAGIC 0x01DF + +/* + * Bits for f_flags: + * + * F_RELFLG relocation info stripped from file + * F_EXEC file is executable (i.e. no unresolved external + * references) + * F_LNNO line numbers stripped from file + * F_LSYMS local symbols stripped from file + * F_MINMAL this is a minimal object file (".m") output of fextract + * F_UPDATE this is a fully bound update file, output of ogen + * F_SWABD this file has had its bytes swabbed (in names) + * F_AR16WR this file has the byte ordering of an AR16WR + * (e.g. 11/70) machine + * F_AR32WR this file has the byte ordering of an AR32WR machine + * (e.g. vax and iNTEL 386) + * F_AR32W this file has the byte ordering of an AR32W machine + * (e.g. 3b,maxi) + * F_PATCH file contains "patch" list in optional header + * F_NODF (minimal file only) no decision functions for + * replaced functions + */ + +#define COFF_F_RELFLG 0000001 +#define COFF_F_EXEC 0000002 +#define COFF_F_LNNO 0000004 +#define COFF_F_LSYMS 0000010 +#define COFF_F_MINMAL 0000020 +#define COFF_F_UPDATE 0000040 +#define COFF_F_SWABD 0000100 +#define COFF_F_AR16WR 0000200 +#define COFF_F_AR32WR 0000400 +#define COFF_F_AR32W 0001000 +#define COFF_F_PATCH 0002000 +#define COFF_F_NODF 0002000 + +typedef struct COFF_aouthdr_t { + uint16_t magic; /* type of file */ + uint16_t vstamp; /* version stamp */ + uint32_t tsize; /* text size in bytes, padded to FW bdry */ + uint32_t dsize; /* initialized data " " */ + uint32_t bsize; /* uninitialized data " " */ + uint32_t entry; /* entry pt. */ + uint32_t text_start; /* base of text used for this file */ + uint32_t data_start; /* base of data used for this file */ + uint32_t o_toc; /* address of TOC */ + uint16_t o_snentry; /* section number of entry point */ + uint16_t o_sntext; /* section number of .text section */ + uint16_t o_sndata; /* section number of .data section */ + uint16_t o_sntoc; /* section number of TOC */ + uint16_t o_snloader; /* section number of .loader section */ + uint16_t o_snbss; /* section number of .bss section */ + uint16_t o_algntext; /* .text alignment */ + uint16_t o_algndata; /* .data alignment */ + uint16_t o_modtype; /* module type (??) */ + uint16_t o_cputype; /* cpu type */ + uint32_t o_maxstack; /* max stack size (??) */ + uint32_t o_maxdata; /* max data size (??) */ + char o_resv2[12]; /* reserved */ +} COFF_aouthdr_t; + +#define AOUT_MAGIC 0x010b + +typedef struct COFF_scnhdr_t { + char s_name[8]; /* section name */ + uint32_t s_paddr; /* physical address, aliased s_nlib */ + uint32_t s_vaddr; /* virtual address */ + uint32_t s_size; /* section size */ + uint32_t s_scnptr; /* file ptr to raw data for section */ + uint32_t s_relptr; /* file ptr to relocation */ + uint32_t s_lnnoptr; /* file ptr to line numbers */ + uint16_t s_nreloc; /* number of relocation entries */ + uint16_t s_nlnno; /* number of line number entries */ + uint32_t s_flags; /* flags */ +} COFF_scnhdr_t; + +#endif /* XCOFF_H */ Modified: trunk/openbios-devel/modules/build.xml =================================================================== --- trunk/openbios-devel/modules/build.xml 2009-09-18 23:32:59 UTC (rev 580) +++ trunk/openbios-devel/modules/build.xml 2009-09-19 21:44:05 UTC (rev 581) @@ -25,6 +25,7 @@ <object source="font_8x16.c" condition="FONT_8X16"/> <object source="ofmem_common.c" condition="OFMEM"/> <object source="elf-loader.c" condition="PPC"/> + <object source="xcoff-loader.c" condition="PPC"/> </library> <dictionary name="openbios" target="forth"> Modified: trunk/openbios-devel/modules/init.c =================================================================== --- trunk/openbios-devel/modules/init.c 2009-09-18 23:32:59 UTC (rev 580) +++ trunk/openbios-devel/modules/init.c 2009-09-19 21:44:05 UTC (rev 581) @@ -44,5 +44,6 @@ #endif #ifdef CONFIG_PPC elf_loader_init(); + xcoff_loader_init(); #endif } Modified: trunk/openbios-devel/modules/modules.h =================================================================== --- trunk/openbios-devel/modules/modules.h 2009-09-18 23:32:59 UTC (rev 580) +++ trunk/openbios-devel/modules/modules.h 2009-09-19 21:44:05 UTC (rev 581) @@ -25,5 +25,6 @@ extern void sunparts_init( void ); extern void cmdline_init( void ); extern void elf_loader_init( void ); +extern void xcoff_loader_init( void ); #endif /* _H_MODULES */ Added: trunk/openbios-devel/modules/xcoff-loader.c =================================================================== --- trunk/openbios-devel/modules/xcoff-loader.c (rev 0) +++ trunk/openbios-devel/modules/xcoff-loader.c 2009-09-19 21:44:05 UTC (rev 581) @@ -0,0 +1,140 @@ +/* + * + * <xcoff-loader.c> + * + * XCOFF file loader + * + * Copyright (C) 2009 Laurent Vivier (Laurent(a)vivier.eu) + * + * from original XCOFF loader by Steven Noonan <steven(a)uplinklabs.net> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 + * + */ + +#include "openbios/config.h" +#include "openbios/bindings.h" +#include "modules.h" +#include "ofmem.h" + +#include "openbios/xcoff.h" + +//#define DEBUG_XCOFF + +#ifdef DEBUG_XCOFF +#define DPRINTF(fmt, args...) \ + do { printk("%s: " fmt, __func__ , ##args); } while (0) +#else +#define DPRINTF(fmt, args...) \ + do { } while (0) +#endif + +DECLARE_NODE(xcoff_loader, INSTALL_OPEN, 0, "+/packages/xcoff-loader" ); + +#ifdef CONFIG_PPC +extern void flush_icache_range( char *start, char *stop ); +#endif + +static void +xcoff_loader_init_program( void *dummy ) +{ + char *base; + COFF_filehdr_t *fhdr; + COFF_aouthdr_t *ahdr; + COFF_scnhdr_t *shdr; + uint32_t offset; + int i; + + feval("load-base"); + base = (char*)POP(); + + fhdr = (COFF_filehdr_t*)base; + + /* Is it an XCOFF file ? */ + + if (fhdr->f_magic != U802WRMAGIC && + fhdr->f_magic != U802ROMAGIC && + fhdr->f_magic != U802TOCMAGIC && + fhdr->f_magic != U802TOMAGIC) { + DPRINTF("Not a XCOFF file %02x\n", fhdr->f_magic); + return; + } + + /* Is it executable ? */ + + if (fhdr->f_magic != 0x01DF && + (fhdr->f_flags & COFF_F_EXEC) == 0) { + DPRINTF("Not an executable XCOFF file %02x\n", fhdr->f_flags); + return; + } + + /* Optional header is a.out ? */ + + if (fhdr->f_opthdr != sizeof(COFF_aouthdr_t)) { + DPRINTF("AOUT optional error size mismatch in XCOFF file\n"); + return; + } + + ahdr = (COFF_aouthdr_t*)(base + sizeof(COFF_filehdr_t)); + + /* check a.out magic number */ + + if (ahdr->magic != AOUT_MAGIC) { + DPRINTF("Invalid AOUT optional header\n"); + return; + } + + offset = sizeof(COFF_filehdr_t) + sizeof(COFF_aouthdr_t); + + DPRINTF("XCOFF file with %d sections\n", fhdr->f_nscns); + + for (i = 0; i < fhdr->f_nscns; i++) { + + DPRINTF("Read header at offset %0x\n", offset); + + shdr = (COFF_scnhdr_t*)(base + offset); + + DPRINTF("Initializing '%s' section from %0x %0x to %0x (%0x)\n", + shdr->s_name, offset, shdr->s_scnptr, + shdr->s_vaddr, shdr->s_size); + + if (strcmp(shdr->s_name, ".text") == 0) { + + memcpy((char*)shdr->s_vaddr, base + shdr->s_scnptr, + shdr->s_size); +#ifdef CONFIG_PPC + flush_icache_range((char*)shdr->s_vaddr, + (char*)(shdr->s_vaddr + shdr->s_size)); +#endif + } else if (strcmp(shdr->s_name, ".data") == 0) { + + memcpy((char*)shdr->s_vaddr, base + shdr->s_scnptr, + shdr->s_size); + + } else if (strcmp(shdr->s_name, ".bss") == 0) { + + memset((void *)shdr->s_vaddr, 0, shdr->s_size); + + } else { + DPRINTF(" Skip '%s' section\n", shdr->s_name); + } + offset += sizeof(COFF_scnhdr_t); + } + + /* FIXME: should initialize saved-program-state. */ + + DPRINTF("XCOFF entry point: %x\n", *(uint32_t*)ahdr->entry); + PUSH(*(uint32_t*)ahdr->entry); + feval("xcoff-entry !"); +} + +NODE_METHODS( xcoff_loader ) = { + { "init-program", xcoff_loader_init_program }, +}; + +void xcoff_loader_init( void ) +{ + REGISTER_NODE( xcoff_loader ); +}

1 0

r580 - trunk/openbios-devel/modules
by svn＠openbios.org 19 Sep '09

19 Sep '09

Author: laurent Date: 2009-09-19 01:32:59 +0200 (Sat, 19 Sep 2009) New Revision: 580 Modified: trunk/openbios-devel/modules/init.c Log: call elf_loader_init() only for PPC Modified: trunk/openbios-devel/modules/init.c =================================================================== --- trunk/openbios-devel/modules/init.c 2009-09-18 23:01:28 UTC (rev 579) +++ trunk/openbios-devel/modules/init.c 2009-09-18 23:32:59 UTC (rev 580) @@ -42,5 +42,7 @@ #ifdef CONFIG_SUN_PARTS sunparts_init(); #endif +#ifdef CONFIG_PPC elf_loader_init(); +#endif }

1 0

r579 - trunk/openbios-devel/modules
by svn＠openbios.org 19 Sep '09

19 Sep '09

Author: laurent Date: 2009-09-19 01:01:28 +0200 (Sat, 19 Sep 2009) New Revision: 579 Added: trunk/openbios-devel/modules/elf-loader.c Log: Add missing file from r578 Added: trunk/openbios-devel/modules/elf-loader.c =================================================================== --- trunk/openbios-devel/modules/elf-loader.c (rev 0) +++ trunk/openbios-devel/modules/elf-loader.c 2009-09-18 23:01:28 UTC (rev 579) @@ -0,0 +1,90 @@ +/* + * + * <elf-loader.c> + * + * ELF file loader + * + * Copyright (C) 2009 Laurent Vivier (Laurent(a)vivier.eu) + * + * Some parts Copyright (C) 2002, 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 + * + */ + +#include "openbios/config.h" +#include "openbios/bindings.h" +#include "modules.h" +#include "ofmem.h" + +#include "openbios/elf.h" +#include "asm/elf.h" + +/* TODO: manage ELF notes section */ + +//#define DEBUG_ELF + +#ifdef DEBUG_ELF +#define DPRINTF(fmt, args...) \ + do { printk("%s: " fmt, __func__ , ##args); } while (0) +#else +#define DPRINTF(fmt, args...) \ + do { } while (0) +#endif + +DECLARE_NODE(elf_loader, INSTALL_OPEN, 0, "+/packages/elf-loader" ); + +#ifdef CONFIG_PPC +extern void flush_icache_range( char *start, char *stop ); +#endif + +static void +elf_loader_init_program( void *dummy ) +{ + char *base; + int i; + Elf_ehdr *ehdr; + Elf_phdr *phdr; + size_t size; + char *addr; + + feval("load-base"); + base = (char*)POP(); + + ehdr = (Elf_ehdr *)base; + phdr = (Elf_phdr *)(base + ehdr->e_phoff); + + for (i = 0; i < ehdr->e_phnum; i++) { + DPRINTF("filesz: %08lX memsz: %08lX p_offset: %08lX " + "p_vaddr %08lX\n", + (ulong)phdr[i].p_filesz, (ulong)phdr[i].p_memsz, + (ulong)phdr[i].p_offset, (ulong)phdr[i].p_vaddr ); + + size = MIN(phdr[i].p_filesz, phdr[i].p_memsz); + if (!size) + continue; + if( ofmem_claim( phdr[i].p_vaddr, phdr[i].p_memsz, 0 ) == -1 ) { + printk("Claim failed!\n"); + return; + } + addr = (char*)phdr[i].p_vaddr; + memcpy(addr, base + phdr[i].p_offset, size); +#ifdef CONFIG_PPC + flush_icache_range( addr, addr + size ); +#endif + } + /* FIXME: should initialize saved-program-state. */ + PUSH(ehdr->e_entry); + feval("elf-entry !"); +} + +NODE_METHODS( elf_loader ) = { + { "init-program", elf_loader_init_program }, +}; + +void elf_loader_init( void ) +{ + REGISTER_NODE( elf_loader ); +}

1 0

r578 - in trunk/openbios-devel: arch/ppc/qemu forth/debugging modules
by svn＠openbios.org 19 Sep '09

19 Sep '09

Author: laurent Date: 2009-09-19 00:59:30 +0200 (Sat, 19 Sep 2009) New Revision: 578 Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/forth/debugging/client.fs trunk/openbios-devel/modules/build.xml trunk/openbios-devel/modules/init.c trunk/openbios-devel/modules/modules.h Log: Allows to boot openSUSE from install CD-ROM Implements "init-program" using loader packages Write a first loader package: elf-loader Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c 2009-09-02 22:25:44 UTC (rev 577) +++ trunk/openbios-devel/arch/ppc/qemu/init.c 2009-09-18 22:59:30 UTC (rev 578) @@ -439,6 +439,18 @@ for (;;); } +static void go( void ); + +static void +go( void ) +{ + ucell addr; + + addr = POP(); + + call_elf( 0, 0, addr); +} + void arch_of_init( void ) { @@ -688,4 +700,5 @@ device_end(); bind_func("platform-boot", boot ); + bind_func("(go)", go); } Modified: trunk/openbios-devel/forth/debugging/client.fs =================================================================== --- trunk/openbios-devel/forth/debugging/client.fs 2009-09-02 22:25:44 UTC (rev 577) +++ trunk/openbios-devel/forth/debugging/client.fs 2009-09-18 22:59:30 UTC (rev 578) @@ -23,8 +23,268 @@ : load-size file-size @ ; +variable file-type + +0 constant elf +1 constant bootinfo +2 constant xcoff +3 constant pe + +\ Array indexes and values for e_type + +d# 16 constant EI_NIDENT + +0 constant EI_MAG0 + h# 7f constant ELFMAG0 + +1 constant EI_MAG1 + [CHAR] E constant ELFMAG1 + +2 constant EI_MAG2 + [CHAR] L constant ELFMAG2 + +3 constant EI_MAG3 + [CHAR] F constant ELFMAG3 + +4 constant EI_CLASS + 0 constant ELFCLASSNONE + 1 constant ELFCLASS32 + 2 constant ELFCLASS64 + +5 constant EI_DATA + 0 constant ELFDATANONE + 1 constant ELFDATA2LSB + 2 constant ELFDATA2MSB + +6 constant EI_VERSION + 0 constant EV_NONE + 1 constant EV_CURRENT + +\ Values for e_type + +0 constant ET_NONE +1 constant ET_REL +2 constant ET_EXEC +3 constant ET_DYN +4 constant ET_CORE + +\ Values for e_machine + +d# 2 constant EM_SPARC +d# 3 constant EM_386 +d# 6 constant EM_486 +d# 18 constant EM_SPARC32PLUS +d# 20 constant EM_PPC +d# 43 constant EM_SPARCV9 + +/l constant Elf32_Addr +/w constant Elf32_Half +/l constant Elf32_Off +/l constant Elf32_Sword +/l constant Elf32_Word +/l constant Elf32_Size + +struct ( ELF header ) + EI_NIDENT field >Elf32_Ehdr.e_ident ( File identification ) + Elf32_Half field >Elf32_Ehdr.e_type ( File type ) + Elf32_Half field >Elf32_Ehdr.e_machine ( Machine archicture ) + Elf32_Word field >Elf32_Ehdr.e_version ( ELF format version ) + Elf32_Addr field >Elf32_Ehdr.e_entry ( Entry point ) + Elf32_Off field >Elf32_Ehdr.e_phoff ( Program header file offset ) + Elf32_Off field >Elf32_Ehdr.e_shoff ( Section header file offset ) + Elf32_Word field >Elf32_Ehdr.e_flags ( Architecture specific flags ) + Elf32_Half field >Elf32_Ehdr.e_ehsize ( Size of ELF header in bytes ) + Elf32_Half field >Elf32_Ehdr.e_phentsize ( Size of program header entries ) + Elf32_Half field >Elf32_Ehdr.e_phnum ( Number of program header entry ) + Elf32_Half field >Elf32_Ehdr.e_shentsize ( Size of section header entry ) + Elf32_Half field >Elf32_Ehdr.e_shnum ( Number of section header entries ) + Elf32_Half field >Elf32_Ehdr.e_shstrndx ( Section name strings section ) +constant /Elf32_Ehdr + +: @e_ident ( base index -- byte ) + swap >Elf32_Ehdr.e_ident + c@ +; + +: @e_type ( base -- type ) + >Elf32_Ehdr.e_type w@ +; + +: @e_machine ( base -- type ) + >Elf32_Ehdr.e_machine w@ +; + +: @e_entry ( base -- entry ) + >Elf32_Ehdr.e_entry l@ +; + +: @e_phoff ( base -- poffset ) + >Elf32_Ehdr.e_phoff l@ +; + +: @e_phnum ( base -- pnum ) + >Elf32_Ehdr.e_phnum w@ +; + +: elf? + " load-base" evaluate + dup EI_MAG0 @e_ident + ELFMAG0 <> if drop false exit then + dup EI_MAG1 @e_ident + ELFMAG1 <> if drop false exit then + dup EI_MAG2 @e_ident + ELFMAG2 <> if drop false exit then + dup EI_MAG3 @e_ident + ELFMAG3 <> if drop false exit then + dup EI_CLASS @e_ident +[IFDEF] CONFIG_SPARC64 + ELFCLASS64 <> if drop false exit then +[ELSE] + ELFCLASS32 <> if drop false exit then +[THEN] + dup EI_DATA @e_ident + " little-endian?" evaluate if + ELFDATA2LSB <> if drop false exit then + else + ELFDATA2MSB <> if drop false exit then + then + dup @e_type + ET_EXEC <> if drop false exit then ( not executable ) + @e_machine +[IFDEF] CONFIG_PPC + EM_PPC <> if false exit then +[THEN] +[IFDEF] CONFIG_X86 + dup + EM_386 <> if + EM_486 <> if + false exit + then + else + drop + then +[THEN] +[IFDEF] CONFIG_SPARC32 + dup + EM_SPARC <> if + EM_SPARC32PLUS <> if + false exit + then + else + drop + then +[THEN] +[IFDEF] CONFIG_SPARC64 + EM_SPARCV9 <> if false exit then +[THEN] + true + ; + +variable elf-entry + +: init-program-elf + elf file-type ! + " /packages/elf-loader" open-dev dup if + dup + " init-program" rot $call-method + close-dev + else + drop + ." /packages/elf-loader is missing" cr + then +; + +: xcoff? + " load-base" evaluate w@ + h# 1df <> if + false + exit + then + true + ; + +: init-program-xcoff + xcoff file-type ! + " /packages/xcoff-loader" open-dev dup if + dup + " init-program" rot $call-method + close-dev + else + drop + ." /packages/xcoff-loader is missing" cr + then + ; + +: pe? + false +; + +: init-program-pe + pe file-type ! + " /packages/pe-loader" open-dev dup if + dup + " init-program" rot $call-method + close-dev + else + drop + ." /packages/pe-loader is missing" cr + then + ; + +: bootinfo? + " load-base" evaluate dup + " <CHRP-BOOT>" comp 0= if + drop + true + exit + then + " <chrp-boot>" comp 0= if + true + exit + then + false + ; + +: init-program-bootinfo + bootinfo file-type ! + " /packages/bootinfo-loader" open-dev dup if + dup + " init-program" rot $call-method + close-dev + else + drop + ." /packages/bootinfo-loader is missing" cr + then + ; + +: init-program ( -- ) + elf? if + init-program-elf + exit + then + xcoff? if + init-program-xcoff + exit + then + pe? if + init-program-pe + exit + then + bootinfo? if + init-program-bootinfo + exit + then + ; + +: encode-bootpath ( str len -- ) + \ FIXME: need to extract bootargs from bootpath and set it in /chosen + " /chosen" (find-dev) if + " bootpath" rot (property) + then +; + : load ( "{params}<cr>" -- ) linefeed parse ( str len ) + 2dup encode-bootpath open-dev ( ihandle ) dup 0= if drop @@ -35,19 +295,23 @@ dup ihandle>phandle " load" rot find-method ( xt 0|1 ) if swap call-package !load-size else cr ." Cannot find load for this package" 2drop then r> close-dev + init-program ; : go ( -- ) - ." go is not yet implemented" + elf file-type @ = if +[IFDEF] CONFIG_PPC + elf-entry @ " (go)" evaluate +[THEN] + else + ." go is not yet implemented" + then ; : state-valid ( -- a-addr ) ; -: init-program ( -- ) - ; - \ 7.6.3 Abort and resume \ already defined !? Modified: trunk/openbios-devel/modules/build.xml =================================================================== --- trunk/openbios-devel/modules/build.xml 2009-09-02 22:25:44 UTC (rev 577) +++ trunk/openbios-devel/modules/build.xml 2009-09-18 22:59:30 UTC (rev 578) @@ -24,6 +24,7 @@ <object source="font_8x8.c" condition="FONT_8X8"/> <object source="font_8x16.c" condition="FONT_8X16"/> <object source="ofmem_common.c" condition="OFMEM"/> + <object source="elf-loader.c" condition="PPC"/> </library> <dictionary name="openbios" target="forth"> Modified: trunk/openbios-devel/modules/init.c =================================================================== --- trunk/openbios-devel/modules/init.c 2009-09-02 22:25:44 UTC (rev 577) +++ trunk/openbios-devel/modules/init.c 2009-09-18 22:59:30 UTC (rev 578) @@ -42,4 +42,5 @@ #ifdef CONFIG_SUN_PARTS sunparts_init(); #endif + elf_loader_init(); } Modified: trunk/openbios-devel/modules/modules.h =================================================================== --- trunk/openbios-devel/modules/modules.h 2009-09-02 22:25:44 UTC (rev 577) +++ trunk/openbios-devel/modules/modules.h 2009-09-18 22:59:30 UTC (rev 578) @@ -24,5 +24,6 @@ extern void pcparts_init( void ); extern void sunparts_init( void ); extern void cmdline_init( void ); +extern void elf_loader_init( void ); #endif /* _H_MODULES */

1 0

[Fwd: [coreboot] possible bug, reported on irc]
by Stefan Reinauer 08 Sep '09

08 Sep '09

2 1

r577 - trunk/openbios-devel/modules
by svn＠openbios.org 03 Sep '09

03 Sep '09

Author: laurent Date: 2009-09-03 00:25:44 +0200 (Thu, 03 Sep 2009) New Revision: 577 Modified: trunk/openbios-devel/modules/disk-label.c Log: Allow "boot hd:,%BOOT" to work again (and thus Quik). Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/modules/disk-label.c =================================================================== --- trunk/openbios-devel/modules/disk-label.c 2009-09-01 23:44:24 UTC (rev 576) +++ trunk/openbios-devel/modules/disk-label.c 2009-09-02 22:25:44 UTC (rev 577) @@ -79,7 +79,7 @@ /* argument format: parnum,filename */ s = path; - filename = NULL; + filename = ""; if( *s == '-' || isdigit(*s) || (*s >= 'a' && *s < ('a' + 8) && (*(s + 1) == ',' || *(s + 1) == '\0'))) { @@ -146,7 +146,7 @@ push_str( filename ); PUSH_ph( ph ); fword("interpose"); - } else if (filename && strcmp(filename, "%BOOT") != 0) { + } else if (*filename && strcmp(filename, "%BOOT") != 0) { goto out; } success = 1;

1 0

Re: [OpenBIOS] r565 - trunk/openbios-devel/modules
by Laurent Vivier 03 Sep '09

03 Sep '09

Le samedi 22 août 2009 à 08:03 +0200, svn(a)openbios.org a écrit : > Author: blueswirl > Date: 2009-08-22 08:03:40 +0200 (Sat, 22 Aug 2009) > New Revision: 565 > > Modified: > trunk/openbios-devel/modules/disk-label.c > Log: > Allow NULL dlabel path argument without accessing page zero. > > Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> > > Modified: trunk/openbios-devel/modules/disk-label.c > =================================================================== > --- trunk/openbios-devel/modules/disk-label.c 2009-08-22 06:03:20 UTC (rev 564) > +++ trunk/openbios-devel/modules/disk-label.c 2009-08-22 06:03:40 UTC (rev 565) > @@ -57,7 +57,7 @@ > static void > dlabel_open( dlabel_info_t *di ) > { > - char *s, *filename; > + const char *s, *filename; > char *path; > char block0[512]; > phandle_t ph; > @@ -65,6 +65,9 @@ > xt_t xt; > > path = my_args_copy(); > + if (!path) { > + path = strdup(""); > + } > DPRINTF("dlabel-open '%s'\n", path ); > > /* open disk interface */ > > This patch breaks booting PPC using QUIK bootloader. Ìs it possible to revert it ? Regards, Laurent -- --------------------- laurent(a)vivier.eu ---------------------- "Tout ce qui est impossible reste à accomplir" Jules Verne "Things are only impossible until they're not" Jean-Luc Picard

2 4

r576 - trunk/openbios-devel/arch/ppc/qemu
by svn＠openbios.org 02 Sep '09

02 Sep '09

Author: laurent Date: 2009-09-02 01:44:24 +0200 (Wed, 02 Sep 2009) New Revision: 576 Modified: trunk/openbios-devel/arch/ppc/qemu/main.c Log: Use the load method to load and execute CHRP script. This adds a better support of Apple BootX script. However, "init-program" and "go" are always missing to be able to really boot with BootX. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/arch/ppc/qemu/main.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c 2009-08-30 23:39:55 UTC (rev 575) +++ trunk/openbios-devel/arch/ppc/qemu/main.c 2009-09-01 23:44:24 UTC (rev 576) @@ -39,6 +39,14 @@ #define NEWWORLD_DPRINTF(fmt, args...) SUBSYS_DPRINTF("NEWWORLD", fmt, ##args) static void +load(const char *path) +{ + char buffer[1024]; + sprintf(buffer, "load %s", path); + feval(buffer); +} + +static void transfer_control_to_elf( ulong elf_entry ) { ELF_DPRINTF("Starting ELF boot loader\n"); @@ -235,10 +243,13 @@ static void try_chrp_script(const char *of_path, const char *param, const char *script_path) { - int fd, len, tag, taglen, script, scriptlen, entity; - char tagbuf[256], bootscript[2048], c; + int tag, taglen, script, scriptlen, entity, chrp; + char tagbuf[128], path[1024], c; char *device, *filename, *directory; int partition; + int current, size; + char *base; + char *bootscript; device = get_device(of_path); partition = get_partition(of_path); @@ -249,31 +260,39 @@ /* read boot script */ if (partition == -1) - snprintf(bootscript, sizeof(bootscript), "%s:,%s", + snprintf(path, sizeof(path), "%s:,%s", device, script_path); else - snprintf(bootscript, sizeof(bootscript), "%s:%d,%s", + snprintf(path, sizeof(path), "%s:%d,%s", device, partition, script_path); - CHRP_DPRINTF("Trying %s\n", bootscript); - if ((fd = open_io(bootscript)) == -1) { - ELF_DPRINTF("Can't open %s\n", bootscript); + CHRP_DPRINTF("Trying %s\n", path); + load(path); + feval("load-size"); + size = POP(); + if (size == 0) { + ELF_DPRINTF("Can't open %s\n", of_path); return; } - len = read_io(fd, tagbuf, 11); - tagbuf[11] = '\0'; - if (len < 0 || strcasecmp(tagbuf, "<chrp-boot>") != 0) - goto badf; + bootscript = malloc(size); + if (bootscript == NULL) { + ELF_DPRINTF("Can't malloc %d bytes\n", size); + return; + } + feval("load-base"); + base = (char*)POP(); + chrp = 0; tag = 0; taglen = 0; script = 0; scriptlen = 0; entity = 0; - do { - len = read_io(fd, &c, 1); - if (len < 0) - goto badf; + current = 0; + while (current < size) { + + c = base[current++]; + if (c == '<') { script = 0; tag = 1; @@ -281,12 +300,27 @@ } else if (c == '>') { tag = 0; tagbuf[taglen] = '\0'; - if (strcasecmp(tagbuf, "boot-script") == 0) - script = 1; - else if (strcasecmp(tagbuf, "/boot-script") == 0) - bootscript[scriptlen] = '\0'; - else if (strcasecmp(tagbuf, "/chrp-boot") == 0) - break; + if (strcasecmp(tagbuf, "chrp-boot") == 0) { + chrp = 1; + } else if (chrp == 1) { + if (strcasecmp(tagbuf, "boot-script") == 0) { + script = 1; + scriptlen = 0; + } else if (strcasecmp(tagbuf, "/boot-script") == 0) { + + script = 0; + bootscript[scriptlen] = '\0'; + + CHRP_DPRINTF("got bootscript %s\n", bootscript); + + encode_bootpath(of_path, param); + + feval(bootscript); + + break; + } else if (strcasecmp(tagbuf, "/chrp-boot") == 0) + break; + } } else if (tag && taglen < sizeof(tagbuf)) { tagbuf[taglen++] = c; } else if (script && c == '&') { @@ -295,7 +329,11 @@ } else if (entity && c ==';') { entity = 0; tagbuf[taglen] = '\0'; - if (strcasecmp(tagbuf, "device") == 0) { + if (strcasecmp(tagbuf, "lt") == 0) { + bootscript[scriptlen++] = '<'; + } else if (strcasecmp(tagbuf, "gt") == 0) { + bootscript[scriptlen++] = '>'; + } else if (strcasecmp(tagbuf, "device") == 0) { strcpy(bootscript + scriptlen, device); scriptlen += strlen(device); } else if (strcasecmp(tagbuf, "partition") == 0) { @@ -322,18 +360,12 @@ } } else if (entity && taglen < sizeof(tagbuf)) { tagbuf[taglen++] = c; - } else if (script && scriptlen < sizeof(bootscript)) { + } else if (script && scriptlen < size) { bootscript[scriptlen++] = c; } - } while (1); + } - CHRP_DPRINTF("got bootscript %s\n", bootscript); - - encode_bootpath(of_path, param); - - feval(bootscript); - badf: - close_io( fd ); + free(bootscript); } #define OLDWORLD_BOOTCODE_BASEADDR (0x3f4000)

1 0

r575 - in trunk/openbios-devel: forth/debugging modules
by svn＠openbios.org 31 Aug '09

31 Aug '09

Author: laurent Date: 2009-08-31 01:39:55 +0200 (Mon, 31 Aug 2009) New Revision: 575 Modified: trunk/openbios-devel/forth/debugging/client.fs trunk/openbios-devel/modules/filesystems.c Log: Implement load method Modified: trunk/openbios-devel/forth/debugging/client.fs =================================================================== --- trunk/openbios-devel/forth/debugging/client.fs 2009-08-30 23:37:42 UTC (rev 574) +++ trunk/openbios-devel/forth/debugging/client.fs 2009-08-30 23:39:55 UTC (rev 575) @@ -17,10 +17,28 @@ \ 7.6.2 Program download and execute +variable file-size + +: !load-size file-size ! ; + +: load-size file-size @ ; + : load ( "{params}<cr>" -- ) + linefeed parse ( str len ) + open-dev ( ihandle ) + dup 0= if + drop + exit + then + dup >r + " load-base" evaluate swap ( load-base ihandle ) + dup ihandle>phandle " load" rot find-method ( xt 0|1 ) + if swap call-package !load-size else cr ." Cannot find load for this package" 2drop then + r> close-dev ; : go ( -- ) + ." go is not yet implemented" ; : state-valid ( -- a-addr ) Modified: trunk/openbios-devel/modules/filesystems.c =================================================================== --- trunk/openbios-devel/modules/filesystems.c 2009-08-30 23:37:42 UTC (rev 574) +++ trunk/openbios-devel/modules/filesystems.c 2009-08-30 23:39:55 UTC (rev 575) @@ -243,6 +243,31 @@ PUSH( (ucell)"unspecified"); } +/* ( addr -- size ) */ + +static void +files_load( files_info_t *mi) +{ + char *buf = (char*)POP(); + int ret, size; + + if (!mi->file) { + PUSH(0); + return; + } + + size = 0; + while(1) { + ret = mi->fs->read( mi->file, buf, 512 ); + if (ret != 512) + break; + buf += ret; + mi->filepos += ret; + size += ret; + } + PUSH( size ); +} + /* static method, ( ih -- flag? ) */ static void files_probe( files_info_t *dummy ) @@ -279,6 +304,7 @@ { "write", files_write }, { "seek", files_seek }, { "tell", files_tell }, + { "load", files_load }, { "block-size", files_block_size }, /* special */

1 0

r574 - trunk/openbios-devel/modules
by svn＠openbios.org 31 Aug '09

31 Aug '09

Author: laurent Date: 2009-08-31 01:37:42 +0200 (Mon, 31 Aug 2009) New Revision: 574 Modified: trunk/openbios-devel/modules/disk-label.c Log: Remove useless openSUSE hack. This hack was needed because we were using the IBM bootscript (ppc/bootinfo.txt) with an HFS+ filesystem (whereas bootscript was using ISO9660 partition number) The newworld_boot() function uses now the Apple bootscript (suseboot/os-chooser) with the correct partition number. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/modules/disk-label.c =================================================================== --- trunk/openbios-devel/modules/disk-label.c 2009-08-29 21:09:21 UTC (rev 573) +++ trunk/openbios-devel/modules/disk-label.c 2009-08-30 23:37:42 UTC (rev 574) @@ -93,37 +93,6 @@ } DPRINTF("filename %s\n", filename); - /* try to see if there is a filesystem without partition, - * like ISO9660. This is needed to boot openSUSE 11.1 CD - * which uses "boot &device;:1,\suseboot\yaboot.ibm" - * whereas HFS+ partition is #2 - */ - - if ( atol(path) == 1 ) { - PUSH_ih( my_self() ); - selfword("find-filesystem"); - ph = POP_ph(); - if( ph ) { - di->offs_hi = 0; - di->offs_lo = 0; - di->size_hi = 0; - di->size_lo = 0; - di->part_ih = 0; - di->type = -1; - di->block_size = 512; - xt = find_parent_method("block-size"); - if (xt) { - call_parent(xt); - di->block_size = POP(); - } - push_str( filename ); - PUSH_ph( ph ); - fword("interpose"); - success = 1; - goto out; - } - } - /* find partition handler */ seek_io( fd, 0 ); if( read_io(fd, block0, sizeof(block0)) != sizeof(block0) )

1 0

Re: [OpenBIOS] [Qemu-devel] sparc memory/io mapping (and a milliseconds counter)
by Blue Swirl 30 Aug '09

30 Aug '09

[added openbios(a)openbios.org to CC] On Sun, Aug 30, 2009 at 2:21 AM, Artyom Tarasenko<atar4qemu(a)googlemail.com> wrote: > is there a generic way to find out mapped device for a virtual > address? Or at least its physical address? > > ok see get-msecs > value get-msecs ( Parameter field: 7680000 ) > > ok 7680000 map? > Virtual : 0768.0000 > Context : @ 0.1ffc.0000 01ff.afc1 # 0 > Region : @ 0.1ffa.fc1c 0000.0000 Invalid > > ok 7680000 iomap? > Virtual : 0768.0000 is not a valid I/O address. You could try to uncomment DEBUG_MMU in helper.c and op_helper.c, maybe the MMU dump contains the address. > Looks like the address 0x7680000 is not mapped to anything, but the > call returns a value: > > ok get-msecs . > 0 > ok get-msecs . > 0 > > The value is obviously wrong, but the question is, where does it come > from? Is it a RAM or is it one of devices? Didn't see anything similar > in prtconf dumps. > > Another related question is, are there any known issues related to > milliseconds counter? > In the current OpenBIOS "get-msecs" call doesn't return anything at all. It's definition in forth/device/other.fs is simply: : get-msecs ( -- n ) ;

1 0

Re: [OpenBIOS] r571 - in trunk/openbios-devel: arch/ppc/qemu forth/admin
by Alexander Graf 30 Aug '09

30 Aug '09

On 29.08.2009, at 17:43, svn(a)openbios.org wrote: > Author: laurent > Date: 2009-08-29 17:43:00 +0200 (Sat, 29 Aug 2009) > New Revision: 571 > > Modified: > trunk/openbios-devel/arch/ppc/qemu/main.c > trunk/openbios-devel/forth/admin/nvram.fs > Log: > Replace yaboot_startup() by newworld_boot() which implements generic > CHRP boot method. > It finds the CHRP bootscript using the file attribute 'tbxi' and > the blessed directory. > > This method allows to boot easily Fedora (the bitness detection is > done > by the script and yaboot is called with the according yaboot.conf) but > openSUSE is broken (you have to use "boot cd:,\suseboot\yaboot") For the lazy readers, what's the reason it worked before but breaks now? Alex

2 2

r573 - in trunk/openbios-devel: arch/ppc/qemu forth/admin
by svn＠openbios.org 29 Aug '09

29 Aug '09

Author: laurent Date: 2009-08-29 23:09:21 +0200 (Sat, 29 Aug 2009) New Revision: 573 Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c trunk/openbios-devel/forth/admin/nvram.fs Log: Define load-base to follow memory mapping defined in the BootX source comments. This as been reported by Steven Noonan. Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c 2009-08-29 20:42:22 UTC (rev 572) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c 2009-08-29 21:09:21 UTC (rev 573) @@ -30,10 +30,24 @@ extern void isi_exception( void ); extern void setup_mmu( ulong code_base ); +/* + * From Apple's BootX source comments: + * + * 96 MB map (currently unused - 4363357 tracks re-adoption) + * 00000000 - 00003FFF : Exception Vectors + * 00004000 - 03FFFFFF : Kernel Image, Boot Struct and Drivers (~64 MB) + * 04000000 - 04FFFFFF : File Load Area (16 MB) [80 MB] + * 05000000 - 053FFFFF : FS Cache (4 MB) [84 MB] + * 05400000 - 055FFFFF : Malloc Zone (2 MB) [86 MB] + * 05600000 - 057FFFFF : BootX Image (2 MB) [88 MB] + * 05800000 - 05FFFFFF : Unused/OF (8 MB) [96 MB] + * + */ + #define FREE_BASE 0x00004000 #define OF_CODE_START 0xfff00000UL #define IO_BASE 0x80000000 -#define OFMEM ((ofmem_t*)FREE_BASE) +#define OFMEM ((ofmem_t*)0x05400000) #define OF_MALLOC_BASE ((char*)OFMEM + ((sizeof(ofmem_t) + 3) & ~3)) @@ -78,7 +92,7 @@ ulong get_ram_bottom( void ) { - return (ulong)OF_MALLOC_BASE; + return (ulong)FREE_BASE; } static ucell get_heap_top( void ) Modified: trunk/openbios-devel/forth/admin/nvram.fs =================================================================== --- trunk/openbios-devel/forth/admin/nvram.fs 2009-08-29 20:42:22 UTC (rev 572) +++ trunk/openbios-devel/forth/admin/nvram.fs 2009-08-29 21:09:21 UTC (rev 573) @@ -334,7 +334,7 @@ " false" " real-mode?" bool-config " -1" " real-base" int-config " -1" " real-size" int-config -" 0x800000" " load-base" int-config +" 4000000" " load-base" int-config " -1" " virt-base" int-config " -1" " virt-size" int-config [THEN]

1 0

r572 - trunk/openbios-devel/forth/bootstrap
by svn＠openbios.org 29 Aug '09

29 Aug '09

Author: laurent Date: 2009-08-29 22:42:22 +0200 (Sat, 29 Aug 2009) New Revision: 572 Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs Log: Implement "$=" to compare two strings (needed by BootX) Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs =================================================================== --- trunk/openbios-devel/forth/bootstrap/bootstrap.fs 2009-08-29 15:43:00 UTC (rev 571) +++ trunk/openbios-devel/forth/bootstrap/bootstrap.fs 2009-08-29 20:42:22 UTC (rev 572) @@ -533,6 +533,20 @@ drop ; +\ compare two string + +: $= ( str1 len1 str2 len2 -- true|false ) + rot ( str1 str2 len2 len1 ) + over ( str1 str2 len2 len1 len2 ) + <> if ( str1 str2 len2 ) + 3drop + false + else ( str1 str2 len2 ) + comp + 0= + then +; + \ : +! tuck @ + swap ! ; : off false swap ! ; : on true swap ! ;

1 0

Re: [OpenBIOS] r571 - in trunk/openbios-devel: arch/ppc/qemu forth/admin
by Stefan Reinauer 29 Aug '09

29 Aug '09

svn(a)openbios.org wrote: > The MacOS bootloader (BootX) is also loaded automatically but forth > script is too complex to be executed correctly. > Where does it fail? Can you dump the script? Stefan

2 1

r571 - in trunk/openbios-devel: arch/ppc/qemu forth/admin
by svn＠openbios.org 29 Aug '09

29 Aug '09

Author: laurent Date: 2009-08-29 17:43:00 +0200 (Sat, 29 Aug 2009) New Revision: 571 Modified: trunk/openbios-devel/arch/ppc/qemu/main.c trunk/openbios-devel/forth/admin/nvram.fs Log: Replace yaboot_startup() by newworld_boot() which implements generic CHRP boot method. It finds the CHRP bootscript using the file attribute 'tbxi' and the blessed directory. This method allows to boot easily Fedora (the bitness detection is done by the script and yaboot is called with the according yaboot.conf) but openSUSE is broken (you have to use "boot cd:,\suseboot\yaboot") Debian works well (as usual...). The openSUSE needs the missing forth words: "load" and "go". The MacOS bootloader (BootX) is also loaded automatically but forth script is too complex to be executed correctly. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/arch/ppc/qemu/main.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c 2009-08-29 15:24:49 UTC (rev 570) +++ trunk/openbios-devel/arch/ppc/qemu/main.c 2009-08-29 15:43:00 UTC (rev 571) @@ -36,7 +36,7 @@ #endif #define CHRP_DPRINTF(fmt, args...) SUBSYS_DPRINTF("CHRP", fmt, ##args) #define ELF_DPRINTF(fmt, args...) SUBSYS_DPRINTF("ELF", fmt, ##args) -#define YABOOT_DPRINTF(fmt, args...) SUBSYS_DPRINTF("YABOOT", fmt, ##args) +#define NEWWORLD_DPRINTF(fmt, args...) SUBSYS_DPRINTF("NEWWORLD", fmt, ##args) static void transfer_control_to_elf( ulong elf_entry ) @@ -236,7 +236,7 @@ try_chrp_script(const char *of_path, const char *param, const char *script_path) { int fd, len, tag, taglen, script, scriptlen, entity; - char tagbuf[256], bootscript[256], c; + char tagbuf[256], bootscript[2048], c; char *device, *filename, *directory; int partition; @@ -244,6 +244,8 @@ partition = get_partition(of_path); filename = get_filename(of_path, &directory); + CHRP_DPRINTF("device %s partition %d filename %s\n", device, partition, filename); + /* read boot script */ if (partition == -1) @@ -378,13 +380,10 @@ } static void -yaboot_startup( void ) +newworld_boot( void ) { - static const char * const chrp_paths[] = { "ppc\\bootinfo.txt", "System\\Library\\CoreServices\\BootX" }; - static const char * const elf_paths[] = { "hd:2,\\ofclient", "hd:2,\\yaboot" }; - static const char * const args[] = { "", "conf=hd:2,\\yaboot.conf" }; + static const char * const chrp_path = "\\\\:tbxi" ; char *path = pop_fstr_copy(), *param; - int i; param = strchr(path, ' '); if (param) { @@ -393,7 +392,7 @@ } if (!path) { - YABOOT_DPRINTF("Entering boot, no path\n"); + NEWWORLD_DPRINTF("Entering boot, no path\n"); push_str("boot-device"); push_str("/options"); fword("(find-dev)"); @@ -415,9 +414,7 @@ param = pop_fstr_copy(); } try_path(path, param); - for( i=0; i < sizeof(chrp_paths) / sizeof(chrp_paths[0]); i++ ) { - try_chrp_script(path, param, chrp_paths[i]); - } + try_chrp_script(path, param, chrp_path); } else { uint16_t boot_device = fw_cfg_read_i16(FW_CFG_BOOT_DEVICE); switch (boot_device) { @@ -429,20 +426,13 @@ path = strdup("cd:"); break; } - for( i=0; i < sizeof(chrp_paths) / sizeof(chrp_paths[0]); i++ ) { - try_chrp_script(path, param, chrp_paths[i]); - } + try_chrp_script(path, param, chrp_path); } } else { - YABOOT_DPRINTF("Entering boot, path %s\n", path); + NEWWORLD_DPRINTF("Entering boot, path %s\n", path); try_path(path, param); - for( i=0; i < sizeof(chrp_paths) / sizeof(chrp_paths[0]); i++ ) { - try_chrp_script(path, param, chrp_paths[i]); - } + try_chrp_script(path, param, chrp_path); } - for( i=0; i < sizeof(elf_paths) / sizeof(elf_paths[0]); i++ ) { - try_path(elf_paths[i], args[i]); - } printk("*** Boot failure! No secondary bootloader specified ***\n"); } @@ -487,5 +477,5 @@ if (boot_device == 'c') { oldworld_boot(); } - yaboot_startup(); + newworld_boot(); } Modified: trunk/openbios-devel/forth/admin/nvram.fs =================================================================== --- trunk/openbios-devel/forth/admin/nvram.fs 2009-08-29 15:24:49 UTC (rev 570) +++ trunk/openbios-devel/forth/admin/nvram.fs 2009-08-29 15:43:00 UTC (rev 571) @@ -365,3 +365,7 @@ \ defers ['] fcode-debug? to _fcode-debug? ['] diag-switch? to _diag-switch? + +: release-load-area + drop +;

1 0

r570 - in trunk/openbios-devel: arch/ppc/qemu modules
by svn＠openbios.org 29 Aug '09

29 Aug '09

Author: laurent Date: 2009-08-29 17:24:49 +0200 (Sat, 29 Aug 2009) New Revision: 570 Modified: trunk/openbios-devel/arch/ppc/qemu/main.c trunk/openbios-devel/modules/mac-parts.c Log: For mac-parts, when no partition number is provided, open the first HFS partition (type is "Apple_HFS"). Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/arch/ppc/qemu/main.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c 2009-08-23 12:40:24 UTC (rev 569) +++ trunk/openbios-devel/arch/ppc/qemu/main.c 2009-08-29 15:24:49 UTC (rev 570) @@ -126,11 +126,11 @@ path++; if (!*path) - return 0; + return -1; path++; if (!strchr(path, ',')) /* check if there is a ',' */ - return 0; + return -1; return atol(path); } @@ -177,10 +177,16 @@ char path[1024]; phandle_t chosen_ph = find_dev("/chosen"); char *filename, *directory; + int partition; filename = get_filename(spec, &directory); - snprintf(path, sizeof(path), "%s:%d,%s\\%s", get_device(spec), - get_partition(spec), directory, filename); + partition = get_partition(spec); + if (partition == -1) + snprintf(path, sizeof(path), "%s:,%s\\%s", get_device(spec), + directory, filename); + else + snprintf(path, sizeof(path), "%s:%d,%s\\%s", get_device(spec), + partition, directory, filename); ELF_DPRINTF("bootpath %s bootargs %s\n", path, args); set_property( chosen_ph, "bootpath", path, strlen(spec)+1 ); @@ -240,8 +246,12 @@ /* read boot script */ - snprintf(bootscript, sizeof(bootscript), "%s:%d,%s", - device, partition, script_path); + if (partition == -1) + snprintf(bootscript, sizeof(bootscript), "%s:,%s", + device, script_path); + else + snprintf(bootscript, sizeof(bootscript), "%s:%d,%s", + device, partition, script_path); CHRP_DPRINTF("Trying %s\n", bootscript); if ((fd = open_io(bootscript)) == -1) { @@ -287,7 +297,10 @@ strcpy(bootscript + scriptlen, device); scriptlen += strlen(device); } else if (strcasecmp(tagbuf, "partition") == 0) { - sprintf(bootscript + scriptlen, "%d", partition); + if (partition != -1) + sprintf(bootscript + scriptlen, "%d", partition); + else + *(bootscript + scriptlen) = 0; scriptlen = strlen(bootscript); } else if (strcasecmp(tagbuf, "directory") == 0) { strcpy(bootscript + scriptlen, directory); @@ -409,11 +422,11 @@ uint16_t boot_device = fw_cfg_read_i16(FW_CFG_BOOT_DEVICE); switch (boot_device) { case 'c': - path = strdup("hd:0"); + path = strdup("hd:"); break; default: case 'd': - path = strdup("cd:0"); + path = strdup("cd:"); break; } for( i=0; i < sizeof(chrp_paths) / sizeof(chrp_paths[0]); i++ ) { Modified: trunk/openbios-devel/modules/mac-parts.c =================================================================== --- trunk/openbios-devel/modules/mac-parts.c 2009-08-23 12:40:24 UTC (rev 569) +++ trunk/openbios-devel/modules/mac-parts.c 2009-08-29 15:24:49 UTC (rev 570) @@ -90,6 +90,7 @@ goto out; if (parnum == -1) { + int firstHFS = -1; /* search a bootable partition */ /* see PowerPC Microprocessor CHRP bindings */ @@ -101,6 +102,10 @@ !par.pmPartBlkCnt ) goto out; + if (firstHFS == -1 && + strcmp(par.pmPartType, "Apple_HFS") == 0) + firstHFS = parnum; + if( (par.pmPartStatus & kPartitionAUXIsBootValid) && (par.pmPartStatus & kPartitionAUXIsValid) && (par.pmPartStatus & kPartitionAUXIsAllocated) && @@ -120,6 +125,10 @@ parnum++; } /* not found */ + if (firstHFS != -1) { + parnum = firstHFS; + goto found; + } ret = 0; goto out; } @@ -135,6 +144,7 @@ if( parnum > par.pmMapBlkCnt) goto out; +found: SEEK( (bs * parnum) ); READ( &par, sizeof(par) ); if( par.pmSig != DESC_PART_SIGNATURE || !par.pmPartBlkCnt )

1 0

Re: [OpenBIOS] Looking for a printf like function
by G 3 26 Aug '09

26 Aug '09

On Aug 26, 2009, at 6:00 AM, openbios-request(a)openbios.org wrote: > Date: Tue, 25 Aug 2009 21:37:30 +0300 > From: Blue Swirl <blauwirbel(a)gmail.com> > To: The OpenBIOS Mailinglist <openbios(a)openbios.org> > Subject: Re: [OpenBIOS] Looking for a printf like function > Message-ID: > <f43fc5580908251137q57ed4205na6402bdddcc44db9(a)mail.gmail.com> > Content-Type: text/plain; charset=UTF-8 > > On Tue, Aug 25, 2009 at 8:11 PM, G 3<programmingkidx(a)gmail.com> wrote: >> I would like to print messages to the console. What function should I >> use to do this? > > printk() from C, from Forth normal Forth words. > >> Background information: >> Building OpenBIOS for Qemu. Emulated Computer: Macintosh. > > PPC or x86? What type? PPC. I am hoping to be able to make Mac OS X run in Qemu one day. > > Is the device tree available, like these: > http://penguinppc.org/historical/dev-trees-html/trees-index.html > ? I don't have any information about the device tree. I just use this command to start qemu: qemu-system-ppc -L qemu-bios -cdrom ~/mac.iso - boot d Thank you for helping.

1 0

Looking for a printf like function
by G 3 25 Aug '09

25 Aug '09

I would like to print messages to the console. What function should I use to do this? Background information: Building OpenBIOS for Qemu. Emulated Computer: Macintosh.

2 1

feature request
by G 3 25 Aug '09

25 Aug '09

I ask that a 'dir' word be added to OpenBIOS. This word is what allows the user to view the files on various disc using OpenBIOS command prompt.

1 0

r569 - trunk/openbios-devel/fs/grubfs
by svn＠openbios.org 23 Aug '09

23 Aug '09

Author: blueswirl Date: 2009-08-23 14:40:24 +0200 (Sun, 23 Aug 2009) New Revision: 569 Modified: trunk/openbios-devel/fs/grubfs/build.xml Log: Use -fno-strict-aliasing flag for all filesystems imported from GRUB. Otherwise, they won't compile with gcc 4.4. Fixing the code would require massive changes, which is not practical for the code taken from another project. Author: Pavel Roskin <proski(a)gnu.org> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/fs/grubfs/build.xml =================================================================== --- trunk/openbios-devel/fs/grubfs/build.xml 2009-08-23 12:40:22 UTC (rev 568) +++ trunk/openbios-devel/fs/grubfs/build.xml 2009-08-23 12:40:24 UTC (rev 569) @@ -1,17 +1,17 @@ <build> <library name="fs" type="static" target="target"> <object source="grubfs_fs.c"/> - <object source="fsys_ext2fs.c" condition="FSYS_EXT2FS" flags="-DFSYS_EXT2FS"/> - <object source="fsys_fat.c" condition="FSYS_FAT" flags="-DFSYS_FAT"/> - <object source="fsys_jfs.c" condition="FSYS_JFS" flags="-DFSYS_JFS"/> - <object source="fsys_minix.c" condition="FSYS_MINIX" flags="-DFSYS_MINIX"/> - <object source="fsys_reiserfs.c" condition="FSYS_REISERFS" flags="-DFSYS_REISERFS"/> - <object source="fsys_xfs.c" condition="FSYS_XFS" flags="-DFSYS_XFS"/> - <object source="fsys_ufs.c" condition="FSYS_UFS" flags="-DFSYS_UFS"/> - <object source="fsys_ffs.c" condition="FSYS_FFS" flags="-DFSYS_FFS"/> - <object source="fsys_vstafs.c" condition="FSYS_VSTAFS" flags="-DFSYS_VSTAFS"/> - <object source="fsys_iso9660.c" condition="FSYS_ISO9660" flags="-DFSYS_ISO9660"/> - <object source="fsys_ntfs.c" condition="FSYS_NTFS" flags="-DFSYS_NTFS"/> - <object source="fsys_affs.c" condition="FSYS_AFFS" flags="-DFSYS_AFFS"/> + <object source="fsys_ext2fs.c" condition="FSYS_EXT2FS" flags="-DFSYS_EXT2FS -fno-strict-aliasing"/> + <object source="fsys_fat.c" condition="FSYS_FAT" flags="-DFSYS_FAT -fno-strict-aliasing"/> + <object source="fsys_jfs.c" condition="FSYS_JFS" flags="-DFSYS_JFS -fno-strict-aliasing"/> + <object source="fsys_minix.c" condition="FSYS_MINIX" flags="-DFSYS_MINIX -fno-strict-aliasing"/> + <object source="fsys_reiserfs.c" condition="FSYS_REISERFS" flags="-DFSYS_REISERFS -fno-strict-aliasing"/> + <object source="fsys_xfs.c" condition="FSYS_XFS" flags="-DFSYS_XFS -fno-strict-aliasing"/> + <object source="fsys_ufs.c" condition="FSYS_UFS" flags="-DFSYS_UFS -fno-strict-aliasing"/> + <object source="fsys_ffs.c" condition="FSYS_FFS" flags="-DFSYS_FFS -fno-strict-aliasing"/> + <object source="fsys_vstafs.c" condition="FSYS_VSTAFS" flags="-DFSYS_VSTAFS -fno-strict-aliasing"/> + <object source="fsys_iso9660.c" condition="FSYS_ISO9660" flags="-DFSYS_ISO9660 -fno-strict-aliasing"/> + <object source="fsys_ntfs.c" condition="FSYS_NTFS" flags="-DFSYS_NTFS -fno-strict-aliasing"/> + <object source="fsys_affs.c" condition="FSYS_AFFS" flags="-DFSYS_AFFS -fno-strict-aliasing"/> </library> </build>

1 0

r568 - in trunk/openbios-devel: drivers modules
by svn＠openbios.org 23 Aug '09

23 Aug '09

Author: blueswirl Date: 2009-08-23 14:40:22 +0200 (Sun, 23 Aug 2009) New Revision: 568 Modified: trunk/openbios-devel/drivers/fw_cfg.c trunk/openbios-devel/modules/pc-parts.c Log: Fix gcc 4.4 warnings about strict aliasing Rather than cast char arrays to other types, use correct types and cast them to char pointers when needed. Author: Pavel Roskin <proski(a)gnu.org> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/drivers/fw_cfg.c =================================================================== --- trunk/openbios-devel/drivers/fw_cfg.c 2009-08-23 12:40:20 UTC (rev 567) +++ trunk/openbios-devel/drivers/fw_cfg.c 2009-08-23 12:40:22 UTC (rev 568) @@ -34,31 +34,31 @@ uint64_t fw_cfg_read_i64(uint16_t cmd) { - char buf[sizeof(uint64_t)]; + uint64_t buf; - fw_cfg_read(cmd, buf, sizeof(uint64_t)); + fw_cfg_read(cmd, (char *)&buf, sizeof(uint64_t)); - return __le64_to_cpu(*(uint64_t *)buf); + return __le64_to_cpu(buf); } uint32_t fw_cfg_read_i32(uint16_t cmd) { - char buf[sizeof(uint32_t)]; + uint32_t buf; - fw_cfg_read(cmd, buf, sizeof(uint32_t)); + fw_cfg_read(cmd, (char *)&buf, sizeof(uint32_t)); - return __le32_to_cpu(*(uint32_t *)buf); + return __le32_to_cpu(buf); } uint16_t fw_cfg_read_i16(uint16_t cmd) { - char buf[sizeof(uint16_t)]; + uint16_t buf; - fw_cfg_read(cmd, buf, sizeof(uint16_t)); + fw_cfg_read(cmd, (char *)&buf, sizeof(uint16_t)); - return __le16_to_cpu(*(uint16_t *)buf); + return __le16_to_cpu(buf); } void Modified: trunk/openbios-devel/modules/pc-parts.c =================================================================== --- trunk/openbios-devel/modules/pc-parts.c 2009-08-23 12:40:20 UTC (rev 567) +++ trunk/openbios-devel/modules/pc-parts.c 2009-08-23 12:40:22 UTC (rev 568) @@ -58,8 +58,8 @@ unsigned char e_head; unsigned char e_sector; unsigned char e_cyl; - unsigned char start_sect[4]; /* unaligned little endian */ - unsigned char nr_sects[4]; /* ditto */ + u32 start_sect; /* unaligned little endian */ + u32 nr_sects; /* ditto */ } *p; unsigned char buf[512]; @@ -96,11 +96,11 @@ printk("partition %d does not exist\n", parnum+1 ); RET( 0 ); } - di->offs = (llong)(__le32_to_cpu(*((u32 *)p->start_sect))) * bs; - di->size = (llong)(__le32_to_cpu(*((u32 *)p->nr_sects))) * bs; + di->offs = (llong)(__le32_to_cpu(p->start_sect)) * bs; + di->size = (llong)(__le32_to_cpu(p->nr_sects)) * bs; /* printk("Primary partition at sector %x\n", - __le32_to_cpu(*((u32 *)p->start_sect))); */ + __le32_to_cpu(p->start_sect)); */ RET( -1 ); } else { @@ -123,7 +123,7 @@ printk("Extended partition at %d\n", i+1); /* Visit each logical partition labels */ - ext_start = __le32_to_cpu(*((u32 *)p[i].start_sect)); + ext_start = __le32_to_cpu(p[i].start_sect); cur_table = ext_start; cur_part = 4; @@ -147,8 +147,8 @@ RET( 0 ); } di->offs = - (llong)(cur_table+__le32_to_cpu(*((u32 *)p->start_sect))) * bs; - di->size = (llong)__le32_to_cpu(*((u32 *)p->nr_sects)) * bs; + (llong)(cur_table+__le32_to_cpu(p->start_sect)) * bs; + di->size = (llong)__le32_to_cpu(p->nr_sects) * bs; RET ( -1 ); } @@ -157,7 +157,7 @@ printk("no link\n"); break; } - cur_table = ext_start + __le32_to_cpu(*((u32 *)p[1].start_sect)); + cur_table = ext_start + __le32_to_cpu(p[1].start_sect); cur_part++; }

1 0

r567 - trunk/openbios-devel
by svn＠openbios.org 23 Aug '09

23 Aug '09

Author: blueswirl Date: 2009-08-23 14:40:20 +0200 (Sun, 23 Aug 2009) New Revision: 567 Modified: trunk/openbios-devel/Makefile.target Log: Show version.fs and openbios-version.h generation Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/Makefile.target =================================================================== --- trunk/openbios-devel/Makefile.target 2009-08-22 06:04:00 UTC (rev 566) +++ trunk/openbios-devel/Makefile.target 2009-08-23 12:40:20 UTC (rev 567) @@ -32,6 +32,8 @@ INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include AS_FLAGS+= -g +quiet-command = $(if $(V),$1,$(if $(2),@echo $2 && $1, @$1)) + # # pre rules # @@ -41,12 +43,14 @@ versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs $(ODIR)/forth/version.fs: + $(call quiet-command,true, " GEN $(TARGET_DIR)$@") @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo ": builddate \" $$DATE\" ; " ; \ echo ": version \" $(VERSION)\" ; " ; ) \ > $(dir $(a))/version.fs $(ODIR)/target/include/openbios-version.h: + $(call quiet-command,true, " GEN $(TARGET_DIR)$@") @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo "#define OPENBIOS_BUILD_DATE \"$$DATE\"" ; \ echo "#define OPENBIOS_VERSION_STR \"$(VERSION)\"" ; ) \ @@ -65,6 +69,4 @@ build: all -quiet-command = $(if $(V),$1,$(if $(2),@echo $2 && $1, @$1)) - include rules.mak

1 0

[patch 0/6] sparc64 zero virtual memory page fixes
by Igor Kovalenko 22 Aug '09

22 Aug '09

Hi! This series do clean up several issues with openbios implementation trying to access zero virtual memory page. These changes are needed to prevent corrupting low memory space, albeit it is hard to verify without corresponding change to qemu which moves pci memory space above low 32bit space. Qemu part is not completed yet, so I use workaround for testing purposes. Change to package.fs dealing with NULL instance or package handles should be visible even witout changes to qemu (meaning more issues are probably there, to be fixed). I think timer handler currently fails into this problematic category as well, so related change postponing timer initialization is here as well. Since timer event handling requires trap table support, I added corresponding entry which does nothing but rearms timer at the moment. Signed-off-by: igor.v.kovalenko(a)gmail.com -- Kind regards, Igor V. Kovalenko

3 15

[patch 0/1] corrected softint handler v1
by Igor Kovalenko 22 Aug '09

22 Aug '09

corrected version v1 removed extra instructions Signed-off-by: igor.v.kovalenko(a)gmail.com -- Kind regards, Igor V. Kovalenko

2 2

r566 - trunk/openbios-devel/arch/sparc64
by svn＠openbios.org 22 Aug '09

22 Aug '09

Author: blueswirl Date: 2009-08-22 08:04:00 +0200 (Sat, 22 Aug 2009) New Revision: 566 Modified: trunk/openbios-devel/arch/sparc64/vectors.S Log: v1 Preliminary support for softint handler with trap to bug on other irqs v0->v1: removed extra instructions Signed-off-by: igor.v.kovalenko(a)gmail.com Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc64/vectors.S =================================================================== --- trunk/openbios-devel/arch/sparc64/vectors.S 2009-08-22 06:03:40 UTC (rev 565) +++ trunk/openbios-devel/arch/sparc64/vectors.S 2009-08-22 06:04:00 UTC (rev 566) @@ -29,11 +29,13 @@ #define ASI_BP ASI_PHYS_BYPASS_EC_E #define PROM_ADDR 0x1fff0000000 #define SER_ADDR 0x1fe020003f8 +#define TICK_INT_DIS 0x8000000000000000 +#define TICK_INTERVAL 10*1000*1000 .section ".text.vectors", "ax" .align 16384 /* Sparc64 trap table */ - .globl trap_table, __divide_error + .globl trap_table, __divide_error, softint_irq, softint_irq_tl1 .register %g2, #scratch .register %g3, #scratch .register %g6, #scratch @@ -96,7 +98,7 @@ nop;nop;nop;nop;nop;nop;nop;nop;nop;nop;nop;nop; #define TRAP_IRQ(routine, level) \ - ba routine; nop; nop; nop; nop; nop; nop; nop; + ba routine; mov level, %g1; nop; nop; nop; nop; nop; nop; #define BTRAP(lvl) \ ba bug; mov lvl, %g1; nop; nop; nop; nop; nop; nop; #define BTRAPTL1(lvl) BTRAP(lvl) @@ -119,7 +121,6 @@ CLEAN_WINDOW ! 24-27 BTRAPS(0x28) BTRAPS(0x30) BTRAPS(0x38) -#if 0 BTRAP(0x40) BTRAP(0x41) BTRAP(0x42) BTRAP(0x43) tl0_irq4: TRAP_IRQ(handler_irq, 4) tl0_irq5: TRAP_IRQ(handler_irq, 5) TRAP_IRQ(handler_irq, 6) @@ -127,11 +128,8 @@ tl0_irq9: TRAP_IRQ(handler_irq, 9) TRAP_IRQ(handler_irq, 10) tl0_irq11: TRAP_IRQ(handler_irq, 11) TRAP_IRQ(handler_irq, 12) tl0_irq13: TRAP_IRQ(handler_irq, 13) -tl0_irq14: TRAP_IRQ(handler_irq, 14) +tl0_irq14: TRAP_IRQ(softint_irq, 14) tl0_irq15: TRAP_IRQ(handler_irq, 15) -#else - BTRAPS(0x40) BTRAPS(0x48) -#endif BTRAPS(0x50) BTRAPS(0x58) BTRAPS4(0x60) TRAP_HANDLER(reload_IMMU_tlb) ! 0x64 : instruction_access_MMU_miss @@ -196,6 +194,9 @@ #undef BTRAPS #define BTRAPS(x) BTRAPTL1(x) BTRAPTL1(x+1) BTRAPTL1(x+2) BTRAPTL1(x+3) BTRAPTL1(x+4) BTRAPTL1(x+5) BTRAPTL1(x+6) BTRAPTL1(x+7) +#define SKIP_IRQ(routine, level) \ + retry; nop; nop; nop; nop; nop; nop; nop; + sparc64_ttable_tl1: BTRAPS(0x00) BTRAPS(0x08) BTRAPS(0x10) BTRAPS(0x18) @@ -203,7 +204,6 @@ CLEAN_WINDOW ! 24-27 BTRAPS(0x28) BTRAPS(0x30) BTRAPS(0x38) -#if 0 BTRAPTL1(0x40) BTRAPTL1(0x41) BTRAPTL1(0x42) BTRAPTL1(0x43) tl1_irq4: TRAP_IRQ(handler_irq, 4) tl1_irq5: TRAP_IRQ(handler_irq, 5) TRAP_IRQ(handler_irq, 6) @@ -211,11 +211,8 @@ tl1_irq9: TRAP_IRQ(handler_irq, 9) TRAP_IRQ(handler_irq, 10) tl1_irq11: TRAP_IRQ(handler_irq, 11) TRAP_IRQ(handler_irq, 12) tl1_irq13: TRAP_IRQ(handler_irq, 13) -tl1_irq14: TRAP_IRQ(handler_irq, 14) +tl1_irq14: SKIP_IRQ(softint_irq, 14) tl1_irq15: TRAP_IRQ(handler_irq, 15) -#else - BTRAPS(0x40) BTRAPS(0x48) -#endif BTRAPS(0x50) BTRAPS(0x58) BTRAPS4(0x60) TRAP_HANDLER(reload_IMMU_tlb) ! 0x64 : instruction_access_MMU_miss @@ -400,6 +397,28 @@ retry +softint_irq_tl1: +softint_irq: + mov 1, %g2 + /* clear tick interrupt */ + wr %g2, 0x0, %clear_softint + sll %g2, %g1, %g2 + sra %g2, 0, %g2 + /* clear softint interrupt */ + wr %g2, 0x0, %clear_softint + + setx TICK_INT_DIS, %g2, %g1 + rd %tick, %g2 + and %g1, %g2, %g1 + brnz,pn %g1, tick_compare_disabled + nop + set TICK_INTERVAL, %g1 + add %g1, %g2, %g1 + wr %g1, 0, %tick_cmpr +tick_compare_disabled: + retry + +handler_irq: __divide_error: bug: /* Dump the exception and its context */

1 0

r565 - trunk/openbios-devel/modules
by svn＠openbios.org 22 Aug '09

22 Aug '09

Author: blueswirl Date: 2009-08-22 08:03:40 +0200 (Sat, 22 Aug 2009) New Revision: 565 Modified: trunk/openbios-devel/modules/disk-label.c Log: Allow NULL dlabel path argument without accessing page zero. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/modules/disk-label.c =================================================================== --- trunk/openbios-devel/modules/disk-label.c 2009-08-22 06:03:20 UTC (rev 564) +++ trunk/openbios-devel/modules/disk-label.c 2009-08-22 06:03:40 UTC (rev 565) @@ -57,7 +57,7 @@ static void dlabel_open( dlabel_info_t *di ) { - char *s, *filename; + const char *s, *filename; char *path; char block0[512]; phandle_t ph; @@ -65,6 +65,9 @@ xt_t xt; path = my_args_copy(); + if (!path) { + path = strdup(""); + } DPRINTF("dlabel-open '%s'\n", path ); /* open disk interface */

1 0

r564 - trunk/openbios-devel/modules
by svn＠openbios.org 22 Aug '09

22 Aug '09

Author: blueswirl Date: 2009-08-22 08:03:20 +0200 (Sat, 22 Aug 2009) New Revision: 564 Modified: trunk/openbios-devel/modules/console_common.c Log: Allow NULL string argument without accessing page zero. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/modules/console_common.c =================================================================== --- trunk/openbios-devel/modules/console_common.c 2009-08-21 19:15:55 UTC (rev 563) +++ trunk/openbios-devel/modules/console_common.c 2009-08-22 06:03:20 UTC (rev 564) @@ -386,6 +386,10 @@ unsigned int y, x; unsigned char ch; + if (!str) { + return 0; + } + if( !cons.inited && console_init() ) return -1;

1 0

r563 - trunk/openbios-devel/arch/sparc64
by svn＠openbios.org 21 Aug '09

21 Aug '09

Author: blueswirl Date: 2009-08-21 21:15:55 +0200 (Fri, 21 Aug 2009) New Revision: 563 Modified: trunk/openbios-devel/arch/sparc64/entry.S Log: Enable timer after trap table is initialized Signed-off-by: igor.v.kovalenko(a)gmail.com Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc64/entry.S =================================================================== --- trunk/openbios-devel/arch/sparc64/entry.S 2009-08-21 19:15:46 UTC (rev 562) +++ trunk/openbios-devel/arch/sparc64/entry.S 2009-08-21 19:15:55 UTC (rev 563) @@ -47,8 +47,8 @@ wrpr %g0, 0, %canrestore wrpr %g0, 0, %otherwin wrpr %g0, 0, %wstate - ! 100 Hz timer - set 10 * 1000 * 1000, %g1 + ! disable timer now + setx 0x8000000000000000, %g2, %g1 wr %g1, 0, %tick_cmpr ! Disable I/D MMUs and caches @@ -319,6 +319,12 @@ /* Finally, turn on traps so that we can call c-code. */ wrpr %g0, (PSTATE_PRIV|PSTATE_PEF|PSTATE_IE), %pstate + ! 100 Hz timer + rd %tick, %g2 + set 10 * 1000 * 1000, %g1 + add %g1, %g2, %g1 + wr %g1, 0, %tick_cmpr + /* Switch to our main context. * Main context is statically defined in C. */

1 0

r562 - trunk/openbios-devel/arch/sparc64
by svn＠openbios.org 21 Aug '09

21 Aug '09

Author: blueswirl Date: 2009-08-21 21:15:46 +0200 (Fri, 21 Aug 2009) New Revision: 562 Modified: trunk/openbios-devel/arch/sparc64/entry.S trunk/openbios-devel/arch/sparc64/ldscript Log: Save locked tlb space by aligning to 512k pages. Signed-off-by: igor.v.kovalenko(a)gmail.com Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc64/entry.S =================================================================== --- trunk/openbios-devel/arch/sparc64/entry.S 2009-08-20 19:10:04 UTC (rev 561) +++ trunk/openbios-devel/arch/sparc64/entry.S 2009-08-21 19:15:46 UTC (rev 562) @@ -131,7 +131,7 @@ ! %g1 contains end of memory setx _end, %g7, %g3 - set 0xffff, %g2 + set 0x7ffff, %g2 add %g3, %g2, %g3 andn %g3, %g2, %g3 setx _data, %g7, %g2 @@ -142,17 +142,17 @@ ! setup .data & .bss setx _data, %g7, %g4 sub %g3, %g4, %g5 - srlx %g5, 16, %g6 ! %g6 = # of 64k .bss pages - set 0xa0000000, %g3 + srlx %g5, 19, %g6 ! %g6 = # of 512k .bss pages + set 0xc0000000, %g3 sllx %g3, 32, %g3 or %g3, 0x76, %g3 - ! valid, 64k, locked, cacheable(I/E/C), priv, writable + ! valid, 512k, locked, cacheable(I/E/C), priv, writable set 48, %g7 -1: stxa %g4, [%g7] ASI_DMMU ! vaddr = _data + N * 0x10000, ctx=0 +1: stxa %g4, [%g7] ASI_DMMU ! vaddr = _data + N * 0x80000, ctx=0 or %g2, %g3, %g5 - ! paddr = start_mem + N * 0x10000 + ! paddr = start_mem + N * 0x80000 stxa %g5, [%g0] ASI_DTLB_DATA_IN - set 0x10000, %g5 + set 0x80000, %g5 add %g2, %g5, %g2 add %g4, %g5, %g4 deccc %g6 @@ -163,16 +163,16 @@ setx _data, %g7, %g5 setx _start, %g7, %g4 sub %g5, %g4, %g5 - srlx %g5, 16, %g6 ! %g6 = # of 64k .rodata pages + srlx %g5, 19, %g6 ! %g6 = # of 512k .rodata pages set 48, %g7 - set 0x10000, %g5 + set 0x80000, %g5 setx PROM_ADDR, %l1, %l2 1: stxa %g4, [%g7] ASI_DMMU ! vaddr = _rodata, ctx=0 - set 0xa0000000, %g3 + set 0xc0000000, %g3 sllx %g3, 32, %g3 or %g3, 0x74, %g3 or %l2, %g3, %g3 - ! valid, 64k, locked, cacheable(I/E/C), priv + ! valid, 512k, locked, cacheable(I/E/C), priv ! paddr = _rodata + N * 0x10000 stxa %g3, [%g0] ASI_DTLB_DATA_IN add %g4, %g5, %g4 @@ -223,17 +223,19 @@ setx _start, %g7, %g4 setx _rodata, %g7, %g5 sub %g5, %g4, %g5 - srlx %g5, 16, %g6 ! %g6 = # of 64k .text pages - set 0x10000, %g5 + set 0x7ffff, %g7 + add %g5, %g7, %g5 ! round to 512k + srlx %g5, 19, %g6 ! %g6 = # of 512k .text pages + set 0x80000, %g5 set 48, %g7 setx PROM_ADDR, %l1, %l2 1: stxa %g4, [%g7] ASI_IMMU ! vaddr = _start, ctx=0 - set 0xa0000000, %g3 + set 0xc0000000, %g3 sllx %g3, 32, %g3 or %g3, 0x74, %g3 or %l2, %g3, %g3 - ! valid, 64k, locked, cacheable(I/E/C), priv - ! paddr = _start + N * 0x10000 + ! valid, 512k, locked, cacheable(I/E/C), priv + ! paddr = _start + N * 0x80000 stxa %g3, [%g0] ASI_ITLB_DATA_IN add %g4, %g5, %g4 deccc %g6 Modified: trunk/openbios-devel/arch/sparc64/ldscript =================================================================== --- trunk/openbios-devel/arch/sparc64/ldscript 2009-08-20 19:10:04 UTC (rev 561) +++ trunk/openbios-devel/arch/sparc64/ldscript 2009-08-21 19:15:46 UTC (rev 562) @@ -25,12 +25,12 @@ _start = .; /* Normal sections */ - .text ALIGN(65536): { + .text ALIGN(524288): { *(.text.vectors) *(.text) *(.text.*) } - .rodata ALIGN(65536): { + .rodata ALIGN(524288): { _rodata = .; sound_drivers_start = .; *(.rodata.sound_drivers) @@ -39,7 +39,7 @@ *(.rodata.*) *(.note.ELFBoot) } - .data ALIGN(65536): { + .data ALIGN(524288): { _data = .; *(.data) *(.data.*)

1 0

r561 - trunk/openbios-devel/libgcc
by svn＠openbios.org 20 Aug '09

20 Aug '09

Author: blueswirl Date: 2009-08-20 21:10:04 +0200 (Thu, 20 Aug 2009) New Revision: 561 Added: trunk/openbios-devel/libgcc/__negti2.c Modified: trunk/openbios-devel/libgcc/build.xml trunk/openbios-devel/libgcc/libgcc.h Log: Some gcc versions need __negti2 Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Added: trunk/openbios-devel/libgcc/__negti2.c =================================================================== --- trunk/openbios-devel/libgcc/__negti2.c (rev 0) +++ trunk/openbios-devel/libgcc/__negti2.c 2009-08-20 19:10:04 UTC (rev 561) @@ -0,0 +1,53 @@ +/* Extracted from gcc-3.4.1/gcc/config/mips/_tilibi.c */ +/* A few TImode functions needed for TFmode emulated arithmetic. + Copyright 2002, 2003 Free Software Foundation, Inc. + Contributed by Alexandre Oliva <aoliva(a)redhat.com> + +This file is part of GCC. + +GCC is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GCC is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GCC; see the file COPYING. If not, write to +the Free Software Foundation, 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +#include "libgcc.h" + +#if defined(__sparc__) || defined(__ppc__) +#define LIBGCC2_WORDS_BIG_ENDIAN +#endif + +typedef union +{ + struct TIstruct { +#if defined(LIBGCC2_WORDS_BIG_ENDIAN) + DItype high, low; +#else + DItype low, high; +#endif + } s; + TItype ll; +} TIunion; + +TItype +__negti2 (TItype u) +{ + TIunion w; + TIunion uu; + + uu.ll = u; + + w.s.low = -uu.s.low; + w.s.high = -uu.s.high - ((UDItype) w.s.low > 0); + + return w.ll; +} Modified: trunk/openbios-devel/libgcc/build.xml =================================================================== --- trunk/openbios-devel/libgcc/build.xml 2009-08-19 19:44:40 UTC (rev 560) +++ trunk/openbios-devel/libgcc/build.xml 2009-08-20 19:10:04 UTC (rev 561) @@ -16,6 +16,7 @@ <object source="__udivmodti4.c" condition="SPARC64"/> <object source="__umodti3.c" condition="SPARC64"/> <object source="multi3.c" condition="SPARC64"/> + <object source="__negti2.c" condition="SPARC64"/> </library> Modified: trunk/openbios-devel/libgcc/libgcc.h =================================================================== --- trunk/openbios-devel/libgcc/libgcc.h 2009-08-19 19:44:40 UTC (rev 560) +++ trunk/openbios-devel/libgcc/libgcc.h 2009-08-20 19:10:04 UTC (rev 561) @@ -38,6 +38,8 @@ __uint128_t __umodti3(__uint128_t num, __uint128_t den); TItype __multi3 (TItype u, TItype v); +TItype __negti2 (TItype u); + #endif #endif /* _LIBGCC_H */

1 0

ucell definition
by G 3 20 Aug '09

20 Aug '09

Hi, I am trying to build openbios, but I keep on receiving errors in the file bootstrap.c. It appears the definition of the ucell type is missing. What file has the definition of the ucell type?

2 1

r560 - trunk/openbios-devel/arch/sparc64
by svn＠openbios.org 19 Aug '09

19 Aug '09

Author: blueswirl Date: 2009-08-19 21:44:40 +0200 (Wed, 19 Aug 2009) New Revision: 560 Modified: trunk/openbios-devel/arch/sparc64/boot.c Log: Fix OpenBSD boot Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc64/boot.c =================================================================== --- trunk/openbios-devel/arch/sparc64/boot.c 2009-08-17 21:57:04 UTC (rev 559) +++ trunk/openbios-devel/arch/sparc64/boot.c 2009-08-19 19:44:40 UTC (rev 560) @@ -88,7 +88,7 @@ if (aout_load(&sys_info, path) == LOADER_NOT_SUPPORT) if (fcode_load(path) == LOADER_NOT_SUPPORT) { - snprintf(altpath, sizeof(altpath), "%s:d", path); + snprintf(altpath, sizeof(altpath), "%s:f", path); if (elf_load(&sys_info, altpath, param) == LOADER_NOT_SUPPORT)

1 0

r559 - trunk/openbios-devel/arch/ppc/qemu
by svn＠openbios.org 17 Aug '09

17 Aug '09

Author: laurent Date: 2009-08-17 23:57:04 +0200 (Mon, 17 Aug 2009) New Revision: 559 Modified: trunk/openbios-devel/arch/ppc/qemu/tree.fs Log: We can select cpu using unit number instead of name, for instance we can use "dev /cpus/@0" instead of "dev /cpus/PowerPC,750". This notation is used in Fedora bootscript to know if the CPU is 64-bit or 32-bit: it looks at "64-bit" property of first available CPUS ("@0"). Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/arch/ppc/qemu/tree.fs =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/tree.fs 2009-08-17 16:58:48 UTC (rev 558) +++ trunk/openbios-devel/arch/ppc/qemu/tree.fs 2009-08-17 21:57:04 UTC (rev 559) @@ -19,6 +19,16 @@ " cpus" device-name 1 encode-int " #address-cells" property 0 encode-int " #size-cells" property + external + + : encode-unit ( unit -- str len ) + pocket tohexstr + ; + + : decode-unit ( str len -- unit ) + parse-hex + ; + finish-device new-device

1 0

r558 - trunk/openbios-devel
by svn＠openbios.org 17 Aug '09

17 Aug '09

Author: blueswirl Date: 2009-08-17 18:58:48 +0200 (Mon, 17 Aug 2009) New Revision: 558 Modified: trunk/openbios-devel/.gitignore Log: Add STGit files to .gitignore Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/.gitignore =================================================================== --- trunk/openbios-devel/.gitignore 2009-08-17 16:58:45 UTC (rev 557) +++ trunk/openbios-devel/.gitignore 2009-08-17 16:58:48 UTC (rev 558) @@ -1 +1,2 @@ obj-* +.stgit-*

1 0

r557 - trunk/openbios-devel/config/examples
by svn＠openbios.org 17 Aug '09

17 Aug '09

Author: blueswirl Date: 2009-08-17 18:58:45 +0200 (Mon, 17 Aug 2009) New Revision: 557 Modified: trunk/openbios-devel/config/examples/cross-sparc32_config.xml trunk/openbios-devel/config/examples/cross-sparc64_config.xml trunk/openbios-devel/config/examples/sparc32_config.xml trunk/openbios-devel/config/examples/sparc64_config.xml Log: Sparc32/64: omit less useful FS modules etc. to reduce size Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/config/examples/cross-sparc32_config.xml =================================================================== --- trunk/openbios-devel/config/examples/cross-sparc32_config.xml 2009-08-17 16:58:42 UTC (rev 556) +++ trunk/openbios-devel/config/examples/cross-sparc32_config.xml 2009-08-17 16:58:45 UTC (rev 557) @@ -7,7 +7,7 @@ <option name="CONFIG_BIG_ENDIAN" type="boolean" value="true"/>  - <option name="CONFIG_IMAGE_ELF" type="boolean" value="true"/> + <option name="CONFIG_IMAGE_ELF" type="boolean" value="false"/> <option name="CONFIG_IMAGE_ELF_EMBEDDED" type="boolean" value="true"/> <option name="CONFIG_IMAGE_ELF_MULTIBOOT" type="boolean" value="true"/> @@ -49,20 +49,20 @@ <option name="CONFIG_SUN_PARTS" type="boolean" value="true"/> <option name="CONFIG_FS" type="boolean" value="true"/> <option name="CONFIG_HFS" type="boolean" value="false"/> - <option name="CONFIG_HFSP" type="boolean" value="true"/> + <option name="CONFIG_HFSP" type="boolean" value="false"/> <option name="CONFIG_GRUBFS" type="boolean" value="true"/> <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="true"/> - <option name="CONFIG_FSYS_FAT" type="boolean" value="true"/> - <option name="CONFIG_FSYS_JFS" type="boolean" value="true"/> - <option name="CONFIG_FSYS_MINIX" type="boolean" value="true"/> - <option name="CONFIG_FSYS_REISERFS" type="boolean" value="true"/> - <option name="CONFIG_FSYS_XFS" type="boolean" value="true"/> + <option name="CONFIG_FSYS_FAT" type="boolean" value="false"/> + <option name="CONFIG_FSYS_JFS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_MINIX" type="boolean" value="false"/> + <option name="CONFIG_FSYS_REISERFS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_XFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_UFS" type="boolean" value="true"/> <option name="CONFIG_FSYS_ISO9660" type="boolean" value="true"/> <option name="CONFIG_FSYS_FFS" type="boolean" value="true"/> - <option name="CONFIG_FSYS_VSTAFS" type="boolean" value="true"/> + <option name="CONFIG_FSYS_VSTAFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_NTFS" type="boolean" value="false"/> - <option name="CONFIG_FSYS_AFFS" type="boolean" value="true"/> + <option name="CONFIG_FSYS_AFFS" type="boolean" value="false"/> <option name="CONFIG_DEBUG_FS" type="boolean" value="false"/> <option name="CONFIG_DEBUG_EXT2FS" type="boolean" value="false"/> Modified: trunk/openbios-devel/config/examples/cross-sparc64_config.xml =================================================================== --- trunk/openbios-devel/config/examples/cross-sparc64_config.xml 2009-08-17 16:58:42 UTC (rev 556) +++ trunk/openbios-devel/config/examples/cross-sparc64_config.xml 2009-08-17 16:58:45 UTC (rev 557) @@ -8,7 +8,7 @@ <option name="CONFIG_BIG_ENDIAN" type="boolean" value="true"/>  - <option name="CONFIG_IMAGE_ELF" type="boolean" value="true"/> + <option name="CONFIG_IMAGE_ELF" type="boolean" value="false"/> <option name="CONFIG_IMAGE_ELF_EMBEDDED" type="boolean" value="true"/> <option name="CONFIG_IMAGE_ELF_MULTIBOOT" type="boolean" value="true"/> Modified: trunk/openbios-devel/config/examples/sparc32_config.xml =================================================================== --- trunk/openbios-devel/config/examples/sparc32_config.xml 2009-08-17 16:58:42 UTC (rev 556) +++ trunk/openbios-devel/config/examples/sparc32_config.xml 2009-08-17 16:58:45 UTC (rev 557) @@ -7,7 +7,7 @@ <option name="CONFIG_BIG_ENDIAN" type="boolean" value="true"/>  - <option name="CONFIG_IMAGE_ELF" type="boolean" value="true"/> + <option name="CONFIG_IMAGE_ELF" type="boolean" value="false"/> <option name="CONFIG_IMAGE_ELF_EMBEDDED" type="boolean" value="true"/> <option name="CONFIG_IMAGE_ELF_MULTIBOOT" type="boolean" value="true"/> @@ -49,20 +49,20 @@ <option name="CONFIG_SUN_PARTS" type="boolean" value="true"/> <option name="CONFIG_FS" type="boolean" value="true"/> <option name="CONFIG_HFS" type="boolean" value="false"/> - <option name="CONFIG_HFSP" type="boolean" value="true"/> + <option name="CONFIG_HFSP" type="boolean" value="false"/> <option name="CONFIG_GRUBFS" type="boolean" value="true"/> <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="true"/> - <option name="CONFIG_FSYS_FAT" type="boolean" value="true"/> - <option name="CONFIG_FSYS_JFS" type="boolean" value="true"/> - <option name="CONFIG_FSYS_MINIX" type="boolean" value="true"/> - <option name="CONFIG_FSYS_REISERFS" type="boolean" value="true"/> - <option name="CONFIG_FSYS_XFS" type="boolean" value="true"/> + <option name="CONFIG_FSYS_FAT" type="boolean" value="false"/> + <option name="CONFIG_FSYS_JFS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_MINIX" type="boolean" value="false"/> + <option name="CONFIG_FSYS_REISERFS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_XFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_UFS" type="boolean" value="true"/> <option name="CONFIG_FSYS_ISO9660" type="boolean" value="true"/> <option name="CONFIG_FSYS_FFS" type="boolean" value="true"/> - <option name="CONFIG_FSYS_VSTAFS" type="boolean" value="true"/> + <option name="CONFIG_FSYS_VSTAFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_NTFS" type="boolean" value="false"/> - <option name="CONFIG_FSYS_AFFS" type="boolean" value="true"/> + <option name="CONFIG_FSYS_AFFS" type="boolean" value="false"/> <option name="CONFIG_DEBUG_FS" type="boolean" value="false"/> <option name="CONFIG_DEBUG_EXT2FS" type="boolean" value="false"/> Modified: trunk/openbios-devel/config/examples/sparc64_config.xml =================================================================== --- trunk/openbios-devel/config/examples/sparc64_config.xml 2009-08-17 16:58:42 UTC (rev 556) +++ trunk/openbios-devel/config/examples/sparc64_config.xml 2009-08-17 16:58:45 UTC (rev 557) @@ -8,7 +8,7 @@ <option name="CONFIG_BIG_ENDIAN" type="boolean" value="true"/>  - <option name="CONFIG_IMAGE_ELF" type="boolean" value="true"/> + <option name="CONFIG_IMAGE_ELF" type="boolean" value="false"/> <option name="CONFIG_IMAGE_ELF_EMBEDDED" type="boolean" value="true"/> <option name="CONFIG_IMAGE_ELF_MULTIBOOT" type="boolean" value="true"/> @@ -49,20 +49,20 @@ <option name="CONFIG_SUN_PARTS" type="boolean" value="true"/> <option name="CONFIG_FS" type="boolean" value="true"/> <option name="CONFIG_HFS" type="boolean" value="false"/> - <option name="CONFIG_HFSP" type="boolean" value="true"/> + <option name="CONFIG_HFSP" type="boolean" value="false"/> <option name="CONFIG_GRUBFS" type="boolean" value="true"/> <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="true"/> - <option name="CONFIG_FSYS_FAT" type="boolean" value="true"/> - <option name="CONFIG_FSYS_JFS" type="boolean" value="true"/> - <option name="CONFIG_FSYS_MINIX" type="boolean" value="true"/> - <option name="CONFIG_FSYS_REISERFS" type="boolean" value="true"/> - <option name="CONFIG_FSYS_XFS" type="boolean" value="true"/> + <option name="CONFIG_FSYS_FAT" type="boolean" value="false"/> + <option name="CONFIG_FSYS_JFS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_MINIX" type="boolean" value="false"/> + <option name="CONFIG_FSYS_REISERFS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_XFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_UFS" type="boolean" value="true"/> <option name="CONFIG_FSYS_ISO9660" type="boolean" value="true"/> <option name="CONFIG_FSYS_FFS" type="boolean" value="true"/> - <option name="CONFIG_FSYS_VSTAFS" type="boolean" value="true"/> + <option name="CONFIG_FSYS_VSTAFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_NTFS" type="boolean" value="false"/> - <option name="CONFIG_FSYS_AFFS" type="boolean" value="true"/> + <option name="CONFIG_FSYS_AFFS" type="boolean" value="false"/> <option name="CONFIG_DEBUG_FS" type="boolean" value="false"/> <option name="CONFIG_DEBUG_EXT2FS" type="boolean" value="false"/>

1 0

r556 - in trunk/openbios-devel: . arch/ppc arch/sparc32 arch/sparc64 arch/unix arch/x86 config/xml kernel
by svn＠openbios.org 17 Aug '09

17 Aug '09

Author: blueswirl Date: 2009-08-17 18:58:42 +0200 (Mon, 17 Aug 2009) New Revision: 556 Modified: trunk/openbios-devel/Makefile.target trunk/openbios-devel/arch/ppc/build.xml trunk/openbios-devel/arch/sparc32/build.xml trunk/openbios-devel/arch/sparc64/build.xml trunk/openbios-devel/arch/unix/build.xml trunk/openbios-devel/arch/x86/build.xml trunk/openbios-devel/arch/x86/entry.S trunk/openbios-devel/config/xml/dictionary.xsl trunk/openbios-devel/config/xml/object.xsl trunk/openbios-devel/config/xml/rules.xml trunk/openbios-devel/kernel/bootstrap.c Log: Introduce quiet build Make forthstrap quiet by default. Use generic rules when possible, unify the rules and cleanup white space. Use ld flag --whole-archive to avoid some local rule use. We can also remove some hacks introduced to avoid missing symbols. Fix problems brought in by ld flag --whole-archive: * x86: fix missing nvram symbols * PPC: disable misc.S build for qemu (conflicts with our libgcc) Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/Makefile.target =================================================================== --- trunk/openbios-devel/Makefile.target 2009-08-17 16:58:39 UTC (rev 555) +++ trunk/openbios-devel/Makefile.target 2009-08-17 16:58:42 UTC (rev 556) @@ -65,4 +65,6 @@ build: all +quiet-command = $(if $(V),$1,$(if $(2),@echo $2 && $1, @$1)) + include rules.mak Modified: trunk/openbios-devel/arch/ppc/build.xml =================================================================== --- trunk/openbios-devel/arch/ppc/build.xml 2009-08-17 16:58:39 UTC (rev 555) +++ trunk/openbios-devel/arch/ppc/build.xml 2009-08-17 16:58:42 UTC (rev 556) @@ -6,13 +6,13 @@ <object source="briq/tree.fs"/> <object source="briq/briq.fs"/> </dictionary> - + <dictionary name="openbios-pearpc" init="openbios" target="forth" condition="PEARPC"> <object source="ppc.fs"/> <object source="pearpc/tree.fs"/> <object source="pearpc/pearpc.fs"/> </dictionary> - + <dictionary name="openbios-qemu" init="openbios" target="forth" condition="QEMU"> <object source="ppc.fs"/> <object source="qemu/tree.fs"/> @@ -24,86 +24,75 @@ <object source="mol/tree.fs"/> <object source="mol/mol.fs"/> </dictionary> - +  - + <executable name="target/include/briq-dict.h" target="target" condition="BRIQ"> <rule><![CDATA[ + $(call quiet-command,true, " GEN $(TARGET_DIR)$@") @echo "static const char forth_dictionary[] = {" > $@ @cat $< | hexdump -ve '1/0 "\t" 8/1 "0x%02x, " 1/0 "\n"' \ | sed 's/0x ,//g' >> $@ - @echo "};" >> $@ - ]]></rule> + @echo "};" >> $@]]></rule> <external-object source="openbios-briq.dict"/> </executable> - + <executable name="target/arch/ppc/briq/kernel.o" target="target" condition="BRIQ"> - <rule><![CDATA[ - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/arch/ppc/briq/kernel.c - ]]></rule> - <external-object source="target/include/briq-dict.h"/> + <rule><![CDATA[ $(SRCDIR)/arch/ppc/briq/kernel.c $(ODIR)/target/include/static-dict.h + $(call quiet-command,$(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/arch/ppc/briq/kernel.c, " CC $(TARGET_DIR)$@")]]></rule> </executable> - - + + <executable name="target/include/pearpc-dict.h" target="target" condition="PEARPC"> <rule><![CDATA[ + $(call quiet-command,true, " GEN $(TARGET_DIR)$@") @echo "static const char forth_dictionary[] = {" > $@ @cat $< | hexdump -ve '1/0 "\t" 8/1 "0x%02x, " 1/0 "\n"' \ | sed 's/0x ,//g' >> $@ - @echo "};" >> $@ - ]]></rule> + @echo "};" >> $@]]></rule> <external-object source="openbios-pearpc.dict"/> </executable> - + <executable name="target/arch/ppc/pearpc/kernel.o" target="target" condition="PEARPC"> - <rule><![CDATA[ - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/arch/ppc/pearpc/kernel.c - ]]></rule> - <external-object source="target/include/pearpc-dict.h"/> + <rule><![CDATA[ $(SRCDIR)/arch/ppc/pearpc/kernel.c $(ODIR)/target/include/pearpc-dict.h + $(call quiet-command,$(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/arch/ppc/pearpc/kernel.c, " CC $(TARGET_DIR)$@")]]></rule> </executable> <executable name="target/include/qemu-dict.h" target="target" condition="QEMU"> <rule><![CDATA[ + $(call quiet-command,true, " GEN $(TARGET_DIR)$@") @echo "static const char forth_dictionary[] = {" > $@ @cat $< | hexdump -ve '1/0 "\t" 8/1 "0x%02x, " 1/0 "\n"' \ | sed 's/0x ,//g' >> $@ - @echo "};" >> $@ - ]]></rule> + @echo "};" >> $@]]></rule> <external-object source="openbios-qemu.dict"/> </executable> <executable name="target/arch/ppc/qemu/kernel.o" target="target" condition="QEMU"> - <rule><![CDATA[ - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/arch/ppc/qemu/kernel.c - ]]></rule> - <external-object source="target/include/qemu-dict.h"/> + <rule><![CDATA[ $(SRCDIR)/arch/ppc/qemu/kernel.c $(ODIR)/target/include/qemu-dict.h + $(call quiet-command,$(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/arch/ppc/qemu/kernel.c, " CC $(TARGET_DIR)$@")]]></rule> </executable> - + <executable name="target/include/mol-dict.h" target="target" condition="MOL"> <rule><![CDATA[ + $(call quiet-command,true, " GEN $(TARGET_DIR)$@") @echo "static const char forth_dictionary[] = {" > $@ @cat $< | hexdump -ve '1/0 "\t" 8/1 "0x%02x, " 1/0 "\n"' \ | sed 's/0x ,//g' >> $@ - @echo "};" >> $@ - ]]></rule> + @echo "};" >> $@]]></rule> <external-object source="openbios-mol.dict"/> </executable> - + <executable name="target/arch/ppc/mol/kernel.o" target="target" condition="MOL"> <rule><![CDATA[ - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/arch/ppc/mol/kernel.c - ]]></rule> - <external-object source="target/include/mol-dict.h"/> + $(call quiet-command,$(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/arch/ppc/mol/kernel.c, " CC $(TARGET_DIR)$@")]]></rule> </executable> - +  - + <library name="briq" target="target" type="static" condition="BRIQ"> - <object source="misc.S"> - <rule><![CDATA[ - $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> - </object> + <object source="misc.S"/> <object source="ofmem.c"/> <object source="briq/briq.c" flags="-I$(SRCDIR)/arch/ppc"/> <object source="briq/init.c" flags="-I$(SRCDIR)/arch/ppc"/> @@ -113,12 +102,9 @@ <object source="briq/tree.c" flags="-I$(SRCDIR)/arch/ppc"/> <object source="briq/vfd.c" flags="-I$(SRCDIR)/arch/ppc"/> </library> - + <library name="pearpc" target="target" type="static" condition="PEARPC"> - <object source="misc.S"> - <rule><![CDATA[ - $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> - </object> + <object source="misc.S"/> <object source="ofmem.c"/> <object source="pearpc/pearpc.c" flags="-I$(SRCDIR)/arch/ppc"/> <object source="pearpc/init.c" flags="-I$(SRCDIR)/arch/ppc"/> @@ -130,12 +116,8 @@  <object source="pearpc/console.c" flags="-I$(SRCDIR)/arch/ppc"/> </library> - + <library name="qemu" target="target" type="static" condition="QEMU"> - <object source="misc.S"> - <rule><![CDATA[ - $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> - </object> <object source="qemu/ofmem.c"/> <object source="qemu/qemu.c" flags="-I$(SRCDIR)/arch/ppc"/> <object source="qemu/init.c" flags="-I$(SRCDIR)/arch/ppc"/> @@ -146,12 +128,8 @@ <object source="qemu/console.c" flags="-I$(SRCDIR)/arch/ppc"/> </library> - <library name="mol" target="target" type="static" condition="MOL"> - <object source="misc.S"> - <rule><![CDATA[ - $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> - </object> + <object source="misc.S"/> <object source="ofmem.c"/> <object source="mol/init.c" flags="-I$(SRCDIR)/arch/ppc"/> <object source="mol/main.c" flags="-I$(SRCDIR)/arch/ppc"/> @@ -165,22 +143,14 @@ <object source="mol/tree.c" flags="-I$(SRCDIR)/arch/ppc"/> <external-object source="target/arch/ppc/mol/kernel.o"/> </library> - + <executable name="openbios-briq.elf" target="target" condition="BRIQ"> <rule> - $(LD) -g -Ttext=0x01e01000 -Bstatic $^ $(shell $(CC) -print-libgcc-file-name) -o $@ - $(NM) $@ | sort > $(ODIR)/openbios-briq.syms - cp $@ $@.nostrip - $(STRIP) $@ - </rule> - <object source="start.S"> - <rule><![CDATA[ - $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> - </object> - <object source="timebase.S"> - <rule><![CDATA[ - $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> - </object> + $(call quiet-command,$(LD) -g -Ttext=0x01e01000 -Bstatic $^ $(shell $(CC) -print-libgcc-file-name) -o $@.nostrip --whole-archive $^," LINK $(TARGET_DIR)$@") + $(call quiet-command,$(NM) $@.nostrip | sort > $(ODIR)/openbios-briq.syms," GEN $(TARGET_DIR)$@.syms") + $(call quiet-command,$(STRIP) $@.nostrip -o $@," STRIP $(TARGET_DIR)$@")</rule> + <object source="start.S"/> + <object source="timebase.S"/> <external-object source="libbriq.a"/> <external-object source="libbootstrap.a"/> <external-object source="libmodules.a"/> @@ -188,23 +158,14 @@ <external-object source="liblibc.a"/> <external-object source="libfs.a"/> </executable> - - + <executable name="openbios-pearpc.elf" target="target" condition="PEARPC"> <rule> - $(LD) -g -Ttext=0x01e01000 -Bstatic $^ $(shell $(CC) -print-libgcc-file-name) -o $@ - $(NM) $@ | sort > $(ODIR)/openbios-pearpc.syms - cp $@ $@.nostrip - $(STRIP) $@ - </rule> - <object source="start.S"> - <rule><![CDATA[ - $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> - </object> - <object source="timebase.S"> - <rule><![CDATA[ - $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> - </object> + $(call quiet-command,$(LD) -g -Ttext=0x01e01000 -Bstatic $^ $(shell $(CC) -print-libgcc-file-name) -o $@.nostrip --whole-archive $^," LINK $(TARGET_DIR)$@") + $(call quiet-command,$(NM) $@.nostrip | sort > $(ODIR)/openbios-pearpc.syms," GEN $(TARGET_DIR)$@.syms") + $(call quiet-command,$(STRIP) $@.nostrip -o $@," STRIP $(TARGET_DIR)$@")</rule> + <object source="start.S"/> + <object source="timebase.S"/> <external-object source="libpearpc.a"/> <external-object source="libbootstrap.a"/> <external-object source="libmodules.a"/> @@ -215,44 +176,26 @@ <executable name="openbios-qemu.elf" target="target" condition="QEMU"> <rule> - $(LD) --warn-common -N -T $(SRCDIR)/arch/ppc/qemu/ldscript $^ -o $@ - $(NM) $@ | sort > $(ODIR)/openbios-qemu.syms - cp $@ $@.nostrip - $(STRIP) $@ - </rule> - <object source="qemu/start.S"> - <rule><![CDATA[ - $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> - </object> - <object source="timebase.S"> - <rule><![CDATA[ - $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> - </object> + $(call quiet-command,$(LD) --warn-common -N -T $(SRCDIR)/arch/ppc/qemu/ldscript -o $@.nostrip --whole-archive $^," LINK $(TARGET_DIR)$@") + $(call quiet-command,$(NM) $@.nostrip | sort > $(ODIR)/openbios-qemu.syms," GEN $(TARGET_DIR)$@.syms") + $(call quiet-command,$(STRIP) $@.nostrip -o $@," STRIP $(TARGET_DIR)$@")</rule> + <object source="qemu/start.S"/> + <object source="timebase.S"/> <external-object source="libqemu.a"/> <external-object source="libbootstrap.a"/> - <external-object source="libdrivers.a"/> -  <external-object source="libmodules.a"/> + <external-object source="libdrivers.a"/> <external-object source="liblibc.a"/> <external-object source="libfs.a"/> <external-object source="libgcc.a"/> </executable> - - - <executable name="openbios-mol.elf" target="target" condition="MOL"> <rule> - $(LD) -g -Ttext=0x01e01000 -Bstatic $^ $(shell $(CC) -print-libgcc-file-name) -o $@ - $(NM) $@ | sort > $(ODIR)/openbios-mol.syms - cp $@ $@.nostrip - $(STRIP) $@ - - </rule> - <object source="start.S"> - <rule><![CDATA[ - $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> - </object> + $(call quiet-command,$(LD) -g -Ttext=0x01e01000 -Bstatic $^ $(shell $(CC) -print-libgcc-file-name) -o $@.nostrip --whole-archive $^," LINK $(TARGET_DIR)$@") + $(call quiet-command,$(NM) $@.nostrip | sort > $(ODIR)/openbios-mol.syms," GEN $(TARGET_DIR)$@.syms") + $(call quiet-command,$(STRIP) $@.nostrip -o $@," STRIP $(TARGET_DIR)$@")</rule> + <object source="start.S"/> <external-object source="libmol.a"/> <external-object source="libbootstrap.a"/> <external-object source="libmodules.a"/> @@ -260,5 +203,5 @@ <external-object source="liblibc.a"/> <external-object source="libfs.a"/> </executable> - + </build> Modified: trunk/openbios-devel/arch/sparc32/build.xml =================================================================== --- trunk/openbios-devel/arch/sparc32/build.xml 2009-08-17 16:58:39 UTC (rev 555) +++ trunk/openbios-devel/arch/sparc32/build.xml 2009-08-17 16:58:42 UTC (rev 556) @@ -20,26 +20,16 @@ <object source="forthload.c"/> <object source="loadfs.c"/> <object source="romvec.c"/> + <object source="entry.S"/> + <object source="vectors.S"/> </library> - <executable name="target/arch/sparc32/entry.o" target="target"> - <rule><![CDATA[ $(SRCDIR)/arch/sparc32/entry.S - $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> - </executable> - <executable name="target/arch/sparc32/vectors.o" target="target"> - <rule><![CDATA[ $(SRCDIR)/arch/sparc32/vectors.S $(SRCDIR)/arch/sparc32/wof.S $(SRCDIR)/arch/sparc32/wuf.S - $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/arch/sparc32/vectors.S]]></rule> - </executable> - <executable name="openbios-plain.elf" target="target" condition="IMAGE_ELF"> <rule> - $(LD) --warn-common -N -T $(SRCDIR)/arch/sparc32/ldscript -o $@.nostrip $^ - $(NM) $@.nostrip | sort > $(ODIR)/openbios-plain.syms - cp $@.nostrip $@ - $(STRIP) $@</rule> + $(call quiet-command,$(LD) --warn-common -N -T $(SRCDIR)/arch/sparc32/ldscript -o $@.nostrip --whole-archive $^," LINK $(TARGET_DIR)$@") + $(call quiet-command,$(NM) $@.nostrip | sort > $(ODIR)/openbios-plain.syms," GEN $(TARGET_DIR)$@.syms") + $(call quiet-command,$(STRIP) $@.nostrip -o $@," STRIP $(TARGET_DIR)$@")</rule> <object source="plainboot.c"/> - <external-object source="target/arch/sparc32/vectors.o"/> - <external-object source="target/arch/sparc32/entry.o"/> <external-object source="libsparc32.a"/> <external-object source="libbootstrap.a"/> <external-object source="libmodules.a"/> @@ -53,6 +43,7 @@ <executable name="target/include/static-dict.h" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule><![CDATA[ + $(call quiet-command,true, " GEN $(TARGET_DIR)$@") @echo "static const char forth_dictionary[] = {" > $@ @cat $< | hexdump -ve '1/0 "\t" 8/1 "0x%02x, " 1/0 "\n"' \ | sed 's/0x ,//g' >> $@ @@ -62,19 +53,16 @@ <executable name="target/arch/sparc32/builtin.o" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule><![CDATA[ $(SRCDIR)/arch/sparc32/builtin.c $(ODIR)/target/include/static-dict.h - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/arch/sparc32/builtin.c]]></rule> + $(call quiet-command,$(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/arch/sparc32/builtin.c, " CC $(TARGET_DIR)$@")]]></rule> </executable>  <executable name="openbios-builtin.elf" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule> - $(LD) --warn-common -N -T $(SRCDIR)/arch/sparc32/ldscript -o $@.nostrip $^ - $(NM) $@.nostrip | sort > $(ODIR)/openbios-builtin.syms - cp $@.nostrip $@ - $(STRIP) $@</rule> - <external-object source="target/arch/sparc32/vectors.o"/> - <external-object source="target/arch/sparc32/entry.o"/> + $(call quiet-command,$(LD) --warn-common -N -T $(SRCDIR)/arch/sparc32/ldscript -o $@.nostrip --whole-archive $^," LINK $(TARGET_DIR)$@") + $(call quiet-command,$(NM) $@.nostrip | sort > $(ODIR)/openbios-builtin.syms," GEN $(TARGET_DIR)$@.syms") + $(call quiet-command,$(STRIP) $@.nostrip -o $@," STRIP $(TARGET_DIR)$@")</rule> <external-object source="target/arch/sparc32/builtin.o"/> <external-object source="libsparc32.a"/> <external-object source="libbootstrap.a"/> Modified: trunk/openbios-devel/arch/sparc64/build.xml =================================================================== --- trunk/openbios-devel/arch/sparc64/build.xml 2009-08-17 16:58:39 UTC (rev 555) +++ trunk/openbios-devel/arch/sparc64/build.xml 2009-08-17 16:58:42 UTC (rev 556) @@ -20,36 +20,21 @@ <object source="fcodeload.c"/> <object source="loadfs.c"/> <object source="ofmem_sparc64.c"/> + <object source="entry.S"/> + <object source="vectors.S"/> + <object source="call-client.S"/> </library> - <executable name="target/arch/sparc64/entry.o" target="target"> - <rule><![CDATA[ $(SRCDIR)/arch/sparc64/entry.S - $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> - </executable> - <executable name="target/arch/sparc64/vectors.o" target="target"> - <rule><![CDATA[ $(SRCDIR)/arch/sparc64/vectors.S - $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> - </executable> - <executable name="target/arch/sparc64/call-client.o" target="target"> - <rule><![CDATA[ $(SRCDIR)/arch/sparc64/call-client.S - $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> - </executable> - <executable name="openbios-plain.elf" target="target" condition="IMAGE_ELF"> <rule> - $(LD) --warn-common -T $(SRCDIR)/arch/sparc64/ldscript -o $@.nostrip $^ - $(NM) $@.nostrip | sort > $(ODIR)/openbios-plain.syms - cp $@.nostrip $@ - $(STRIP) $@</rule> + $(call quiet-command,$(LD) --warn-common -T $(SRCDIR)/arch/sparc64/ldscript -o $@.nostrip --whole-archive $^," LINK $(TARGET_DIR)$@") + $(call quiet-command,$(NM) $@.nostrip | sort > $(ODIR)/openbios-plain.syms," GEN $(TARGET_DIR)$@.syms") + $(call quiet-command,$(STRIP) $@.nostrip -o $@," STRIP $(TARGET_DIR)$@")</rule> <object source="plainboot.c"/> - <external-object source="target/arch/sparc64/vectors.o"/> - <external-object source="target/arch/sparc64/entry.o"/> - <external-object source="target/arch/sparc64/call-client.o"/> <external-object source="libsparc64.a"/> <external-object source="libbootstrap.a"/> - <external-object source="libdrivers.a"/> -  <external-object source="libmodules.a"/> + <external-object source="libdrivers.a"/> <external-object source="liblibc.a"/> <external-object source="libfs.a"/> <external-object source="libgcc.a"/> @@ -59,6 +44,7 @@ <executable name="target/include/static-dict.h" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule><![CDATA[ + $(call quiet-command,true, " GEN $(TARGET_DIR)$@") @echo "static const char forth_dictionary[] = {" > $@ @cat $< | hexdump -ve '1/0 "\t" 8/1 "0x%02x, " 1/0 "\n"' \ | sed 's/0x ,//g' >> $@ @@ -68,7 +54,7 @@ <executable name="target/arch/sparc64/builtin.o" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule><![CDATA[ $(SRCDIR)/arch/sparc64/builtin.c $(ODIR)/target/include/static-dict.h - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/arch/sparc64/builtin.c]]></rule> + $(call quiet-command,$(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/arch/sparc64/builtin.c, " CC $(TARGET_DIR)$@")]]></rule> </executable>  @@ -76,19 +62,14 @@ <executable name="openbios-builtin.elf" target="target" condition="IMAGE_ELF_EMBEDDED">  <rule> - $(LD) --warn-common -N -T $(SRCDIR)/arch/sparc64/ldscript -o $@.nostrip $^ - $(NM) $@.nostrip | sort > $(ODIR)/openbios-builtin.syms - cp $@.nostrip $@ - $(STRIP) $@</rule> - <external-object source="target/arch/sparc64/vectors.o"/> - <external-object source="target/arch/sparc64/entry.o"/> + $(call quiet-command,$(LD) --warn-common -N -T $(SRCDIR)/arch/sparc64/ldscript -o $@.nostrip --whole-archive $^," LINK $(TARGET_DIR)$@") + $(call quiet-command,$(NM) $@.nostrip | sort > $(ODIR)/openbios-builtin.syms," GEN $(TARGET_DIR)$@.syms") + $(call quiet-command,$(STRIP) $@.nostrip -o $@," STRIP $(TARGET_DIR)$@")</rule> <external-object source="target/arch/sparc64/builtin.o"/> - <external-object source="target/arch/sparc64/call-client.o"/> <external-object source="libsparc64.a"/> <external-object source="libbootstrap.a"/> - <external-object source="libdrivers.a"/> -  <external-object source="libmodules.a"/> + <external-object source="libdrivers.a"/> <external-object source="liblibc.a"/> <external-object source="libfs.a"/> <external-object source="libgcc.a"/> Modified: trunk/openbios-devel/arch/unix/build.xml =================================================================== --- trunk/openbios-devel/arch/unix/build.xml 2009-08-17 16:58:39 UTC (rev 555) +++ trunk/openbios-devel/arch/unix/build.xml 2009-08-17 16:58:42 UTC (rev 556) @@ -6,7 +6,7 @@ <executable name="openbios-unix" target="target"> <rule> - $(CC) $(CFLAGS) -rdynamic $(LIBDL_LDFLAGS) -o $@ $^ + $(call quiet-command,$(CC) $(CFLAGS) -rdynamic $(LIBDL_LDFLAGS) -o $@ $^," LINK $(TARGET_DIR)$@") </rule> <object source="unix.c" flags="-DBOOTSTRAP"/> <object source="boot.c" flags="-DBOOTSTRAP"/> Modified: trunk/openbios-devel/arch/x86/build.xml =================================================================== --- trunk/openbios-devel/arch/x86/build.xml 2009-08-17 16:58:39 UTC (rev 555) +++ trunk/openbios-devel/arch/x86/build.xml 2009-08-17 16:58:42 UTC (rev 556) @@ -17,29 +17,21 @@ <object source="elfload.c"/> <object source="forthload.c"/> <object source="loadfs.c"/> + <object source="entry.S"/> <object source="xbox/console.c" condition="XBOX"/> <object source="xbox/methods.c" condition="XBOX"/> </library> - <executable name="target/arch/x86/entry.o" target="target"> - <rule><![CDATA[ $(SRCDIR)/arch/x86/entry.S - $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> - </executable> - <executable name="openbios.multiboot" target="target" condition="IMAGE_ELF_MULTIBOOT"> <rule> - $(LD) --warn-common -N -T $(SRCDIR)/arch/x86/ldscript -o $@.nostrip $^ - $(NM) $@.nostrip | sort > $(ODIR)/openbios-multiboot.syms - cp $@.nostrip $@ - $(STRIP) $@ - </rule> - <external-object source="target/arch/x86/entry.o"/> + $(call quiet-command,$(LD) --warn-common -N -T $(SRCDIR)/arch/x86/ldscript -o $@.nostrip --whole-archive $^," LINK $(TARGET_DIR)$@") + $(call quiet-command,$(NM) $@.nostrip | sort > $(ODIR)/openbios-multiboot.syms," GEN $(TARGET_DIR)$@.syms") + $(call quiet-command,$(STRIP) $@.nostrip -o $@," STRIP $(TARGET_DIR)$@")</rule> <object source="multiboot.c"/> <external-object source="libx86.a"/> <external-object source="libbootstrap.a"/> - <external-object source="libdrivers.a"/> -  <external-object source="libmodules.a"/> + <external-object source="libdrivers.a"/> <external-object source="liblibc.a"/> <external-object source="libfs.a"/> <external-object source="libgcc.a"/> @@ -47,60 +39,51 @@ <executable name="openbios-plain.elf" target="target" condition="IMAGE_ELF"> <rule> - $(LD) --warn-common -N -T $(SRCDIR)/arch/x86/ldscript -o $@.nostrip $^ - $(NM) $@.nostrip | sort > $(ODIR)/openbios-plain.syms - cp $@.nostrip $@ - $(STRIP) $@ - </rule> - <external-object source="target/arch/x86/entry.o"/> + $(call quiet-command,$(LD) --warn-common -N -T $(SRCDIR)/arch/x86/ldscript -o $@.nostrip --whole-archive $^," LINK $(TARGET_DIR)$@") + $(call quiet-command,$(NM) $@.nostrip | sort > $(ODIR)/openbios-plain.syms," GEN $(TARGET_DIR)$@.syms") + $(call quiet-command,$(STRIP) $@.nostrip -o $@," STRIP $(TARGET_DIR)$@")</rule> <object source="plainboot.c"/> <external-object source="libx86.a"/> <external-object source="libbootstrap.a"/> - <external-object source="libdrivers.a"/> -  <external-object source="libmodules.a"/> + <external-object source="libdrivers.a"/> <external-object source="liblibc.a"/> <external-object source="libfs.a"/> <external-object source="libgcc.a"/> </executable>  - + <executable name="target/include/static-dict.h" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule><![CDATA[ + $(call quiet-command,true, " GEN $(TARGET_DIR)$@") @echo "static const char forth_dictionary[] = {" > $@ @cat $< | hexdump -ve '1/0 "\t" 8/1 "0x%02x, " 1/0 "\n"' \ | sed 's/0x ,//g' >> $@ - @echo "};" >> $@ - ]]></rule> + @echo "};" >> $@]]></rule> <external-object source="openbios-x86.dict"/> </executable> - + <executable name="target/arch/x86/builtin.o" target="target" condition="IMAGE_ELF_EMBEDDED"> - <rule><![CDATA[ - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/arch/x86/builtin.c - ]]></rule> - <external-object source="target/include/static-dict.h"/> + <rule><![CDATA[ $(SRCDIR)/arch/x86/builtin.c $(ODIR)/target/include/static-dict.h + $(call quiet-command,$(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/arch/x86/builtin.c, " CC $(TARGET_DIR)$@")]]></rule> </executable> - +  <executable name="openbios-builtin.elf" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule> - $(LD) --warn-common -N -T $(SRCDIR)/arch/x86/ldscript -o $@.nostrip $^ - $(NM) $@.nostrip | sort > $(ODIR)/openbios-builtin.syms - cp $@.nostrip $@ - $(STRIP) $@</rule> - <external-object source="target/arch/x86/entry.o"/> + $(call quiet-command,$(LD) --warn-common -N -T $(SRCDIR)/arch/x86/ldscript -o $@.nostrip --whole-archive $^," LINK $(TARGET_DIR)$@") + $(call quiet-command,$(NM) $@.nostrip | sort > $(ODIR)/openbios-builtin.syms," GEN $(TARGET_DIR)$@.syms") + $(call quiet-command,$(STRIP) $@.nostrip -o $@," STRIP $(TARGET_DIR)$@")</rule> <external-object source="target/arch/x86/builtin.o"/> <external-object source="libx86.a"/> <external-object source="libbootstrap.a"/> - <external-object source="libdrivers.a"/> -  <external-object source="libmodules.a"/> + <external-object source="libdrivers.a"/> <external-object source="liblibc.a"/> <external-object source="libfs.a"/> <external-object source="libgcc.a"/> </executable> - + </build> Modified: trunk/openbios-devel/arch/x86/entry.S =================================================================== --- trunk/openbios-devel/arch/x86/entry.S 2009-08-17 16:58:39 UTC (rev 555) +++ trunk/openbios-devel/arch/x86/entry.S 2009-08-17 16:58:42 UTC (rev 556) @@ -302,3 +302,14 @@ _idt: .fill 20, 8, 0 # idt is unitiailzed _idt_end: + + .globl arch_nvram_size, arch_nvram_get, arch_nvram_put +arch_nvram_size: + xor %eax, %eax + ret + +arch_nvram_get: + ret + +arch_nvram_put: + ret Modified: trunk/openbios-devel/config/xml/dictionary.xsl =================================================================== --- trunk/openbios-devel/config/xml/dictionary.xsl 2009-08-17 16:58:39 UTC (rev 555) +++ trunk/openbios-devel/config/xml/dictionary.xsl 2009-08-17 16:58:42 UTC (rev 556) @@ -95,7 +95,7 @@ </xsl:if> <xsl:text>
</xsl:text>  - <xsl:text>	$(ODIR)/forthstrap</xsl:text> + <xsl:text>	$(call quiet-command,$(ODIR)/forthstrap</xsl:text> <xsl:for-each select="//dictionary[@name = @name]"> <xsl:variable name="conditions"> @@ -131,7 +131,7 @@ </xsl:if> <xsl:text> $(</xsl:text> <xsl:value-of select="@name"/> - <xsl:text>-DICTIONARY)

</xsl:text> + <xsl:text>-DICTIONARY)," GEN $(TARGET_DIR)$@")

</xsl:text> </xsl:if> </xsl:if> </xsl:for-each> Modified: trunk/openbios-devel/config/xml/object.xsl =================================================================== --- trunk/openbios-devel/config/xml/object.xsl 2009-08-17 16:58:39 UTC (rev 555) +++ trunk/openbios-devel/config/xml/object.xsl 2009-08-17 16:58:42 UTC (rev 556) @@ -63,13 +63,19 @@ <xsl:text>
</xsl:text> </xsl:when> <xsl:otherwise> - <xsl:if test="@flags!=''"> - <xsl:text>
	EXTRACFLAGS="</xsl:text> - <xsl:value-of select="@flags"/> - <xsl:text>" ;\</xsl:text> - </xsl:if> -  - <xsl:value-of select="document('rules.xml',.)//rule[@target=$target][@entity='object']"/> + <xsl:choose> + <xsl:when test="@flags!=''"> + <xsl:value-of select="document('rules.xml',.)//rule[@target=$target][@entity='object'][@extracflags='1']"/> + <xsl:text> </xsl:text> + <xsl:value-of select="@flags"/> + <xsl:text> </xsl:text> + <xsl:value-of select="document('rules.xml',.)//rule[@target=$target][@entity='object'][@extracflags='2']"/> + </xsl:when> + <xsl:otherwise> +  + <xsl:value-of select="document('rules.xml',.)//rule[@target=$target][@entity='object']"/> + </xsl:otherwise> + </xsl:choose> </xsl:otherwise> </xsl:choose> Modified: trunk/openbios-devel/config/xml/rules.xml =================================================================== --- trunk/openbios-devel/config/xml/rules.xml 2009-08-17 16:58:39 UTC (rev 555) +++ trunk/openbios-devel/config/xml/rules.xml 2009-08-17 16:58:42 UTC (rev 556) @@ -1,23 +1,31 @@ <rules>  <rule target="host" entity="executable"> - $(HOSTCC) $(HOSTCFLAGS) -o $@ $^ + $(call quiet-command,$(HOSTCC) $(HOSTCFLAGS) -o $@ $^," HOSTCC $(TARGET_DIR)$@") </rule> <rule target="host" entity="object"> - $(HOSTCC) $(HOSTCFLAGS) $(HOSTINCLUDES) -c -o $@ $^ + $(call quiet-command,$(HOSTCC) $(HOSTCFLAGS) $(HOSTINCLUDES) -c -o $@ $^," HOSTCC $(TARGET_DIR)$@") </rule> +<rule target="host" entity="object" extracflags="1"> + $(call quiet-command,$(HOSTCC) $(HOSTCFLAGS) $(HOSTINCLUDES)</rule> +<rule target="host" entity="object" extracflags="2"> -c -o $@ $^," HOSTCC $(TARGET_DIR)$@") +</rule> <rule target="host" entity="library"> - $(AR) cru $@ $^; $(RANLIB) $@ + $(call quiet--command,$(AR) cru $@ $^; $(RANLIB) $@," HOSTAR $(TARGET_DIR)$@") </rule>  <rule target="target" entity="executable"> - $(CC) $(CFLAGS) -o $@ $^ + $(call quiet-command,$(CC) $(CFLAGS) -o $@ $^," CC $(TARGET_DIR)$@") </rule> <rule target="target" entity="object"> - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^ + $(call quiet-command,$(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^," CC $(TARGET_DIR)$@") </rule> +<rule target="target" entity="object" extracflags="1"> + $(call quiet-command,$(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES)</rule> +<rule target="target" entity="object" extracflags="2"> -c -o $@ $^," CC $(TARGET_DIR)$@") +</rule> <rule target="target" entity="library"> - $(AR) cru $@ $^; $(RANLIB) $@ + $(call quiet-command,$(AR) cru $@ $^; $(RANLIB) $@," AR $(TARGET_DIR)$@") </rule> </rules> Modified: trunk/openbios-devel/kernel/bootstrap.c =================================================================== --- trunk/openbios-devel/kernel/bootstrap.c 2009-08-17 16:58:39 UTC (rev 555) +++ trunk/openbios-devel/kernel/bootstrap.c 2009-08-17 16:58:42 UTC (rev 556) @@ -220,7 +220,9 @@ header->checksum=target_long(checksum); - dump_header(header); + if (verbose) { + dump_header(header); + } f = fopen(filename, "w"); if (!f) { @@ -727,8 +729,9 @@ buildconstant("/x", sizeof(u64)); reveal(); - printk("Dictionary initialization finished.\n"); - + if (verbose) { + printk("Dictionary initialization finished.\n"); + } return 0; } @@ -873,7 +876,9 @@ size = ftell( file ); fseek( file, 0, SEEK_SET ); - printk("\nEncoding %s [%d bytes]\n", name, size ); + if (verbose) { + printk("\nEncoding %s [%d bytes]\n", name, size ); + } fread( dict + dicthead, size, 1, file ); PUSH( pointer2cell(dict + dicthead) ); PUSH( size ); @@ -914,8 +919,10 @@ interpret_source((char *)source); - printk("interpretion finished. %d errors occured.\n", - errors); + if (verbose || errors > 0) { + printk("interpretion finished. %d errors occured.\n", + errors); + } } /* @@ -964,8 +971,6 @@ const char *optstring = "VvhsI:d:D:?"; - printk(BANNER); - while (1) { #ifdef __GLIBC__ int option_index = 0; @@ -1014,12 +1019,10 @@ break; case 'd': if (!basedict) { - printk("Using source dictionary '%s'\n", optarg); basedict = optarg; } case 'D': if(!dictname) { - printk("Dumping final dictionary to '%s'\n", optarg); dictname = optarg; } break; @@ -1028,6 +1031,12 @@ } } + if (verbose) { + printk(BANNER); + printk("Using source dictionary '%s'\n", basedict); + printk("Dumping final dictionary to '%s'\n", dictname); + } + if (argc < optind + 1) { printk(USAGE, argv[0]); return 1; @@ -1085,7 +1094,9 @@ */ for (cnt=0; cnt<2; cnt++) { - printk("Compiling dictionary %d/%d\n", cnt+1, 2); + if (verbose) { + printk("Compiling dictionary %d/%d\n", cnt+1, 2); + } dict=bootstrapdict[cnt]; if(!basedict) { new_dictionary(argv[optind]);

1 0

r555 - trunk/openbios-devel/include/sparc64
by svn＠openbios.org 17 Aug '09

17 Aug '09

Author: blueswirl Date: 2009-08-17 18:58:39 +0200 (Mon, 17 Aug 2009) New Revision: 555 Modified: trunk/openbios-devel/include/sparc64/types.h Log: Sparc64: partially revert r515: long long is safer than int64_t Host headers may define int64_t as different type than long long, especially on a 64 bit host. This matters with printf formatting. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/include/sparc64/types.h =================================================================== --- trunk/openbios-devel/include/sparc64/types.h 2009-08-17 16:58:35 UTC (rev 554) +++ trunk/openbios-devel/include/sparc64/types.h 2009-08-17 16:58:39 UTC (rev 555) @@ -29,8 +29,8 @@ #include "autoconf.h" /* cell based types */ -typedef int64_t cell; -typedef uint64_t ucell; +typedef long long cell; +typedef unsigned long long ucell; #define FMT_cell "%lld" #define FMT_ucell "%llu"

1 0

r554 - trunk/openbios-devel/config/examples
by svn＠openbios.org 17 Aug '09

17 Aug '09

Author: blueswirl Date: 2009-08-17 18:58:35 +0200 (Mon, 17 Aug 2009) New Revision: 554 Modified: trunk/openbios-devel/config/examples/cross-sparc64_config.xml Log: Sparc64: omit less useful FS modules to reduce size Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/config/examples/cross-sparc64_config.xml =================================================================== --- trunk/openbios-devel/config/examples/cross-sparc64_config.xml 2009-08-13 19:11:02 UTC (rev 553) +++ trunk/openbios-devel/config/examples/cross-sparc64_config.xml 2009-08-17 16:58:35 UTC (rev 554) @@ -49,20 +49,20 @@ <option name="CONFIG_SUN_PARTS" type="boolean" value="true"/> <option name="CONFIG_FS" type="boolean" value="true"/> <option name="CONFIG_HFS" type="boolean" value="false"/> - <option name="CONFIG_HFSP" type="boolean" value="true"/> + <option name="CONFIG_HFSP" type="boolean" value="false"/> <option name="CONFIG_GRUBFS" type="boolean" value="true"/> <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="true"/> - <option name="CONFIG_FSYS_FAT" type="boolean" value="true"/> - <option name="CONFIG_FSYS_JFS" type="boolean" value="true"/> - <option name="CONFIG_FSYS_MINIX" type="boolean" value="true"/> - <option name="CONFIG_FSYS_REISERFS" type="boolean" value="true"/> - <option name="CONFIG_FSYS_XFS" type="boolean" value="true"/> + <option name="CONFIG_FSYS_FAT" type="boolean" value="false"/> + <option name="CONFIG_FSYS_JFS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_MINIX" type="boolean" value="false"/> + <option name="CONFIG_FSYS_REISERFS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_XFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_UFS" type="boolean" value="true"/> <option name="CONFIG_FSYS_ISO9660" type="boolean" value="true"/> <option name="CONFIG_FSYS_FFS" type="boolean" value="true"/> - <option name="CONFIG_FSYS_VSTAFS" type="boolean" value="true"/> + <option name="CONFIG_FSYS_VSTAFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_NTFS" type="boolean" value="false"/> - <option name="CONFIG_FSYS_AFFS" type="boolean" value="true"/> + <option name="CONFIG_FSYS_AFFS" type="boolean" value="false"/> <option name="CONFIG_DEBUG_FS" type="boolean" value="false"/> <option name="CONFIG_DEBUG_EXT2FS" type="boolean" value="false"/>

1 0

Strict aliasing
by Pavel Roskin 13 Aug '09

13 Aug '09

Hello! The reason OpenBIOS violates the strict aliasing rules so often is because it uses char arrays to represent endian-specific data. Char arrays may have alignment different from that of the longer types. That's why casting a pointer to such array to a pointer to a longer type and dereferencing it is considered unsafe by the compiler. The compiler assumes that different types would not occupy the same memory unless we tell it not to make such assumption. Char arrays serve as protection against misusing endian-specific data as host-endian integers. The alternative it to use sparse annotated types, such as __le32. __le32 has the same alignment as u32, but sparse would recognize attempts to use __le32 in arithmetic operations. I think switching to sparse annotated types would be a good idea whether strict aliasing is disabled or not. It makes the code more readable. It could also fix some hard to find bugs. -- Regards, Pavel Roskin

3 2

[patch 0/1] fix zero page reference in ob_pci_close
by Igor Kovalenko 13 Aug '09

13 Aug '09

Hi! I tried unmapping zero virtual address page for sparc64 and found there is an issue with ob_pci_close; it calls close-deblocker method without deblocker being open. This leads to multiple references to wrong cells, including ones in zero page. Signed-off-by: igor.v.kovalenko(a)gmail.com -- Kind regards, Igor V. Kovalenko

2 2

r553 - trunk/openbios-devel/drivers
by svn＠openbios.org 13 Aug '09

13 Aug '09

Author: blueswirl Date: 2009-08-13 21:11:02 +0200 (Thu, 13 Aug 2009) New Revision: 553 Modified: trunk/openbios-devel/drivers/pci.c Log: Do not call close-deblocker since ob_pci_open did not open it. Fix an issue with ob_pci_close; it calls close-deblocker method without deblocker being open. This leads to multiple references to wrong cells, including ones in zero page. Signed-off-by: igor.v.kovalenko(a)gmail.com Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/drivers/pci.c =================================================================== --- trunk/openbios-devel/drivers/pci.c 2009-08-12 19:55:31 UTC (rev 552) +++ trunk/openbios-devel/drivers/pci.c 2009-08-13 19:11:02 UTC (rev 553) @@ -79,7 +79,6 @@ static void ob_pci_close(int *idx) { - selfword("close-deblocker"); } static void

1 0

Re: [OpenBIOS] r551 - trunk/openbios-devel/config/examples
by Ravi Bankar 13 Aug '09

13 Aug '09

Hi al, I want to port OpenBios on INTEL ATOM. Does it support it and how do i move further Thanks and Regards Ravindra Bankar > Date: Wed, 12 Aug 2009 19:29:52 +0200 > To: openbios(a)lists.openbios.org > From: svn(a)openbios.org > Subject: [OpenBIOS] r551 - trunk/openbios-devel/config/examples > > Author: laurent > Date: 2009-08-12 19:29:51 +0200 (Wed, 12 Aug 2009) > New Revision: 551 > > Modified: > trunk/openbios-devel/config/examples/cross-ppc_config.xml > trunk/openbios-devel/config/examples/ppc_config.xml > Log: > Re-enable HFS (with HFS+) > > Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> > > > Modified: trunk/openbios-devel/config/examples/cross-ppc_config.xml > =================================================================== > --- trunk/openbios-devel/config/examples/cross-ppc_config.xml 2009-08-11 20:47:13 UTC (rev 550) > +++ trunk/openbios-devel/config/examples/cross-ppc_config.xml 2009-08-12 17:29:51 UTC (rev 551) > @@ -48,7 +48,7 @@ > <option name="CONFIG_DEBUG_MAC_PARTS" type="boolean" value="false"/> > <option name="CONFIG_PC_PARTS" type="boolean" value="true"/> > <option name="CONFIG_FS" type="boolean" value="true"/> > - <option name="CONFIG_HFS" type="boolean" value="false"/> > + <option name="CONFIG_HFS" type="boolean" value="true"/> > <option name="CONFIG_HFSP" type="boolean" value="true"/> > <option name="CONFIG_GRUBFS" type="boolean" value="true"/> > <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="true"/> > > Modified: trunk/openbios-devel/config/examples/ppc_config.xml > =================================================================== > --- trunk/openbios-devel/config/examples/ppc_config.xml 2009-08-11 20:47:13 UTC (rev 550) > +++ trunk/openbios-devel/config/examples/ppc_config.xml 2009-08-12 17:29:51 UTC (rev 551) > @@ -49,7 +49,7 @@ > <option name="CONFIG_DEBUG_MAC_PARTS" type="boolean" value="false"/> > <option name="CONFIG_PC_PARTS" type="boolean" value="true"/> > <option name="CONFIG_FS" type="boolean" value="true"/> > - <option name="CONFIG_HFS" type="boolean" value="false"/> > + <option name="CONFIG_HFS" type="boolean" value="true"/> > <option name="CONFIG_HFSP" type="boolean" value="true"/> > <option name="CONFIG_GRUBFS" type="boolean" value="true"/> > <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="true"/> > > > -- > OpenBIOS http://openbios.org/ > Mailinglist: http://lists.openbios.org/mailman/listinfo > Free your System - May the Forth be with you _________________________________________________________________ One stop at MSN India to catch up with what’s hot in the world around you today http://in.msn.com

1 0

r552 - in trunk/openbios-devel: arch/ppc/qemu fs/grubfs modules
by svn＠openbios.org 12 Aug '09

12 Aug '09

Author: laurent Date: 2009-08-12 21:55:31 +0200 (Wed, 12 Aug 2009) New Revision: 552 Modified: trunk/openbios-devel/arch/ppc/qemu/main.c trunk/openbios-devel/fs/grubfs/grubfs_fs.c trunk/openbios-devel/modules/disk-label.c trunk/openbios-devel/modules/mac-parts.c Log: This patch allows to boot from bootsector of first bootable partition using "boot hd:%BOOT" As explained in: "PowerPC Microprocessor Common Hardware Reference Platform (CHRP) System binding to: IEEE Std 1275-1994 Standard for Boot (Initialization, Configuration) Firmware Revision: 1.8" "Chapter 11.1.2. Open Method Algorith" Signed-off-by: Laurent Vivier <Laurent(a)vivier.info> Modified: trunk/openbios-devel/arch/ppc/qemu/main.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c 2009-08-12 17:29:51 UTC (rev 551) +++ trunk/openbios-devel/arch/ppc/qemu/main.c 2009-08-12 19:55:31 UTC (rev 552) @@ -321,69 +321,46 @@ close_io( fd ); } -#define QUIK_SECOND_BASEADDR 0x3e0000 -#define QUIK_FIRST_BASEADDR 0x3f4000 -#define QUIK_SECOND_SIZE (QUIK_FIRST_BASEADDR - QUIK_SECOND_BASEADDR) -#define QUIK_FIRST_INFO_OFF 0x2c8 +#define OLDWORLD_BOOTCODE_BASEADDR (0x3f4000) -struct first_info { - char quik_vers[8]; - int nblocks; - int blocksize; - unsigned second_base; - int conf_part; - char conf_file[32]; - unsigned blknos[64]; -}; - static void -quik_startup( void ) +oldworld_boot( void ) { int fd; - int len; - const char *path = "hd:2"; - union { - char buffer[1024]; - int first_word; - struct { - char pad[QUIK_FIRST_INFO_OFF]; - struct first_info fi; - } fi; - } u; + int len, total; + const char *path = "hd:,%BOOT"; + char *bootcode; if ((fd = open_io(path)) == -1) { ELF_DPRINTF("Can't open %s\n", path); return; } - seek_io(fd, 0); - len = read_io(fd, u.buffer, sizeof(u)); + + total = 0; + bootcode = (char*)OLDWORLD_BOOTCODE_BASEADDR; + while(1) { + if (seek_io(fd, total) == -1) + break; + len = read_io(fd, bootcode, 512); + bootcode += len; + total += len; + } + close_io( fd ); - if (len == -1) { + if (total == 0) { ELF_DPRINTF("Can't read %s\n", path); return; } - /* is it quik ? */ - - if (memcmp(u.fi.fi.quik_vers, "QUIK", 4)) - return; - encode_bootpath(path, "Linux"); - if( ofmem_claim( QUIK_FIRST_BASEADDR, len, 0 ) == -1 ) + if( ofmem_claim( OLDWORLD_BOOTCODE_BASEADDR, total, 0 ) == -1 ) fatal_error("Claim failed!\n"); - memcpy((char*)QUIK_FIRST_BASEADDR, u.buffer, len); + call_elf(0, 0, OLDWORLD_BOOTCODE_BASEADDR); - /* quik fist level doesn't claim second level memory */ - - if( ofmem_claim( QUIK_SECOND_BASEADDR, QUIK_SECOND_SIZE, 0 ) == -1 ) - fatal_error("Claim failed!\n"); - - call_elf(0, 0, QUIK_FIRST_BASEADDR); - return; } @@ -495,7 +472,7 @@ check_preloaded_kernel(); } if (boot_device == 'c') { - quik_startup(); + oldworld_boot(); } yaboot_startup(); } Modified: trunk/openbios-devel/fs/grubfs/grubfs_fs.c =================================================================== --- trunk/openbios-devel/fs/grubfs/grubfs_fs.c 2009-08-12 17:29:51 UTC (rev 551) +++ trunk/openbios-devel/fs/grubfs/grubfs_fs.c 2009-08-12 19:55:31 UTC (rev 552) @@ -298,7 +298,9 @@ } if( seek_io(curfs->dev_fd, offs) ) { +#ifdef CONFIG_DEBUG_FS printk("seek failure\n"); +#endif return -1; } return (read_io(curfs->dev_fd, buf, byte_len) == byte_len) ? 1:0; Modified: trunk/openbios-devel/modules/disk-label.c =================================================================== --- trunk/openbios-devel/modules/disk-label.c 2009-08-12 17:29:51 UTC (rev 551) +++ trunk/openbios-devel/modules/disk-label.c 2009-08-12 19:55:31 UTC (rev 552) @@ -57,42 +57,46 @@ static void dlabel_open( dlabel_info_t *di ) { - char *s, *filename, *parstr; + char *s, *filename; + char *path; char block0[512]; phandle_t ph; int fd, success=0; xt_t xt; - parstr = my_args_copy(); - DPRINTF("dlabel-open '%s'\n", parstr ); + path = my_args_copy(); + DPRINTF("dlabel-open '%s'\n", path ); + /* open disk interface */ + if( (fd=open_ih(my_parent())) == -1 ) goto out; di->fd = fd; /* argument format: parnum,filename */ - s = parstr; + + s = path; filename = NULL; - if( s ) { - if( *s == '-' || isdigit(*s) || - (*s >= 'a' && *s < ('a' + 8) - && (*(s + 1) == ',' || *(s + 1) == '\0'))) { - if( (s=strpbrk(parstr,",")) ) { - filename = s+1; - *s = 0; - } - } else { - filename = s; - parstr = NULL; - if( *s == ',' ) - filename++; + if( *s == '-' || isdigit(*s) || + (*s >= 'a' && *s < ('a' + 8) + && (*(s + 1) == ',' || *(s + 1) == '\0'))) { + if( (s=strpbrk(path,",")) ) { + filename = s+1; } + } else { + filename = s; + if( *s == ',' ) + filename++; } - DPRINTF("parstr %s filename %s\n", parstr, filename); + DPRINTF("filename %s\n", filename); - /* try to see if there is a filesystem without partition */ + /* try to see if there is a filesystem without partition, + * like ISO9660. This is needed to boot openSUSE 11.1 CD + * which uses "boot &device;:1,\suseboot\yaboot.ibm" + * whereas HFS+ partition is #2 + */ - if (atol(parstr) == 1) { + if ( atol(path) == 1 ) { PUSH_ih( my_self() ); selfword("find-filesystem"); ph = POP_ph(); @@ -127,7 +131,7 @@ /* open partition package */ if( ph ) { - if( !(di->part_ih=open_package(parstr, ph)) ) + if( !(di->part_ih=open_package(path, ph)) ) goto out; if( !(xt=find_ih_method("get-info", di->part_ih)) ) goto out; @@ -143,9 +147,26 @@ call_package(xt, di->part_ih); di->block_size = POP(); } + } else { + /* unknown (or missing) partition map, + * try the whole disk + */ + di->offs_hi = 0; + di->offs_lo = 0; + di->size_hi = 0; + di->size_lo = 0; + di->part_ih = 0; + di->type = -1; + di->block_size = 512; + xt = find_parent_method("block-size"); + if (xt) { + call_parent(xt); + di->block_size = POP(); + } } /* probe for filesystem */ + PUSH_ih( my_self() ); selfword("find-filesystem"); ph = POP_ph(); @@ -153,14 +174,14 @@ push_str( filename ); PUSH_ph( ph ); fword("interpose"); - } else if( filename ) { + } else if (filename && strcmp(filename, "%BOOT") != 0) { goto out; } success = 1; out: - if( parstr ) - free( parstr ); + if( path ) + free( path ); if( !success ) { dlabel_close( di ); RET(0); Modified: trunk/openbios-devel/modules/mac-parts.c =================================================================== --- trunk/openbios-devel/modules/mac-parts.c 2009-08-12 17:29:51 UTC (rev 551) +++ trunk/openbios-devel/modules/mac-parts.c 2009-08-12 19:55:31 UTC (rev 552) @@ -49,13 +49,25 @@ desc_map_t dmap; part_entry_t par; int ret = 0; + int want_bootcode = 0; + DPRINTF("partition %s\n", str); if( str ) { + char *tmp; parnum = atol(str); if( *str == 0 || *str == ',' ) parnum = -1; + tmp = str; + while (*tmp && *tmp != ',') + tmp++; + if (*tmp == ',') + tmp++; + if (strcmp(tmp, "%BOOT") == 0) + want_bootcode = 1; + free(str); } + DPRINTF("want_bootcode %d\n", want_bootcode); DPRINTF("macparts_open %d\n", parnum); SEEK( 0 ); if( READ(&dmap, sizeof(dmap)) != sizeof(dmap) ) @@ -97,6 +109,10 @@ di->blocksize =(uint)bs; di->offs = (llong)par.pmPyPartStart * bs; di->size = (llong)par.pmPartBlkCnt * bs; + if (want_bootcode) { + di->offs += (llong)par.pmLgBootStart*bs; + di->size = (llong)par.pmBootSize; + } ret = -1; goto out; } @@ -132,10 +148,13 @@ di->blocksize =(uint)bs; di->offs = (llong)par.pmPyPartStart * bs; di->size = (llong)par.pmPartBlkCnt * bs; + if (want_bootcode) { + di->offs += (llong)par.pmLgBootStart * bs; + di->size = (llong)par.pmBootSize; + } out: - if (str) - free(str); + DPRINTF("offset 0x%llx size 0x%llx\n", di->offs, di->size); PUSH( ret); }

1 0

r551 - trunk/openbios-devel/config/examples
by svn＠openbios.org 12 Aug '09

12 Aug '09

Author: laurent Date: 2009-08-12 19:29:51 +0200 (Wed, 12 Aug 2009) New Revision: 551 Modified: trunk/openbios-devel/config/examples/cross-ppc_config.xml trunk/openbios-devel/config/examples/ppc_config.xml Log: Re-enable HFS (with HFS+) Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/config/examples/cross-ppc_config.xml =================================================================== --- trunk/openbios-devel/config/examples/cross-ppc_config.xml 2009-08-11 20:47:13 UTC (rev 550) +++ trunk/openbios-devel/config/examples/cross-ppc_config.xml 2009-08-12 17:29:51 UTC (rev 551) @@ -48,7 +48,7 @@ <option name="CONFIG_DEBUG_MAC_PARTS" type="boolean" value="false"/> <option name="CONFIG_PC_PARTS" type="boolean" value="true"/> <option name="CONFIG_FS" type="boolean" value="true"/> - <option name="CONFIG_HFS" type="boolean" value="false"/> + <option name="CONFIG_HFS" type="boolean" value="true"/> <option name="CONFIG_HFSP" type="boolean" value="true"/> <option name="CONFIG_GRUBFS" type="boolean" value="true"/> <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="true"/> Modified: trunk/openbios-devel/config/examples/ppc_config.xml =================================================================== --- trunk/openbios-devel/config/examples/ppc_config.xml 2009-08-11 20:47:13 UTC (rev 550) +++ trunk/openbios-devel/config/examples/ppc_config.xml 2009-08-12 17:29:51 UTC (rev 551) @@ -49,7 +49,7 @@ <option name="CONFIG_DEBUG_MAC_PARTS" type="boolean" value="false"/> <option name="CONFIG_PC_PARTS" type="boolean" value="true"/> <option name="CONFIG_FS" type="boolean" value="true"/> - <option name="CONFIG_HFS" type="boolean" value="false"/> + <option name="CONFIG_HFS" type="boolean" value="true"/> <option name="CONFIG_HFSP" type="boolean" value="true"/> <option name="CONFIG_GRUBFS" type="boolean" value="true"/> <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="true"/>

1 0

Re: [OpenBIOS] [PATHC][RFC] OldWorld Booting Method
by Laurent Vivier 12 Aug '09

12 Aug '09

> > >On 11.08.2009, at 23:13, Laurent Vivier <Laurent(a)vivier.eu> wrote: > >> Hi, >> >> the attached patch allows to boot using "boot hd:%BOOT". This is the >> method used by OldWorld bootloader, Quik. >> >> As I've only tested it with PPC target, I'd like to have some comments >> before commiting it (If someone can test sparc, I'll be happy). >> > >Since it is part of PPC only CHRP, I think it should be fine to make >sure the code is only used on PPC, I believe... It is not as simple as it seems... All the work is made in mac-parts.c (only used by CHRP), but to do the work it needs to know the filename ("%BOOT"). Until now, disk-label.c (common part) sends a string with only the partition number to the partition module. So this patch modifies disk-label.c to pass the partition number AND the filename. This is the part which can break other architectures. But as it seems all partition managers are using atol() on the argument to find the partition number, it should work fine even if the partition number is followed by a filename. I think I'll commit this this evening. Regards, Laurent -- --------------------- Laurent(a)vivier.eu --------------------- "Tout ce qui est impossible reste à accomplir" Jules Verne "Things are only impossible until they're not" Jean-Luc Picard

1 0

[PATHC][RFC] OldWorld Booting Method
by Laurent Vivier 12 Aug '09

12 Aug '09

Hi, the attached patch allows to boot using "boot hd:%BOOT". This is the method used by OldWorld bootloader, Quik. As I've only tested it with PPC target, I'd like to have some comments before commiting it (If someone can test sparc, I'll be happy). Regards, Laurent

3 2

r550 - trunk/openbios-devel/config/examples
by svn＠openbios.org 11 Aug '09

11 Aug '09

Author: laurent Date: 2009-08-11 22:47:13 +0200 (Tue, 11 Aug 2009) New Revision: 550 Modified: trunk/openbios-devel/config/examples/cross-ppc_config.xml trunk/openbios-devel/config/examples/ppc_config.xml Log: For powerpc, use HFSPlus instead of HFS. Later, this will allow to boot like a real NewWorld OpenFirmware: boot hd:,\\:tbxi Where "\\" is the default (blessed) system folder (defined by the filesystem, generally "/System/Library/CoreServices" on MacOS X), and ":tbxi" the first file with the "tbxi" file attribute ("BootX" on MacOS X) Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/config/examples/cross-ppc_config.xml =================================================================== --- trunk/openbios-devel/config/examples/cross-ppc_config.xml 2009-08-11 20:31:50 UTC (rev 549) +++ trunk/openbios-devel/config/examples/cross-ppc_config.xml 2009-08-11 20:47:13 UTC (rev 550) @@ -48,8 +48,8 @@ <option name="CONFIG_DEBUG_MAC_PARTS" type="boolean" value="false"/> <option name="CONFIG_PC_PARTS" type="boolean" value="true"/> <option name="CONFIG_FS" type="boolean" value="true"/> - <option name="CONFIG_HFS" type="boolean" value="true"/> - <option name="CONFIG_HFSP" type="boolean" value="false"/> + <option name="CONFIG_HFS" type="boolean" value="false"/> + <option name="CONFIG_HFSP" type="boolean" value="true"/> <option name="CONFIG_GRUBFS" type="boolean" value="true"/> <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="true"/> <option name="CONFIG_FSYS_FAT" type="boolean" value="false"/> Modified: trunk/openbios-devel/config/examples/ppc_config.xml =================================================================== --- trunk/openbios-devel/config/examples/ppc_config.xml 2009-08-11 20:31:50 UTC (rev 549) +++ trunk/openbios-devel/config/examples/ppc_config.xml 2009-08-11 20:47:13 UTC (rev 550) @@ -49,8 +49,8 @@ <option name="CONFIG_DEBUG_MAC_PARTS" type="boolean" value="false"/> <option name="CONFIG_PC_PARTS" type="boolean" value="true"/> <option name="CONFIG_FS" type="boolean" value="true"/> - <option name="CONFIG_HFS" type="boolean" value="true"/> - <option name="CONFIG_HFSP" type="boolean" value="false"/> + <option name="CONFIG_HFS" type="boolean" value="false"/> + <option name="CONFIG_HFSP" type="boolean" value="true"/> <option name="CONFIG_GRUBFS" type="boolean" value="true"/> <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="true"/> <option name="CONFIG_FSYS_FAT" type="boolean" value="false"/>

1 0

[PATCH 1/4] Disable strict aliasing for all targets
by Pavel Roskin 11 Aug '09

11 Aug '09

--- Makefile.target | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Makefile.target b/Makefile.target index f94f450..bf83b5b 100644 --- a/Makefile.target +++ b/Makefile.target @@ -25,6 +25,7 @@ STRIP := $(TARGET)strip RANLIB := $(TARGET)ranlib CFLAGS+= -Os -g -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS +CFLAGS+= -fno-strict-aliasing CFLAGS+= -Wall -Wredundant-decls -Wshadow -Wpointer-arith CFLAGS+= -Wstrict-prototypes -Wmissing-declarations -Wundef -Wendif-labels CFLAGS+= -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes

2 8