Re: [RFC PATCH 16/18] target/riscv: Recognize watchpoints with first/last

On 8/17/26 22:43, Philippe Mathieu-Daudé wrote:
> On 15/8/26 22:37, Richard Henderson wrote:
>> Signed-off-by: Richard Henderson <[email protected]>
>> ---
>>   target/riscv/tcg/cpu_helper.c | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/target/riscv/tcg/cpu_helper.c b/target/riscv/tcg/cpu_helper.c
>> index 11f2654da1..3318e82ea7 100644
>> --- a/target/riscv/tcg/cpu_helper.c
>> +++ b/target/riscv/tcg/cpu_helper.c
>> @@ -1784,8 +1784,8 @@ bool riscv_cpu_tlb_fill(CPUState *cs, vaddr address, vaddr first, 
>> vaddr last,
>>            * Otherwise we'll throw a debug exception and execution
>>            * will continue elsewhere.
>>            */
>> -        cpu_check_watchpoint(cs, address, size, MEMTXATTRS_UNSPECIFIED,
>> -                             wp_access, retaddr);
>> +        cpu_check_watchpoint(cs, first, last - first + 1,
>> +                             MEMTXATTRS_UNSPECIFIED, wp_access, retaddr);
> 
> Maybe squash in "accel/tcg: Replace size with first/last in TCGCPUOps.tlb_fill"

No, because that one explicitly makes no other code changes.


> or re-order just after?

Ok.

> I'm confused by this single WP change in middle of PMP API ones.
It's just before the last use of size is removed.  :-/


r~