X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Foptions.c;h=39efd5727400013491cc94113921913e2a6a4c1d;hb=5905b40585298defb8e4230adfe90dfbccb465b9;hp=3c292d461f3219e2bd25c09a55e5fc2a52672f1a;hpb=593009d28f70be7e5deebc7a44c16e85c2574422;p=emu8051.git

diff --git a/src/options.c b/src/options.c
index 3c292d4..39efd57 100644
--- a/src/options.c
+++ b/src/options.c
@@ -46,6 +46,7 @@ static const char args_doc[] = "[FILENAME]";
 static struct argp_option argp_options[] = {
 	{"debug", 'd', "level", 0,  "Produce debugging output" },
 	{"iram",  'i', "size",  0,  "Set internal ram size" },
+	{"pram",  'p', "size",  0,  "Set program memory size" },
 	{"xram",  'x', "size",  0,  "Set external ram size (default is 1024)" },
 	{ 0 }
 };
@@ -67,16 +68,16 @@ decode_debug_option(char *arg, struct argp_state *state)
 	log_level = strtol(arg, &endptr, 0);
 
 	if (*endptr != '\0') {
-		log_fail_no_exit("Invalid log level");
+		log_err("Invalid log level");
 		argp_usage(state);
 	}
 
 	if (log_level > LOG_LEVEL_DEBUG) {
-		log_fail_no_exit("Invalid log level");
+		log_err("Invalid log level (0 to 3)");
 		argp_usage(state);
 	}
 
-	log_set_level(log_level);
+	options.log = log_level;
 }
 
 static void
@@ -85,7 +86,9 @@ decode_memory_size(char *arg, struct argp_state *state, int memid)
 	char *endptr;
 	int *dest;
 
-	if (memid == INT_MEM_ID)
+	if (memid == PGM_MEM_ID)
+		dest = &options.pram_size;
+	else if (memid == INT_MEM_ID)
 		dest = &options.iram_size;
 	else if (memid == EXT_MEM_ID)
 		dest = &options.xram_size;
@@ -99,7 +102,7 @@ decode_memory_size(char *arg, struct argp_state *state, int memid)
 	*dest = strtol(arg, &endptr, 0);
 
 	if (*endptr != '\0') {
-		log_fail_no_exit("Invalid memory size");
+		log_err("Invalid memory size");
 		argp_usage(state);
 	}
 }
@@ -115,6 +118,9 @@ parse_opt(int key, char *arg, struct argp_state *state)
 	case 'i':
 		decode_memory_size(arg, state, INT_MEM_ID);
 		break;
+	case 'p':
+		decode_memory_size(arg, state, PGM_MEM_ID);
+		break;
 	case 'x':
 		decode_memory_size(arg, state, EXT_MEM_ID);
 		break;
@@ -151,8 +157,10 @@ parse_command_line_options(int argc, char *argv[])
 
 	/* Setting default values. */
 	options.filename = NULL;
+	options.pram_size = PGM_MEM_DEFAULT_SIZE;
 	options.iram_size = INT_MEM_MAX_SIZE;
 	options.xram_size = EXT_MEM_DEFAULT_SIZE;
+	options.log = LOG_LEVEL_ERR;
 
 	/* Parse our arguments. */
 	argp_parse(&argp, argc, argv, 0, 0, NULL);