[Qemu-devel] [PATCH] [m68k] Move helpers.h to helper.h

[Qemu-devel] [PATCH] [m68k] Move helpers.h to helper.h

[Lluís Vilanova]

Provides a file naming scheme consistent with other targets.

Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu>
---
 target-m68k/helper.c    |    2 +-
 target-m68k/helper.h    |   54 +++++++++++++++++++++++++++++++++++++++++++++++
 target-m68k/helpers.h   |   54 -----------------------------------------------
 target-m68k/op_helper.c |    2 +-
 target-m68k/translate.c |    6 +++--
 5 files changed, 59 insertions(+), 59 deletions(-)
 create mode 100644 target-m68k/helper.h
 delete mode 100644 target-m68k/helpers.h

diff --git a/target-m68k/helper.c b/target-m68k/helper.c
index 674c8e6..123e1d9 100644
--- a/target-m68k/helper.c
+++ b/target-m68k/helper.c
@@ -26,7 +26,7 @@
 #include "qemu-common.h"
 #include "gdbstub.h"
 
-#include "helpers.h"
+#include "helper.h"
 
 #define SIGNBIT (1u << 31)
 
diff --git a/target-m68k/helper.h b/target-m68k/helper.h
new file mode 100644
index 0000000..cb8a0c7
--- /dev/null
+++ b/target-m68k/helper.h
@@ -0,0 +1,54 @@
+#include "def-helper.h"
+
+DEF_HELPER_1(bitrev, i32, i32)
+DEF_HELPER_1(ff1, i32, i32)
+DEF_HELPER_2(sats, i32, i32, i32)
+DEF_HELPER_2(divu, void, env, i32)
+DEF_HELPER_2(divs, void, env, i32)
+DEF_HELPER_3(addx_cc, i32, env, i32, i32)
+DEF_HELPER_3(subx_cc, i32, env, i32, i32)
+DEF_HELPER_3(shl_cc, i32, env, i32, i32)
+DEF_HELPER_3(shr_cc, i32, env, i32, i32)
+DEF_HELPER_3(sar_cc, i32, env, i32, i32)
+DEF_HELPER_2(xflag_lt, i32, i32, i32)
+DEF_HELPER_2(set_sr, void, env, i32)
+DEF_HELPER_3(movec, void, env, i32, i32)
+
+DEF_HELPER_2(f64_to_i32, f32, env, f64)
+DEF_HELPER_2(f64_to_f32, f32, env, f64)
+DEF_HELPER_2(i32_to_f64, f64, env, i32)
+DEF_HELPER_2(f32_to_f64, f64, env, f32)
+DEF_HELPER_2(iround_f64, f64, env, f64)
+DEF_HELPER_2(itrunc_f64, f64, env, f64)
+DEF_HELPER_2(sqrt_f64, f64, env, f64)
+DEF_HELPER_1(abs_f64, f64, f64)
+DEF_HELPER_1(chs_f64, f64, f64)
+DEF_HELPER_3(add_f64, f64, env, f64, f64)
+DEF_HELPER_3(sub_f64, f64, env, f64, f64)
+DEF_HELPER_3(mul_f64, f64, env, f64, f64)
+DEF_HELPER_3(div_f64, f64, env, f64, f64)
+DEF_HELPER_3(sub_cmp_f64, f64, env, f64, f64)
+DEF_HELPER_2(compare_f64, i32, env, f64)
+
+DEF_HELPER_3(mac_move, void, env, i32, i32)
+DEF_HELPER_3(macmulf, i64, env, i32, i32)
+DEF_HELPER_3(macmuls, i64, env, i32, i32)
+DEF_HELPER_3(macmulu, i64, env, i32, i32)
+DEF_HELPER_2(macsats, void, env, i32)
+DEF_HELPER_2(macsatu, void, env, i32)
+DEF_HELPER_2(macsatf, void, env, i32)
+DEF_HELPER_2(mac_set_flags, void, env, i32)
+DEF_HELPER_2(set_macsr, void, env, i32)
+DEF_HELPER_2(get_macf, i32, env, i64)
+DEF_HELPER_1(get_macs, i32, i64)
+DEF_HELPER_1(get_macu, i32, i64)
+DEF_HELPER_2(get_mac_extf, i32, env, i32)
+DEF_HELPER_2(get_mac_exti, i32, env, i32)
+DEF_HELPER_3(set_mac_extf, void, env, i32, i32)
+DEF_HELPER_3(set_mac_exts, void, env, i32, i32)
+DEF_HELPER_3(set_mac_extu, void, env, i32, i32)
+
+DEF_HELPER_2(flush_flags, void, env, i32)
+DEF_HELPER_1(raise_exception, void, i32)
+
+#include "def-helper.h"
diff --git a/target-m68k/helpers.h b/target-m68k/helpers.h
deleted file mode 100644
index cb8a0c7..0000000
--- a/target-m68k/helpers.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#include "def-helper.h"
-
-DEF_HELPER_1(bitrev, i32, i32)
-DEF_HELPER_1(ff1, i32, i32)
-DEF_HELPER_2(sats, i32, i32, i32)
-DEF_HELPER_2(divu, void, env, i32)
-DEF_HELPER_2(divs, void, env, i32)
-DEF_HELPER_3(addx_cc, i32, env, i32, i32)
-DEF_HELPER_3(subx_cc, i32, env, i32, i32)
-DEF_HELPER_3(shl_cc, i32, env, i32, i32)
-DEF_HELPER_3(shr_cc, i32, env, i32, i32)
-DEF_HELPER_3(sar_cc, i32, env, i32, i32)
-DEF_HELPER_2(xflag_lt, i32, i32, i32)
-DEF_HELPER_2(set_sr, void, env, i32)
-DEF_HELPER_3(movec, void, env, i32, i32)
-
-DEF_HELPER_2(f64_to_i32, f32, env, f64)
-DEF_HELPER_2(f64_to_f32, f32, env, f64)
-DEF_HELPER_2(i32_to_f64, f64, env, i32)
-DEF_HELPER_2(f32_to_f64, f64, env, f32)
-DEF_HELPER_2(iround_f64, f64, env, f64)
-DEF_HELPER_2(itrunc_f64, f64, env, f64)
-DEF_HELPER_2(sqrt_f64, f64, env, f64)
-DEF_HELPER_1(abs_f64, f64, f64)
-DEF_HELPER_1(chs_f64, f64, f64)
-DEF_HELPER_3(add_f64, f64, env, f64, f64)
-DEF_HELPER_3(sub_f64, f64, env, f64, f64)
-DEF_HELPER_3(mul_f64, f64, env, f64, f64)
-DEF_HELPER_3(div_f64, f64, env, f64, f64)
-DEF_HELPER_3(sub_cmp_f64, f64, env, f64, f64)
-DEF_HELPER_2(compare_f64, i32, env, f64)
-
-DEF_HELPER_3(mac_move, void, env, i32, i32)
-DEF_HELPER_3(macmulf, i64, env, i32, i32)
-DEF_HELPER_3(macmuls, i64, env, i32, i32)
-DEF_HELPER_3(macmulu, i64, env, i32, i32)
-DEF_HELPER_2(macsats, void, env, i32)
-DEF_HELPER_2(macsatu, void, env, i32)
-DEF_HELPER_2(macsatf, void, env, i32)
-DEF_HELPER_2(mac_set_flags, void, env, i32)
-DEF_HELPER_2(set_macsr, void, env, i32)
-DEF_HELPER_2(get_macf, i32, env, i64)
-DEF_HELPER_1(get_macs, i32, i64)
-DEF_HELPER_1(get_macu, i32, i64)
-DEF_HELPER_2(get_mac_extf, i32, env, i32)
-DEF_HELPER_2(get_mac_exti, i32, env, i32)
-DEF_HELPER_3(set_mac_extf, void, env, i32, i32)
-DEF_HELPER_3(set_mac_exts, void, env, i32, i32)
-DEF_HELPER_3(set_mac_extu, void, env, i32, i32)
-
-DEF_HELPER_2(flush_flags, void, env, i32)
-DEF_HELPER_1(raise_exception, void, i32)
-
-#include "def-helper.h"
diff --git a/target-m68k/op_helper.c b/target-m68k/op_helper.c
index 2f7fe6b..da7ebe4 100644
--- a/target-m68k/op_helper.c
+++ b/target-m68k/op_helper.c
@@ -18,7 +18,7 @@
  */
 #include "cpu.h"
 #include "dyngen-exec.h"
