OpenBIOS July 2008

openbios@openbios.org

6 participants
32 discussions

r198 - openbios-devel/arch/sparc64
by svn＠openbios.org 12 Jul '08

12 Jul '08

Author: blueswirl Date: 2008-07-12 11:41:08 +0200 (Sat, 12 Jul 2008) New Revision: 198 Modified: openbios-devel/arch/sparc64/openbios.c openbios-devel/arch/sparc64/tree.fs Log: Add a CPU node Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-07-11 23:21:43 UTC (rev 197) +++ openbios-devel/arch/sparc64/openbios.c 2008-07-12 09:41:08 UTC (rev 198) @@ -40,6 +40,47 @@ const char *name; }; +static void cpu_generic_init(const struct cpudef *cpu) +{ + unsigned long iu_version; + + push_str("/"); + fword("find-device"); + + fword("new-device"); + + push_str(cpu->name); + fword("device-name"); + + push_str("cpu"); + fword("device-type"); + + asm("rdpr %%ver, %0\n" + : "=r"(iu_version) :); + + PUSH((iu_version >> 48) & 0xff); + fword("encode-int"); + push_str("manufacturer#"); + fword("property"); + + PUSH((iu_version >> 32) & 0xff); + fword("encode-int"); + push_str("implementation#"); + fword("property"); + + PUSH((iu_version >> 24) & 0xff); + fword("encode-int"); + push_str("mask#"); + fword("property"); + + PUSH(9); + fword("encode-int"); + push_str("sparc-version"); + fword("property"); + + fword("finish-device"); +} + static const struct cpudef sparc_defs[] = { { .iu_version = (0x04ULL << 48) | (0x02ULL << 32), @@ -166,6 +207,8 @@ printk("CPUs: %x", nv_info.nb_cpus); cpu = id_cpu(); + //cpu->initfn(); + cpu_generic_init(cpu); printk(" x %s\n", cpu->name); } Modified: openbios-devel/arch/sparc64/tree.fs =================================================================== --- openbios-devel/arch/sparc64/tree.fs 2008-07-11 23:21:43 UTC (rev 197) +++ openbios-devel/arch/sparc64/tree.fs 2008-07-12 09:41:08 UTC (rev 198) @@ -2,6 +2,7 @@ " /" find-device 2 encode-int " #address-cells" property 1 encode-int " #size-cells" property + " sun4u" encode-string " compatible" property \ : encode-unit encode-unit-sbus ; \ : decode-unit decode-unit-sbus ;

1 0

r197 - fcode-utils/documentation
by svn＠openbios.org 11 Jul '08

11 Jul '08

Author: stepan Date: 2008-07-12 01:21:43 +0200 (Sat, 12 Jul 2008) New Revision: 197 Modified: fcode-utils/documentation/localvalues.html fcode-utils/documentation/toke.html Log: some documentation fixes in the fcode suite documentation Modified: fcode-utils/documentation/localvalues.html =================================================================== --- fcode-utils/documentation/localvalues.html 2008-07-08 16:02:43 UTC (rev 196) +++ fcode-utils/documentation/localvalues.html 2008-07-11 23:21:43 UTC (rev 197) @@ -185,7 +185,7 @@ body of the word is not recommended, but is permitted.  A Local Values Declaration that occurs inside a Flow-Control Structure will be -reported as an <a href="TokenizerNewFeatures.htm#An_ERROR">Error</a>. +reported as an <a href="toke.html#An_ERROR">Error</a>. A Local Values Declaration may include comments and may continue across @@ -225,18 +225,18 @@ Vertical-Bar. The User may suppress this message by means of a <a - href="TokenizerNewFeatures.htm#Command-Line_options_">Command-line + href="toke.html#Command-Line_options_">Command-line switch</a>, known as the -<a href="TokenizerNewFeatures.htm#Special_Feature_Flags">Special-Feature -Flag</a> named <a href="TokenizerNewFeatures.htm#SF_Flag_LV_Leg_Mssg">Special-Feature +Flag</a> named <a href="toke.html#SF_Flag_LV_Leg_Mssg">NoLV-Legacy-Message</a> -, which is described in the <a href="TokenizerNewFeatures.htm">Tokenizer +, which is described in the <a href="toke.html">Tokenizer User's Guide</a>. <a name="Disallow_Legacy"></a>Conversely, the User who wishes to disallow the use of Semicolon as an alternative separator may do so by means of the Special-Feature Flag named <a - href="TokenizerNewFeatures.htm#SF_Flag_LV_Leg_Sep">NoLV-Legacy-Separator</a> .  When the Legacy Local Values Separator is thus disallowed, occurrences will be treated as an @@ -757,9 +757,9 @@ style="font-family: courier new,courier,monospace; font-weight: bold;">instance data. -The <a href="TokenizerNewFeatures.htm#INSTANCE_at_run_time">consequence</a> +The <a href="toke.html#INSTANCE_at_run_time">consequence</a> of this is that, in device-drivers that are configured -with <a href="TokenizerNewFeatures.htm#Multiple_device_nodes">multiple +with <a href="toke.html#Multiple_device_nodes">multiple device-nodes</a>, the Local Values Support Functions file must be re-floaded for each device-node that uses Local Values.  That is to say, every @@ -770,18 +770,18 @@ Functions file must be floaded again. The Tokenizer is sophisticated enough to keep a <a - href="TokenizerNewFeatures.htm#device-node_vocabularies">separate + href="toke.html#device-node_vocabularies">separate vocabulary for each device-node</a>, and will flag an <a href="#Error_handling">Error</a> if Local Values are used in a device-node for which the Local Values Support Functions file has not been floaded. However, should the user so choose, a <a - href="TokenizerNewFeatures.htm#Example_4">means</a> is available + href="toke.html#Example_4">means</a> is available whereby a single floading of the Local Values Support Functions can become <a - href="TokenizerNewFeatures.htm#Global_Definitions">accessible to all + href="toke.html#Global_Definitions">accessible to all Device Nodes</a> in a driver, trading off economy of System-memory for convenience of programming. <h4><a class="mozTocH4" name="mozTocId684194"></a><a @@ -833,7 +833,7 @@ the scope of that FCode program, and the question of synchronizing Local Values will be rendered irrelevant. -An <a href="TokenizerNewFeatures.htm#The_OVERLOAD_Directive">overloaded</a> +An <a href="toke.html#The_OVERLOAD_Directive">overloaded</a> catch in the Local Values Support Functions file does the job. Modified: fcode-utils/documentation/toke.html =================================================================== --- fcode-utils/documentation/toke.html 2008-07-08 16:02:43 UTC (rev 196) +++ fcode-utils/documentation/toke.html 2008-07-11 23:21:43 UTC (rev 197) @@ -347,7 +347,7 @@ messages.</li> <li>A complete list of FATAL conditions. </li> - <li>Support for <a href="TokenizerLocalValues.htm">IBM-Style Local + <li>Support for <a href="localvalues.html">IBM-Style Local Values</a>. That is the subject of a separate writeup.</li> </ul> @@ -416,8 +416,8 @@ generated into the Binary Output.  If a PCI Header is in effect, the position relative to the end of that PCI Header will also be shown; this is to maintain consistency with the <a - href="DeTokenizer.htm#with_offsets">"offsets</a>" displayed be the <a - href="DeTokenizer.htm">DeTokenizer</a> + href="detok.html#with_offsets">"offsets</a>" displayed by the <a + href="detok.html">DeTokenizer</a> <a name="Errors_Ignored"></a> The Tokenizer typically runs through to completion of the source file, @@ -786,7 +786,7 @@ </ul> </ul> Support IBM-style <a - href="TokenizerLocalValues.htm">Local Values</a> ("LV"s).  + href="localvalues.html">Local Values</a> ("LV"s).  Initially disabled. <ul> @@ -797,8 +797,8 @@ </ul> Allow Semicolon for Local Values <a - href="TokenizerLocalValues.htm#Separation_Character_between_Initialized">Separator</a> -("<a href="TokenizerLocalValues.htm#Disallow_Legacy">Legacy</a>"). + href="localvalues.html#Separation_Character_between_Initialized">Separator</a> +("<a href="localvalues.html#Disallow_Legacy">Legacy</a>"). <ul> <ul> @@ -807,7 +807,7 @@ </ul> </ul> Display a <a - href="TokenizerLocalValues.htm#Legacy_Separator">Warning + href="localvalues.html#Legacy_Separator">Warning Message</a> when Semicolon is used as the Local Values Separator. @@ -3462,7 +3462,7 @@ Support File can be incorporated at a <a href="#Global_Definitions">Global</a> level.  Normally, <a href="#Multiple_device_nodes">that would be problematical</a> because -the <a href="TokenizerLocalValues.htm#Instance_Data_in_L_V_Support">Local +the <a href="localvalues.html#Instance_Data_in_L_V_Support">Local Values Support functions</a> are written to use instance

1 0

r196 - openbios-devel/arch/sparc64
by svn＠openbios.org 08 Jul '08

08 Jul '08

Author: blueswirl Date: 2008-07-08 18:02:43 +0200 (Tue, 08 Jul 2008) New Revision: 196 Added: openbios-devel/arch/sparc64/aoutload.c Modified: openbios-devel/arch/sparc64/boot.c openbios-devel/arch/sparc64/boot.h openbios-devel/arch/sparc64/build.xml Log: Add a.out support for SILO Added: openbios-devel/arch/sparc64/aoutload.c =================================================================== --- openbios-devel/arch/sparc64/aoutload.c (rev 0) +++ openbios-devel/arch/sparc64/aoutload.c 2008-07-08 16:02:43 UTC (rev 196) @@ -0,0 +1,146 @@ +/* a.out boot loader + * As we have seek, this implementation can be straightforward. + * 2003-07 by SONE Takeshi + */ + +#include "openbios/config.h" +#include "openbios/kernel.h" +#define CONFIG_SPARC64_PAGE_SIZE_8KB +#include "a.out.h" +#include "sys_info.h" +#include "loadfs.h" +#include "boot.h" +#define printf printk +#define debug printk + +#define addr_fixup(addr) ((addr) & 0x00ffffff) + +static char *image_name, *image_version; +const char *program_name, *program_version; + +static int check_mem_ranges(struct sys_info *info, + unsigned long start, + unsigned long size) +{ + int j; + unsigned long end; + unsigned long prog_start, prog_end; + struct memrange *mem; + + prog_start = virt_to_phys(&_start); + prog_end = virt_to_phys(&_end); + + end = start + size; + + if (start < prog_start && end > prog_start) + goto conflict; + if (start < prog_end && end > prog_end) + goto conflict; + mem = info->memrange; + for (j = 0; j < info->n_memranges; j++) { + if (mem[j].base <= start && mem[j].base + mem[j].size >= end) + break; + } + if (j >= info->n_memranges) + goto badseg; + return 1; + + conflict: + printf("%s occupies [%#lx-%#lx]\n", program_name, prog_start, prog_end); + + badseg: + printf("A.out file [%#lx-%#lx] doesn't fit into memory\n", start, end - 1); + return 0; +} + +int aout_load(struct sys_info *info, const char *filename, const char *cmdline) +{ + int retval = -1; + int image_retval; + struct exec ehdr; + unsigned long start, size; + unsigned int offset; + + image_name = image_version = 0; + + if (!file_open(filename)) + goto out; + + for (offset = 0; offset < 16 * 512; offset += 512) { + file_seek(offset); + if (lfile_read(&ehdr, sizeof ehdr) != sizeof ehdr) { + debug("Can't read a.out header\n"); + retval = LOADER_NOT_SUPPORT; + goto out; + } + if (!N_BADMAG(ehdr)) + break; + } + + if (N_BADMAG(ehdr)) { + debug("Not a bootable a.out image\n"); + retval = LOADER_NOT_SUPPORT; + goto out; + } + + if (ehdr.a_text == 0x30800007) + ehdr.a_text=64*1024; + + if (N_MAGIC(ehdr) == NMAGIC) { + size = addr_fixup(N_DATADDR(ehdr)) + addr_fixup(ehdr.a_data); + } else { + size = addr_fixup(ehdr.a_text) + addr_fixup(ehdr.a_data); + } + + if (size < 7680) + size = 7680; + + + start = 0x4000; // N_TXTADDR(ehdr); + + if (!check_mem_ranges(info, start, size)) + goto out; + + printf("Loading a.out %s...\n", image_name ? image_name : "image"); + + file_seek(offset + N_TXTOFF(ehdr)); + + if (N_MAGIC(ehdr) == NMAGIC) { + if ((unsigned long)lfile_read((void *)start, ehdr.a_text) != ehdr.a_text) { + printf("Can't read program text segment (size 0x%lx)\n", ehdr.a_text); + goto out; + } + if ((unsigned long)lfile_read((void *)(start + N_DATADDR(ehdr)), ehdr.a_data) != ehdr.a_data) { + printf("Can't read program data segment (size 0x%lx)\n", ehdr.a_data); + goto out; + } + } else { + if ((unsigned long)lfile_read((void *)start, size) != size) { + printf("Can't read program (size 0x%lx)\n", size); + goto out; + } + } + + debug("Loaded %lu bytes\n", size); + + debug("entry point is %#lx\n", start); + printf("Jumping to entry point...\n"); + +#if 1 + { + int (*entry)(unsigned long p1, unsigned long p2, unsigned long p3, + unsigned long p4, unsigned long p5); + extern int of_client_interface( int *params ); + + entry = (void *) addr_fixup(start); + image_retval = entry(0, 0, 0, 0, (unsigned long)&of_client_interface); + } +#endif + + printf("Image returned with return value %#x\n", image_retval); + retval = 0; + +out: + file_close(); + return retval; +} Modified: openbios-devel/arch/sparc64/boot.c =================================================================== --- openbios-devel/arch/sparc64/boot.c 2008-07-08 15:59:40 UTC (rev 195) +++ openbios-devel/arch/sparc64/boot.c 2008-07-08 16:02:43 UTC (rev 196) @@ -67,13 +67,15 @@ if (elf_load(&sys_info, path, param) == LOADER_NOT_SUPPORT) - if (linux_load(&sys_info, path, param) == LOADER_NOT_SUPPORT) { + if (linux_load(&sys_info, path, param) == LOADER_NOT_SUPPORT) + if (aout_load(&sys_info, path, param) == LOADER_NOT_SUPPORT) { sprintf(altpath, "%s:d", path); if (elf_load(&sys_info, altpath, param) == LOADER_NOT_SUPPORT) if (linux_load(&sys_info, altpath, param) == LOADER_NOT_SUPPORT) - printk("Unsupported image format\n"); + if (aout_load(&sys_info, altpath, param) == LOADER_NOT_SUPPORT) + printk("Unsupported image format\n"); } free(path); Modified: openbios-devel/arch/sparc64/boot.h =================================================================== --- openbios-devel/arch/sparc64/boot.h 2008-07-08 15:59:40 UTC (rev 195) +++ openbios-devel/arch/sparc64/boot.h 2008-07-08 16:02:43 UTC (rev 196) @@ -9,6 +9,7 @@ int forth_load(struct sys_info *info, const char *filename, const char *cmdline); int elf_load(struct sys_info *info, const char *filename, const char *cmdline); int linux_load(struct sys_info *info, const char *file, const char *cmdline); +int aout_load(struct sys_info *info, const char *filename, const char *cmdline); uint64_t start_elf(uint64_t entry_point, uint64_t param); Modified: openbios-devel/arch/sparc64/build.xml =================================================================== --- openbios-devel/arch/sparc64/build.xml 2008-07-08 15:59:40 UTC (rev 195) +++ openbios-devel/arch/sparc64/build.xml 2008-07-08 16:02:43 UTC (rev 196) @@ -15,6 +15,7 @@ <object source="linux_load.c"/> <object source="sys_info.c"/> <object source="elfload.c"/> + <object source="aoutload.c"/> <object source="forthload.c"/> <object source="loadfs.c"/> </library>

1 0

r195 - in openbios-devel: Documentation config/examples
by svn＠openbios.org 08 Jul '08

08 Jul '08

Author: blueswirl Date: 2008-07-08 17:59:40 +0200 (Tue, 08 Jul 2008) New Revision: 195 Modified: openbios-devel/Documentation/TODO.sparc openbios-devel/config/examples/cross-sparc64_config.xml openbios-devel/config/examples/sparc64_config.xml Log: Remove debug messages Modified: openbios-devel/Documentation/TODO.sparc =================================================================== --- openbios-devel/Documentation/TODO.sparc 2008-07-08 15:57:45 UTC (rev 194) +++ openbios-devel/Documentation/TODO.sparc 2008-07-08 15:59:40 UTC (rev 195) @@ -24,9 +24,6 @@ - BPP parallel - Diagnostic switch -- Optimizations/improvements: - - Remove debug messages - Sparc64: - Unimplemented features/bugs: - Debug direct kernel boot Modified: openbios-devel/config/examples/cross-sparc64_config.xml =================================================================== --- openbios-devel/config/examples/cross-sparc64_config.xml 2008-07-08 15:57:45 UTC (rev 194) +++ openbios-devel/config/examples/cross-sparc64_config.xml 2008-07-08 15:59:40 UTC (rev 195) @@ -18,7 +18,7 @@  <option name="CONFIG_DEBUG" type="boolean" value="true"/> - <option name="CONFIG_DEBUG_BOOT" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_BOOT" type="boolean" value="false"/> <option name="CONFIG_DEBUG_DSTACK" type="boolean" value="false"/> <option name="CONFIG_DEBUG_RSTACK" type="boolean" value="false"/> <option name="CONFIG_DEBUG_DICTIONARY" type="boolean" value="false"/> @@ -69,7 +69,7 @@ <option name="CONFIG_DEBUG_PCI" type="boolean" value="true"/> <option name="CONFIG_DRIVER_IDE" type="boolean" value="true"/> <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="4"/> - <option name="CONFIG_DEBUG_IDE" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_IDE" type="boolean" value="false"/> <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="true"/> <option name="CONFIG_DRIVER_VGA" type="boolean" value="true"/> Modified: openbios-devel/config/examples/sparc64_config.xml =================================================================== --- openbios-devel/config/examples/sparc64_config.xml 2008-07-08 15:57:45 UTC (rev 194) +++ openbios-devel/config/examples/sparc64_config.xml 2008-07-08 15:59:40 UTC (rev 195) @@ -18,7 +18,7 @@  <option name="CONFIG_DEBUG" type="boolean" value="true"/> - <option name="CONFIG_DEBUG_BOOT" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_BOOT" type="boolean" value="false"/> <option name="CONFIG_DEBUG_DSTACK" type="boolean" value="false"/> <option name="CONFIG_DEBUG_RSTACK" type="boolean" value="false"/> <option name="CONFIG_DEBUG_DICTIONARY" type="boolean" value="false"/> @@ -69,7 +69,7 @@ <option name="CONFIG_DEBUG_PCI" type="boolean" value="true"/> <option name="CONFIG_DRIVER_IDE" type="boolean" value="true"/> <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="4"/> - <option name="CONFIG_DEBUG_IDE" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_IDE" type="boolean" value="false"/> <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="true"/> <option name="CONFIG_DRIVER_VGA" type="boolean" value="true"/>

1 0

r194 - in openbios-devel: Documentation arch/sparc32 arch/sparc64
by svn＠openbios.org 08 Jul '08

08 Jul '08

Author: blueswirl Date: 2008-07-08 17:57:45 +0200 (Tue, 08 Jul 2008) New Revision: 194 Modified: openbios-devel/Documentation/TODO.sparc openbios-devel/arch/sparc32/build.xml openbios-devel/arch/sparc64/build.xml Log: Add Make dependencies for some files, unify Sparc32/64 build.xml files Modified: openbios-devel/Documentation/TODO.sparc =================================================================== --- openbios-devel/Documentation/TODO.sparc 2008-07-08 15:52:55 UTC (rev 193) +++ openbios-devel/Documentation/TODO.sparc 2008-07-08 15:57:45 UTC (rev 194) @@ -3,7 +3,6 @@ Sparc common: - Unimplemented features/bugs: - Send keycode on keypress - - Add Make dependencies for .S files - Remove compiler warnings - Clean up Modified: openbios-devel/arch/sparc32/build.xml =================================================================== --- openbios-devel/arch/sparc32/build.xml 2008-07-08 15:52:55 UTC (rev 193) +++ openbios-devel/arch/sparc32/build.xml 2008-07-08 15:57:45 UTC (rev 194) @@ -23,14 +23,12 @@ </library> <executable name="target/arch/sparc32/entry.o" target="target"> - <rule><![CDATA[ - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/sparc32/entry.S - ]]></rule> + <rule><![CDATA[ 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[ - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/sparc32/vectors.S - ]]></rule> + <rule><![CDATA[ arch/sparc32/vectors.S + $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </executable> <executable name="openbios-plain.elf" target="target" condition="IMAGE_ELF"> @@ -38,8 +36,7 @@ $(LD) -N -T arch/sparc32/ldscript -o $@.nostrip $^ $(NM) $@.nostrip | sort > $(ODIR)/openbios-plain.syms cp $@.nostrip $@ - $(STRIP) $@ - </rule> + $(STRIP) $@</rule> <object source="plainboot.c"/> <external-object source="target/arch/sparc32/vectors.o"/> <external-object source="target/arch/sparc32/entry.o"/> @@ -59,16 +56,13 @@ @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-sparc32.dict"/> </executable> <executable name="target/arch/sparc32/builtin.o" target="target" condition="IMAGE_ELF_EMBEDDED"> - <rule><![CDATA[ - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/sparc32/builtin.c - ]]></rule> - <external-object source="target/include/static-dict.h"/> + <rule><![CDATA[ arch/sparc32/builtin.c + $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </executable>  @@ -78,8 +72,7 @@ $(LD) -N -T arch/sparc32/ldscript -o $@.nostrip $^ $(NM) $@.nostrip | sort > $(ODIR)/openbios-builtin.syms cp $@.nostrip $@ - $(STRIP) $@ - </rule> + $(STRIP) $@</rule> <external-object source="target/arch/sparc32/vectors.o"/> <external-object source="target/arch/sparc32/entry.o"/> <external-object source="target/arch/sparc32/builtin.o"/> Modified: openbios-devel/arch/sparc64/build.xml =================================================================== --- openbios-devel/arch/sparc64/build.xml 2008-07-08 15:52:55 UTC (rev 193) +++ openbios-devel/arch/sparc64/build.xml 2008-07-08 15:57:45 UTC (rev 194) @@ -28,7 +28,6 @@ $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </executable> - <executable name="openbios-plain.elf" target="target" condition="IMAGE_ELF"> <rule> $(LD) -T arch/sparc64/ldscript -o $@.nostrip $^

1 0

r193 - openbios-devel/arch/sparc32
by svn＠openbios.org 08 Jul '08

08 Jul '08

Author: blueswirl Date: 2008-07-08 17:52:55 +0200 (Tue, 08 Jul 2008) New Revision: 193 Modified: openbios-devel/arch/sparc32/init.fs Log: Implement obmem for NetBSD loader Modified: openbios-devel/arch/sparc32/init.fs =================================================================== --- openbios-devel/arch/sparc32/init.fs 2008-07-07 18:38:30 UTC (rev 192) +++ openbios-devel/arch/sparc32/init.fs 2008-07-08 15:52:55 UTC (rev 193) @@ -56,3 +56,7 @@ drop 0 ; +\ D5.3 SBus specific on-board memory address space +: obmem ( -- space ) + 0 + ;

1 0

r192 - openbios-devel/libgcc
by svn＠openbios.org 07 Jul '08

07 Jul '08

Author: blueswirl Date: 2008-07-07 20:38:30 +0200 (Mon, 07 Jul 2008) New Revision: 192 Added: openbios-devel/libgcc/libgcc.h Modified: openbios-devel/libgcc/__divdi3.c openbios-devel/libgcc/__divti3.c openbios-devel/libgcc/__lshrdi3.c openbios-devel/libgcc/__udivdi3.c openbios-devel/libgcc/__udivmoddi4.c openbios-devel/libgcc/__udivmodti4.c openbios-devel/libgcc/__udivti3.c openbios-devel/libgcc/__umoddi3.c openbios-devel/libgcc/__umodti3.c openbios-devel/libgcc/ashldi3.c openbios-devel/libgcc/ashrdi3.c openbios-devel/libgcc/multi3.c Log: Add a common header file for libgcc functions Modified: openbios-devel/libgcc/__divdi3.c =================================================================== --- openbios-devel/libgcc/__divdi3.c 2008-07-07 18:37:24 UTC (rev 191) +++ openbios-devel/libgcc/__divdi3.c 2008-07-07 18:38:30 UTC (rev 192) @@ -2,11 +2,8 @@ * arch/i386/libgcc/__divdi3.c */ -#include <stdint.h> -#include <stddef.h> +#include "libgcc.h" -extern uint64_t __udivmoddi4(uint64_t num, uint64_t den, uint64_t *rem); - int64_t __divdi3(int64_t num, int64_t den) { int minus = 0; Modified: openbios-devel/libgcc/__divti3.c =================================================================== --- openbios-devel/libgcc/__divti3.c 2008-07-07 18:37:24 UTC (rev 191) +++ openbios-devel/libgcc/__divti3.c 2008-07-07 18:38:30 UTC (rev 192) @@ -2,11 +2,8 @@ * arch/i386/libgcc/__divti3.c */ -#include "asm/types.h" -#define NULL ((void *)0) +#include "libgcc.h" -extern __uint128_t __udivmodti4(__uint128_t num, __uint128_t den, __uint128_t *rem); - __int128_t __divti3(__int128_t num, __int128_t den) { int minus = 0; Modified: openbios-devel/libgcc/__lshrdi3.c =================================================================== --- openbios-devel/libgcc/__lshrdi3.c 2008-07-07 18:37:24 UTC (rev 191) +++ openbios-devel/libgcc/__lshrdi3.c 2008-07-07 18:38:30 UTC (rev 192) @@ -18,13 +18,10 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "libgcc.h" + #define BITS_PER_UNIT 8 -typedef int SItype __attribute__ ((mode (SI))); -typedef unsigned int USItype __attribute__ ((mode (SI))); -typedef int DItype __attribute__ ((mode (DI))); -typedef int word_type __attribute__ ((mode (__word__))); - struct DIstruct {SItype high, low;}; typedef union Modified: openbios-devel/libgcc/__udivdi3.c =================================================================== --- openbios-devel/libgcc/__udivdi3.c 2008-07-07 18:37:24 UTC (rev 191) +++ openbios-devel/libgcc/__udivdi3.c 2008-07-07 18:38:30 UTC (rev 192) @@ -2,11 +2,8 @@ * arch/i386/libgcc/__divdi3.c */ -#include <stdint.h> -#include <stddef.h> +#include "libgcc.h" -extern uint64_t __udivmoddi4(uint64_t num, uint64_t den, uint64_t *rem); - uint64_t __udivdi3(uint64_t num, uint64_t den) { return __udivmoddi4(num, den, NULL); Modified: openbios-devel/libgcc/__udivmoddi4.c =================================================================== --- openbios-devel/libgcc/__udivmoddi4.c 2008-07-07 18:37:24 UTC (rev 191) +++ openbios-devel/libgcc/__udivmoddi4.c 2008-07-07 18:38:30 UTC (rev 192) @@ -1,7 +1,5 @@ -#include <stdint.h> +#include "libgcc.h" -extern void __divide_error(); - uint64_t __udivmoddi4(uint64_t num, uint64_t den, uint64_t *rem_p) { uint64_t quot = 0, qbit = 1; Modified: openbios-devel/libgcc/__udivmodti4.c =================================================================== --- openbios-devel/libgcc/__udivmodti4.c 2008-07-07 18:37:24 UTC (rev 191) +++ openbios-devel/libgcc/__udivmodti4.c 2008-07-07 18:38:30 UTC (rev 192) @@ -1,7 +1,5 @@ -#include "asm/types.h" +#include "libgcc.h" -extern void __divide_error(); - __uint128_t __udivmodti4(__uint128_t num, __uint128_t den, __uint128_t *rem_p) { __uint128_t quot = 0, qbit = 1; Modified: openbios-devel/libgcc/__udivti3.c =================================================================== --- openbios-devel/libgcc/__udivti3.c 2008-07-07 18:37:24 UTC (rev 191) +++ openbios-devel/libgcc/__udivti3.c 2008-07-07 18:38:30 UTC (rev 192) @@ -2,11 +2,8 @@ * arch/i386/libgcc/__divdi3.c */ -#include "asm/types.h" -#define NULL ((void *)0) +#include "libgcc.h" -extern __uint128_t __udivmodti4(__uint128_t num, __uint128_t den, __uint128_t *rem); - __uint128_t __udivti3(__uint128_t num, __uint128_t den) { return __udivmodti4(num, den, NULL); Modified: openbios-devel/libgcc/__umoddi3.c =================================================================== --- openbios-devel/libgcc/__umoddi3.c 2008-07-07 18:37:24 UTC (rev 191) +++ openbios-devel/libgcc/__umoddi3.c 2008-07-07 18:38:30 UTC (rev 192) @@ -2,11 +2,8 @@ * arch/i386/libgcc/__umoddi3.c */ -#include <stdint.h> -#include <stddef.h> +#include "libgcc.h" -extern uint64_t __udivmoddi4(uint64_t num, uint64_t den, uint64_t *rem); - uint64_t __umoddi3(uint64_t num, uint64_t den) { uint64_t v; Modified: openbios-devel/libgcc/__umodti3.c =================================================================== --- openbios-devel/libgcc/__umodti3.c 2008-07-07 18:37:24 UTC (rev 191) +++ openbios-devel/libgcc/__umodti3.c 2008-07-07 18:38:30 UTC (rev 192) @@ -2,10 +2,8 @@ * arch/i386/libgcc/__umoddi3.c */ -#include "asm/types.h" +#include "libgcc.h" -extern __uint128_t __udivmodti4(__uint128_t num, __uint128_t den, __uint128_t *rem); - __uint128_t __umodti3(__uint128_t num, __uint128_t den) { __uint128_t v; Modified: openbios-devel/libgcc/ashldi3.c =================================================================== --- openbios-devel/libgcc/ashldi3.c 2008-07-07 18:37:24 UTC (rev 191) +++ openbios-devel/libgcc/ashldi3.c 2008-07-07 18:38:30 UTC (rev 192) @@ -18,13 +18,10 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "libgcc.h" + #define BITS_PER_UNIT 8 -typedef int SItype __attribute__ ((mode (SI))); -typedef unsigned int USItype __attribute__ ((mode (SI))); -typedef int DItype __attribute__ ((mode (DI))); -typedef int word_type __attribute__ ((mode (__word__))); - struct DIstruct {SItype high, low;}; typedef union Modified: openbios-devel/libgcc/ashrdi3.c =================================================================== --- openbios-devel/libgcc/ashrdi3.c 2008-07-07 18:37:24 UTC (rev 191) +++ openbios-devel/libgcc/ashrdi3.c 2008-07-07 18:38:30 UTC (rev 192) @@ -18,13 +18,10 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "libgcc.h" + #define BITS_PER_UNIT 8 -typedef int SItype __attribute__ ((mode (SI))); -typedef unsigned int USItype __attribute__ ((mode (SI))); -typedef int DItype __attribute__ ((mode (DI))); -typedef int word_type __attribute__ ((mode (__word__))); - struct DIstruct {SItype high, low;}; typedef union Added: openbios-devel/libgcc/libgcc.h =================================================================== --- openbios-devel/libgcc/libgcc.h (rev 0) +++ openbios-devel/libgcc/libgcc.h 2008-07-07 18:38:30 UTC (rev 192) @@ -0,0 +1,37 @@ +#ifndef _LIBGCC_H +#define _LIBGCC_H + +#include "asm/types.h" + +#ifndef NULL +#define NULL ((void *)0) +#endif + +typedef int SItype __attribute__ ((mode (SI))); +typedef unsigned int USItype __attribute__ ((mode (SI))); +typedef int DItype __attribute__ ((mode (DI))); +typedef unsigned int UDItype __attribute__ ((mode (DI))); +typedef int TItype __attribute__ ((mode (TI))); +typedef int word_type __attribute__ ((mode (__word__))); + +uint64_t __udivmoddi4(uint64_t num, uint64_t den, uint64_t *rem); +__uint128_t __udivmodti4(__uint128_t num, __uint128_t den, __uint128_t *rem); + +int64_t __divdi3(int64_t num, int64_t den); +uint64_t __udivdi3(uint64_t num, uint64_t den); +__int128_t __divti3(__int128_t num, __int128_t den); +__uint128_t __udivti3(__uint128_t num, __uint128_t den); + +uint64_t __umoddi3(uint64_t num, uint64_t den); +__uint128_t __umodti3(__uint128_t num, __uint128_t den); + +DItype __ashldi3 (DItype u, word_type b); +DItype __lshrdi3 (DItype u, word_type b); +DItype __ashrdi3 (DItype u, word_type b); + +TItype __multi3 (TItype u, TItype v); + +// Must be implemented outside: +void __divide_error(void); + +#endif /* _LIBGCC_H */ Modified: openbios-devel/libgcc/multi3.c =================================================================== --- openbios-devel/libgcc/multi3.c 2008-07-07 18:37:24 UTC (rev 191) +++ openbios-devel/libgcc/multi3.c 2008-07-07 18:38:30 UTC (rev 192) @@ -1,4 +1,4 @@ -/* muldi3.c extracted from gcc-2.7.2.3/libgcc2.c and +/* muldi3.c extracted from gcc-2.7.2.3/libgcc2.c and gcc-2.7.2.3/longlong.h which is: */ /* Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. @@ -19,6 +19,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "libgcc.h" + #define BITS_PER_UNIT 8 #define DI_TYPE_SIZE 64 @@ -56,11 +58,6 @@ umul_ppmm (__w.s.high, __w.s.low, u, v); \ __w.ll; }) -typedef int DItype __attribute__ ((mode (DI))); -typedef unsigned int UDItype __attribute__ ((mode (DI))); -typedef int TItype __attribute__ ((mode (TI))); -typedef int word_type __attribute__ ((mode (__word__))); - struct TIstruct {DItype high, low;}; typedef union

1 0

r191 - openbios-devel/include/libc
by svn＠openbios.org 07 Jul '08

07 Jul '08

Author: blueswirl Date: 2008-07-07 20:37:24 +0200 (Mon, 07 Jul 2008) New Revision: 191 Modified: openbios-devel/include/libc/vsprintf.h Log: Add prototypes for [v]snprintf Modified: openbios-devel/include/libc/vsprintf.h =================================================================== --- openbios-devel/include/libc/vsprintf.h 2008-07-07 18:36:16 UTC (rev 190) +++ openbios-devel/include/libc/vsprintf.h 2008-07-07 18:37:24 UTC (rev 191) @@ -18,7 +18,11 @@ #define _H_VSPRINTF #include <stdarg.h> +#include "openbios/config.h" + extern int vsprintf(char *buf, const char *fmt, va_list args ); extern int sprintf(char * buf, const char *fmt, ...); +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, ...); #endif /* _H_VSPRINTF */

1 0

r190 - in openbios-devel: arch/sparc64 include/sparc64
by svn＠openbios.org 07 Jul '08

07 Jul '08

Author: blueswirl Date: 2008-07-07 20:36:16 +0200 (Mon, 07 Jul 2008) New Revision: 190 Modified: openbios-devel/arch/sparc64/boot.c openbios-devel/arch/sparc64/boot.h openbios-devel/arch/sparc64/build.xml openbios-devel/arch/sparc64/context.c openbios-devel/arch/sparc64/elfload.c openbios-devel/arch/sparc64/entry.S openbios-devel/arch/sparc64/forthload.c openbios-devel/arch/sparc64/init.fs openbios-devel/arch/sparc64/ldscript openbios-devel/arch/sparc64/lib.c openbios-devel/arch/sparc64/linux_load.c openbios-devel/arch/sparc64/loadfs.c openbios-devel/arch/sparc64/loadfs.h openbios-devel/arch/sparc64/multiboot.c openbios-devel/arch/sparc64/multiboot.h openbios-devel/arch/sparc64/openbios.c openbios-devel/arch/sparc64/openbios.h openbios-devel/arch/sparc64/switch.S openbios-devel/arch/sparc64/sys_info.c openbios-devel/arch/sparc64/ttable.h openbios-devel/arch/sparc64/vectors.S openbios-devel/include/sparc64/io.h Log: Fix some Sparc64 compile warnings Modified: openbios-devel/arch/sparc64/boot.c =================================================================== --- openbios-devel/arch/sparc64/boot.c 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/boot.c 2008-07-07 18:36:16 UTC (rev 190) @@ -7,18 +7,14 @@ #include "openbios/elfload.h" #include "openbios/nvram.h" #include "libc/diskio.h" +#include "libc/vsprintf.h" #include "sys_info.h" +#include "boot.h" -int elf_load(struct sys_info *, const char *filename, const char *cmdline); -int aout_load(struct sys_info *, const char *filename, const char *cmdline); -int linux_load(struct sys_info *, const char *filename, const char *cmdline); - -void boot(void); - -struct sys_info sys_info; +struct sys_info sys_info; uint64_t kernel_image; uint64_t kernel_size; -uint64_t cmdline; +uint64_t qemu_cmdline; uint64_t cmdline_size; char boot_device; @@ -60,11 +56,11 @@ *param = '\0'; param++; } else if (cmdline_size) { - param = (char *)cmdline; + param = (char *)qemu_cmdline; } printk("[sparc64] Booting file '%s' ", path); - if(param) + if (param) printk("with parameters '%s'\n", param); else printk("without parameters.\n"); Modified: openbios-devel/arch/sparc64/boot.h =================================================================== --- openbios-devel/arch/sparc64/boot.h 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/boot.h 2008-07-07 18:36:16 UTC (rev 190) @@ -10,11 +10,13 @@ int elf_load(struct sys_info *info, const char *filename, const char *cmdline); int linux_load(struct sys_info *info, const char *file, const char *cmdline); -unsigned int start_elf(unsigned long entry_point, unsigned long param); +uint64_t start_elf(uint64_t entry_point, uint64_t param); +void boot(void); + extern uint64_t kernel_image; extern uint64_t kernel_size; -extern uint64_t cmdline; +extern uint64_t qemu_cmdline; extern uint64_t cmdline_size; extern char boot_device; extern struct sys_info sys_info; Modified: openbios-devel/arch/sparc64/build.xml =================================================================== --- openbios-devel/arch/sparc64/build.xml 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/build.xml 2008-07-07 18:36:16 UTC (rev 190) @@ -18,7 +18,7 @@ <object source="forthload.c"/> <object source="loadfs.c"/> </library> - + <executable name="target/arch/sparc64/entry.o" target="target"> <rule><![CDATA[ arch/sparc64/entry.S $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> @@ -48,7 +48,7 @@ </executable>  - + <executable name="target/include/static-dict.h" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule><![CDATA[ @echo "static const char forth_dictionary[] = {" > $@ @@ -57,12 +57,12 @@ @echo "};" >> $@]]></rule> <external-object source="openbios-sparc64.dict"/> </executable> - + <executable name="target/arch/sparc64/builtin.o" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule><![CDATA[ arch/sparc64/builtin.c $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </executable> - +  <executable name="openbios-builtin.elf" target="target" condition="IMAGE_ELF_EMBEDDED"> @@ -83,5 +83,5 @@ <external-object source="libfs.a"/> <external-object source="libgcc.a"/> </executable> - + </build> Modified: openbios-devel/arch/sparc64/context.c =================================================================== --- openbios-devel/arch/sparc64/context.c 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/context.c 2008-07-07 18:36:16 UTC (rev 190) @@ -6,6 +6,8 @@ #include "openbios/config.h" #include "openbios/kernel.h" #include "context.h" +#include "sys_info.h" +#include "boot.h" #define MAIN_STACK_SIZE 16384 #define IMAGE_STACK_SIZE 4096 @@ -16,11 +18,11 @@ void __exit_context(void); /* assembly routine */ /* - * Main context structure + * Main context structure * It is placed at the bottom of our stack, and loaded by assembly routine * to start us up. */ -const struct context main_ctx = { +struct context main_ctx = { .regs[REG_SP] = (uint64_t) &_estack - 2047 - 96, .pc = (uint64_t) start_main, .npc = (uint64_t) start_main + 4, Modified: openbios-devel/arch/sparc64/elfload.c =================================================================== --- openbios-devel/arch/sparc64/elfload.c 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/elfload.c 2008-07-07 18:36:16 UTC (rev 190) @@ -11,10 +11,10 @@ #include "sys_info.h" #include "ipchecksum.h" #include "loadfs.h" +#include "boot.h" #define printf printk #define debug printk -extern unsigned int start_elf(unsigned long entry_point, unsigned long param); #define addr_fixup(addr) ((addr) & 0x00ffffff) static char *image_name, *image_version; @@ -92,7 +92,7 @@ continue; buf = malloc(phdr[i].p_filesz); file_seek(offset + phdr[i].p_offset); - if (lfile_read(buf, phdr[i].p_filesz) != phdr[i].p_filesz) { + if ((uint64_t)lfile_read(buf, phdr[i].p_filesz) != phdr[i].p_filesz) { printf("Can't read note segment\n"); goto out; } @@ -150,14 +150,14 @@ i, addr_fixup(phdr[i].p_paddr), phdr[i].p_filesz, phdr[i].p_memsz); file_seek(offset + phdr[i].p_offset); debug("loading... "); - if (lfile_read(phys_to_virt(addr_fixup(phdr[i].p_paddr)), phdr[i].p_filesz) + if ((uint64_t)lfile_read(phys_to_virt(addr_fixup(phdr[i].p_paddr)), phdr[i].p_filesz) != phdr[i].p_filesz) { printf("Can't read program segment %d\n", i); return 0; } bytes += phdr[i].p_filesz; debug("clearing... "); - memset(phys_to_virt(addr_fixup(phdr[i].p_paddr) + phdr[i].p_filesz), 0, + memset(phys_to_virt(addr_fixup(phdr[i].p_paddr) + phdr[i].p_filesz), 0, phdr[i].p_memsz - phdr[i].p_filesz); if (phdr[i].p_offset <= checksum_offset && phdr[i].p_offset + phdr[i].p_filesz >= checksum_offset+2) { @@ -320,7 +320,7 @@ goto out; for (offset = 0; offset < 16 * 512; offset += 512) { - if (lfile_read(&ehdr, sizeof ehdr) != sizeof ehdr) { + if ((size_t)lfile_read(&ehdr, sizeof ehdr) != sizeof ehdr) { debug("Can't read ELF header\n"); retval = LOADER_NOT_SUPPORT; goto out; @@ -351,7 +351,7 @@ phdr_size = ehdr.e_phnum * sizeof *phdr; phdr = malloc(phdr_size); file_seek(offset + ehdr.e_phoff); - if (lfile_read(phdr, phdr_size) != phdr_size) { + if ((unsigned long)lfile_read(phdr, phdr_size) != phdr_size) { printf("Can't read program header\n"); goto out; } @@ -368,7 +368,7 @@ if (!load_segments(phdr, ehdr.e_phnum, checksum_offset, offset)) goto out; - + if (checksum_offset) { if (!verify_image(&ehdr, phdr, ehdr.e_phnum, checksum)) goto out; Modified: openbios-devel/arch/sparc64/entry.S =================================================================== --- openbios-devel/arch/sparc64/entry.S 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/entry.S 2008-07-07 18:36:16 UTC (rev 190) @@ -100,8 +100,8 @@ lduba [%g1] ASI_PHYS_BYPASS_EC_E, %g3 or %g3, %g4, %g1 ! %g1 contains end of memory - - + + setx _end, %g7, %g3 set 0xffff, %g2 add %g3, %g2, %g3 @@ -280,7 +280,7 @@ setx qemu_mem_size, %g7, %g1 stx %g3, [%g1] - + setx _data, %g7, %g1 ! Store va->pa conversion factor sub %g1, %l0, %g2 setx va_shift, %g7, %g1 Modified: openbios-devel/arch/sparc64/forthload.c =================================================================== --- openbios-devel/arch/sparc64/forthload.c 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/forthload.c 2008-07-07 18:36:16 UTC (rev 190) @@ -38,10 +38,10 @@ } forthsize = file_size(); - + forthtext = malloc(forthsize+1); file_seek(0); - + printk("Loading forth source ..."); if ((unsigned long)lfile_read(forthtext, forthsize) != forthsize) { printk("Can't read forth text\n"); Modified: openbios-devel/arch/sparc64/init.fs =================================================================== --- openbios-devel/arch/sparc64/init.fs 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/init.fs 2008-07-07 18:36:16 UTC (rev 190) @@ -1,4 +1,4 @@ -:noname +:noname ." Type 'help' for detailed information" cr \ ." boot secondary slave cdrom: " cr \ ." 0 > boot hd:2,\boot\vmlinuz root=/dev/hda2" cr @@ -16,7 +16,7 @@ : preopen ( chosen-str node-path ) 2dup make-openable - + " /chosen" find-device open-dev ?dup if encode-int 2swap property @@ -24,7 +24,7 @@ 2drop then ; - + :noname set-defaults ; SYSTEM-initializer @@ -45,11 +45,11 @@ " /builtin/console" " output-device" $setenv then ; SYSTEM-initializer - + :noname " keyboard" input ; CONSOLE-IN-initializer - + device-end : rmap@ ( virt -- rmentry ) Modified: openbios-devel/arch/sparc64/ldscript =================================================================== --- openbios-devel/arch/sparc64/ldscript 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/ldscript 2008-07-07 18:36:16 UTC (rev 190) @@ -20,7 +20,7 @@ { . = BASE_ADDR; - /* Start of the program. + /* Start of the program. * Now the version string is in the note, we must include it * in the program. Otherwise we lose the string after relocation. */ _start = .; Modified: openbios-devel/arch/sparc64/lib.c =================================================================== --- openbios-devel/arch/sparc64/lib.c 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/lib.c 2008-07-07 18:36:16 UTC (rev 190) @@ -15,7 +15,7 @@ #include "openbios/kernel.h" /* Format a string and print it on the screen, just like the libc - * function printf. + * function printf. */ int printk( const char *fmt, ... ) { @@ -50,7 +50,7 @@ if(memsize>=size) { memsize-=size; ret=memptr; - memptr+=size; + memptr = (void *)((unsigned long)memptr + size); } return ret; } @@ -59,7 +59,3 @@ { /* Nothing yet */ } - -unsigned long map_page(unsigned long va, unsigned long epa, int type) -{ -} Modified: openbios-devel/arch/sparc64/linux_load.c =================================================================== --- openbios-devel/arch/sparc64/linux_load.c 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/linux_load.c 2008-07-07 18:36:16 UTC (rev 190) @@ -14,6 +14,7 @@ #include "sys_info.h" #include "context.h" #include "loadfs.h" +#include "boot.h" #define printf printk #define debug printk @@ -355,7 +356,7 @@ printf("Garbage after mem=<size>, ignored\n"); forced_memsize = 0; } - debug("mem=%Lu\n", forced_memsize); + debug("mem=%llu\n", (unsigned long long)forced_memsize); } /* mem= is for both loader and kernel */ to_kern = 1; @@ -424,7 +425,7 @@ #endif printf("Loading kernel... "); - if (lfile_read(phys_to_virt(kern_addr), kern_size) != kern_size) { + if ((uint32_t)lfile_read(phys_to_virt(kern_addr), kern_size) != kern_size) { printf("Can't read kernel\n"); return 0; } @@ -433,8 +434,8 @@ return kern_size; } -static int load_initrd(struct linux_header *hdr, struct sys_info *info, - uint32_t kern_end, struct linux_params *params, const char *initrd_file) +static int load_initrd(struct linux_header *hdr, uint32_t kern_end, + struct linux_params *params, const char *initrd_file) { uint32_t max; uint32_t start, end, size; @@ -462,7 +463,7 @@ max = hdr->initrd_addr_max; else max = 0x38000000; /* Hardcoded value for older kernels */ - + /* FILO itself is at the top of RAM. (relocated) * So, try putting initrd just below us. */ end = virt_to_phys(_start); @@ -497,7 +498,7 @@ } printf("Loading initrd... "); - if (lfile_read(phys_to_virt(start), size) != size) { + if ((uint32_t)lfile_read(phys_to_virt(start), size) != size) { printf("Can't read initrd\n"); return -1; } @@ -518,9 +519,9 @@ outb(0, 0xf0); outb(0, 0xf1); - /* we're getting screwed again and again by this problem of the 8259. - * so we're going to leave this lying around for inclusion into - * crt0.S on an as-needed basis. + /* we're getting screwed again and again by this problem of the 8259. + * so we're going to leave this lying around for inclusion into + * crt0.S on an as-needed basis. * * well, that went ok, I hope. Now we have to reprogram the interrupts :-( * we put them right after the intel-reserved hardware interrupts, at @@ -548,7 +549,7 @@ } /* Start Linux */ -static int start_linux(uint32_t kern_addr, struct linux_params *params) +static int start_linux(uint32_t kern_addr) { struct context *ctx; //extern int cursor_x, cursor_y; @@ -568,12 +569,12 @@ params->orig_x = cursor_x; params->orig_y = cursor_y; #endif - + /* Go... */ ctx = switch_to(ctx); /* It's impossible but... */ - printf("Returned with o0=%#x\n", ctx->regs[REG_O0]); + printf("Returned with o0=%#lx\n", ctx->regs[REG_O0]); return ctx->regs[REG_O0]; } @@ -608,7 +609,7 @@ } if (initrd_file) { - if (load_initrd(&hdr, info, kern_addr+kern_size, params, initrd_file) + if (load_initrd(&hdr, kern_addr+kern_size, params, initrd_file) != 0) { free(initrd_file); return -1; @@ -618,6 +619,6 @@ hardware_setup(); - start_linux(kern_addr, params); + start_linux(kern_addr); return 0; } Modified: openbios-devel/arch/sparc64/loadfs.c =================================================================== --- openbios-devel/arch/sparc64/loadfs.c 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/loadfs.c 2008-07-07 18:36:16 UTC (rev 190) @@ -15,7 +15,7 @@ void file_close(void) { - if(load_fd==-1) + if(load_fd==-1) return; close_io(load_fd); Modified: openbios-devel/arch/sparc64/loadfs.h =================================================================== --- openbios-devel/arch/sparc64/loadfs.h 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/loadfs.h 2008-07-07 18:36:16 UTC (rev 190) @@ -2,6 +2,4 @@ int lfile_read(void *buf, unsigned long len); int file_seek(unsigned long offset); unsigned long file_size(void); - - - +void file_close(void); Modified: openbios-devel/arch/sparc64/multiboot.c =================================================================== --- openbios-devel/arch/sparc64/multiboot.c 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/multiboot.c 2008-07-07 18:36:16 UTC (rev 190) @@ -1,6 +1,6 @@ /* Support for Multiboot */ -#include "openbios/config.h" +#include "openbios/config.h" #include "asm/io.h" #include "sys_info.h" #include "multiboot.h" @@ -9,7 +9,7 @@ #ifdef CONFIG_DEBUG_BOOT #define debug printk #else -#define debug(x...) +#define debug(x...) #endif struct mbheader { @@ -62,11 +62,11 @@ printf("Multiboot: no dictionary\n"); return; } - + mod = (module_t *) mbinfo->mods_addr; info->dict_start=(unsigned long *)mod->mod_start; info->dict_end=(unsigned long *)mod->mod_end; - + if (mbinfo->flags & MULTIBOOT_MMAP_VALID) { /* convert mmap records */ mbmem = phys_to_virt(mbinfo->mmap_addr); Modified: openbios-devel/arch/sparc64/multiboot.h =================================================================== --- openbios-devel/arch/sparc64/multiboot.h 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/multiboot.h 2008-07-07 18:36:16 UTC (rev 190) @@ -1,5 +1,5 @@ -/* multiboot.h - * tag: header for multiboot +/* multiboot.h + * tag: header for multiboot * * Copyright (C) 2003-2004 Stefan Reinauer * Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/openbios.c 2008-07-07 18:36:16 UTC (rev 190) @@ -13,13 +13,15 @@ #include "dict.h" #include "openbios/kernel.h" #include "openbios/stack.h" +#include "openbios/nvram.h" #include "sys_info.h" #include "openbios.h" +#include "libc/byteorder.h" +#define cpu_to_be16(x) __cpu_to_be16(x) #include "openbios/firmware_abi.h" #include "boot.h" +#include "../../drivers/timer.h" // XXX -void boot(void); - static unsigned char intdict[256 * 1024]; // XXX @@ -122,9 +124,9 @@ void arch_nvram_get(char *data) { unsigned short i; - unsigned char *nvptr = &nv_info; + unsigned char *nvptr = (unsigned char *)&nv_info; uint32_t size; - struct cpudef *cpu; + const struct cpudef *cpu; for (i = 0; i < sizeof(ohwcfg_v3_t); i++) { outb(i & 0xff, 0x74); @@ -146,13 +148,13 @@ size = nv_info.cmdline_size; if (size > OBIO_CMDLINE_MAX - 1) size = OBIO_CMDLINE_MAX - 1; - memcpy(obio_cmdline, (void *)nv_info.cmdline, size); + memcpy(&obio_cmdline, (void *)(long)nv_info.cmdline, size); obio_cmdline[size] = '\0'; - cmdline = obio_cmdline; + qemu_cmdline = (uint64_t)obio_cmdline; cmdline_size = size; boot_device = nv_info.boot_devices[0]; - printk("kernel addr %x size %x\n", kernel_image, kernel_size); + printk("kernel addr %lx size %lx\n", kernel_image, kernel_size); if (size) printk("kernel cmdline %s\n", obio_cmdline); @@ -178,16 +180,16 @@ } } -int arch_nvram_size() +int arch_nvram_size(void) { return NVRAM_OB_SIZE; } -void setup_timers() +void setup_timers(void) { } -void udelay() +void udelay(unsigned int usecs) { } @@ -195,7 +197,7 @@ { /* push start and end of available memory to the stack - * so that the forth word QUIT can initialize memory + * so that the forth word QUIT can initialize memory * management. For now we use hardcoded memory between * 0x10000 and 0x9ffff (576k). If we need more memory * than that we have serious bloat. @@ -208,8 +210,6 @@ static void arch_init( void ) { - void setup_timers(void); - modules_init(); #ifdef CONFIG_DRIVER_PCI ob_pci_init(); @@ -249,7 +249,7 @@ dict=intdict; load_dictionary((char *)sys_info.dict_start, - (unsigned long)sys_info.dict_end + (unsigned long)sys_info.dict_end - (unsigned long)sys_info.dict_start); #ifdef CONFIG_DEBUG_BOOT Modified: openbios-devel/arch/sparc64/openbios.h =================================================================== --- openbios-devel/arch/sparc64/openbios.h 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/openbios.h 2008-07-07 18:36:16 UTC (rev 190) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2004/01/15 16:14:05 samuel> * Time-stamp: <2004/01/15 16:14:05 samuel> - * + * * <openbios.h> * * - * + * * Copyright (C) 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 - * + * */ #ifndef _H_OPENBIOS Modified: openbios-devel/arch/sparc64/switch.S =================================================================== --- openbios-devel/arch/sparc64/switch.S 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/switch.S 2008-07-07 18:36:16 UTC (rev 190) @@ -18,7 +18,7 @@ * switches the stack, and restores everything from the new stack. * This function takes no argument. New stack pointer is * taken from global variable __context, and old stack pointer - * is also saved to __context. This way we can just jump to + * is also saved to __context. This way we can just jump to * this routine to get back to the original context. */ @@ -99,7 +99,7 @@ ldx [%g1 + 232], %i5 ldx [%g1 + 240], %i6 ldx [%g1 + 248], %i7 - + ldx [%g1 + 256], %g1 /* Finally, load new %pc */ jmp %g1 Modified: openbios-devel/arch/sparc64/sys_info.c =================================================================== --- openbios-devel/arch/sparc64/sys_info.c 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/sys_info.c 2008-07-07 18:36:16 UTC (rev 190) @@ -8,7 +8,7 @@ #ifdef CONFIG_DEBUG_BOOT #define debug printk #else -#define debug(x...) +#define debug(x...) #endif uint64_t qemu_mem_size; Modified: openbios-devel/arch/sparc64/ttable.h =================================================================== --- openbios-devel/arch/sparc64/ttable.h 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/ttable.h 2008-07-07 18:36:16 UTC (rev 190) @@ -175,7 +175,7 @@ stx %l1, [%sp + PTREGS_OFF + PT_V9_TPC]; \ ba,pt %xcc, rtrap_clr_l6; \ stx %l2, [%sp + PTREGS_OFF + PT_V9_TNPC]; - + #ifdef CONFIG_KPROBES #define KPROBES_TRAP(lvl) TRAP_IRQ(kprobe_trap, lvl) #else Modified: openbios-devel/arch/sparc64/vectors.S =================================================================== --- openbios-devel/arch/sparc64/vectors.S 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/vectors.S 2008-07-07 18:36:16 UTC (rev 190) @@ -4,7 +4,7 @@ * Sparc V9 Trap Table(s) with SpitFire/Cheetah extensions. * * Copyright (C) 1996, 2001 David S. Miller (davem(a)caip.rutgers.edu) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 as published by the Free Software Foundation. @@ -13,7 +13,7 @@ * 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 this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, Modified: openbios-devel/include/sparc64/io.h =================================================================== --- openbios-devel/include/sparc64/io.h 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/include/sparc64/io.h 2008-07-07 18:36:16 UTC (rev 190) @@ -20,7 +20,7 @@ static inline unsigned long pa2va(unsigned long pa) { - if ((pa + va_shift >= (unsigned long)&_data) && + if ((pa + va_shift >= (unsigned long)&_data) && (pa + va_shift< (unsigned long)&_end)) return pa + va_shift; else

1 0

r189 - in openbios-devel: arch/sparc32 drivers include/openbios
by svn＠openbios.org 07 Jul '08

07 Jul '08

Author: blueswirl Date: 2008-07-07 20:35:51 +0200 (Mon, 07 Jul 2008) New Revision: 189 Modified: openbios-devel/arch/sparc32/aoutload.c openbios-devel/arch/sparc32/boot.c openbios-devel/arch/sparc32/boot.h openbios-devel/arch/sparc32/build.xml openbios-devel/arch/sparc32/console.c openbios-devel/arch/sparc32/context.c openbios-devel/arch/sparc32/elfload.c openbios-devel/arch/sparc32/entry.S openbios-devel/arch/sparc32/forthload.c openbios-devel/arch/sparc32/init.fs openbios-devel/arch/sparc32/ldscript openbios-devel/arch/sparc32/lib.c openbios-devel/arch/sparc32/linux_load.c openbios-devel/arch/sparc32/loadfs.c openbios-devel/arch/sparc32/loadfs.h openbios-devel/arch/sparc32/multiboot.c openbios-devel/arch/sparc32/multiboot.h openbios-devel/arch/sparc32/openbios.c openbios-devel/arch/sparc32/openbios.h openbios-devel/arch/sparc32/openprom.h openbios-devel/arch/sparc32/romvec.c openbios-devel/arch/sparc32/switch.S openbios-devel/arch/sparc32/sys_info.c openbios-devel/arch/sparc32/tree.fs openbios-devel/arch/sparc32/vectors.S openbios-devel/arch/sparc32/wof.S openbios-devel/arch/sparc32/wuf.S openbios-devel/drivers/esp.c openbios-devel/drivers/iommu.c openbios-devel/drivers/obio.c openbios-devel/drivers/pgtsrmmu.h openbios-devel/drivers/sbus.c openbios-devel/include/openbios/drivers.h Log: Fix some Sparc32 compile warnings Modified: openbios-devel/arch/sparc32/aoutload.c =================================================================== --- openbios-devel/arch/sparc32/aoutload.c 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/aoutload.c 2008-07-07 18:35:51 UTC (rev 189) @@ -8,6 +8,7 @@ #include "a.out.h" #include "sys_info.h" #include "loadfs.h" +#include "boot.h" #define printf printk #define debug printk @@ -84,7 +85,7 @@ if (ehdr.a_text == 0x30800007) ehdr.a_text=64*1024; - + if (N_MAGIC(ehdr) == NMAGIC) { size = addr_fixup(N_DATADDR(ehdr)) + addr_fixup(ehdr.a_data); } else { @@ -105,21 +106,21 @@ file_seek(offset + N_TXTOFF(ehdr)); if (N_MAGIC(ehdr) == NMAGIC) { - if (lfile_read(start, ehdr.a_text) != ehdr.a_text) { + if ((unsigned long)lfile_read((void *)start, ehdr.a_text) != ehdr.a_text) { printf("Can't read program text segment (size 0x%lx)\n", ehdr.a_text); goto out; } - if (lfile_read(start + N_DATADDR(ehdr), ehdr.a_data) != ehdr.a_data) { + if ((unsigned long)lfile_read((void *)(start + N_DATADDR(ehdr)), ehdr.a_data) != ehdr.a_data) { printf("Can't read program data segment (size 0x%lx)\n", ehdr.a_data); goto out; } } else { - if (lfile_read(start, size) != size) { + if ((unsigned long)lfile_read((void *)start, size) != size) { printf("Can't read program (size 0x%lx)\n", size); goto out; } } - + debug("Loaded %lu bytes\n", size); debug("entry point is %#lx\n", start); @@ -127,7 +128,7 @@ #if 1 { - int (*entry)(const void *romvec, int p2, int p3, int p4, int p5); + int (*entry)(const void *romvec_ptr, int p2, int p3, int p4, int p5); entry = (void *) addr_fixup(start); image_retval = entry(romvec, 0, 0, 0, 0); Modified: openbios-devel/arch/sparc32/boot.c =================================================================== --- openbios-devel/arch/sparc32/boot.c 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/boot.c 2008-07-07 18:35:51 UTC (rev 189) @@ -7,30 +7,23 @@ #include "openbios/elfload.h" #include "openbios/nvram.h" #include "libc/diskio.h" +#include "libc/vsprintf.h" #include "sys_info.h" #include "openprom.h" +#include "boot.h" -int elf_load(struct sys_info *, const char *filename, const char *cmdline, const void *romvec); -int aout_load(struct sys_info *, const char *filename, const char *cmdline, const void *romvec); -int linux_load(struct sys_info *, const char *filename, const char *cmdline, const void *romvec); - -void boot(void); - -struct sys_info sys_info; +struct sys_info sys_info; uint32_t kernel_image; uint32_t kernel_size; -uint32_t cmdline; +uint32_t qemu_cmdline; uint32_t cmdline_size; char boot_device; -extern unsigned int qemu_mem_size; -void *init_openprom(unsigned long memsize); -extern struct linux_arguments_v0 obp_arg; void boot(void) { char *path = pop_fstr_copy(), *param, *oldpath = path; char altpath[256]; - int unit; + int unit = 0; const void *romvec; if(!path) { @@ -41,18 +34,15 @@ fword("get-package-property"); if (!POP()) { path = pop_fstr_copy(); - unit = 0; } else { switch (boot_device) { case 'a': path = strdup("/obio/SUNW,fdtwo"); oldpath = "fd()"; - unit = 0; break; case 'c': path = strdup("disk"); oldpath = "sd(0,0,0):d"; - unit = 0; break; default: case 'd': @@ -66,7 +56,6 @@ case 'n': path = strdup("net"); oldpath = "le()"; - unit = 0; break; } } @@ -78,14 +67,14 @@ obp_arg.boot_dev[0] = oldpath[0]; obp_arg.boot_dev[1] = oldpath[1]; obp_arg.argv[0] = oldpath; - obp_arg.argv[1] = cmdline; + obp_arg.argv[1] = (void *)(long)qemu_cmdline; param = strchr(path, ' '); if(param) { *param = '\0'; param++; } else if (cmdline_size) { - param = (char *)cmdline; + param = (char *)qemu_cmdline; } else { push_str("boot-args"); push_str("/options"); @@ -100,7 +89,7 @@ romvec = init_openprom(qemu_mem_size); if (kernel_size) { - int (*entry)(const void *romvec, int p2, int p3, int p4, int p5); + int (*entry)(const void *romvec_ptr, int p2, int p3, int p4, int p5); printk("[sparc] Kernel already loaded\n"); entry = (void *) kernel_image; @@ -108,7 +97,7 @@ } printk("[sparc] Booting file '%s' ", path); - if(param) + if (param) printk("with parameters '%s'\n", param); else printk("without parameters.\n"); Modified: openbios-devel/arch/sparc32/boot.h =================================================================== --- openbios-devel/arch/sparc32/boot.h 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/boot.h 2008-07-07 18:35:51 UTC (rev 189) @@ -15,3 +15,16 @@ const void *romvec); unsigned int start_elf(unsigned long entry_point, unsigned long param); + +void *init_openprom(unsigned long memsize); +void boot(void); + +extern struct sys_info sys_info; +extern uint32_t kernel_image; +extern uint32_t kernel_size; +extern uint32_t qemu_cmdline; +extern uint32_t cmdline_size; +extern char boot_device; +extern unsigned int qemu_mem_size; +extern struct linux_arguments_v0 obp_arg; +extern int qemu_machine_type; Modified: openbios-devel/arch/sparc32/build.xml =================================================================== --- openbios-devel/arch/sparc32/build.xml 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/build.xml 2008-07-07 18:35:51 UTC (rev 189) @@ -21,7 +21,7 @@ <object source="loadfs.c"/> <object source="romvec.c"/> </library> - + <executable name="target/arch/sparc32/entry.o" target="target"> <rule><![CDATA[ $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/sparc32/entry.S @@ -53,7 +53,7 @@ </executable>  - + <executable name="target/include/static-dict.h" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule><![CDATA[ @echo "static const char forth_dictionary[] = {" > $@ @@ -63,14 +63,14 @@ ]]></rule> <external-object source="openbios-sparc32.dict"/> </executable> - + <executable name="target/arch/sparc32/builtin.o" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule><![CDATA[ $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/sparc32/builtin.c ]]></rule> <external-object source="target/include/static-dict.h"/> </executable> - +  <executable name="openbios-builtin.elf" target="target" condition="IMAGE_ELF_EMBEDDED"> @@ -91,5 +91,5 @@ <external-object source="libfs.a"/> <external-object source="libgcc.a"/> </executable> - + </build> Modified: openbios-devel/arch/sparc32/console.c =================================================================== --- openbios-devel/arch/sparc32/console.c 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/console.c 2008-07-07 18:35:51 UTC (rev 189) @@ -7,6 +7,7 @@ #include "openbios/config.h" #include "openbios/kernel.h" +#include "openbios/drivers.h" #include "openbios.h" #ifdef CONFIG_DEBUG_CONSOLE @@ -148,13 +149,13 @@ int rb, w, h, depth; } osi_fb_info_t; -int TCX_GetFBInfo( osi_fb_info_t *fb ) +static int TCX_GetFBInfo( osi_fb_info_t *fb ) { fb->w = 1024; fb->h = 768; fb->depth = 8; fb->rb = 1024; - fb->mphys = vmem; + fb->mphys = (unsigned long)vmem; return 0; } Modified: openbios-devel/arch/sparc32/context.c =================================================================== --- openbios-devel/arch/sparc32/context.c 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/context.c 2008-07-07 18:35:51 UTC (rev 189) @@ -6,6 +6,8 @@ #include "openbios/config.h" #include "openbios/kernel.h" #include "context.h" +#include "sys_info.h" +#include "boot.h" #define MAIN_STACK_SIZE 16384 #define IMAGE_STACK_SIZE 4096 @@ -16,7 +18,7 @@ void __exit_context(void); /* assembly routine */ /* - * Main context structure + * Main context structure * It is placed at the bottom of our stack, and loaded by assembly routine * to start us up. */ @@ -93,7 +95,7 @@ } /* Start ELF Boot image */ -uint32_t start_elf(uint32_t entry_point, uint32_t param) +unsigned int start_elf(unsigned long entry_point, unsigned long param) { struct context *ctx; Modified: openbios-devel/arch/sparc32/elfload.c =================================================================== --- openbios-devel/arch/sparc32/elfload.c 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/elfload.c 2008-07-07 18:35:51 UTC (rev 189) @@ -11,10 +11,10 @@ #include "sys_info.h" #include "ipchecksum.h" #include "loadfs.h" +#include "boot.h" #define printf printk #define debug printk -extern unsigned int start_elf(unsigned long entry_point, unsigned long param); #define addr_fixup(addr) ((addr) & 0x00ffffff) static char *image_name, *image_version; @@ -92,7 +92,7 @@ continue; buf = malloc(phdr[i].p_filesz); file_seek(offset + phdr[i].p_offset); - if (lfile_read(buf, phdr[i].p_filesz) != phdr[i].p_filesz) { + if ((uint32_t)lfile_read(buf, phdr[i].p_filesz) != phdr[i].p_filesz) { printf("Can't read note segment\n"); goto out; } @@ -150,14 +150,14 @@ i, addr_fixup(phdr[i].p_paddr), phdr[i].p_filesz, phdr[i].p_memsz); file_seek(offset + phdr[i].p_offset); debug("loading... "); - if (lfile_read(phys_to_virt(addr_fixup(phdr[i].p_paddr)), phdr[i].p_filesz) + if ((uint32_t)lfile_read(phys_to_virt(addr_fixup(phdr[i].p_paddr)), phdr[i].p_filesz) != phdr[i].p_filesz) { printf("Can't read program segment %d\n", i); return 0; } bytes += phdr[i].p_filesz; debug("clearing... "); - memset(phys_to_virt(addr_fixup(phdr[i].p_paddr) + phdr[i].p_filesz), 0, + memset(phys_to_virt(addr_fixup(phdr[i].p_paddr) + phdr[i].p_filesz), 0, phdr[i].p_memsz - phdr[i].p_filesz); if (phdr[i].p_offset <= checksum_offset && phdr[i].p_offset + phdr[i].p_filesz >= checksum_offset+2) { @@ -352,7 +352,7 @@ phdr_size = ehdr.e_phnum * sizeof *phdr; phdr = malloc(phdr_size); file_seek(offset + ehdr.e_phoff); - if (lfile_read(phdr, phdr_size) != phdr_size) { + if ((uint32_t)lfile_read(phdr, phdr_size) != phdr_size) { printf("Can't read program header\n"); goto out; } @@ -369,7 +369,7 @@ if (!load_segments(phdr, ehdr.e_phnum, checksum_offset, offset)) goto out; - + if (checksum_offset) { if (!verify_image(&ehdr, phdr, ehdr.e_phnum, checksum)) goto out; @@ -384,7 +384,7 @@ #if 1 { - int (*entry)(const void *romvec, int p2, int p3, int p4, int p5); + int (*entry)(const void *romvec_ptr, int p2, int p3, int p4, int p5); entry = (void *) addr_fixup(ehdr.e_entry); image_retval = entry(romvec, 0, 0, 0, 0); Modified: openbios-devel/arch/sparc32/entry.S =================================================================== --- openbios-devel/arch/sparc32/entry.S 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/entry.S 2008-07-07 18:35:51 UTC (rev 189) @@ -120,7 +120,7 @@ lduba [%g1] ASI_M_CTL, %g2 cmp %g2, 'U' bne ss2 - + ! Ok, this is SS-10 or SS-600MP set PHYS_SS10_EEPROM + SPARC_MACHINE_ID, %g1 lduba [%g1] ASI_M_CTL, %g2 @@ -359,7 +359,7 @@ set qemu_mem_size, %g1 st %g6, [%g1] - + sll %g7, 4, %g7 ! Store va->pa conversion factor set _start - 0x1000, %g1 sub %g1, %g7, %g7 @@ -369,7 +369,7 @@ set qemu_machine_type, %g1 mov %y, %g2 st %g2, [%g1] - + /* Finally, turn on traps so that we can call c-code. */ rd %psr, %g3 wr %g3, 0x0, %psr Modified: openbios-devel/arch/sparc32/forthload.c =================================================================== --- openbios-devel/arch/sparc32/forthload.c 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/forthload.c 2008-07-07 18:35:51 UTC (rev 189) @@ -38,10 +38,10 @@ } forthsize = file_size(); - + forthtext = malloc(forthsize+1); file_seek(0); - + printk("Loading forth source ..."); if ((unsigned long)lfile_read(forthtext, forthsize) != forthsize) { printk("Can't read forth text\n"); Modified: openbios-devel/arch/sparc32/init.fs =================================================================== --- openbios-devel/arch/sparc32/init.fs 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/init.fs 2008-07-07 18:35:51 UTC (rev 189) @@ -1,4 +1,4 @@ -:noname +:noname ." Type 'help' for detailed information" cr \ ." boot secondary slave cdrom: " cr \ ." 0 > boot hd:2,\boot\vmlinuz root=/dev/hda2" cr @@ -16,7 +16,7 @@ : preopen ( chosen-str node-path ) 2dup make-openable - + " /chosen" find-device open-dev ?dup if encode-int 2swap property @@ -24,7 +24,7 @@ 2drop then ; - + :noname set-defaults ; PREPOST-initializer @@ -45,11 +45,11 @@ " /builtin/console" " output-device" $setenv then ; SYSTEM-initializer - + :noname " keyboard" input ; CONSOLE-IN-initializer - + device-end : rmap@ ( virt -- rmentry ) Modified: openbios-devel/arch/sparc32/ldscript =================================================================== --- openbios-devel/arch/sparc32/ldscript 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/ldscript 2008-07-07 18:35:51 UTC (rev 189) @@ -20,7 +20,7 @@ { . = BASE_ADDR; - /* Start of the program. + /* Start of the program. * Now the version string is in the note, we must include it * in the program. Otherwise we lose the string after relocation. */ _start = .; Modified: openbios-devel/arch/sparc32/lib.c =================================================================== --- openbios-devel/arch/sparc32/lib.c 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/lib.c 2008-07-07 18:35:51 UTC (rev 189) @@ -15,7 +15,7 @@ #include "openbios/kernel.h" /* Format a string and print it on the screen, just like the libc - * function printf. + * function printf. */ int printk( const char *fmt, ... ) { @@ -92,12 +92,13 @@ if (size > ALLOC_BLOCK) alloc_size = size; // Recover possible leftover - if (ofmem.left > sizeof(alloc_desc_t) + 4) { - alloc_desc_t *d; + if ((size_t)ofmem.left > sizeof(alloc_desc_t) + 4) { + alloc_desc_t *d_leftover; - d = (alloc_desc_t*)ofmem.next_malloc; - d->size = ofmem.left - sizeof(alloc_desc_t); - free((unsigned long)d + sizeof(alloc_desc_t)); + d_leftover = (alloc_desc_t*)ofmem.next_malloc; + d_leftover->size = ofmem.left - sizeof(alloc_desc_t); + free((void *)((unsigned long)d_leftover + + sizeof(alloc_desc_t))); } ofmem.next_malloc = mem_alloc(&cmem, alloc_size, 4); Modified: openbios-devel/arch/sparc32/linux_load.c =================================================================== --- openbios-devel/arch/sparc32/linux_load.c 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/linux_load.c 2008-07-07 18:35:51 UTC (rev 189) @@ -14,6 +14,7 @@ #include "sys_info.h" #include "context.h" #include "loadfs.h" +#include "boot.h" #define printf printk #define debug printk @@ -424,7 +425,7 @@ #endif printf("Loading kernel... "); - if (lfile_read(phys_to_virt(kern_addr), kern_size) != kern_size) { + if ((uint32_t)lfile_read(phys_to_virt(kern_addr), kern_size) != kern_size) { printf("Can't read kernel\n"); return 0; } @@ -462,7 +463,7 @@ max = hdr->initrd_addr_max; else max = 0x38000000; /* Hardcoded value for older kernels */ - + /* FILO itself is at the top of RAM. (relocated) * So, try putting initrd just below us. */ end = virt_to_phys(_start); @@ -497,7 +498,7 @@ } printf("Loading initrd... "); - if (lfile_read(phys_to_virt(start), size) != size) { + if ((uint32_t)lfile_read(phys_to_virt(start), size) != size) { printf("Can't read initrd\n"); return -1; } @@ -518,9 +519,9 @@ outb(0, 0xf0); outb(0, 0xf1); - /* we're getting screwed again and again by this problem of the 8259. - * so we're going to leave this lying around for inclusion into - * crt0.S on an as-needed basis. + /* we're getting screwed again and again by this problem of the 8259. + * so we're going to leave this lying around for inclusion into + * crt0.S on an as-needed basis. * * well, that went ok, I hope. Now we have to reprogram the interrupts :-( * we put them right after the intel-reserved hardware interrupts, at @@ -568,7 +569,7 @@ params->orig_x = cursor_x; params->orig_y = cursor_y; #endif - + /* Go... */ ctx = switch_to(ctx); Modified: openbios-devel/arch/sparc32/loadfs.c =================================================================== --- openbios-devel/arch/sparc32/loadfs.c 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/loadfs.c 2008-07-07 18:35:51 UTC (rev 189) @@ -15,7 +15,7 @@ void file_close(void) { - if(load_fd==-1) + if(load_fd==-1) return; close_io(load_fd); Modified: openbios-devel/arch/sparc32/loadfs.h =================================================================== --- openbios-devel/arch/sparc32/loadfs.h 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/loadfs.h 2008-07-07 18:35:51 UTC (rev 189) @@ -2,6 +2,4 @@ int lfile_read(void *buf, unsigned long len); int file_seek(unsigned long offset); unsigned long file_size(void); - - - +void file_close(void); Modified: openbios-devel/arch/sparc32/multiboot.c =================================================================== --- openbios-devel/arch/sparc32/multiboot.c 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/multiboot.c 2008-07-07 18:35:51 UTC (rev 189) @@ -1,6 +1,6 @@ /* Support for Multiboot */ -#include "openbios/config.h" +#include "openbios/config.h" #include "asm/io.h" #include "sys_info.h" #include "multiboot.h" @@ -9,7 +9,7 @@ #ifdef CONFIG_DEBUG_BOOT #define debug printk #else -#define debug(x...) +#define debug(x...) #endif struct mbheader { @@ -62,11 +62,11 @@ printf("Multiboot: no dictionary\n"); return; } - + mod = (module_t *) mbinfo->mods_addr; info->dict_start=(unsigned long *)mod->mod_start; info->dict_end=(unsigned long *)mod->mod_end; - + if (mbinfo->flags & MULTIBOOT_MMAP_VALID) { /* convert mmap records */ mbmem = phys_to_virt(mbinfo->mmap_addr); Modified: openbios-devel/arch/sparc32/multiboot.h =================================================================== --- openbios-devel/arch/sparc32/multiboot.h 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/multiboot.h 2008-07-07 18:35:51 UTC (rev 189) @@ -1,5 +1,5 @@ -/* multiboot.h - * tag: header for multiboot +/* multiboot.h + * tag: header for multiboot * * Copyright (C) 2003-2004 Stefan Reinauer * Modified: openbios-devel/arch/sparc32/openbios.c =================================================================== --- openbios-devel/arch/sparc32/openbios.c 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/openbios.c 2008-07-07 18:35:51 UTC (rev 189) @@ -13,14 +13,11 @@ #include "dict.h" #include "openbios/kernel.h" #include "openbios/stack.h" +#include "openbios/nvram.h" #include "sys_info.h" #include "openbios.h" +#include "boot.h" -void boot(void); -void ob_ide_init(void); -void tcx_init(uint64_t base); -void kbd_init(uint64_t base); - int qemu_machine_type; struct hwdef { @@ -97,7 +94,7 @@ { /* push start and end of available memory to the stack - * so that the forth word QUIT can initialize memory + * so that the forth word QUIT can initialize memory * management. For now we use hardcoded memory between * 0x10000 and 0x9ffff (576k). If we need more memory * than that we have serious bloat. @@ -133,8 +130,6 @@ int openbios(void) { - extern struct sys_info sys_info; - extern struct mem cmem; unsigned int i; for (i = 0; i < sizeof(hwdefs) / sizeof(struct hwdef); i++) { @@ -164,10 +159,10 @@ #endif collect_sys_info(&sys_info); - + dict=intdict; load_dictionary((char *)sys_info.dict_start, - (unsigned long)sys_info.dict_end + (unsigned long)sys_info.dict_end - (unsigned long)sys_info.dict_start); #ifdef CONFIG_DEBUG_BOOT @@ -183,7 +178,7 @@ PUSH_xt( bind_noname_func(arch_init) ); fword("PREPOST-initializer"); - + PC = (ucell)findword("initialize-of"); if (!PC) { Modified: openbios-devel/arch/sparc32/openbios.h =================================================================== --- openbios-devel/arch/sparc32/openbios.h 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/openbios.h 2008-07-07 18:35:51 UTC (rev 189) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2004/01/15 16:14:05 samuel> * Time-stamp: <2004/01/15 16:14:05 samuel> - * + * * <openbios.h> - * - * - * + * + * + * * Copyright (C) 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 - * + * */ #ifndef _H_OPENBIOS Modified: openbios-devel/arch/sparc32/openprom.h =================================================================== --- openbios-devel/arch/sparc32/openprom.h 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/openprom.h 2008-07-07 18:35:51 UTC (rev 189) @@ -205,7 +205,7 @@ /* Ranges and reg properties are a bit different for PCI. */ struct linux_prom_pci_registers { - /* + /* * We don't know what information this field contain. * We guess, PCI device function is in bits 15:8 * So, ... Modified: openbios-devel/arch/sparc32/romvec.c =================================================================== --- openbios-devel/arch/sparc32/romvec.c 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/romvec.c 2008-07-07 18:35:51 UTC (rev 189) @@ -14,8 +14,11 @@ #include "libc/vsprintf.h" #include "openbios/config.h" #include "openbios/bindings.h" +#include "openbios/drivers.h" #include "openbios/kernel.h" #include "openbios/sysinclude.h" +#include "sys_info.h" +#include "boot.h" #ifdef CONFIG_DEBUG_OBP #define DPRINTF(fmt, args...) \ @@ -178,7 +181,7 @@ int i; DPRINTF("obp_getprop(0x%x, %s) = ", node, name); for (i = 0; i < len; i++) { - DPRINTF("%02x%s", str[i] & 0xFF, + DPRINTF("%02x%s", str[i] & 0xFF, (len == 4 || i == len-1) ? "" : " "); } DPRINTF("\n"); @@ -210,7 +213,7 @@ } else { int len; char *str; - + len = POP(); str = (char *) POP(); @@ -437,7 +440,7 @@ // ROM. if (va == NULL) { - va = next_free_address - size; + va = (char *)(next_free_address - size); next_free_address -= size; DPRINTF("obp_dumb_memalloc req null -> 0x%x\n", va); } @@ -447,9 +450,6 @@ return va; } -extern int start_cpu(unsigned int pc, unsigned int context_ptr, - unsigned int context, int cpu); - static int obp_cpustart(__attribute__((unused))unsigned int whichcpu, __attribute__((unused))int ctxtbl_ptr, __attribute__((unused))int thiscontext, @@ -497,7 +497,7 @@ // don't get a stack underrun. // // FIXME: find out why solaris doesnt put its stuff on the stack - // + // fword("0"); fword("0"); Modified: openbios-devel/arch/sparc32/switch.S =================================================================== --- openbios-devel/arch/sparc32/switch.S 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/switch.S 2008-07-07 18:35:51 UTC (rev 189) @@ -14,7 +14,7 @@ * switches the stack, and restores everything from the new stack. * This function takes no argument. New stack pointer is * taken from global variable __context, and old stack pointer - * is also saved to __context. This way we can just jump to + * is also saved to __context. This way we can just jump to * this routine to get back to the original context. */ @@ -104,7 +104,7 @@ ld [%g1 + 116], %i5 ld [%g1 + 120], %i6 ld [%g1 + 124], %i7 - + ld [%g1 + 128], %g1 /* Finally, load new %pc */ jmp %g1 Modified: openbios-devel/arch/sparc32/sys_info.c =================================================================== --- openbios-devel/arch/sparc32/sys_info.c 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/sys_info.c 2008-07-07 18:35:51 UTC (rev 189) @@ -8,7 +8,7 @@ #ifdef CONFIG_DEBUG_BOOT #define debug printk #else -#define debug(x...) +#define debug(x...) #endif unsigned int qemu_mem_size; Modified: openbios-devel/arch/sparc32/tree.fs =================================================================== --- openbios-devel/arch/sparc32/tree.fs 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/tree.fs 2008-07-07 18:35:51 UTC (rev 189) @@ -5,7 +5,7 @@ " sun4m" encode-string " compatible" property h# 0a21fe80 encode-int " clock-frequency" property - + : encode-unit encode-unit-sbus ; : decode-unit decode-unit-sbus ; Modified: openbios-devel/arch/sparc32/vectors.S =================================================================== --- openbios-devel/arch/sparc32/vectors.S 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/vectors.S 2008-07-07 18:35:51 UTC (rev 189) @@ -4,7 +4,7 @@ * Sparc V9 Trap Table(s) with SpitFire/Cheetah extensions. * * Copyright (C) 1996, 2001 David S. Miller (davem(a)caip.rutgers.edu) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 as published by the Free Software Foundation. @@ -13,7 +13,7 @@ * 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 this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, Modified: openbios-devel/arch/sparc32/wof.S =================================================================== --- openbios-devel/arch/sparc32/wof.S 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/wof.S 2008-07-07 18:35:51 UTC (rev 189) @@ -3,7 +3,7 @@ * because we have no user windows. * * Copyright (C) 1995 David S. Miller (davem(a)caip.rutgers.edu) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 as published by the Free Software Foundation. @@ -12,7 +12,7 @@ * 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 this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, @@ -96,7 +96,7 @@ * nop */ - .globl spill_window_entry + .globl spill_window_entry .globl spnwin_patch1, spnwin_patch2 spill_window_entry: /* LOCATION: Trap Window */ Modified: openbios-devel/arch/sparc32/wuf.S =================================================================== --- openbios-devel/arch/sparc32/wuf.S 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/wuf.S 2008-07-07 18:35:51 UTC (rev 189) @@ -11,7 +11,7 @@ * 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 this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, Modified: openbios-devel/drivers/esp.c =================================================================== --- openbios-devel/drivers/esp.c 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/drivers/esp.c 2008-07-07 18:35:51 UTC (rev 189) @@ -1,6 +1,6 @@ /* * OpenBIOS ESP driver - * + * * Copyright (C) 2004 Jens Axboe <axboe(a)suse.de> * Copyright (C) 2005 Stefan Reinauer <stepan(a)openbios.org> * @@ -122,7 +122,7 @@ if ((status & ESP_STAT_TCNT) != ESP_STAT_TCNT || (status & ESP_STAT_PMASK) == ESP_STATP) return status; - + // Get reply // Set DMA address esp->espdma.regs->st_addr = esp->buffer_dvma; @@ -211,7 +211,7 @@ } sd->present = 1; sd->media = esp->buffer[0]; - + switch (sd->media) { case TYPE_DISK: media = "disk"; @@ -271,7 +271,7 @@ phandle_t ph; fword("my-unit"); - id = POP(); + id = POP(); //POP(); // unit id is 2 ints but we only need one. *sd = &global_esp->sd[id]; @@ -463,7 +463,7 @@ // Chip reset esp->ll->regs[ESP_CMD] = ESP_CMD_RC; - + DPRINTF("ESP at 0x%lx, buffer va 0x%lx dva 0x%lx\n", (unsigned long)esp, (unsigned long)esp->buffer, (unsigned long)esp->buffer_dvma); DPRINTF("done\n"); Modified: openbios-devel/drivers/iommu.c =================================================================== --- openbios-devel/drivers/iommu.c 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/drivers/iommu.c 2008-07-07 18:35:51 UTC (rev 189) @@ -92,7 +92,7 @@ pa = va2pa((unsigned long)t->curp) + (align - 1); pa &= ~(align - 1); p = (char *)pa2va(pa); - + if ((unsigned long)p >= (unsigned long)t->uplim || (unsigned long)p + size > (unsigned long)t->uplim) return 0; Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/drivers/obio.c 2008-07-07 18:35:51 UTC (rev 189) @@ -1,9 +1,9 @@ /* * OpenBIOS Sparc OBIO driver - * + * * (C) 2004 Stefan Reinauer <stepan(a)openbios.org> * (C) 2005 Ed Schouten <ed(a)fxq.nl> - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 @@ -19,6 +19,7 @@ #include "openbios/drivers.h" #include "openbios/nvram.h" #include "obio.h" +#define cpu_to_be16(x) __cpu_to_be16(x) #include "openbios/firmware_abi.h" #define REGISTER_NAMED_NODE( name, path ) do { \ @@ -50,7 +51,7 @@ * mapped memory. */ #define OBIO_CMDLINE_MAX 256 -char obio_cmdline[OBIO_CMDLINE_MAX]; +static char obio_cmdline[OBIO_CMDLINE_MAX]; /* DECLARE data structures for the nodes. */ DECLARE_UNNAMED_NODE( ob_obio, INSTALL_OPEN, sizeof(int) ); @@ -171,12 +172,9 @@ } } -int keyboard_dataready(void); -unsigned char keyboard_readdata(void); - /* ( addr len -- actual ) */ static void -zs_read_keyboard(unsigned long *address) +zs_read_keyboard(void) { unsigned char *addr; int len; @@ -314,7 +312,7 @@ push_str("width"); fword("property"); - regs = map_reg(ECC_BASE, 0, ECC_SIZE, 1, ECC_BASE >> 32); + regs = (uint32_t *)map_reg(ECC_BASE, 0, ECC_SIZE, 1, ECC_BASE >> 32); version = regs[0]; switch (version) { @@ -723,7 +721,7 @@ { extern uint32_t kernel_image; extern uint32_t kernel_size; - extern uint32_t cmdline; + extern uint32_t qemu_cmdline; extern uint32_t cmdline_size; extern char boot_device; extern char obp_stdin, obp_stdout; @@ -735,7 +733,7 @@ char nographic; uint32_t size; unsigned int machine_id; - struct cpudef *cpu; + const struct cpudef *cpu; ohwcfg_v3_t *header; ob_new_obio_device("eeprom", NULL); @@ -746,7 +744,7 @@ fword("encode-int"); push_str("address"); fword("property"); - + memcpy(&nv_info, nvram, sizeof(nv_info)); machine_id = (unsigned int)nvram[0x1fd9] & 0xff; printk("Nvram id %s, version %d, machine id 0x%2.2x\n", @@ -763,9 +761,9 @@ size = nv_info.cmdline_size; if (size > OBIO_CMDLINE_MAX - 1) size = OBIO_CMDLINE_MAX - 1; - memcpy(obio_cmdline, nv_info.cmdline, size); + memcpy(&obio_cmdline, (void *)(long)nv_info.cmdline, size); obio_cmdline[size] = '\0'; - cmdline = obio_cmdline; + qemu_cmdline = (uint32_t) &obio_cmdline; cmdline_size = size; header = (ohwcfg_v3_t *)nvram; header->kernel_image = 0; @@ -785,7 +783,7 @@ // Add /idprom push_str("/"); fword("find-device"); - + PUSH((long)&nvram[NVRAM_IDPROM]); PUSH(32); fword("encode-bytes"); @@ -940,7 +938,7 @@ fword("encode-int"); push_str("ecache-associativity"); fword("property"); - + PUSH(2); fword("encode-int"); push_str("ncaches"); @@ -973,7 +971,7 @@ fword("encode-int"); push_str("mid"); fword("property"); - + cpu->initfn(); fword("finish-device"); @@ -1055,7 +1053,7 @@ { ob_new_obio_device("power", NULL); - power_reg = ob_reg(base, offset, AUXIO2_REGS, 1); + power_reg = (void *)ob_reg(base, offset, AUXIO2_REGS, 1); // Not in device tree reset_reg = map_io(base + (uint64_t)SLAVIO_RESET, RESET_REGS); @@ -1187,7 +1185,7 @@ if (!cpu) return -1; - sparc_header = &nvram[header->nvram_arch_ptr]; + sparc_header = (struct sparc_arch_cfg *)&nvram[header->nvram_arch_ptr]; sparc_header->smp_entry = pc; sparc_header->smp_ctxtbl = context_ptr; sparc_header->smp_ctx = context; Modified: openbios-devel/drivers/pgtsrmmu.h =================================================================== --- openbios-devel/drivers/pgtsrmmu.h 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/drivers/pgtsrmmu.h 2008-07-07 18:35:51 UTC (rev 189) @@ -218,7 +218,7 @@ srmmu_get_pte (unsigned long addr) { register unsigned long entry; - + __asm__ __volatile__("\n\tlda [%1] %2,%0\n\t" : "=r" (entry): "r" ((addr & 0xfffff000) | 0x400), "i" (ASI_M_FLUSH_PROBE)); Modified: openbios-devel/drivers/sbus.c =================================================================== --- openbios-devel/drivers/sbus.c 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/drivers/sbus.c 2008-07-07 18:35:51 UTC (rev 189) @@ -1,9 +1,9 @@ /* * OpenBIOS SBus driver - * + * * (C) 2004 Stefan Reinauer <stepan(a)openbios.org> * (C) 2005 Ed Schouten <ed(a)fxq.nl> - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 @@ -57,8 +57,7 @@ } static void -ob_le_init(unsigned int slot, unsigned long base, unsigned long leoffset, - unsigned long dmaoffset) +ob_le_init(unsigned int slot, unsigned long leoffset, unsigned long dmaoffset) { push_str("/iommu/sbus/ledma"); fword("find-device"); @@ -90,7 +89,7 @@ uint16_t graphic_depth; static void -ob_tcx_init(unsigned int slot, unsigned long base) +ob_tcx_init(unsigned int slot) { push_str("/iommu/sbus/SUNW,tcx"); fword("find-device"); @@ -305,7 +304,7 @@ } static void -ob_cs4231_init(unsigned int slot, unsigned long base) +ob_cs4231_init(unsigned int slot) { push_str("/iommu/sbus"); fword("find-device"); @@ -362,7 +361,7 @@ #endif // NCR 92C990, Am7990, Lance. See http://www.amd.com - ob_le_init(slot, base, offset + 0x00c00000, offset + 0x00400010); + ob_le_init(slot, offset + 0x00c00000, offset + 0x00400010); // Parallel port //ob_bpp_init(base); @@ -374,11 +373,11 @@ // OpenBIOS and Qemu don't know how to do Sbus probing switch(slot) { case 3: // SUNW,tcx - ob_tcx_init(slot, base); + ob_tcx_init(slot); break; case 4: // SUNW,CS4231 - ob_cs4231_init(slot, base); + ob_cs4231_init(slot); // Power management (APC) ob_apc_init(slot, APC_OFFSET); break; @@ -396,7 +395,7 @@ // OpenBIOS and Qemu don't know how to do Sbus probing switch(slot) { case 2: // SUNW,tcx - ob_tcx_init(slot, base); + ob_tcx_init(slot); break; case 0xf: // le, esp, bpp, power-management ob_macio_init(slot, base, 0); @@ -414,14 +413,14 @@ // OpenBIOS and Qemu don't know how to do Sbus probing switch(slot) { case 2: // SUNW,tcx - ob_tcx_init(slot, base); + ob_tcx_init(slot); break; case 0xf: // le, esp, bpp, power-management #ifdef CONFIG_DRIVER_ESP ob_esp_init(slot, base, SS600MP_ESP, SS600MP_ESPDMA); #endif // NCR 92C990, Am7990, Lance. See http://www.amd.com - ob_le_init(slot, base, 0x00060000, SS600MP_LEBUFFER); + ob_le_init(slot, 0x00060000, SS600MP_LEBUFFER); // Power management (APC) XXX should not exist ob_apc_init(slot, APC_OFFSET); break; @@ -431,20 +430,20 @@ } static void -ob_sbus_open(int *idx) +ob_sbus_open(void) { int ret=1; RET ( -ret ); } static void -ob_sbus_close(int *idx) +ob_sbus_close(void) { selfword("close-deblocker"); } static void -ob_sbus_initialize(int *idx) +ob_sbus_initialize(void) { } @@ -505,7 +504,7 @@ } static int -ob_sbus_init_ss5(uint64_t base) +ob_sbus_init_ss5(void) { unsigned int slot; int notfirst = 0; @@ -526,7 +525,7 @@ } static int -ob_sbus_init_ss10(uint64_t base) +ob_sbus_init_ss10(void) { unsigned int slot; int notfirst = 0; @@ -547,7 +546,7 @@ } static int -ob_sbus_init_ss600mp(uint64_t base) +ob_sbus_init_ss600mp(void) { unsigned int slot; int notfirst = 0; @@ -573,11 +572,11 @@ switch (machine_id) { case 0x71: - return ob_sbus_init_ss600mp(base); + return ob_sbus_init_ss600mp(); case 0x72: - return ob_sbus_init_ss10(base); + return ob_sbus_init_ss10(); case 0x80: - return ob_sbus_init_ss5(base); + return ob_sbus_init_ss5(); default: return -1; } Modified: openbios-devel/include/openbios/drivers.h =================================================================== --- openbios-devel/include/openbios/drivers.h 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/include/openbios/drivers.h 2008-07-07 18:35:51 UTC (rev 189) @@ -16,7 +16,14 @@ #endif #ifdef CONFIG_DRIVER_SBUS int ob_sbus_init(uint64_t base, int machine_id); +void tcx_init(uint64_t base); +void kbd_init(uint64_t base); +int keyboard_dataready(void); +unsigned char keyboard_readdata(void); +#ifdef CONFIG_DEBUG_CONSOLE_VIDEO +void init_video(void); #endif +#endif #ifdef CONFIG_DRIVER_IDE int ob_ide_init(void); #endif @@ -28,5 +35,10 @@ int ob_obio_init(uint64_t slavio_base, unsigned long fd_offset, unsigned long counter_offset, unsigned long intr_offset, unsigned long aux1_offset, unsigned long aux2_offset); +int start_cpu(unsigned int pc, unsigned int context_ptr, unsigned int context, + int cpu); +extern struct mem cmem; #endif - +#ifdef CONFIG_DRIVER_FLOPPY +int ob_floppy_init(void); +#endif

1 0