Hi
This does the job (I hope) mentioned in the TODO file for the files
user/plugins/loader/bin.c
user/plugins/loader/kernel.c
user/plugins/misc/replay.c
There is still bios/rombios.c and user/plugins/loader/hack-linux.c, but
that patch is probably too big to post to the list (especially as it is
so trivial): >2500 lines. If this stuff is OK shall I send the other
direct to [EMAIL PROTECTED]?
Regards
Warwick
Index: user/plugins/loader/bin.c
===================================================================
RCS file: /cvsroot-plex86/plex86/user/plugins/loader/bin.c,v
retrieving revision 1.2
diff -u -r1.2 bin.c
--- user/plugins/loader/bin.c 2000/10/26 18:24:51 1.2
+++ user/plugins/loader/bin.c 2000/12/22 19:33:54
@@ -167,7 +167,7 @@
#define BUFF_SIZE 4096
Bit8u buffer[BUFF_SIZE];
- // read in ROM BIOS image file
+ /* read in ROM BIOS image file */
fd = open(path, O_RDONLY
#ifdef O_BINARY
| O_BINARY
@@ -208,7 +208,7 @@
path, (unsigned) stat_buf.st_size, (unsigned) paddr_orig);
return page_size;
-// +++ fix this wierdness
+/* +++ fix this wierdness */
}
/************************************************************************/
Index: user/plugins/loader/kernel.c
===================================================================
RCS file: /cvsroot-plex86/plex86/user/plugins/loader/kernel.c,v
retrieving revision 1.1
diff -u -r1.1 kernel.c
--- user/plugins/loader/kernel.c 2000/08/13 20:51:01 1.1
+++ user/plugins/loader/kernel.c 2000/12/22 19:33:55
@@ -52,18 +52,18 @@
bios_plugin = plugin;
- // Get the file= parameter
+ /* Get the file= parameter */
i = 0;
if ( !argv[i] || strncmp(argv[i], FILE_PARAM, strlen(FILE_PARAM)) )
goto usage;
filename_p = &argv[i][strlen(FILE_PARAM)];
i++;
- // ============================
- // Get the [address=] parameter
- // ============================
+ /********************************/
+ /* Get the [address=] parameter */
+ /********************************/
if ( !argv[i] || strncmp(argv[i], ADDRESS_PARAM, strlen(ADDRESS_PARAM)) ) {
- address = -1; // not given, assign max val as flag
+ address = -1; /* not given, assign max val as flag */
}
else {
address_p = &argv[i][strlen(ADDRESS_PARAM)];
@@ -71,18 +71,18 @@
i++;
}
- // ==========================
- // Get the [stack=] parameter
- // ==========================
+ /******************************/
+ /* Get the [stack=] parameter */
+ /******************************/
if ( !argv[i] || strncmp(argv[i], STACK_PARAM, strlen(STACK_PARAM)) )
goto usage;
stack_p = &argv[i][strlen(STACK_PARAM)];
stack = strtoul(stack_p, NULL, 0);
i++;
- // ===================================
- // Get the [rd=address:path] parameter
- // ===================================
+ /***************************************/
+ /* Get the [rd=address:path] parameter */
+ /***************************************/
if ( (i>=argc) || !argv[i] || strncmp(argv[i], RD_PARAM, strlen(RD_PARAM)) )
{
rd_address = 0xffffffff;
@@ -108,9 +108,9 @@
i++;
}
- // ===========================
- // Get the [hack=os] parameter
- // ===========================
+ /*******************************/
+ /* Get the [hack=os] parameter */
+ /*******************************/
hack_linux = 0;
if ( (i>=argc) || !argv[i] || strncmp(argv[i], HACK_PARAM, strlen(HACK_PARAM)) )
{
Index: user/plugins/misc/replay.c
===================================================================
RCS file: /cvsroot-plex86/plex86/user/plugins/misc/replay.c,v
retrieving revision 1.2
diff -u -r1.2 replay.c
--- user/plugins/misc/replay.c 2000/08/13 20:25:20 1.2
+++ user/plugins/misc/replay.c 2000/12/22 19:33:55
@@ -49,7 +49,7 @@
if (argc != 1)
goto usage;
- // Get the file= parameter
+ /* Get the file= parameter */
if ( !argv[0] || strncmp(argv[0], FILE_PARAM, strlen(FILE_PARAM)) )
goto usage;
filename_p = &argv[0][strlen(FILE_PARAM)];
--
Warwick Duncan | Catalysis Research Unit
[EMAIL PROTECTED] | Department of Chemical Engineering
[EMAIL PROTECTED] | University of Cape Town
Phone: +27 21 650-3721 | South Africa
