diff options
Diffstat (limited to 'common/memsize.c')
| -rw-r--r-- | common/memsize.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/common/memsize.c b/common/memsize.c index 0fb9ba57b62..c31527567c3 100644 --- a/common/memsize.c +++ b/common/memsize.c @@ -27,7 +27,8 @@ DECLARE_GLOBAL_DATA_PTR; long get_ram_size(long *base, long maxsize) { volatile long *addr; - long save[32]; + long save[31]; + long save_base; long cnt; long val; long size; @@ -43,7 +44,7 @@ long get_ram_size(long *base, long maxsize) addr = base; sync(); - save[i] = *addr; + save_base = *addr; sync(); *addr = 0; @@ -51,7 +52,7 @@ long get_ram_size(long *base, long maxsize) if ((val = *addr) != 0) { /* Restore the original data before leaving the function. */ sync(); - *addr = save[i]; + *base = save_base; for (cnt = 1; cnt < maxsize / sizeof(long); cnt <<= 1) { addr = base + cnt; sync(); @@ -76,9 +77,16 @@ long get_ram_size(long *base, long maxsize) addr = base + cnt; *addr = save[--i]; } + /* warning: don't restore save_base in this case, + * it is already done in the loop because + * base and base+size share the same physical memory + * and *base is saved after *(base+size) modification + * in first loop + */ return (size); } } + *base = save_base; return (maxsize); } |