[Qemu-devel] [PATCH 0/3] target/xtensa: improvements for core-specific files

[Qemu-devel] [PATCH 0/3] target/xtensa: improvements for core-specific files

[Max Filippov]

Hello,

this series adds .inc. to the names of non-top level xtensa core-specific
files and fixes script import_core.sh so that it does it automatically.
It also adds a fixup to the script that changes #include <xtensa-isa.h>
to #include "xtensa-isa.h".

Max Filippov (3):
  target/xtensa: add .inc. to non-top level source file names
  target/xtensa/import_core.sh: fix names of non-top level files
  target/xtensa/import_core.sh: fix #include <xtensa-isa.h>

 target/xtensa/core-dc232b.c                                      | 4 ++--
 target/xtensa/core-dc232b/{gdb-config.c => gdb-config.inc.c}     | 0
 .../core-dc232b/{xtensa-modules.c => xtensa-modules.inc.c}       | 0
 target/xtensa/core-dc233c.c                                      | 4 ++--
 target/xtensa/core-dc233c/{gdb-config.c => gdb-config.inc.c}     | 0
 .../core-dc233c/{xtensa-modules.c => xtensa-modules.inc.c}       | 0
 target/xtensa/core-de212.c                                       | 4 ++--
 target/xtensa/core-de212/{gdb-config.c => gdb-config.inc.c}      | 0
 .../xtensa/core-de212/{xtensa-modules.c => xtensa-modules.inc.c} | 0
 target/xtensa/core-fsf.c                                         | 2 +-
 .../xtensa/core-fsf/{xtensa-modules.c => xtensa-modules.inc.c}   | 0
 target/xtensa/core-sample_controller.c                           | 4 ++--
 .../core-sample_controller/{gdb-config.c => gdb-config.inc.c}    | 0
 .../{xtensa-modules.c => xtensa-modules.inc.c}                   | 0
 target/xtensa/import_core.sh                                     | 9 +++++----
 15 files changed, 14 insertions(+), 13 deletions(-)
 rename target/xtensa/core-dc232b/{gdb-config.c => gdb-config.inc.c} (100%)
 rename target/xtensa/core-dc232b/{xtensa-modules.c => xtensa-modules.inc.c} (100%)
 rename target/xtensa/core-dc233c/{gdb-config.c => gdb-config.inc.c} (100%)
 rename target/xtensa/core-dc233c/{xtensa-modules.c => xtensa-modules.inc.c} (100%)
 rename target/xtensa/core-de212/{gdb-config.c => gdb-config.inc.c} (100%)
 rename target/xtensa/core-de212/{xtensa-modules.c => xtensa-modules.inc.c} (100%)
 rename target/xtensa/core-fsf/{xtensa-modules.c => xtensa-modules.inc.c} (100%)
 rename target/xtensa/core-sample_controller/{gdb-config.c => gdb-config.inc.c} (100%)
 rename target/xtensa/core-sample_controller/{xtensa-modules.c => xtensa-modules.inc.c} (100%)

-- 
2.11.0

[Qemu-devel] [PATCH 1/3] target/xtensa: add .inc. to non-top level source file names

[Max Filippov]

Fix definitions of existing cores and core importing script.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
---
 target/xtensa/core-dc232b.c                                           | 4 ++--
 target/xtensa/core-dc232b/{gdb-config.c => gdb-config.inc.c}          | 0
 target/xtensa/core-dc232b/{xtensa-modules.c => xtensa-modules.inc.c}  | 0
 target/xtensa/core-dc233c.c                                           | 4 ++--
 target/xtensa/core-dc233c/{gdb-config.c => gdb-config.inc.c}          | 0
 target/xtensa/core-dc233c/{xtensa-modules.c => xtensa-modules.inc.c}  | 0
 target/xtensa/core-de212.c                                            | 4 ++--
 target/xtensa/core-de212/{gdb-config.c => gdb-config.inc.c}           | 0
 target/xtensa/core-de212/{xtensa-modules.c => xtensa-modules.inc.c}   | 0
 target/xtensa/core-fsf.c                                              | 2 +-
 target/xtensa/core-fsf/{xtensa-modules.c => xtensa-modules.inc.c}     | 0
 target/xtensa/core-sample_controller.c                                | 4 ++--
 .../xtensa/core-sample_controller/{gdb-config.c => gdb-config.inc.c}  | 0
 .../core-sample_controller/{xtensa-modules.c => xtensa-modules.inc.c} | 0
 14 files changed, 9 insertions(+), 9 deletions(-)
 rename target/xtensa/core-dc232b/{gdb-config.c => gdb-config.inc.c} (100%)
 rename target/xtensa/core-dc232b/{xtensa-modules.c => xtensa-modules.inc.c} (100%)
 rename target/xtensa/core-dc233c/{gdb-config.c => gdb-config.inc.c} (100%)
 rename target/xtensa/core-dc233c/{xtensa-modules.c => xtensa-modules.inc.c} (100%)
 rename target/xtensa/core-de212/{gdb-config.c => gdb-config.inc.c} (100%)
 rename target/xtensa/core-de212/{xtensa-modules.c => xtensa-modules.inc.c} (100%)
 rename target/xtensa/core-fsf/{xtensa-modules.c => xtensa-modules.inc.c} (100%)
 rename target/xtensa/core-sample_controller/{gdb-config.c => gdb-config.inc.c} (100%)
 rename target/xtensa/core-sample_controller/{xtensa-modules.c => xtensa-modules.inc.c} (100%)

