summaryrefslogtreecommitdiff
path: root/s51
diff options
context:
space:
mode:
Diffstat (limited to 's51')
-rw-r--r--s51/commands7
-rw-r--r--s51/s51-command.c29
-rw-r--r--s51/s51-main.c5
-rw-r--r--s51/s51-parse.c5
-rw-r--r--s51/s51.14
5 files changed, 23 insertions, 27 deletions
diff --git a/s51/commands b/s51/commands
index 77a98493..aba65cd0 100644
--- a/s51/commands
+++ b/s51/commands
@@ -47,15 +47,14 @@ Load a file
Execution control:
run <start> - run starting at <start>
- run <start> <stop> - set temporary bp at <stop>
+ run <start> <stop> - set temporary bp at <stop>
run - continue
next - step over calls(?)
step - step one instruction
-
+
reset - reset the simulator
res - synonym?
-
+
Error messages:
start with "Error:"
-
diff --git a/s51/s51-command.c b/s51/s51-command.c
index 02ecdddd..4f803060 100644
--- a/s51/s51-command.c
+++ b/s51/s51-command.c
@@ -73,7 +73,7 @@ static void
dump_bytes(uint8_t *memory, int length, uint16_t start, char *format)
{
int group, i;
-
+
for (group = 0; group < length; group += 8) {
s51_printf(format, start + group);
for (i = group; i < length && i < group + 8; i++)
@@ -97,7 +97,7 @@ command_di (int argc, char **argv)
uint8_t memory[65536];
uint8_t status;
int length;
-
+
if (argc != 3)
return command_error;
if (parse_uint16(argv[1], &start) != command_success)
@@ -117,7 +117,7 @@ command_ds (int argc, char **argv)
uint8_t memory[0x100];
uint8_t status;
int length;
-
+
if (argc != 3)
return command_error;
if (parse_uint8(argv[1], &start) != command_success)
@@ -137,7 +137,7 @@ command_dx (int argc, char **argv)
uint8_t memory[65536];
uint8_t status;
int length;
-
+
if (argc != 3)
return command_error;
if (parse_uint16(argv[1], &start) != command_success)
@@ -171,7 +171,7 @@ command_set (int argc, char **argv)
for (i = 0; i < len; i++)
if (parse_uint8(argv[i+3], &data[i]) != command_success)
return command_error;
-
+
if (strcmp(argv[1], "xram") == 0) {
ccdbg_write_memory(s51_dbg, address, data, len);
} else if (strcmp(argv[1], "iram") == 0) {
@@ -205,7 +205,7 @@ command_file (int argc, char **argv)
struct hex_file *hex;
struct hex_image *image;
FILE *file;
-
+
if (argc != 2)
return command_error;
file = fopen (argv[1], "r");
@@ -257,7 +257,7 @@ static void
disable_breakpoint(int b)
{
uint8_t status;
-
+
status = ccdbg_set_hw_brkpnt(s51_dbg, b, 0, breakpoints[b].address);
if (status != 0x00 && status != 0xff)
s51_printf("disable_breakpoint status 0x%02x\n", status);
@@ -267,7 +267,7 @@ static void
enable_breakpoint(int b)
{
uint8_t status;
-
+
status = ccdbg_set_hw_brkpnt(s51_dbg, b, 1, breakpoints[b].address);
if (status != 0xff)
s51_printf("enable_breakpoint status 0x%02x\n", status);
@@ -434,7 +434,7 @@ command_run (int argc, char **argv)
uint16_t pc;
uint8_t status;
int b;
-
+
if (argv[1]) {
result = parse_uint16(argv[1], &start);
if (result != command_success)
@@ -497,7 +497,7 @@ command_load (int argc, char **argv)
FILE *file;
struct hex_file *hex;
struct hex_image *image;
-
+
if (!filename)
return command_error;
file = fopen(filename, "r");
@@ -599,7 +599,7 @@ info_breakpoints(int argc, char **argv)
}
return command_success;
}
-
+
}
static enum command_result
@@ -610,7 +610,7 @@ static struct command_function infos[] = {
"List current breakpoints\n" },
{ "help", "?", info_help, "help",
"Print this list\n" },
-
+
{ NULL, NULL, NULL, NULL, NULL },
};
@@ -624,7 +624,7 @@ enum command_result
command_info(int argc, char **argv)
{
struct command_function *func;
-
+
if (argc < 2)
return command_error;
func = command_string_to_function(infos, argv[1]);
@@ -644,7 +644,7 @@ cc_wait(void)
return command_success;
}
if (s51_interrupted || s51_check_input()) {
-
+
ccdbg_halt(s51_dbg);
status = ccdbg_read_status(s51_dbg);
cc_stopped(status);
@@ -652,4 +652,3 @@ cc_wait(void)
}
}
}
-
diff --git a/s51/s51-main.c b/s51/s51-main.c
index 46b97b0c..4dbd4c60 100644
--- a/s51/s51-main.c
+++ b/s51/s51-main.c
@@ -137,7 +137,7 @@ main(int argc, char **argv)
for (;;) {
struct sockaddr_in client_addr;
socklen_t client_len = sizeof (struct sockaddr_in);
-
+
s = accept(l, (struct sockaddr *)
&client_addr, &client_len);
if (s < 0) {
@@ -233,8 +233,7 @@ s51_check_input(void)
if (r > 0) {
char line[256];
(void) s51_read_line(line, sizeof (line));
- return 1;
+ return 1;
}
return 0;
}
-
diff --git a/s51/s51-parse.c b/s51/s51-parse.c
index aba45485..170c979d 100644
--- a/s51/s51-parse.c
+++ b/s51/s51-parse.c
@@ -112,7 +112,7 @@ command_string_to_function(struct command_function *functions, char *name)
!strcmp(name, functions[i].alias))
return &functions[i];
return NULL;
-}
+}
enum command_result
command_function_help(struct command_function *functions, int argc, char **argv)
@@ -176,7 +176,7 @@ command_help(int argc, char **argv)
{
return command_function_help(functions, argc, argv);
}
-
+
void
command_syntax_error(int argc, char **argv)
{
@@ -239,4 +239,3 @@ command_read (void)
ccdbg_close(s51_dbg);
s51_printf("...\n");
}
-
diff --git a/s51/s51.1 b/s51/s51.1
index c283950e..f2f59a52 100644
--- a/s51/s51.1
+++ b/s51/s51.1
@@ -151,14 +151,14 @@ List the things you can get info on.
This doesn't do anything and is present only to retain compatibility with
the original 8051 emulator.
.SH "BOARD BRINGUP DEBUGGING"
-.PP
+.PP
While the original purpose for this program was to connect the source
debugger with the hardware, it can also be used as a low-level hex debugger
all on its own. In particular, all of the cc1111 peripherals can be
manipulated directly from the s51 command line.
.IP "Starting s51"
If the CP2103 is plugged in, and the CC1111 is connected correctly, the
-\'s51\' command itself should connect to the device without trouble.
+\'s51\' command itself should connect to the device without trouble.
Note that the CP2103 must have the GPIO pins configured correctly as well.
.IP
$ s51