[PATCH v3 16/18] target/s390x: Remove ILEN_AUTO

Richard Henderson posted 18 patches 6 years, 4 months ago
There is a newer version of this series
[PATCH v3 16/18] target/s390x: Remove ILEN_AUTO
Posted by Richard Henderson 6 years, 4 months ago
This setting is no longer used.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 target/s390x/cpu.h         | 2 --
 target/s390x/excp_helper.c | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
index a5eab491cd..fc941c7d76 100644
--- a/target/s390x/cpu.h
+++ b/target/s390x/cpu.h
@@ -816,8 +816,6 @@ void s390_io_interrupt(uint16_t subchannel_id, uint16_t subchannel_nr,
                        uint32_t io_int_parm, uint32_t io_int_word);
 /* instruction length set by unwind info */
 #define ILEN_UNWIND                 0
-/* automatically detect the instruction length */
-#define ILEN_AUTO                   0xff
 #define RA_IGNORED                  0
 void s390_program_interrupt(CPUS390XState *env, uint32_t code, uintptr_t ra);
 /* service interrupts are floating therefore we must not pass an cpustate */
diff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c
index 8ce992e639..c252e9a7d8 100644
--- a/target/s390x/excp_helper.c
+++ b/target/s390x/excp_helper.c
@@ -196,9 +196,6 @@ static void do_program_interrupt(CPUS390XState *env)
     LowCore *lowcore;
     int ilen = env->int_pgm_ilen;
 
-    if (ilen == ILEN_AUTO) {
-        ilen = get_ilen(cpu_ldub_code(env, env->psw.addr));
-    }
     assert(ilen == 2 || ilen == 4 || ilen == 6);
 
     switch (env->int_pgm_code) {
-- 
2.17.1


Re: [PATCH v3 16/18] target/s390x: Remove ILEN_AUTO
Posted by David Hildenbrand 6 years, 4 months ago
On 26.09.19 18:26, Richard Henderson wrote:
> This setting is no longer used.
> 
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>  target/s390x/cpu.h         | 2 --
>  target/s390x/excp_helper.c | 3 ---
>  2 files changed, 5 deletions(-)
> 
> diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
> index a5eab491cd..fc941c7d76 100644
> --- a/target/s390x/cpu.h
> +++ b/target/s390x/cpu.h
> @@ -816,8 +816,6 @@ void s390_io_interrupt(uint16_t subchannel_id, uint16_t subchannel_nr,
>                         uint32_t io_int_parm, uint32_t io_int_word);
>  /* instruction length set by unwind info */
>  #define ILEN_UNWIND                 0
> -/* automatically detect the instruction length */
> -#define ILEN_AUTO                   0xff
>  #define RA_IGNORED                  0
>  void s390_program_interrupt(CPUS390XState *env, uint32_t code, uintptr_t ra);
>  /* service interrupts are floating therefore we must not pass an cpustate */
> diff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c
> index 8ce992e639..c252e9a7d8 100644
> --- a/target/s390x/excp_helper.c
> +++ b/target/s390x/excp_helper.c
> @@ -196,9 +196,6 @@ static void do_program_interrupt(CPUS390XState *env)
>      LowCore *lowcore;
>      int ilen = env->int_pgm_ilen;
>  
> -    if (ilen == ILEN_AUTO) {
> -        ilen = get_ilen(cpu_ldub_code(env, env->psw.addr));
> -    }
>      assert(ilen == 2 || ilen == 4 || ilen == 6);
>  
>      switch (env->int_pgm_code) {
> 

Reviewed-by: David Hildenbrand <david@redhat.com>

-- 

Thanks,

David / dhildenb