ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/mon/src/mon.cpp
(Generate patch)

Comparing mon/src/mon.cpp (file contents):
Revision 1.1.1.1 by cebix, 1999-10-04T19:31:09Z vs.
Revision 1.10 by cebix, 2000-09-25T12:44:31Z

# Line 1 | Line 1
1   /*
2 < *  mon.cpp - Machine language monitor
2 > *  mon.cpp - mon main program
3   *
4 < *  (C) 1997-1999 Christian Bauer
4 > *  mon (C) 1997-2000 Christian Bauer, Marc Hellwig
5 > *
6 > *  This program is free software; you can redistribute it and/or modify
7 > *  it under the terms of the GNU General Public License as published by
8 > *  the Free Software Foundation; either version 2 of the License, or
9 > *  (at your option) any later version.
10 > *
11 > *  This program is distributed in the hope that it will be useful,
12 > *  but WITHOUT ANY WARRANTY; without even the implied warranty of
13 > *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14 > *  GNU General Public License for more details.
15 > *
16 > *  You should have received a copy of the GNU General Public License
17 > *  along with this program; if not, write to the Free Software
18 > *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
19   */
20  
21 < #include <sys/types.h>
22 < #include <netinet/in.h>
21 > #include "sysdeps.h"
22 >
23   #include <stdio.h>
24   #include <stdlib.h>
11 #include <string.h>
25   #include <signal.h>
26   #include <ctype.h>
14 #include <unistd.h>
15 #include <errno.h>
27  
28 + #if defined(HAVE_READLINE_H)
29 + extern "C" {
30 + #include <readline.h>
31 + }
32 + #elif defined(HAVE_READLINE_READLINE_H)
33   extern "C" {
34 < extern char *readline(char *prompt);
19 < extern void add_history(char *str);
34 > #include <readline/readline.h>
35   }
36 + #endif
37 +
38 + #if defined(HAVE_HISTORY_H)
39 + extern "C" {
40 + #include <history.h>
41 + }
42 + #elif defined(HAVE_READLINE_HISTORY_H)
43 + extern "C" {
44 + #include <readline/history.h>
45 + }
46 + #endif
47  
48   #include "mon.h"
49   #include "mon_cmd.h"
50  
51 + #ifndef VERSION
52 + #define VERSION "2"
53 + #endif
54 +
55  
56   // Buffer we're operating on
57   bool mon_use_real_mem = false;
# Line 177 | Line 207 | bool mon_aborted(void)
207   *  Access to buffer
208   */
209  
210 < uint32 mon_read_byte(uint32 adr)
210 > uint32 (*mon_read_byte)(uint32 adr);
211 >
212 > uint32 mon_read_byte_buffer(uint32 adr)
213   {
214 <        if (mon_use_real_mem)
183 <                return *(uint8 *)adr;
184 <        else
185 <                return mem[adr % mon_mem_size];
214 >        return mem[adr % mon_mem_size];
215   }
216  
217 < void mon_write_byte(uint32 adr, uint32 b)
217 > uint32 mon_read_byte_real(uint32 adr)
218   {
219 <        if (mon_use_real_mem)
220 <                *(uint8 *)adr = b;
221 <        else
222 <                mem[adr % mon_mem_size] = b;
219 >        return *(uint8 *)adr;
220 > }
221 >
222 > void (*mon_write_byte)(uint32 adr, uint32 b);
223 >
224 > void mon_write_byte_buffer(uint32 adr, uint32 b)
225 > {
226 >        mem[adr % mon_mem_size] = b;
227 > }
228 >
229 > void mon_write_byte_real(uint32 adr, uint32 b)
230 > {
231 >        *(uint8 *)adr = b;
232   }
233  
234   uint32 mon_read_half(uint32 adr)
235   {
236 <        if (mon_use_real_mem)
199 <                return ntohs(*(uint16 *)adr);
200 <        else
201 <                return mem[adr % mon_mem_size] << 8 | mem[(adr+1) % mon_mem_size];
236 >        return (mon_read_byte(adr) << 8) | mon_read_byte(adr+1);
237   }
238  
239   void mon_write_half(uint32 adr, uint32 w)
240   {
241 <        if (mon_use_real_mem)
242 <                *(uint16 *)adr = htons(w);
208 <        else {
209 <                mem[adr % mon_mem_size] = w >> 8;
210 <                mem[(adr+1) % mon_mem_size] = w;
211 <        }
241 >        mon_write_byte(adr, w >> 8);
242 >        mon_write_byte(adr+1, w);
243   }
244  
245   uint32 mon_read_word(uint32 adr)
246   {
247 <        if (mon_use_real_mem)
217 <                return ntohl(*(uint32 *)adr);
218 <        else
219 <                return mon_read_byte(adr) << 24 | mon_read_byte(adr+1) << 16 | mon_read_byte(adr+2) << 8 | mon_read_byte(adr+3);
247 >        return (mon_read_byte(adr) << 24) | (mon_read_byte(adr+1) << 16) | (mon_read_byte(adr+2) << 8) | mon_read_byte(adr+3);
248   }
249  
250   void mon_write_word(uint32 adr, uint32 l)
251   {
252 <        if (mon_use_real_mem)
253 <                *(uint32 *)adr = htonl(l);
254 <        else {
255 <                mem[adr % mon_mem_size] = l >> 24;
228 <                mem[(adr+1) % mon_mem_size] = l >> 16;
229 <                mem[(adr+2) % mon_mem_size] = l >> 8;
230 <                mem[(adr+3) % mon_mem_size] = l;
231 <        }
252 >        mon_write_byte(adr, l >> 24);
253 >        mon_write_byte(adr+1, l >> 16);
254 >        mon_write_byte(adr+2, l >> 8);
255 >        mon_write_byte(adr+3, l);
256   }
257  
258  
# Line 238 | Line 262 | void mon_write_word(uint32 adr, uint32 l
262  
263   static void read_line(char *prompt)
264   {
265 + #ifdef HAVE_LIBREADLINE
266          static char *line_read = NULL;
267  
268          if (line_read) {
# Line 252 | Line 277 | static void read_line(char *prompt)
277  
278          strncpy(in_ptr = input, line_read, INPUT_LENGTH);
279          input[INPUT_LENGTH-1] = 0;
280 + #else
281 +        fprintf(monout, prompt);
282 +        fflush(monout);
283 +        fgets(in_ptr = input, INPUT_LENGTH, monin);
284 +        char *s = strchr(input, '\n');
285 +        if (s != NULL)
286 +                *s = 0;
287 + #endif
288   }
289  
290  
# Line 809 | Line 842 | static void set_var(void)
842                          fprintf(monout, "No variables defined\n");
843                  else
844                          for (Variable *v=first_var; v; v=v->next)
845 <                                fprintf(monout, "%s = %08lx\n", v->name, v->value);
845 >                                fprintf(monout, "%s = %08x\n", v->name, v->value);
846  
847          } else if (mon_token == T_NAME) {
848                  char var_name[256];
# Line 902 | Line 935 | static void reallocate(void)
935          }
936  
937          if (mon_token == T_END) {
938 <                fprintf(monerr, "Buffer size: %08lx bytes\n", mon_mem_size);
938 >                fprintf(monerr, "Buffer size: %08x bytes\n", mon_mem_size);
939                  return;
940          }
941  
# Line 914 | Line 947 | static void reallocate(void)
947          }
948  
949          if ((mem = (uint8 *)realloc(mem, size)) != NULL)
950 <                fprintf(monerr, "Buffer size: %08lx bytes\n", mon_mem_size = size);
950 >                fprintf(monerr, "Buffer size: %08x bytes\n", mon_mem_size = size);
951          else
952                  fprintf(monerr, "Unable to reallocate buffer\n");
953   }
# Line 956 | Line 989 | static void apply(int size)
989                          read_func = mon_read_word;
990                          write_func = mon_write_word;
991                          break;
992 +                default:
993 +                        abort();
994 +                        break;
995          }
996  
997          while (adr<=end_adr) {
# Line 1038 | Line 1074 | void mon_init(void)
1074          mon_add_command("@", reallocate,                        "@ [size]                 Reallocate buffer\n");
1075          mon_add_command("i", ascii_dump,                        "i [start [end]]          ASCII memory dump\n");
1076          mon_add_command("m", memory_dump,                       "m [start [end]]          Hex/ASCII memory dump\n");
1077 +        mon_add_command("b", binary_dump,                       "b [start [end]]          Binary memory dump\n");
1078          mon_add_command("d", disassemble_ppc,           "d [start [end]]          Disassemble PowerPC code\n");
1079          mon_add_command("d65", disassemble_6502,        "d65 [start [end]]        Disassemble 6502 code\n");
1080          mon_add_command("d68", disassemble_680x0,       "d68 [start [end]]        Disassemble 680x0 code\n");
# Line 1063 | Line 1100 | void mon_init(void)
1100          mon_add_command("]", save_data,                         "] start size \"file\"      Save data to file\n");
1101          mon_add_command("set", set_var,                         "set [var[=value]]        Set/clear/show variables\n");
1102          mon_add_command("cv", clear_vars,                       "cv                       Clear all variables\n");
1103 +
1104 +        mon_read_byte = NULL;
1105 +        mon_write_byte = NULL;
1106   }
1107  
1108  
# Line 1108 | Line 1148 | void mon(int argc, char **argv)
1148                  interactive = (argc == 0);
1149          }
1150  
1151 +        // Set up memory access functions if not supplied by the user
1152 +        if (mon_read_byte == NULL) {
1153 +                if (mon_use_real_mem)
1154 +                        mon_read_byte = mon_read_byte_real;
1155 +                else
1156 +                        mon_read_byte = mon_read_byte_buffer;
1157 +        }
1158 +        if (mon_write_byte == NULL) {
1159 +                if (mon_use_real_mem)
1160 +                        mon_write_byte = mon_write_byte_real;
1161 +                else
1162 +                        mon_write_byte = mon_write_byte_buffer;
1163 +        }
1164 +
1165          // Allocate buffer
1166          if (!mon_use_real_mem) {
1167                  mon_mem_size = 0x100000;
# Line 1115 | Line 1169 | void mon(int argc, char **argv)
1169  
1170                  // Print banner
1171                  if (interactive)
1172 <                        fprintf(monerr, "\n *** mon V%d.%d by Christian Bauer ***\n"
1173 <                                                        " ***      Press 'h' for help     ***\n\n", MON_VERSION, MON_REVISION);
1172 >                        fprintf(monerr, "\n *** mon V" VERSION " by Christian Bauer and Marc Hellwig ***\n"
1173 >                                                        " ***              Press 'h' for help              ***\n\n");
1174          }
1175  
1176          init_abort();
# Line 1125 | Line 1179 | void mon(int argc, char **argv)
1179          while (!done) {
1180                  if (interactive) {
1181                          char prompt[16];
1182 <                        sprintf(prompt, "[%08lx]-> ", mon_dot_address);
1182 >                        sprintf(prompt, "[%08x]-> ", mon_dot_address);
1183                          read_line(prompt);
1184                  } else {
1185                          if (argc == 0) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines