Undo qemu address changes

diff --git a/media/audio/mp3/mp3_0.gpr b/media/audio/mp3/mp3_0.gpr
index f76bcbcccefd00ff463db73e70845819400df901..3318e6a466694a593ee0fbe676f66a8912668c66 100644 (file)
--- a/media/audio/mp3/mp3_0.gpr
+++ b/media/audio/mp3/mp3_0.gpr
@@ -1,9 +1,9 @@
 # void ff_mpadsp_apply_window_float(float *synth_buf, float *window,
 #                                  int *dither_state, float *samples,
 #                                  ptrdiff_t incr);
-1: 0x20800000    # stack pointer (high up in "RAM" to keep qemu happy)
-3: 0x20100000      # param 1: float *sunth_buf     buf
-4: 0x20200000      # param 2: float *window        win
-5: 0x20300000      # param 3: int *dither_state    &unused
-6: 0x20400000      # param 3: float *samples       out
+1: 0x4000        # stack pointer
+3: 0x100000      # param 1: float *sunth_buf     buf
+4: 0x200000      # param 2: float *window        win
+5: 0x300000      # param 3: int *dither_state    &unused
+6: 0x400000      # param 3: float *samples       out
 7: 1             # param 5: ptr_diff_t incr      1

diff --git a/media/audio/mp3/mp3_0.sh b/media/audio/mp3/mp3_0.sh
index a49af0c8a1d4648274e97a0dc731b9de0246c805..b90c40cc4e1c1721997efbc20a392fc2e12e9d5d 100755 (executable)
--- a/media/audio/mp3/mp3_0.sh
+++ b/media/audio/mp3/mp3_0.sh
@@ -2,9 +2,9 @@
 
 pypowersim -g audio/mp3/mp3_0.gpr \
        -s common.spr \
-    -p 0x20000000 \
-       -l data/audio/mp3/mp3_0_data/buf${1}:0x20100000 \
-       -l data/audio/mp3/mp3_0_data/win0:0x20200000 \
-       -d ${2}:0x20400000:128 \
+       -p 0x20000000 \
+       -l data/audio/mp3/mp3_0_data/buf${1}:0x100000 \
+       -l data/audio/mp3/mp3_0_data/win0:0x200000 \
+       -d ${2}:0x400000:128 \
        -i audio/mp3/mp3_0_apply_window_float.bin
 cmp ${2} data/audio/mp3/mp3_0_data/samples${1}

diff --git a/media/audio/mp3/mp3_1.sh b/media/audio/mp3/mp3_1.sh
index 6356dce4d0361bb9b09c488c7ccd6a8cc3a080aa..c2cdea0da1a85dbc5e41453cc5db0c61cba656df 100755 (executable)
--- a/media/audio/mp3/mp3_1.sh
+++ b/media/audio/mp3/mp3_1.sh
@@ -2,7 +2,7 @@
 
 pypowersim -g audio/mp3/mp3_1.gpr \
        -s common.spr \
-    -p 0x20000000 \
+       -p 0x20000000 \
        -l data/audio/mp3/mp3_1_data/beforeout${1}:0x100000 \
        -l data/audio/mp3/mp3_1_data/buf${1}:0x200000 \
        -l data/audio/mp3/mp3_1_data/in${1}:0x300000 \