--- trunk/src/main.c	2007/10/08 16:21:43	37
+++ trunk/src/main.c	2007/10/08 16:21:53	38
@@ -25,7 +25,7 @@
  *  SUCH DAMAGE.
  *
  *
- *  $Id: main.c,v 1.293 2007/02/05 16:49:05 debug Exp $
+ *  $Id: main.c,v 1.296 2007/03/31 15:11:26 debug Exp $
  */
 
 #include <stdio.h>
@@ -46,6 +46,10 @@
 #include "settings.h"
 #include "timer.h"
 
+#ifdef TEST_NATIVE_X86
+#include "native_x86.h"
+#endif
+
 
 extern volatile int single_step;
 extern int force_debugger_at_exit;
@@ -244,8 +248,8 @@
 	    " file)\n");
 	printf("                s      SCSI\n");
 	printf("                t      tape\n");
+	printf("                V      add an overlay\n");
 	printf("                0-7    force a specific ID\n");
-	printf("  -G port   listen to gdb remote connections on this port\n");
 	printf("  -I hz     set the main cpu frequency to hz (not used by "
 	    "all combinations\n            of machines and guest OSes)\n");
 	printf("  -i        display each instruction as it is executed\n");
@@ -366,7 +370,7 @@
 #ifdef UNSTABLE_DEVEL
 	    "bB"
 #endif
-	    "C:c:Dd:E:e:G:HhI:iJj:k:KM:Nn:Oo:p:QqRrSs:TtU"
+	    "C:c:Dd:E:e:HhI:iJj:k:KM:Nn:Oo:p:QqRrSs:TtU"
 #ifdef UNSTABLE_DEVEL
 	    "u:"
 #endif
@@ -438,17 +442,6 @@
 			subtype = optarg;
 			msopts = 1;
 			break;
-		case 'G':
-			m->gdb.port = atoi(optarg);
-			if (m->gdb.port < 1 || m->gdb.port > 65535) {
-				fprintf(stderr, "Invalid debugger port %i.\n",
-				    m->gdb.port);
-				exit(1);
-			}
-			/*  Note: implicit -V  */
-			single_step = ENTER_SINGLE_STEPPING;
-			msopts = 1;
-			break;
 		case 'H':
 			machine_list_available_types_and_cpus();
 			exit(1);
@@ -747,6 +740,10 @@
 	int i;
 
 
+/*
+ *  Experimental profil() code, which works on my laptop.
+ *  Don't use it for anything else.
+ */
 #ifdef USE_PROFIL
 	uint16_t samples[0x100000];
 	memset(samples, 0, sizeof(samples));
@@ -758,6 +755,13 @@
 #endif
 
 
+/*  Experimental test code:  */
+#ifdef TEST_NATIVE_X86
+	test_native_x86();
+#endif
+
+
+
 	progname = argv[0];