Menu
▾
▴
[cadcdev-svn-commits] [SCM] branch master updated. v2.0.0-451-g324daa5
|
From: Lawrence S. <ljs...@us...> - 2020-09-08 03:06:07
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "A pseudo Operating System for the Dreamcast.".
The branch, master has been updated
via 324daa5daf2fcb7c8292c343541624fdd891c042 (commit)
from 5c80a7620356fbcff0542632668435746bf94ed2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 324daa5daf2fcb7c8292c343541624fdd891c042
Author: Lawrence Sebald <ljs...@us...>
Date: Mon Sep 7 23:05:32 2020 -0400
Add binary building to the naomi bin tool.
-----------------------------------------------------------------------
Summary of changes:
utils/naomibintool/naomibintool.c | 280 +++++++++++++++++++++++++++++++++++++-
1 file changed, 279 insertions(+), 1 deletion(-)
diff --git a/utils/naomibintool/naomibintool.c b/utils/naomibintool/naomibintool.c
index b321c57..c86338a 100644
--- a/utils/naomibintool/naomibintool.c
+++ b/utils/naomibintool/naomibintool.c
@@ -12,6 +12,7 @@
#include <stdint.h>
#include <stddef.h>
#include <inttypes.h>
+#include <unistd.h>
#define NAOMI_REGION_JAPAN 0
#define NAOMI_REGION_USA 1
@@ -19,6 +20,12 @@
#define NAOMI_REGION_KOREA 3
#define NAOMI_REGION_AUSTRALIA 4
+#define DEFAULT_PLATFORM "NAOMI "
+#define DEFAULT_DEVELOPER "Anonymous Developer "
+#define DEFAULT_TITLE "Homebrew Application "
+#define DEFAULT_SEQ1 "CREDIT TO START "
+#define DEFAULT_SEQ2 "CREDIT TO CONTINUE "
+
typedef struct naomi_segment {
uint32_t rom_offset;
uint32_t ram_offset;
@@ -119,7 +126,22 @@ static void print_entries(const naomi_hdr_t *hdr) {
void usage(const char *progname) {
printf("Usage: %s oper filename [args]\n\n", progname);
printf("Where oper is one of the following:\n"
- " read -- Reads the header binary and prints out information.\n");
+ " read -- Reads the ROM header and prints out information.\n"
+ " build -- Builds a ROM from the specified arguments.\n\n"
+ "Arguments for the build operation:\n"
+ " -p name - Specify the platform for the rom\n"
+ " (default: \"NAOMI\").\n"
+ " -d name - Specify the developer of the rom.\n"
+ " -t name[:regn] - Specify the title of the rom for a the given\n"
+ " region number. If no number is given, the\n"
+ " title is used for all regions.\n"
+ " -b file[:addr] - Specify a binary to pack into rom, and\n"
+ " optionally the address to load to. The default\n"
+ " address is 0x8c020000.\n"
+ " -s addr - Specify the entry point address\n"
+ " (default: 0x8c020000).\n"
+ "Note: Currently only one bin can be packed into a rom.\n"
+ "This will be fixed in a future version of this tool.\n");
}
int read_header(int argc, char *argv[]) {
@@ -157,6 +179,259 @@ int read_header(int argc, char *argv[]) {
return 0;
}
+static long get_filesize(FILE *fp) {
+ long len;
+
+ if(fseek(fp, 0, SEEK_END) < 0) {
+ perror("Cannot read binary");
+ return EXIT_FAILURE;
+ }
+
+ len = ftell(fp);
+
+ if(fseek(fp, 0, SEEK_SET) < 0) {
+ perror("Cannot read binary");
+ return EXIT_FAILURE;
+ }
+
+ return len;
+}
+
+#define BUF_SIZE 4096
+static uint8_t buf[BUF_SIZE];
+
+static int write_rom_bin(naomi_hdr_t *hdr, const char fn[], FILE *bin) {
+ FILE *fp;
+ size_t sz, sz2;
+
+ if(!(fp = fopen(fn, "wb"))) {
+ perror("Cannot open file for writing");
+ return EXIT_FAILURE;
+ }
+
+ if(fwrite(hdr, sizeof(naomi_hdr_t), 1, fp) != 1) {
+ perror("Cannot write file");
+ fclose(fp);
+ return EXIT_FAILURE;
+ }
+
+ if(fseek(fp, 0x1000, SEEK_SET) < 0) {
+ perror("Cannot write file");
+ fclose(fp);
+ return EXIT_FAILURE;
+ }
+
+ do {
+ sz = fread(buf, 1, BUF_SIZE, bin);
+ if(!sz) {
+ if(ferror(bin)) {
+ perror("Cannot read binary");
+ fclose(fp);
+ return EXIT_FAILURE;
+ }
+ }
+ else {
+ sz2 = fwrite(buf, 1, sz, fp);
+ if(!sz2) {
+ perror("Cannot write file");
+ fclose(fp);
+ return EXIT_FAILURE;
+ }
+ }
+ } while(sz);
+
+ fclose(fp);
+
+ printf("Successfully wrote rom file.\n");
+ return 0;
+}
+
+int build_rom(int argc, char *argv[]) {
+ char *argv2[argc - 2];
+ int i, j, k;
+ naomi_hdr_t hdr;
+ char *tmp, *tmp2;
+ FILE *binfile = NULL;
+
+ /* Clear the header and set some reasonable defaults... */
+ memset(&hdr, 0, sizeof(naomi_hdr_t));
+ memcpy(hdr.signature, DEFAULT_PLATFORM, 16);
+ memcpy(hdr.developer, DEFAULT_DEVELOPER, 32);
+ for(i = 0; i < 8; ++i) {
+ memcpy(hdr.region_title[i], DEFAULT_TITLE, 32);
+ }
+
+ hdr.mfg_year = 1999;
+ hdr.mfg_month = 9;
+ hdr.mfg_day = 9;
+
+ hdr.serial_number[0] = hdr.serial_number[1] = hdr.serial_number[2] =
+ hdr.serial_number[3] = 'X';
+
+ memcpy(hdr.sequence_text[0], DEFAULT_SEQ1, 32);
+ memcpy(hdr.sequence_text[1], DEFAULT_SEQ2, 32);
+
+ hdr.entry = 0x8c020000;
+ hdr.test_entry = 0x8c020000;
+ hdr.segment[0].rom_offset = 0x1000;
+ hdr.segment[0].ram_offset = 0x8c020000;
+ hdr.segment[1].rom_offset = 0xFFFFFFFF;
+ hdr.test_segment[0].rom_offset = 0x1000;
+ hdr.test_segment[0].ram_offset = 0x8c020000;
+ hdr.test_segment[1].rom_offset = 0xFFFFFFFF;
+ hdr.supported_regions = 0xFF;
+ memset(hdr.padding, 0xFF, 71);
+ hdr.encrypted = 0xFF;
+
+ /* Shift off the "build" command and the filename. */
+ argv2[0] = argv[0];
+ for(i = 3; i < argc; ++i) {
+ argv2[i - 2] = argv[i];
+ }
+
+ /* Parse arguments. */
+ while((i = getopt(argc - 2, argv2, "p:d:t:b:s:")) != -1) {
+ switch(i) {
+ case 'p':
+ j = strlen(optarg);
+ if(j > 16) {
+ fprintf(stderr, "Invalid platform name: '%s'\n", optarg);
+ goto err;
+ }
+
+ memcpy(hdr.signature, optarg, j);
+ while(j < 16)
+ hdr.signature[j++] = ' ';
+ break;
+
+ case 'd':
+ j = strlen(optarg);
+ if(j > 32) {
+ fprintf(stderr, "Invalid developer name: '%s'\n", optarg);
+ goto err;
+ }
+
+ memcpy(hdr.developer, optarg, j);
+ while(j < 32)
+ hdr.developer[j++] = ' ';
+ break;
+
+ case 't':
+ /* Do we have a region number? */
+ tmp = strdup(optarg);
+ k = -1;
+
+ if((tmp2 = strchr(tmp, ':'))) {
+ *tmp2++ = 0;
+ errno = 0;
+ k = (int)strtol(tmp2, NULL, 10);
+
+ if(errno || k < 0 || k > 7) {
+ fprintf(stderr, "Invalid region number: '%s'\n", tmp2);
+ free(tmp);
+ goto err;
+ }
+ }
+
+ j = strlen(tmp);
+ if(j > 32) {
+ fprintf(stderr, "Invalid title: '%s'\n", tmp);
+ free(tmp);
+ goto err;
+ }
+
+ if(k != -1) {
+ memcpy(hdr.region_title[k], tmp, j);
+ while(j < 32)
+ hdr.region_title[k][j++] = ' ';
+ }
+ else {
+ memcpy(hdr.region_title[0], tmp, j);
+ while(j < 32)
+ hdr.region_title[0][j++] = ' ';
+
+ for(k = 1; k < 8; ++k) {
+ memcpy(hdr.region_title[k], hdr.region_title[0], 32);
+ }
+ }
+
+ free(tmp);
+ break;
+
+ case 's':
+ errno = 0;
+ hdr.entry = (uint32_t)strtoul(optarg, NULL, 16);
+
+ if(errno) {
+ fprintf(stderr, "Invalid entry point: '%s'", optarg);
+ goto err;
+ }
+
+ hdr.test_entry = hdr.entry;
+ break;
+
+ case 'b':
+ if(binfile) {
+ fprintf(stderr, "Cannot load multiple binaries!\n");
+ goto err;
+ }
+
+ /* Do we have a load address? */
+ tmp = strdup(optarg);
+ if((tmp2 = strchr(tmp, ':'))) {
+ *tmp2 = 0;
+ errno = 0;
+ hdr.segment[0].ram_offset =
+ (uint32_t)strtoul(tmp2, NULL, 16);
+ hdr.test_segment[0].ram_offset = hdr.segment[0].ram_offset;
+
+ if(errno) {
+ fprintf(stderr, "Invalid load address: '%s'\n", tmp2);
+ free(tmp);
+ return EXIT_FAILURE;
+ }
+ }
+
+ binfile = fopen(tmp, "rb");
+ free(tmp);
+ if(!binfile) {
+ perror("Cannot open binary");
+ return EXIT_FAILURE;
+ }
+
+ hdr.segment[0].size = (uint32_t)get_filesize(binfile);
+ hdr.test_segment[0].size = hdr.segment[0].size;
+ break;
+
+ case '?':
+ fprintf(stderr, "Unrecognized option: '-%c'\n", optopt);
+ goto err;
+
+ case ':':
+ fprintf(stderr, "Option -%c requires an argument\n", optopt);
+ goto err;
+ }
+ }
+
+ /* Did we get a binary? */
+ if(!binfile) {
+ fprintf(stderr, "You must specify a binary to pack into the rom!\n");
+ return EXIT_FAILURE;
+ }
+
+ /* Write out our binary... */
+ i = write_rom_bin(&hdr, argv[2], binfile);
+ fclose(binfile);
+
+ return i;
+
+err:
+ if(binfile)
+ fclose(binfile);
+
+ return EXIT_FAILURE;
+}
+
int main(int argc, char *argv[]) {
if(argc < 3) {
usage(argv[0]);
@@ -166,6 +441,9 @@ int main(int argc, char *argv[]) {
if(!strcmp(argv[1], "read")) {
return read_header(argc, argv);
}
+ else if(!strcmp(argv[1], "build")) {
+ return build_rom(argc, argv);
+ }
usage(argv[0]);
return EXIT_FAILURE;
hooks/post-receive
--
A pseudo Operating System for the Dreamcast.
|