-#include "helpers.h"
+#include "helper.h"
 
 #if defined(CONFIG_USER_ONLY)
 
diff --git a/target-m68k/translate.c b/target-m68k/translate.c
index 0e7f1fe..fe750e2 100644
--- a/target-m68k/translate.c
+++ b/target-m68k/translate.c
@@ -29,9 +29,9 @@
 #include "tcg-op.h"
 #include "qemu-log.h"
 
-#include "helpers.h"
+#include "helper.h"
 #define GEN_HELPER 1
-#include "helpers.h"
+#include "helper.h"
 
 //#define DEBUG_DISPATCH 1
 
@@ -110,7 +110,7 @@ void m68k_tcg_init(void)
     store_dummy = tcg_global_mem_new(TCG_AREG0, -8, "NULL");
 
 #define GEN_HELPER 2
-#include "helpers.h"
+#include "helper.h"
 }
 
 static inline void qemu_assert(int cond, const char *msg)

Re: [Qemu-devel] [PATCH] [m68k] Move helpers.h to helper.h

[Andreas Färber]

Am 13.02.2012 16:33, schrieb Lluís Vilanova:
> Provides a file naming scheme consistent with other targets.
> 
> Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu>
> ---
>  target-m68k/helper.c    |    2 +-
>  target-m68k/helper.h    |   54 +++++++++++++++++++++++++++++++++++++++++++++++
>  target-m68k/helpers.h   |   54 -----------------------------------------------
>  target-m68k/op_helper.c |    2 +-
>  target-m68k/translate.c |    6 +++--
>  5 files changed, 59 insertions(+), 59 deletions(-)
>  create mode 100644 target-m68k/helper.h
>  delete mode 100644 target-m68k/helpers.h