diff --git a/target/xtensa/core-dc232b.c b/target/xtensa/core-dc232b.c
index fe80582df465..aa07018af4e7 100644
--- a/target/xtensa/core-dc232b.c
+++ b/target/xtensa/core-dc232b.c
@@ -35,7 +35,7 @@
 #include "overlay_tool.h"
 
 #define xtensa_modules xtensa_modules_dc232b
-#include "core-dc232b/xtensa-modules.c"
+#include "core-dc232b/xtensa-modules.inc.c"
 
 static XtensaConfig dc232b __attribute__((unused)) = {
     .name = "dc232b",
@@ -43,7 +43,7 @@ static XtensaConfig dc232b __attribute__((unused)) = {
         .num_regs = 120,
         .num_core_regs = 52,
         .reg = {
-#include "core-dc232b/gdb-config.c"
+#include "core-dc232b/gdb-config.inc.c"
         }
     },
     .isa_internal = &xtensa_modules,
diff --git a/target/xtensa/core-dc232b/gdb-config.c b/target/xtensa/core-dc232b/gdb-config.inc.c
similarity index 100%
rename from target/xtensa/core-dc232b/gdb-config.c
rename to target/xtensa/core-dc232b/gdb-config.inc.c
diff --git a/target/xtensa/core-dc232b/xtensa-modules.c b/target/xtensa/core-dc232b/xtensa-modules.inc.c
similarity index 100%
rename from target/xtensa/core-dc232b/xtensa-modules.c
rename to target/xtensa/core-dc232b/xtensa-modules.inc.c
diff --git a/target/xtensa/core-dc233c.c b/target/xtensa/core-dc233c.c
index 00301c28a2e8..8296e6fa109a 100644
--- a/target/xtensa/core-dc233c.c
+++ b/target/xtensa/core-dc233c.c
@@ -36,7 +36,7 @@
 #include "overlay_tool.h"
 
 #define xtensa_modules xtensa_modules_dc233c
-#include "core-dc233c/xtensa-modules.c"
+#include "core-dc233c/xtensa-modules.inc.c"
 
 static XtensaConfig dc233c __attribute__((unused)) = {
     .name = "dc233c",
@@ -44,7 +44,7 @@ static XtensaConfig dc233c __attribute__((unused)) = {
         .num_regs = 121,
         .num_core_regs = 52,
         .reg = {
-#include "core-dc233c/gdb-config.c"
+#include "core-dc233c/gdb-config.inc.c"
         }
     },
     .isa_internal = &xtensa_modules,
diff --git a/target/xtensa/core-dc233c/gdb-config.c b/target/xtensa/core-dc233c/gdb-config.inc.c
similarity index 100%
rename from target/xtensa/core-dc233c/gdb-config.c
rename to target/xtensa/core-dc233c/gdb-config.inc.c
diff --git a/target/xtensa/core-dc233c/xtensa-modules.c b/target/xtensa/core-dc233c/xtensa-modules.inc.c
similarity index 100%
rename from target/xtensa/core-dc233c/xtensa-modules.c
rename to target/xtensa/core-dc233c/xtensa-modules.inc.c
diff --git a/target/xtensa/core-de212.c b/target/xtensa/core-de212.c
index 466a467f7fa0..53775a97fae0 100644
--- a/target/xtensa/core-de212.c
+++ b/target/xtensa/core-de212.c
@@ -36,13 +36,13 @@
 #include "overlay_tool.h"
 
 #define xtensa_modules xtensa_modules_de212
-#include "core-de212/xtensa-modules.c"
+#include "core-de212/xtensa-modules.inc.c"
 
 static XtensaConfig de212 __attribute__((unused)) = {
     .name = "de212",
     .gdb_regmap = {
         .reg = {
-#include "core-de212/gdb-config.c"
+#include "core-de212/gdb-config.inc.c"
         }
     },
     .isa_internal = &xtensa_modules,
diff --git a/target/xtensa/core-de212/gdb-config.c b/target/xtensa/core-de212/gdb-config.inc.c
similarity index 100%
rename from target/xtensa/core-de212/gdb-config.c
rename to target/xtensa/core-de212/gdb-config.inc.c
diff --git a/target/xtensa/core-de212/xtensa-modules.c b/target/xtensa/core-de212/xtensa-modules.inc.c
similarity index 100%
rename from target/xtensa/core-de212/xtensa-modules.c
rename to target/xtensa/core-de212/xtensa-modules.inc.c
diff --git a/target/xtensa/core-fsf.c b/target/xtensa/core-fsf.c
index f41de9a1aa05..01932bdc8b15 100644
--- a/target/xtensa/core-fsf.c
+++ b/target/xtensa/core-fsf.c
@@ -36,7 +36,7 @@
 #include "overlay_tool.h"
 
 #define xtensa_modules xtensa_modules_fsf
-#include "core-fsf/xtensa-modules.c"
+#include "core-fsf/xtensa-modules.inc.c"
 
 static XtensaConfig fsf __attribute__((unused)) = {
     .name = "fsf",
diff --git a/target/xtensa/core-fsf/xtensa-modules.c b/target/xtensa/core-fsf/xtensa-modules.inc.c
similarity index 100%
rename from target/xtensa/core-fsf/xtensa-modules.c
rename to target/xtensa/core-fsf/xtensa-modules.inc.c
diff --git a/target/xtensa/core-sample_controller.c b/target/xtensa/core-sample_controller.c
index 879e853a9224..c622335ca5a2 100644
--- a/target/xtensa/core-sample_controller.c
+++ b/target/xtensa/core-sample_controller.c
@@ -36,13 +36,13 @@
 #include "overlay_tool.h"
 
 #define xtensa_modules xtensa_modules_sample_controller
-#include "core-sample_controller/xtensa-modules.c"
+#include "core-sample_controller/xtensa-modules.inc.c"
 
 static XtensaConfig sample_controller __attribute__((unused)) = {
     .name = "sample_controller",
     .gdb_regmap = {
         .reg = {
-#include "core-sample_controller/gdb-config.c"
+#include "core-sample_controller/gdb-config.inc.c"
         }
     },
     .isa_internal = &xtensa_modules,
diff --git a/target/xtensa/core-sample_controller/gdb-config.c b/target/xtensa/core-sample_controller/gdb-config.inc.c
similarity index 100%
rename from target/xtensa/core-sample_controller/gdb-config.c
rename to target/xtensa/core-sample_controller/gdb-config.inc.c
diff --git a/target/xtensa/core-sample_controller/xtensa-modules.c b/target/xtensa/core-sample_controller/xtensa-modules.inc.c
similarity index 100%
rename from target/xtensa/core-sample_controller/xtensa-modules.c
rename to target/xtensa/core-sample_controller/xtensa-modules.inc.c
-- 
2.11.0

[Qemu-devel] [PATCH 2/3] target/xtensa/import_core.sh: fix names of non-top level files

[Max Filippov]

Add .inc. to the names of files imported from configuration overlay in
the import_core.sh script to follow the rule of naming non-top level
source files.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
---
 target/xtensa/import_core.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/target/xtensa/import_core.sh b/target/xtensa/import_core.sh
index 32255eea9b1b..58a42987d853 100755
--- a/target/xtensa/import_core.sh
+++ b/target/xtensa/import_core.sh
@@ -22,7 +22,7 @@ mkdir -p "$TARGET"
 tar -xf "$OVERLAY" -C "$TARGET" --strip-components=1 \
     --xform='s/core/core-isa/' config/core.h
 tar -xf "$OVERLAY" -O gdb/xtensa-config.c | \
-    sed -n '1,/*\//p;/XTREG/,/XTREG_END/p' > "$TARGET"/gdb-config.c
+    sed -n '1,/*\//p;/XTREG/,/XTREG_END/p' > "$TARGET"/gdb-config.inc.c
 #
 # Fix up known issues in the xtensa-modules.c
 #
@@ -33,7 +33,7 @@ tar -xf "$OVERLAY" -O binutils/xtensa-modules.c | \
         -e '/^uint32 \*bypass_entry(int i)/,/}/d' \
         -e '/^#include "ansidecl.h"/d' \
         -e '/^Slot_[a-zA-Z0-9_]\+_decode (const xtensa_insnbuf insn)/,/^}/s/^  return 0;$/  return XTENSA_UNDEFINED;/' \
-    > "$TARGET"/xtensa-modules.c
+    > "$TARGET"/xtensa-modules.inc.c
 
 cat <<EOF > "${TARGET}.c"
 #include "qemu/osdep.h"
@@ -47,13 +47,13 @@ cat <<EOF > "${TARGET}.c"
 #include "overlay_tool.h"
 
 #define xtensa_modules xtensa_modules_$NAME
-#include "core-$NAME/xtensa-modules.c"
+#include "core-$NAME/xtensa-modules.inc.c"
 
 static XtensaConfig $NAME __attribute__((unused)) = {
     .name = "$NAME",
     .gdb_regmap = {
         .reg = {
-#include "core-$NAME/gdb-config.c"
+#include "core-$NAME/gdb-config.inc.c"
         }
     },
     .isa_internal = &xtensa_modules,
-- 
2.11.0

[Qemu-devel] [PATCH 3/3] target/xtensa/import_core.sh: fix #include <xtensa-isa.h>

[Max Filippov]

Change #include <xtensa-isa.h> to #include "xtensa-isa.h" in imported
files to make references to local files consistent.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
---
 target/xtensa/import_core.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/xtensa/import_core.sh b/target/xtensa/import_core.sh
index 58a42987d853..af6c6104792d 100755
--- a/target/xtensa/import_core.sh
+++ b/target/xtensa/import_core.sh
@@ -33,6 +33,7 @@ tar -xf "$OVERLAY" -O binutils/xtensa-modules.c | \
         -e '/^uint32 \*bypass_entry(int i)/,/}/d' \
         -e '/^#include "ansidecl.h"/d' \
         -e '/^Slot_[a-zA-Z0-9_]\+_decode (const xtensa_insnbuf insn)/,/^}/s/^  return 0;$/  return XTENSA_UNDEFINED;/' \
+        -e 's/#include <xtensa-isa.h>/#include "xtensa-isa.h"/' \
     > "$TARGET"/xtensa-modules.inc.c
 
 cat <<EOF > "${TARGET}.c"
-- 
2.11.0

Re: [Qemu-devel] [PATCH 2/3] target/xtensa/import_core.sh: fix names of non-top level files

[Eric Blake]

On 03/22/2018 01:09 PM, Max Filippov wrote:
> Add .inc. to the names of files imported from configuration overlay in
> the import_core.sh script to follow the rule of naming non-top level
> source files.
> 
> Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
> ---
>   target/xtensa/import_core.sh | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)

I'd squash this with 1/3 (otherwise, you have a one patch gap where the 
generator doesn't match the current tree contents, which may confuse 
someone doing a bisect).

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org

Re: [Qemu-devel] [PATCH 1/3] target/xtensa: add .inc. to non-top level source file names

[Eric Blake]

On 03/22/2018 01:09 PM, Max Filippov wrote:
> Fix definitions of existing cores and core importing script.

This mentions the script...

> 
> Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
> ---
>   target/xtensa/core-dc232b.c                                           | 4 ++--
>   target/xtensa/core-dc232b/{gdb-config.c => gdb-config.inc.c}          | 0
>   target/xtensa/core-dc232b/{xtensa-modules.c => xtensa-modules.inc.c}  | 0
>   target/xtensa/core-dc233c.c                                           | 4 ++--
>   target/xtensa/core-dc233c/{gdb-config.c => gdb-config.inc.c}          | 0
>   target/xtensa/core-dc233c/{xtensa-modules.c => xtensa-modules.inc.c}  | 0
>   target/xtensa/core-de212.c                                            | 4 ++--
>   target/xtensa/core-de212/{gdb-config.c => gdb-config.inc.c}           | 0
>   target/xtensa/core-de212/{xtensa-modules.c => xtensa-modules.inc.c}   | 0
>   target/xtensa/core-fsf.c                                              | 2 +-
>   target/xtensa/core-fsf/{xtensa-modules.c => xtensa-modules.inc.c}     | 0
>   target/xtensa/core-sample_controller.c                                | 4 ++--
>   .../xtensa/core-sample_controller/{gdb-config.c => gdb-config.inc.c}  | 0
>   .../core-sample_controller/{xtensa-modules.c => xtensa-modules.inc.c} | 0
>   14 files changed, 9 insertions(+), 9 deletions(-)

...but only touches .c files.


-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org

Re: [Qemu-devel] [PATCH 0/3] target/xtensa: improvements for core-specific files

[Eric Blake]

On 03/22/2018 01:09 PM, Max Filippov wrote:
> Hello,
> 
> this series adds .inc. to the names of non-top level xtensa core-specific
> files and fixes script import_core.sh so that it does it automatically.
> It also adds a fixup to the script that changes #include <xtensa-isa.h>
> to #include "xtensa-isa.h".
> 
> Max Filippov (3):
>    target/xtensa: add .inc. to non-top level source file names
>    target/xtensa/import_core.sh: fix names of non-top level files
>    target/xtensa/import_core.sh: fix #include <xtensa-isa.h>

Simple enough.  I don't know if it qualifies as a bug fix, so up to you 
as maintainer whether you feel comfortable enough getting it into 2.12. 
See my per-patch comments about possibly merging 1 and 2; but for the 
series,
Reviewed-by: Eric Blake <eblake@redhat.com>

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org

Re: [Qemu-devel] [PATCH 1/3] target/xtensa: add .inc. to non-top level source file names

[Max Filippov]

On Thu, Mar 22, 2018 at 12:16 PM, Eric Blake <eblake@redhat.com> wrote:
> On 03/22/2018 01:09 PM, Max Filippov wrote:
>>
>> Fix definitions of existing cores and core importing script.
>
> This mentions the script...
> ...but only touches .c files.

Yeah, I initially did it in a single patch, but then split it into
two. Will merge
them back as suggested.

-- 
Thanks.
-- Max

Re: [Qemu-devel] [PATCH 1/3] target/xtensa: add .inc. to non-top level source file names

[Philippe Mathieu-Daudé]

On 03/22/2018 05:37 PM, Max Filippov wrote:
> On Thu, Mar 22, 2018 at 12:16 PM, Eric Blake <eblake@redhat.com> wrote:
>> On 03/22/2018 01:09 PM, Max Filippov wrote:
>>>
>>> Fix definitions of existing cores and core importing script.
>>
>> This mentions the script...
>> ...but only touches .c files.
> 
> Yeah, I initially did it in a single patch, but then split it into
> two. Will merge
> them back as suggested.
> 

squashed with #2 (import_core.sh):
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Re: [Qemu-devel] [PATCH 3/3] target/xtensa/import_core.sh: fix #include <xtensa-isa.h>

[Philippe Mathieu-Daudé]

On 03/22/2018 03:09 PM, Max Filippov wrote:
> Change #include <xtensa-isa.h> to #include "xtensa-isa.h" in imported
> files to make references to local files consistent.
> 
> Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
>  target/xtensa/import_core.sh | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/target/xtensa/import_core.sh b/target/xtensa/import_core.sh
> index 58a42987d853..af6c6104792d 100755
> --- a/target/xtensa/import_core.sh
> +++ b/target/xtensa/import_core.sh
> @@ -33,6 +33,7 @@ tar -xf "$OVERLAY" -O binutils/xtensa-modules.c | \
>          -e '/^uint32 \*bypass_entry(int i)/,/}/d' \
>          -e '/^#include "ansidecl.h"/d' \
>          -e '/^Slot_[a-zA-Z0-9_]\+_decode (const xtensa_insnbuf insn)/,/^}/s/^  return 0;$/  return XTENSA_UNDEFINED;/' \
> +        -e 's/#include <xtensa-isa.h>/#include "xtensa-isa.h"/' \
>      > "$TARGET"/xtensa-modules.inc.c
>  
>  cat <<EOF > "${TARGET}.c"
>