filename | src/aica/armmem.c |
changeset | 431:248dd77a9e44 |
prev | 66:2ec5b6eb75e5 |
next | 502:c4ecae2b1b5e |
author | nkeynes |
date | Tue Oct 23 10:40:46 2007 +0000 (16 years ago) |
permissions | -rw-r--r-- |
last change | Remove (I think) last remaining glade/glade-derived files, as they're no longer used. |
file | annotate | diff | log | raw |
1.1 --- a/src/aica/armmem.c Tue Jan 10 13:56:54 2006 +00001.2 +++ b/src/aica/armmem.c Tue Oct 23 10:40:46 2007 +00001.3 @@ -1,5 +1,5 @@1.4 /**1.5 - * $Id: armmem.c,v 1.7 2006-01-10 13:56:54 nkeynes Exp $1.6 + * $Id: armmem.c,v 1.8 2007-10-09 08:11:51 nkeynes Exp $1.7 *1.8 * Implements the ARM's memory map.1.9 *1.10 @@ -101,7 +101,7 @@1.11 /* Undefined memory */1.12 }1.13 }1.14 - return 0;1.15 + return;1.16 }1.18 uint32_t arm_combine_byte( uint32_t addr, uint32_t val, uint8_t byte )1.19 @@ -115,6 +115,8 @@1.20 return (val & 0xFF00FFFF) | (byte<<16);1.21 case 3:1.22 return (val & 0x00FFFFFF) | (byte<<24);1.23 + default:1.24 + return val; // Can't happen, but make gcc happy1.25 }1.26 }1.28 @@ -151,7 +153,7 @@1.29 /* Undefined memory */1.30 }1.31 }1.32 - return 0;1.33 + return;1.34 }1.36 /* User translations - TODO */
.