Please check your git options, it did not recognize that you're renaming
the file. Or did you also reformat it?

Is there any particular reason for these three patches beyond
aesthetics? Header names are purely target-specific choices here and do
not simplify, e.g., any Makefile logic.

Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [PATCH] [m68k] Move helpers.h to helper.h

[Lluís Vilanova]

Andreas Färber writes:

> Am 13.02.2012 16:33, schrieb Lluís Vilanova:
>> Provides a file naming scheme consistent with other targets.
>> 
>> Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu>
>> ---
>> target-m68k/helper.c    |    2 +-
>> target-m68k/helper.h    |   54 +++++++++++++++++++++++++++++++++++++++++++++++
>> target-m68k/helpers.h   |   54 -----------------------------------------------
>> target-m68k/op_helper.c |    2 +-
>> target-m68k/translate.c |    6 +++--
>> 5 files changed, 59 insertions(+), 59 deletions(-)
>> create mode 100644 target-m68k/helper.h
>> delete mode 100644 target-m68k/helpers.h

> Please check your git options, it did not recognize that you're renaming
> the file. Or did you also reformat it?

It's pure file renaming. Which git options are you referring to?


> Is there any particular reason for these three patches beyond
> aesthetics? Header names are purely target-specific choices here and do
> not simplify, e.g., any Makefile logic.

It's used by a tracetool-related patch in my TCG tracing queue. I just thought I
could send it separately (due to aesthetics) while other earlier patches are
waiting on enter Stefan's tracing queue.


Lluis

-- 
 "And it's much the same thing with knowledge, for whenever you learn
 something new, the whole world becomes that much richer."
 -- The Princess of Pure Reason, as told by Norton Juster in The Phantom
 Tollbooth

Re: [Qemu-devel] [PATCH] [m68k] Move helpers.h to helper.h

[Andreas Färber]

Am 13.02.2012 18:01, schrieb Lluís Vilanova:
> Andreas Färber writes:
> 
>> Am 13.02.2012 16:33, schrieb Lluís Vilanova:
>>> Provides a file naming scheme consistent with other targets.
>>>
>>> Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu>
>>> ---
>>> target-m68k/helper.c    |    2 +-
>>> target-m68k/helper.h    |   54 +++++++++++++++++++++++++++++++++++++++++++++++
>>> target-m68k/helpers.h   |   54 -----------------------------------------------
>>> target-m68k/op_helper.c |    2 +-
>>> target-m68k/translate.c |    6 +++--
>>> 5 files changed, 59 insertions(+), 59 deletions(-)
>>> create mode 100644 target-m68k/helper.h
>>> delete mode 100644 target-m68k/helpers.h
> 
>> Please check your git options, it did not recognize that you're renaming
>> the file. Or did you also reformat it?
> 
> It's pure file renaming. Which git options are you referring to?

Command lines options:
--no-renames
--find-renames=n / -Mn

Or config file options:
[diff]
	renames = true
	;or renames = "copies"

The default settings (i.e., none of the above set) usually detect it.

Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [PATCH] [m68k] Move helpers.h to helper.h

[Lluís Vilanova]

Andreas Färber writes:

> Am 13.02.2012 18:01, schrieb Lluís Vilanova:
>> Andreas Färber writes:
>> 
>>> Am 13.02.2012 16:33, schrieb Lluís Vilanova:
>>>> Provides a file naming scheme consistent with other targets.
>>>> 
>>>> Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu>
>>>> ---
>>>> target-m68k/helper.c    |    2 +-
>>>> target-m68k/helper.h    |   54 +++++++++++++++++++++++++++++++++++++++++++++++
>>>> target-m68k/helpers.h   |   54 -----------------------------------------------
>>>> target-m68k/op_helper.c |    2 +-
>>>> target-m68k/translate.c |    6 +++--
>>>> 5 files changed, 59 insertions(+), 59 deletions(-)
>>>> create mode 100644 target-m68k/helper.h
>>>> delete mode 100644 target-m68k/helpers.h
>> 
>>> Please check your git options, it did not recognize that you're renaming
>>> the file. Or did you also reformat it?
>> 
>> It's pure file renaming. Which git options are you referring to?

> Command lines options:
> --no-renames
> --find-renames=n / -Mn

> Or config file options:
> [diff]
> 	renames = true
> 	;or renames = "copies"

> The default settings (i.e., none of the above set) usually detect it.

Ah, right. It seems like stgit failed to activate rename detection when calling
git diff to send the mails.


Lluis

-- 
 "And it's much the same thing with knowledge, for whenever you learn
 something new, the whole world becomes that much richer."
 -- The Princess of Pure Reason, as told by Norton Juster in The Phantom
 Tollbooth