opcodes2c.pl: Add command line options

[emu8051.git] / src / common / options.c

diff --git a/src/common/options.c b/src/common/options.c
index ba0a9fa..c3d91d1 100644 (file)
--- a/src/common/options.c
+++ b/src/common/options.c
@@ -3,17 +3,13 @@
  *
  * Copyright (C) 2011 Hugo Villeneuve <hugo@hugovil.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This file is released under the GPLv2
  */
 
 #if HAVE_CONFIG_H
 #  include "config.h"
 #endif
 
-#include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <argp.h>
@@ -46,6 +42,7 @@ static const char args_doc[] = "[FILENAME]";
 /* The options we understand. */
 static struct argp_option argp_options[] = {
        {"debug", 'd', "level", 0,  "Produce debugging output", 0},
+       {"geometry",  'g', "pos",  0,  "Set geometry", 0},
        {"pram",  'p', "size",  0,  "Set program memory size", 0},
        {"xram",  'x', "size",  0,
         "Set external ram size (default is 1024)", 0},
@@ -62,7 +59,7 @@ decode_debug_option(char *arg, struct argp_state *state)
        char *endptr;
        int log_level;
 
-       log_level = strtol(arg, &endptr, 0);
+       log_level = (int) strtol(arg, &endptr, 0);
 
        if (*endptr != '\0') {
                log_err("Invalid log level");
@@ -90,13 +87,13 @@ decode_memory_size(char *arg, struct argp_state *state, int memid)
        else if (memid == EXT_MEM_ID)
                dest = &options.xram_size;
        else
-               exit(1); /* Programming error. */
+               exit(EXIT_FAILURE); /* Programming error. */
 
        /*
         * Sizes versus max memory sizes will be checked when calling
         * memory_init().
         */
-       *dest = strtol(arg, &endptr, 0);
+       *dest = (int) strtol(arg, &endptr, 0);
 
        if (*endptr != '\0') {
                log_err("Invalid memory size");
@@ -109,7 +106,7 @@ decode_address(char *arg, struct argp_state *state, uint16_t *dest)
 {
        char *endptr;
 
-       *dest = strtol(arg, &endptr, 0);
+       *dest = (uint16_t) strtol(arg, &endptr, 0);
 
        if (*endptr != '\0') {
                log_err("Invalid address");
@@ -125,6 +122,9 @@ parse_opt(int key, char *arg, struct argp_state *state)
        case 'd':
                decode_debug_option(arg, state);
                break;
+       case 'g':
+               options.g = arg;
+               break;
        case 'i':
                decode_memory_size(arg, state, INT_MEM_ID);
                break;
@@ -166,8 +166,11 @@ static struct argp argp = {argp_options, parse_opt, args_doc, str_doc,
 void
 parse_command_line_options(int argc, char *argv[])
 {
+       error_t rc;
+
        /* Setting default values. */
        options.filename = NULL;
+       options.g = NULL;
        options.pram_size = PGM_MEM_DEFAULT_SIZE;
        options.iram_size = INT_MEM_MAX_SIZE;
        options.xram_size = EXT_MEM_DEFAULT_SIZE;
@@ -175,5 +178,7 @@ parse_command_line_options(int argc, char *argv[])
        options.stop_address = 0; /* 0 means stop address is disabled. */
 
        /* Parse our arguments. */
-       argp_parse(&argp, argc, argv, 0, 0, NULL);
+       rc = argp_parse(&argp, argc, argv, 0, 0, NULL);
+       if (rc != 0)
+               log_fail("Failure to parse command line arguments");
 }