moving stack and parameters higher up for media test

diff --git a/media/audio/mp3/mp3_0.gpr b/media/audio/mp3/mp3_0.gpr
index ae16168e6273acd31aba895922f51b2a2a10c8f7..f76bcbcccefd00ff463db73e70845819400df901 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: 0x800000      # 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
+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
 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 352483e285a70c0542c66176fc3bbb4206f93344..a49af0c8a1d4648274e97a0dc731b9de0246c805 100755 (executable)
--- a/media/audio/mp3/mp3_0.sh
+++ b/media/audio/mp3/mp3_0.sh
@@ -3,8 +3,8 @@
 pypowersim -g audio/mp3/mp3_0.gpr \
        -s common.spr \
     -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 \
+       -l data/audio/mp3/mp3_0_data/buf${1}:0x20100000 \
+       -l data/audio/mp3/mp3_0_data/win0:0x20200000 \
+       -d ${2}:0x20400000:128 \
        -i audio/mp3/mp3_0_apply_window_float.bin
 cmp ${2} data/audio/mp3/mp3_0_data/samples${1}

diff --git a/src/openpower/simulator/qemu.py b/src/openpower/simulator/qemu.py
index 8b8bc22bed8ca747d514f1d7b03ebaee0fec83f6..5ef5c36da5ff7321736ed2353790e9bb68ad43a0 100644 (file)
--- a/src/openpower/simulator/qemu.py
+++ b/src/openpower/simulator/qemu.py
@@ -4,12 +4,12 @@ import subprocess
 launch_args_be = ['qemu-system-ppc64',
                   '-machine', 'powernv9',
                   '-nographic',
-                  '-s', '-S']
+                  '-s', '-S', '-m', 'size=4096']
 
 launch_args_le = ['qemu-system-ppc64le',
                   '-machine', 'powernv9',
                   '-nographic',
-                  '-s', '-S']
+                  '-s', '-S', '-m', 'size=4096']
 
 
 def swap_order(x, nbytes):