projects
/
emu8051.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add display of address in case of error
[emu8051.git]
/
src
/
memory.c
diff --git
a/src/memory.c
b/src/memory.c
index
202d8d3
..
0b69e32
100644
(file)
--- a/
src/memory.c
+++ b/
src/memory.c
@@
-37,36
+37,33
@@
static u_int8_t int_mem[INT_MEM_SIZE];
static u_int8_t ext_mem[EXT_MEM_SIZE];
void
static u_int8_t ext_mem[EXT_MEM_SIZE];
void
-memory_write8(
int memory_id, unsigned long address, u_int8_t value
)
+memory_write8(
int memory_id, unsigned long address, u_int8_t value
)
{
{
- switch
( memory_id
) {
+ switch
(memory_id
) {
case PGM_MEM_ID:
case PGM_MEM_ID:
- if( address >= PGM_MEM_SIZE ) {
- printf("Address is greater than PGM_MEM_SIZE\n");
+ if (address >= PGM_MEM_SIZE) {
+ printf("Address (%lu) is greater than PGM_MEM_SIZE\n",
+ address);
return;
return;
- }
- else {
+ } else
pgm_mem[address] = value;
pgm_mem[address] = value;
- }
break;
case INT_MEM_ID:
break;
case INT_MEM_ID:
- if( address >= INT_MEM_SIZE) {
- printf("Address is greater than INT_MEM_SIZE\n");
+ if (address >= INT_MEM_SIZE) {
+ printf("Address (%lu) is greater than INT_MEM_SIZE\n",
+ address);
return;
return;
- }
- else {
+ } else
int_mem[address] = value;
int_mem[address] = value;
- }
break;
case EXT_MEM_ID:
break;
case EXT_MEM_ID:
- if( address >= EXT_MEM_SIZE ) {
- printf("Address is greater than EXT_MEM_SIZE\n");
+ if (address >= EXT_MEM_SIZE) {
+ printf("Address (%lu) is greater than EXT_MEM_SIZE\n",
+ address);
return;
return;
- }
- else {
+ } else
ext_mem[address] = value;
ext_mem[address] = value;
- }
- break;
+ break;
default:
/* Error. */
break;
default:
/* Error. */
break;
@@
-74,36
+71,36
@@
memory_write8( int memory_id, unsigned long address, u_int8_t value )
}
u_int8_t
}
u_int8_t
-memory_read8(
int memory_id, unsigned long address
)
+memory_read8(
int memory_id, unsigned long address
)
{
{
- switch
( memory_id
) {
+ switch
(memory_id
) {
case PGM_MEM_ID:
case PGM_MEM_ID:
- if
( address < PGM_MEM_SIZE ) {
+ if
(address < PGM_MEM_SIZE)
return pgm_mem[address];
return pgm_mem[address];
- }
else {
else {
- printf("Address is greater than PGM_MEM_SIZE\n");
+ printf("Address (%lu) is greater than PGM_MEM_SIZE\n",
+ address);
return 0;
}
break;
case INT_MEM_ID:
return 0;
}
break;
case INT_MEM_ID:
- if
( address < INT_MEM_SIZE ) {
+ if
(address < INT_MEM_SIZE)
return int_mem[address];
return int_mem[address];
- }
else {
else {
- printf("Address is greater than INT_MEM_SIZE\n");
+ printf("Address (%lu) is greater than INT_MEM_SIZE\n",
+ address);
return 0;
}
break;
case EXT_MEM_ID:
return 0;
}
break;
case EXT_MEM_ID:
- if
( address < EXT_MEM_SIZE ) {
+ if
(address < EXT_MEM_SIZE)
return ext_mem[address];
return ext_mem[address];
- }
else {
else {
- printf("Address is greater than EXT_MEM_SIZE\n");
+ printf("Address (%lu) is greater than EXT_MEM_SIZE\n",
+ address);
return 0;
}
return 0;
}
- break;
+ break;
default:
/* Error. */
return 0;
default:
/* Error. */
return 0;