From 414c838a722efedb0f787b64629db13d88c9ef7c Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Wed, 5 Oct 2016 09:31:13 +0100 Subject: [PATCH] Simplify i386, amd64 and x32 expedite registers Nowadays, there are a lot of duplication about i386/{i386, amd64, x32}*-expedite in features/Makefile. However, in features/Makefile, we have echo "expedite:$(if $($*-expedite),$($*-expedite),$($(firstword $(subst -, ,$(notdir $*)))-expedite))" \ >> $(outdir)/$*.tmp which means for a given bar/foo-baz.xml, we'll look for either bar/foo-baz-expedite or foo-expedite. In x86 expedite registers, we use the former now, but it will be much simpler if we use the latter. This is what this patch does. This patch removes them, and defines three generic expedite. Re-run 'make GDB=/path/build/gdb all' to regenerate regformats/*.dat files, and they are not changed. gdb: 2016-10-05 Yao Qi * features/Makefile: Remove i386/*-expedite. Add i386-expedite, amd64-expedite, and x32-expedite. --- gdb/ChangeLog | 5 +++++ gdb/features/Makefile | 31 +++---------------------------- 2 files changed, 8 insertions(+), 28 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f28a0efc970..deedbee599a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2016-10-05 Yao Qi + + * features/Makefile: Remove i386/*-expedite. Add i386-expedite, + amd64-expedite, and x32-expedite. + 2016-10-05 Terry Guo Yao Qi diff --git a/gdb/features/Makefile b/gdb/features/Makefile index f24b13ecea0..6282adfa3d8 100644 --- a/gdb/features/Makefile +++ b/gdb/features/Makefile @@ -79,34 +79,9 @@ WHICH = aarch64 \ # Record which registers should be sent to GDB by default after stop. aarch64-expedite = x29,sp,pc arm-expedite = r11,sp,pc -i386/i386-expedite = ebp,esp,eip -i386/i386-linux-expedite = ebp,esp,eip -i386/amd64-expedite = rbp,rsp,rip -i386/amd64-linux-expedite = rbp,rsp,rip -i386/i386-avx-expedite = ebp,esp,eip -i386/i386-avx-linux-expedite = ebp,esp,eip -i386/i386-mpx-expedite = ebp,esp,eip -i386/i386-avx-mpx-expedite = ebp,esp,eip -i386/i386-mpx-linux-expedite = ebp,esp,eip -i386/i386-avx-mpx-linux-expedite = ebp,esp,eip -i386/i386-avx512-expedite = ebp,esp,eip -i386/i386-avx512-linux-expedite = ebp,esp,eip -i386/i386-mmx-expedite = ebp,esp,eip -i386/i386-mmx-linux-expedite = ebp,esp,eip -i386/amd64-avx-expedite = rbp,rsp,rip -i386/amd64-avx-linux-expedite = rbp,rsp,rip -i386/amd64-mpx-expedite = rbp,rsp,rip -i386/amd64-avx-mpx-expedite = rbp,rsp,rip -i386/amd64-mpx-linux-expedite = rbp,rsp,rip -i386/amd64-avx-mpx-linux-expedite = rbp,rsp,rip -i386/amd64-avx512-expedite = rbp,rsp,rip -i386/amd64-avx512-linux-expedite = rbp,rsp,rip -i386/x32-expedite = rbp,rsp,rip -i386/x32-linux-expedite = rbp,rsp,rip -i386/x32-avx-expedite = rbp,rsp,rip -i386/x32-avx-linux-expedite = rbp,rsp,rip -i386/x32-avx512-expedite = rbp,rsp,rip -i386/x32-avx512-linux-expedite = rbp,rsp,rip +i386-expedite = ebp,esp,eip +amd64-expedite = rbp,rsp,rip +x32-expedite = rbp,rsp,rip mips-expedite = r29,pc mips-dsp-expedite = r29,pc mips64-expedite = r29,pc -- 2.30.2