#include "language.h"
#include "gdb_string.h"
-/* FIXME: While this conflicts with the enum defined in breakpoint.h,
- I used them to be consistant with how breakpoints, tracepoints, and
- displays are implemented. It doesn't lose now because breakpoint.h
- is not included. */
-enum enable
-{
- disabled,
- enabled
-};
-
const struct mem_attrib default_mem_attrib =
{
MEM_RW, /* mode */
new->lo = lo;
new->hi = hi;
new->number = ++mem_number;
- new->status = enabled;
+ new->enabled_p = 1;
new->attrib = *attrib;
/* link in new node */
for (m = mem_region_chain; m; m = m->next)
{
- if (m->status == enabled)
+ if (m->enabled_p == 1)
{
if (addr >= m->lo && addr < m->hi)
return m;
return;
}
- printf_filtered ("Memory regions now in effect:\n");
+ printf_filtered ("Num ");
+ printf_filtered ("Enb ");
+ printf_filtered ("Low Addr ");
+ if (TARGET_ADDR_BIT > 32)
+ printf_filtered (" ");
+ printf_filtered ("High Addr ");
+ if (TARGET_ADDR_BIT > 32)
+ printf_filtered (" ");
+ printf_filtered ("Attrs ");
+ printf_filtered ("\n");
+
for (m = mem_region_chain; m; m = m->next)
{
- printf_filtered ("%d: %c\t",
+ char *tmp;
+ printf_filtered ("%-3d %-3c\t",
m->number,
- m->status ? 'y' : 'n');
- printf_filtered ("%s - ",
- local_hex_string_custom ((unsigned long) m->lo, "08l"));
- printf_filtered ("%s\t",
- local_hex_string_custom ((unsigned long) m->hi, "08l"));
+ m->enabled_p ? 'y' : 'n');
+ if (TARGET_ADDR_BIT <= 32)
+ tmp = longest_local_hex_string_custom ((unsigned long) m->lo, "08l");
+ else
+ tmp = longest_local_hex_string_custom ((unsigned long) m->lo, "016l");
+
+ printf_filtered ("%s ", tmp);
+
+ if (TARGET_ADDR_BIT <= 32)
+ tmp = longest_local_hex_string_custom ((unsigned long) m->hi, "08l");
+ else
+ tmp = longest_local_hex_string_custom ((unsigned long) m->hi, "016l");
+
+ printf_filtered ("%s ", tmp);
/* Print a token for each attribute.
for (m = mem_region_chain; m; m = m->next)
if (m->number == num)
{
- m->status = enabled;
+ m->enabled_p = 1;
return;
}
printf_unfiltered ("No memory region number %d.\n", num);
if (p == 0)
{
for (m = mem_region_chain; m; m = m->next)
- m->status = enabled;
+ m->enabled_p = 1;
}
else
while (*p)
for (m = mem_region_chain; m; m = m->next)
if (m->number == num)
{
- m->status = disabled;
+ m->enabled_p = 0;
return;
}
printf_unfiltered ("No memory region number %d.\n", num);
if (p == 0)
{
for (m = mem_region_chain; m; m = m->next)
- m->status = disabled;
+ m->enabled_p = 0;
}
else
while (*p)
_initialize_mem ()
{
add_com ("mem", class_vars, mem_command,
- "Define attributes for memory region.");
+ "Define attributes for memory region.\n\
+Usage: mem <lo addr> <hi addr> [<mode> <width> <cache>], \n\
+where <mode> may be rw (read/write), ro (read-only) or wo (write-only), \n\
+ <width> may be 8, 16, 32, or 64, and \n\
+ <cache> may be cache or nocache");
add_cmd ("mem", class_vars, mem_enable_command,
"Enable memory region.\n\
Arguments are the code numbers of the memory regions to enable.\n\
+Usage: enable mem <code number>\n\
Do \"info mem\" to see current list of code numbers.", &enablelist);
add_cmd ("mem", class_vars, mem_disable_command,
"Disable memory region.\n\
Arguments are the code numbers of the memory regions to disable.\n\
+Usage: disable mem <code number>\n\
Do \"info mem\" to see current list of code numbers.", &disablelist);
add_cmd ("mem", class_vars, mem_delete_command,
"Delete memory region.\n\
Arguments are the code numbers of the memory regions to delete.\n\
+Usage: delete mem <code number>\n\
Do \"info mem\" to see current list of code numbers.", &deletelist);
add_info ("mem", mem_info_command,