From e8330a5dfda9f97651ec4552039cf1d7e8a09069 Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Fri, 23 Apr 2021 16:16:00 +0100 Subject: [PATCH] remove simulator directory, moved to openpower-isa --- src/soc/simulator/__init__.py | 0 src/soc/simulator/envcmds.py | 5 ----- src/soc/simulator/gas.py | 5 ----- src/soc/simulator/memmap | 11 ----------- src/soc/simulator/program.py | 5 ----- src/soc/simulator/qemu.py | 5 ----- src/soc/simulator/qemu_test/.gitignore | 4 ---- src/soc/simulator/qemu_test/Makefile | 18 ------------------ src/soc/simulator/qemu_test/README.md | 8 -------- src/soc/simulator/qemu_test/__init__.py | 0 src/soc/simulator/qemu_test/condition.patch | 0 src/soc/simulator/qemu_test/gdbscript | 4 ---- src/soc/simulator/qemu_test/launch.sh | 1 - src/soc/simulator/qemu_test/memmap | 11 ----------- src/soc/simulator/qemu_test/test.s | 6 ------ 15 files changed, 83 deletions(-) delete mode 100644 src/soc/simulator/__init__.py delete mode 100644 src/soc/simulator/envcmds.py delete mode 100644 src/soc/simulator/gas.py delete mode 100644 src/soc/simulator/memmap delete mode 100644 src/soc/simulator/program.py delete mode 100644 src/soc/simulator/qemu.py delete mode 100644 src/soc/simulator/qemu_test/.gitignore delete mode 100644 src/soc/simulator/qemu_test/Makefile delete mode 100644 src/soc/simulator/qemu_test/README.md delete mode 100644 src/soc/simulator/qemu_test/__init__.py delete mode 100644 src/soc/simulator/qemu_test/condition.patch delete mode 100644 src/soc/simulator/qemu_test/gdbscript delete mode 100755 src/soc/simulator/qemu_test/launch.sh delete mode 100644 src/soc/simulator/qemu_test/memmap delete mode 100644 src/soc/simulator/qemu_test/test.s diff --git a/src/soc/simulator/__init__.py b/src/soc/simulator/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/src/soc/simulator/envcmds.py b/src/soc/simulator/envcmds.py deleted file mode 100644 index 29b284b6..00000000 --- a/src/soc/simulator/envcmds.py +++ /dev/null @@ -1,5 +0,0 @@ -# moved to openpower-isa -# https://git.libre-soc.org/?p=openpower-isa.git;a=summary -# wildcard imports here ONLY to support migration - -from openpower.simulator.envcmds import * diff --git a/src/soc/simulator/gas.py b/src/soc/simulator/gas.py deleted file mode 100644 index cb5d73ff..00000000 --- a/src/soc/simulator/gas.py +++ /dev/null @@ -1,5 +0,0 @@ -# moved to openpower-isa -# https://git.libre-soc.org/?p=openpower-isa.git;a=summary -# wildcard imports here ONLY to support migration - -from openpower.simulator.gas import * diff --git a/src/soc/simulator/memmap b/src/soc/simulator/memmap deleted file mode 100644 index 8cc1a16e..00000000 --- a/src/soc/simulator/memmap +++ /dev/null @@ -1,11 +0,0 @@ - -MEMORY -{ - ram : ORIGIN = 0x20000000, LENGTH = 128M -} - -SECTIONS -{ - .text : { *(.text*) } > ram - .bss : { *(.text*) } > ram -} diff --git a/src/soc/simulator/program.py b/src/soc/simulator/program.py deleted file mode 100644 index 550d4cb8..00000000 --- a/src/soc/simulator/program.py +++ /dev/null @@ -1,5 +0,0 @@ -# moved to openpower-isa -# https://git.libre-soc.org/?p=openpower-isa.git;a=summary -# wildcard imports here ONLY to support migration - -from openpower.simulator.program import * diff --git a/src/soc/simulator/qemu.py b/src/soc/simulator/qemu.py deleted file mode 100644 index f07827b6..00000000 --- a/src/soc/simulator/qemu.py +++ /dev/null @@ -1,5 +0,0 @@ -# moved to openpower-isa -# https://git.libre-soc.org/?p=openpower-isa.git;a=summary -# wildcard imports here ONLY to support migration - -from openpower.simulator.qemu import * diff --git a/src/soc/simulator/qemu_test/.gitignore b/src/soc/simulator/qemu_test/.gitignore deleted file mode 100644 index 416ab3a3..00000000 --- a/src/soc/simulator/qemu_test/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -*.bin -*.elf -*.o -*~ diff --git a/src/soc/simulator/qemu_test/Makefile b/src/soc/simulator/qemu_test/Makefile deleted file mode 100644 index 88833cd4..00000000 --- a/src/soc/simulator/qemu_test/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -TOOLCHAIN=powerpc64-linux-gnu -CC=$(TOOLCHAIN)-gcc -AS=$(TOOLCHAIN)-as -AFLAGS=-mpwr9 - -all: kernel.bin - -clean: - rm *.o *.elf *.bin - -kernel.elf: test.o - $(TOOLCHAIN)-ld $^ -o $@ -T memmap - -kernel.bin: kernel.elf - $(TOOLCHAIN)-objcopy $< -O binary $@ - -%.o: %.s - $(AS) $(AFLAGS) -c $< -o $@ diff --git a/src/soc/simulator/qemu_test/README.md b/src/soc/simulator/qemu_test/README.md deleted file mode 100644 index 32f90eec..00000000 --- a/src/soc/simulator/qemu_test/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# Qemu test directory - -To launch and debug qemu, run the following: -``` -make -./launch.sh -powerpc64-linux-gnu-gdb -x gdbscript -``` diff --git a/src/soc/simulator/qemu_test/__init__.py b/src/soc/simulator/qemu_test/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/src/soc/simulator/qemu_test/condition.patch b/src/soc/simulator/qemu_test/condition.patch deleted file mode 100644 index e69de29b..00000000 diff --git a/src/soc/simulator/qemu_test/gdbscript b/src/soc/simulator/qemu_test/gdbscript deleted file mode 100644 index 1337e6a7..00000000 --- a/src/soc/simulator/qemu_test/gdbscript +++ /dev/null @@ -1,4 +0,0 @@ -target remote localhost:1234 -layout asm -b *0x20000000 -c diff --git a/src/soc/simulator/qemu_test/launch.sh b/src/soc/simulator/qemu_test/launch.sh deleted file mode 100755 index 28445530..00000000 --- a/src/soc/simulator/qemu_test/launch.sh +++ /dev/null @@ -1 +0,0 @@ -qemu-system-ppc64 -machine powernv9 -nographic -s -S -kernel kernel.bin diff --git a/src/soc/simulator/qemu_test/memmap b/src/soc/simulator/qemu_test/memmap deleted file mode 100644 index 8cc1a16e..00000000 --- a/src/soc/simulator/qemu_test/memmap +++ /dev/null @@ -1,11 +0,0 @@ - -MEMORY -{ - ram : ORIGIN = 0x20000000, LENGTH = 128M -} - -SECTIONS -{ - .text : { *(.text*) } > ram - .bss : { *(.text*) } > ram -} diff --git a/src/soc/simulator/qemu_test/test.s b/src/soc/simulator/qemu_test/test.s deleted file mode 100644 index fb2ec156..00000000 --- a/src/soc/simulator/qemu_test/test.s +++ /dev/null @@ -1,6 +0,0 @@ - lis 1, 0xdead - ori 1, 1, 0xbeef - lis 2, 0x2000 - ori 2, 2, 0x0100 - std 1, 0(2) - lhz 1, 4(2) -- 2.30.2