diff mbox series

[v3,17/18] target/s390x: Remove ilen argument from trigger_access_exception

Message ID 20190926162615.31168-18-richard.henderson@linaro.org
State Superseded
Headers show
Series target/s390: Use tcg unwinding for ilen | expand

Commit Message

Richard Henderson Sept. 26, 2019, 4:26 p.m. UTC
The single caller passes ILEN_UNWIND; pass that along to
trigger_pgm_exception directly.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

---
 target/s390x/mmu_helper.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

-- 
2.17.1

Comments

David Hildenbrand Sept. 27, 2019, 11:04 a.m. UTC | #1
On 26.09.19 18:26, Richard Henderson wrote:
> The single caller passes ILEN_UNWIND; pass that along to

> trigger_pgm_exception directly.

> 

> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

> ---

>  target/s390x/mmu_helper.c | 6 +++---

>  1 file changed, 3 insertions(+), 3 deletions(-)

> 

> diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c

> index bf7fddb056..e6c3139c57 100644

> --- a/target/s390x/mmu_helper.c

> +++ b/target/s390x/mmu_helper.c

> @@ -33,7 +33,7 @@

>  #define FS_WRITE 0x400

>  

>  static void trigger_access_exception(CPUS390XState *env, uint32_t type,

> -                                     uint32_t ilen, uint64_t tec)

> +                                     uint64_t tec)

>  {

>      S390CPU *cpu = env_archcpu(env);

>  

> @@ -44,7 +44,7 @@ static void trigger_access_exception(CPUS390XState *env, uint32_t type,

>          if (type != PGM_ADDRESSING) {

>              stq_phys(cs->as, env->psa + offsetof(LowCore, trans_exc_code), tec);

>          }

> -        trigger_pgm_exception(env, type, ilen);

> +        trigger_pgm_exception(env, type, ILEN_UNWIND);

>      }

>  }

>  

> @@ -482,7 +482,7 @@ int s390_cpu_virt_mem_rw(S390CPU *cpu, vaddr laddr, uint8_t ar, void *hostbuf,

>  

>      ret = translate_pages(cpu, laddr, nr_pages, pages, is_write, &tec);

>      if (ret) {

> -        trigger_access_exception(&cpu->env, ret, ILEN_UNWIND, tec);

> +        trigger_access_exception(&cpu->env, ret, tec);

>      } else if (hostbuf != NULL) {

>          /* Copy data by stepping through the area page by page */

>          for (i = 0; i < nr_pages; i++) {

> 


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


-- 

Thanks,

David / dhildenb
diff mbox series

Patch

diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c
index bf7fddb056..e6c3139c57 100644
--- a/target/s390x/mmu_helper.c
+++ b/target/s390x/mmu_helper.c
@@ -33,7 +33,7 @@ 
 #define FS_WRITE 0x400
 
 static void trigger_access_exception(CPUS390XState *env, uint32_t type,
-                                     uint32_t ilen, uint64_t tec)
+                                     uint64_t tec)
 {
     S390CPU *cpu = env_archcpu(env);
 
@@ -44,7 +44,7 @@  static void trigger_access_exception(CPUS390XState *env, uint32_t type,
         if (type != PGM_ADDRESSING) {
             stq_phys(cs->as, env->psa + offsetof(LowCore, trans_exc_code), tec);
         }
-        trigger_pgm_exception(env, type, ilen);
+        trigger_pgm_exception(env, type, ILEN_UNWIND);
     }
 }
 
@@ -482,7 +482,7 @@  int s390_cpu_virt_mem_rw(S390CPU *cpu, vaddr laddr, uint8_t ar, void *hostbuf,
 
     ret = translate_pages(cpu, laddr, nr_pages, pages, is_write, &tec);
     if (ret) {
-        trigger_access_exception(&cpu->env, ret, ILEN_UNWIND, tec);
+        trigger_access_exception(&cpu->env, ret, tec);
     } else if (hostbuf != NULL) {
         /* Copy data by stepping through the area page by page */
         for (i = 0; i < nr_pages; i++) {