| Message ID | 20201208194839.31305-19-cfontana@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | i386 cleanup | expand |
On 12/8/20 8:48 PM, Claudio Fontana wrote: > From: Eduardo Habkost <ehabkost@redhat.com> > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> > [claudio: wrapped in CONFIG_TCG] > Signed-off-by: Claudio Fontana <cfontana@suse.de> > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- ... > diff --git a/include/hw/core/tcg-cpu-ops.h b/include/hw/core/tcg-cpu-ops.h > index 4475ef0996..109291ac52 100644 > --- a/include/hw/core/tcg-cpu-ops.h > +++ b/include/hw/core/tcg-cpu-ops.h > @@ -10,9 +10,6 @@ > #ifndef TCG_CPU_OPS_H > #define TCG_CPU_OPS_H Missing for TranslationBlock: #include "hw/core/cpu.h" > > -/** > - * struct TcgCpuOperations: TCG operations specific to a CPU class > - */ Why remove the comment? > typedef struct TcgCpuOperations { > /** > * @initialize: Initalize TCG state > @@ -20,6 +17,17 @@ typedef struct TcgCpuOperations { > * Called when the first CPU is realized. > */ > void (*initialize)(void); > + /** > + * @synchronize_from_tb: Synchronize state from a TCG #TranslationBlock > + * > + * This is called when we abandon execution of a TB before > + * starting it, and must set all parts of the CPU state which > + * the previous TB in the chain may not have updated. This > + * will need to do more. If this hook is not implemented then > + * the default is to call > + * @set_pc(tb->pc). > + */ > + void (*synchronize_from_tb)(CPUState *cpu, struct TranslationBlock *tb); > } TcgCpuOperations; ...
Claudio Fontana <cfontana@suse.de> writes: > From: Eduardo Habkost <ehabkost@redhat.com> > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> > [claudio: wrapped in CONFIG_TCG] > Signed-off-by: Claudio Fontana <cfontana@suse.de> > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > accel/tcg/cpu-exec.c | 4 ++-- > include/hw/core/cpu.h | 8 -------- > include/hw/core/tcg-cpu-ops.h | 14 +++++++++++--- > target/arm/cpu.c | 2 +- > target/avr/cpu.c | 2 +- > target/hppa/cpu.c | 2 +- > target/i386/tcg-cpu.c | 2 +- > target/microblaze/cpu.c | 2 +- > target/mips/cpu.c | 2 +- > target/riscv/cpu.c | 2 +- > target/rx/cpu.c | 2 +- > target/sh4/cpu.c | 2 +- > target/sparc/cpu.c | 2 +- > target/tricore/cpu.c | 2 +- > 14 files changed, 24 insertions(+), 24 deletions(-) > > diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c > index 436dfbf155..776415d47e 100644 > --- a/accel/tcg/cpu-exec.c > +++ b/accel/tcg/cpu-exec.c > @@ -192,8 +192,8 @@ static inline tcg_target_ulong cpu_tb_exec(CPUState *cpu, TranslationBlock *itb) > TARGET_FMT_lx "] %s\n", > last_tb->tc.ptr, last_tb->pc, > lookup_symbol(last_tb->pc)); > - if (cc->synchronize_from_tb) { > - cc->synchronize_from_tb(cpu, last_tb); > + if (cc->tcg_ops.synchronize_from_tb) { > + cc->tcg_ops.synchronize_from_tb(cpu, last_tb); > } else { > assert(cc->set_pc); > cc->set_pc(cpu, last_tb->pc); > diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h > index ea648d52ad..83007d262c 100644 > --- a/include/hw/core/cpu.h > +++ b/include/hw/core/cpu.h > @@ -110,13 +110,6 @@ struct TranslationBlock; > * If the target behaviour here is anything other than "set > * the PC register to the value passed in" then the target must > * also implement the synchronize_from_tb hook. > - * @synchronize_from_tb: Callback for synchronizing state from a TCG > - * #TranslationBlock. This is called when we abandon execution > - * of a TB before starting it, and must set all parts of the CPU > - * state which the previous TB in the chain may not have updated. > - * This always includes at least the program counter; some targets > - * will need to do more. If this hook is not implemented then the > - * default is to call @set_pc(tb->pc). > * @tlb_fill: Callback for handling a softmmu tlb miss or user-only > * address fault. For system mode, if the access is valid, call > * tlb_set_page and return true; if the access is invalid, and > @@ -193,7 +186,6 @@ struct CPUClass { > void (*get_memory_mapping)(CPUState *cpu, MemoryMappingList *list, > Error **errp); > void (*set_pc)(CPUState *cpu, vaddr value); > - void (*synchronize_from_tb)(CPUState *cpu, struct TranslationBlock *tb); > bool (*tlb_fill)(CPUState *cpu, vaddr address, int size, > MMUAccessType access_type, int mmu_idx, > bool probe, uintptr_t retaddr); > diff --git a/include/hw/core/tcg-cpu-ops.h b/include/hw/core/tcg-cpu-ops.h > index 4475ef0996..109291ac52 100644 > --- a/include/hw/core/tcg-cpu-ops.h > +++ b/include/hw/core/tcg-cpu-ops.h > @@ -10,9 +10,6 @@ > #ifndef TCG_CPU_OPS_H > #define TCG_CPU_OPS_H > > -/** > - * struct TcgCpuOperations: TCG operations specific to a CPU class > - */ > typedef struct TcgCpuOperations { > /** > * @initialize: Initalize TCG state > @@ -20,6 +17,17 @@ typedef struct TcgCpuOperations { > * Called when the first CPU is realized. > */ > void (*initialize)(void); > + /** > + * @synchronize_from_tb: Synchronize state from a TCG #TranslationBlock > + * > + * This is called when we abandon execution of a TB before > + * starting it, and must set all parts of the CPU state which > + * the previous TB in the chain may not have updated. This > + * will need to do more. If this hook is not implemented then > + * the default is to call > + * @set_pc(tb->pc). > + */ We could clean-up the comment here to better fit the javadoc style API documentation format, i.e.: /** * synchronize_from_tb: Synchronize current TCG execution state * @cpu: current cpu * @tb: about to be executed #TranslationBlock * * This is called when we abandon execution of a TB before * starting it, and must set all parts of the CPU state which * the previous TB in the chain may not have updated. This * will need to do more. If this hook is not implemented then * the default is to call @set_pc(tb->pc). */ <snip> Otherwise: Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Hi Philippe, On 12/9/20 10:27 AM, Philippe Mathieu-Daudé wrote: > On 12/8/20 8:48 PM, Claudio Fontana wrote: >> From: Eduardo Habkost <ehabkost@redhat.com> >> >> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> >> [claudio: wrapped in CONFIG_TCG] >> Signed-off-by: Claudio Fontana <cfontana@suse.de> >> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> >> --- > ... >> diff --git a/include/hw/core/tcg-cpu-ops.h b/include/hw/core/tcg-cpu-ops.h >> index 4475ef0996..109291ac52 100644 >> --- a/include/hw/core/tcg-cpu-ops.h >> +++ b/include/hw/core/tcg-cpu-ops.h >> @@ -10,9 +10,6 @@ >> #ifndef TCG_CPU_OPS_H >> #define TCG_CPU_OPS_H > > Missing for TranslationBlock: > > #include "hw/core/cpu.h" this file though is only included from hw/core/cpu.h itself under CONFIG_TCG.. > >> >> -/** >> - * struct TcgCpuOperations: TCG operations specific to a CPU class >> - */ > > Why remove the comment? a mistake, will fix. > >> typedef struct TcgCpuOperations { >> /** >> * @initialize: Initalize TCG state >> @@ -20,6 +17,17 @@ typedef struct TcgCpuOperations { >> * Called when the first CPU is realized. >> */ >> void (*initialize)(void); >> + /** >> + * @synchronize_from_tb: Synchronize state from a TCG #TranslationBlock >> + * >> + * This is called when we abandon execution of a TB before >> + * starting it, and must set all parts of the CPU state which >> + * the previous TB in the chain may not have updated. This >> + * will need to do more. If this hook is not implemented then >> + * the default is to call >> + * @set_pc(tb->pc). >> + */ >> + void (*synchronize_from_tb)(CPUState *cpu, struct TranslationBlock *tb); >> } TcgCpuOperations; > ... > >
On Wed, Dec 09, 2020 at 10:50:29AM +0000, Alex Bennée wrote: > > Claudio Fontana <cfontana@suse.de> writes: > > > From: Eduardo Habkost <ehabkost@redhat.com> > > > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> > > [claudio: wrapped in CONFIG_TCG] > > Signed-off-by: Claudio Fontana <cfontana@suse.de> > > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > > --- [...] > > @@ -20,6 +17,17 @@ typedef struct TcgCpuOperations { > > * Called when the first CPU is realized. > > */ > > void (*initialize)(void); > > + /** > > + * @synchronize_from_tb: Synchronize state from a TCG #TranslationBlock > > + * > > + * This is called when we abandon execution of a TB before > > + * starting it, and must set all parts of the CPU state which > > + * the previous TB in the chain may not have updated. This > > + * will need to do more. If this hook is not implemented then > > + * the default is to call > > + * @set_pc(tb->pc). > > + */ > > We could clean-up the comment here to better fit the javadoc style API > documentation format, i.e.: > > /** > * synchronize_from_tb: Synchronize current TCG execution state > * @cpu: current cpu > * @tb: about to be executed #TranslationBlock > * > * This is called when we abandon execution of a TB before > * starting it, and must set all parts of the CPU state which > * the previous TB in the chain may not have updated. This > * will need to do more. If this hook is not implemented then > * the default is to call @set_pc(tb->pc). > */ Would this work with kernel-doc? This will be parsed as a portion of the documentation of struct TcgCpuOperations, so I was not expecting kernel-doc to treat the "@cpu: ..." and "@tb: ..." lines as valid.
On 12/9/20 3:33 PM, Claudio Fontana wrote: > Hi Philippe, > > On 12/9/20 10:27 AM, Philippe Mathieu-Daudé wrote: >> On 12/8/20 8:48 PM, Claudio Fontana wrote: >>> From: Eduardo Habkost <ehabkost@redhat.com> >>> >>> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> >>> [claudio: wrapped in CONFIG_TCG] >>> Signed-off-by: Claudio Fontana <cfontana@suse.de> >>> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> >>> --- >> ... >>> diff --git a/include/hw/core/tcg-cpu-ops.h b/include/hw/core/tcg-cpu-ops.h >>> index 4475ef0996..109291ac52 100644 >>> --- a/include/hw/core/tcg-cpu-ops.h >>> +++ b/include/hw/core/tcg-cpu-ops.h >>> @@ -10,9 +10,6 @@ >>> #ifndef TCG_CPU_OPS_H >>> #define TCG_CPU_OPS_H >> >> Missing for TranslationBlock: >> >> #include "hw/core/cpu.h" > > > this file though is only included from hw/core/cpu.h itself under CONFIG_TCG.. 1/ we never know how it will be included, includes should be self-contained IMO. 2/ my editor isn't that smart and can't figure out the types.
Eduardo Habkost <ehabkost@redhat.com> writes: > On Wed, Dec 09, 2020 at 10:50:29AM +0000, Alex Bennée wrote: >> >> Claudio Fontana <cfontana@suse.de> writes: >> >> > From: Eduardo Habkost <ehabkost@redhat.com> >> > >> > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> >> > [claudio: wrapped in CONFIG_TCG] >> > Signed-off-by: Claudio Fontana <cfontana@suse.de> >> > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> >> > --- > [...] >> > @@ -20,6 +17,17 @@ typedef struct TcgCpuOperations { >> > * Called when the first CPU is realized. >> > */ >> > void (*initialize)(void); >> > + /** >> > + * @synchronize_from_tb: Synchronize state from a TCG #TranslationBlock >> > + * >> > + * This is called when we abandon execution of a TB before >> > + * starting it, and must set all parts of the CPU state which >> > + * the previous TB in the chain may not have updated. This >> > + * will need to do more. If this hook is not implemented then >> > + * the default is to call >> > + * @set_pc(tb->pc). >> > + */ >> >> We could clean-up the comment here to better fit the javadoc style API >> documentation format, i.e.: >> >> /** >> * synchronize_from_tb: Synchronize current TCG execution state >> * @cpu: current cpu >> * @tb: about to be executed #TranslationBlock >> * >> * This is called when we abandon execution of a TB before >> * starting it, and must set all parts of the CPU state which >> * the previous TB in the chain may not have updated. This >> * will need to do more. If this hook is not implemented then >> * the default is to call @set_pc(tb->pc). >> */ > > Would this work with kernel-doc? This will be parsed as a > portion of the documentation of struct TcgCpuOperations, so I was > not expecting kernel-doc to treat the "@cpu: ..." and "@tb: ..." > lines as valid. Hmm looking at the guides it seems they wouldn't be processed: https://www.kernel.org/doc/html/v4.18/doc-guide/kernel-doc.html#structure-union-and-enumeration-documentation I must admit I had previously just used exec-all.h as my template for what a well formed function document comment is meant to look like. It seems for it to work properly you need to use function pointer typedefs and document those. However looking at which headers we convert into docs at the moment this is all moot as we don't process these headers at the moment. IOW ignore this request ;-)
diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 436dfbf155..776415d47e 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -192,8 +192,8 @@ static inline tcg_target_ulong cpu_tb_exec(CPUState *cpu, TranslationBlock *itb) TARGET_FMT_lx "] %s\n", last_tb->tc.ptr, last_tb->pc, lookup_symbol(last_tb->pc)); - if (cc->synchronize_from_tb) { - cc->synchronize_from_tb(cpu, last_tb); + if (cc->tcg_ops.synchronize_from_tb) { + cc->tcg_ops.synchronize_from_tb(cpu, last_tb); } else { assert(cc->set_pc); cc->set_pc(cpu, last_tb->pc); diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index ea648d52ad..83007d262c 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -110,13 +110,6 @@ struct TranslationBlock; * If the target behaviour here is anything other than "set * the PC register to the value passed in" then the target must * also implement the synchronize_from_tb hook. - * @synchronize_from_tb: Callback for synchronizing state from a TCG - * #TranslationBlock. This is called when we abandon execution - * of a TB before starting it, and must set all parts of the CPU - * state which the previous TB in the chain may not have updated. - * This always includes at least the program counter; some targets - * will need to do more. If this hook is not implemented then the - * default is to call @set_pc(tb->pc). * @tlb_fill: Callback for handling a softmmu tlb miss or user-only * address fault. For system mode, if the access is valid, call * tlb_set_page and return true; if the access is invalid, and @@ -193,7 +186,6 @@ struct CPUClass { void (*get_memory_mapping)(CPUState *cpu, MemoryMappingList *list, Error **errp); void (*set_pc)(CPUState *cpu, vaddr value); - void (*synchronize_from_tb)(CPUState *cpu, struct TranslationBlock *tb); bool (*tlb_fill)(CPUState *cpu, vaddr address, int size, MMUAccessType access_type, int mmu_idx, bool probe, uintptr_t retaddr); diff --git a/include/hw/core/tcg-cpu-ops.h b/include/hw/core/tcg-cpu-ops.h index 4475ef0996..109291ac52 100644 --- a/include/hw/core/tcg-cpu-ops.h +++ b/include/hw/core/tcg-cpu-ops.h @@ -10,9 +10,6 @@ #ifndef TCG_CPU_OPS_H #define TCG_CPU_OPS_H -/** - * struct TcgCpuOperations: TCG operations specific to a CPU class - */ typedef struct TcgCpuOperations { /** * @initialize: Initalize TCG state @@ -20,6 +17,17 @@ typedef struct TcgCpuOperations { * Called when the first CPU is realized. */ void (*initialize)(void); + /** + * @synchronize_from_tb: Synchronize state from a TCG #TranslationBlock + * + * This is called when we abandon execution of a TB before + * starting it, and must set all parts of the CPU state which + * the previous TB in the chain may not have updated. This + * will need to do more. If this hook is not implemented then + * the default is to call + * @set_pc(tb->pc). + */ + void (*synchronize_from_tb)(CPUState *cpu, struct TranslationBlock *tb); } TcgCpuOperations; #endif /* TCG_CPU_OPS_H */ diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 1fa9382a7c..2f9e27c248 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -2242,7 +2242,6 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data) cc->cpu_exec_interrupt = arm_cpu_exec_interrupt; cc->dump_state = arm_cpu_dump_state; cc->set_pc = arm_cpu_set_pc; - cc->synchronize_from_tb = arm_cpu_synchronize_from_tb; cc->gdb_read_register = arm_cpu_gdb_read_register; cc->gdb_write_register = arm_cpu_gdb_write_register; #ifndef CONFIG_USER_ONLY @@ -2262,6 +2261,7 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data) cc->disas_set_info = arm_disas_set_info; #ifdef CONFIG_TCG cc->tcg_ops.initialize = arm_translate_init; + cc->tcg_ops.synchronize_from_tb = arm_cpu_synchronize_from_tb; cc->tlb_fill = arm_cpu_tlb_fill; cc->debug_excp_handler = arm_debug_excp_handler; cc->debug_check_watchpoint = arm_debug_check_watchpoint; diff --git a/target/avr/cpu.c b/target/avr/cpu.c index 94306a2aa0..f753c15768 100644 --- a/target/avr/cpu.c +++ b/target/avr/cpu.c @@ -207,7 +207,7 @@ static void avr_cpu_class_init(ObjectClass *oc, void *data) cc->vmsd = &vms_avr_cpu; cc->disas_set_info = avr_cpu_disas_set_info; cc->tcg_ops.initialize = avr_cpu_tcg_init; - cc->synchronize_from_tb = avr_cpu_synchronize_from_tb; + cc->tcg_ops.synchronize_from_tb = avr_cpu_synchronize_from_tb; cc->gdb_read_register = avr_cpu_gdb_read_register; cc->gdb_write_register = avr_cpu_gdb_write_register; cc->gdb_num_core_regs = 35; diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c index 4c778966c2..12a09e93ae 100644 --- a/target/hppa/cpu.c +++ b/target/hppa/cpu.c @@ -143,7 +143,7 @@ static void hppa_cpu_class_init(ObjectClass *oc, void *data) cc->cpu_exec_interrupt = hppa_cpu_exec_interrupt; cc->dump_state = hppa_cpu_dump_state; cc->set_pc = hppa_cpu_set_pc; - cc->synchronize_from_tb = hppa_cpu_synchronize_from_tb; + cc->tcg_ops.synchronize_from_tb = hppa_cpu_synchronize_from_tb; cc->gdb_read_register = hppa_cpu_gdb_read_register; cc->gdb_write_register = hppa_cpu_gdb_write_register; cc->tlb_fill = hppa_cpu_tlb_fill; diff --git a/target/i386/tcg-cpu.c b/target/i386/tcg-cpu.c index 1f2a3e881a..d1414e2970 100644 --- a/target/i386/tcg-cpu.c +++ b/target/i386/tcg-cpu.c @@ -60,7 +60,7 @@ void tcg_cpu_common_class_init(CPUClass *cc) { cc->do_interrupt = x86_cpu_do_interrupt; cc->cpu_exec_interrupt = x86_cpu_exec_interrupt; - cc->synchronize_from_tb = x86_cpu_synchronize_from_tb; + cc->tcg_ops.synchronize_from_tb = x86_cpu_synchronize_from_tb; cc->cpu_exec_enter = x86_cpu_exec_enter; cc->cpu_exec_exit = x86_cpu_exec_exit; cc->tcg_ops.initialize = tcg_x86_init; diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c index bc10518fa3..97d94d9c27 100644 --- a/target/microblaze/cpu.c +++ b/target/microblaze/cpu.c @@ -322,7 +322,7 @@ static void mb_cpu_class_init(ObjectClass *oc, void *data) cc->cpu_exec_interrupt = mb_cpu_exec_interrupt; cc->dump_state = mb_cpu_dump_state; cc->set_pc = mb_cpu_set_pc; - cc->synchronize_from_tb = mb_cpu_synchronize_from_tb; + cc->tcg_ops.synchronize_from_tb = mb_cpu_synchronize_from_tb; cc->gdb_read_register = mb_cpu_gdb_read_register; cc->gdb_write_register = mb_cpu_gdb_write_register; cc->tlb_fill = mb_cpu_tlb_fill; diff --git a/target/mips/cpu.c b/target/mips/cpu.c index bc48573763..71c488f3dd 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -238,7 +238,6 @@ static void mips_cpu_class_init(ObjectClass *c, void *data) cc->cpu_exec_interrupt = mips_cpu_exec_interrupt; cc->dump_state = mips_cpu_dump_state; cc->set_pc = mips_cpu_set_pc; - cc->synchronize_from_tb = mips_cpu_synchronize_from_tb; cc->gdb_read_register = mips_cpu_gdb_read_register; cc->gdb_write_register = mips_cpu_gdb_write_register; #ifndef CONFIG_USER_ONLY @@ -250,6 +249,7 @@ static void mips_cpu_class_init(ObjectClass *c, void *data) cc->disas_set_info = mips_cpu_disas_set_info; #ifdef CONFIG_TCG cc->tcg_ops.initialize = mips_tcg_init; + cc->tcg_ops.synchronize_from_tb = mips_cpu_synchronize_from_tb; cc->tlb_fill = mips_cpu_tlb_fill; #endif diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 27dd1645c9..a9c30879d3 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -543,7 +543,7 @@ static void riscv_cpu_class_init(ObjectClass *c, void *data) cc->cpu_exec_interrupt = riscv_cpu_exec_interrupt; cc->dump_state = riscv_cpu_dump_state; cc->set_pc = riscv_cpu_set_pc; - cc->synchronize_from_tb = riscv_cpu_synchronize_from_tb; + cc->tcg_ops.synchronize_from_tb = riscv_cpu_synchronize_from_tb; cc->gdb_read_register = riscv_cpu_gdb_read_register; cc->gdb_write_register = riscv_cpu_gdb_write_register; cc->gdb_num_core_regs = 33; diff --git a/target/rx/cpu.c b/target/rx/cpu.c index a701a09b11..d03c4e0b05 100644 --- a/target/rx/cpu.c +++ b/target/rx/cpu.c @@ -189,7 +189,7 @@ static void rx_cpu_class_init(ObjectClass *klass, void *data) cc->cpu_exec_interrupt = rx_cpu_exec_interrupt; cc->dump_state = rx_cpu_dump_state; cc->set_pc = rx_cpu_set_pc; - cc->synchronize_from_tb = rx_cpu_synchronize_from_tb; + cc->tcg_ops.synchronize_from_tb = rx_cpu_synchronize_from_tb; cc->gdb_read_register = rx_cpu_gdb_read_register; cc->gdb_write_register = rx_cpu_gdb_write_register; cc->get_phys_page_debug = rx_cpu_get_phys_page_debug; diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c index bdc5c9d90b..a33025b5c8 100644 --- a/target/sh4/cpu.c +++ b/target/sh4/cpu.c @@ -222,7 +222,7 @@ static void superh_cpu_class_init(ObjectClass *oc, void *data) cc->cpu_exec_interrupt = superh_cpu_exec_interrupt; cc->dump_state = superh_cpu_dump_state; cc->set_pc = superh_cpu_set_pc; - cc->synchronize_from_tb = superh_cpu_synchronize_from_tb; + cc->tcg_ops.synchronize_from_tb = superh_cpu_synchronize_from_tb; cc->gdb_read_register = superh_cpu_gdb_read_register; cc->gdb_write_register = superh_cpu_gdb_write_register; cc->tlb_fill = superh_cpu_tlb_fill; diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c index 07e48b86d1..baf6c5b587 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -868,7 +868,7 @@ static void sparc_cpu_class_init(ObjectClass *oc, void *data) cc->memory_rw_debug = sparc_cpu_memory_rw_debug; #endif cc->set_pc = sparc_cpu_set_pc; - cc->synchronize_from_tb = sparc_cpu_synchronize_from_tb; + cc->tcg_ops.synchronize_from_tb = sparc_cpu_synchronize_from_tb; cc->gdb_read_register = sparc_cpu_gdb_read_register; cc->gdb_write_register = sparc_cpu_gdb_write_register; cc->tlb_fill = sparc_cpu_tlb_fill; diff --git a/target/tricore/cpu.c b/target/tricore/cpu.c index 78b2925955..5edf96c600 100644 --- a/target/tricore/cpu.c +++ b/target/tricore/cpu.c @@ -162,7 +162,7 @@ static void tricore_cpu_class_init(ObjectClass *c, void *data) cc->dump_state = tricore_cpu_dump_state; cc->set_pc = tricore_cpu_set_pc; - cc->synchronize_from_tb = tricore_cpu_synchronize_from_tb; + cc->tcg_ops.synchronize_from_tb = tricore_cpu_synchronize_from_tb; cc->get_phys_page_debug = tricore_cpu_get_phys_page_debug; cc->tcg_ops.initialize = tricore_tcg_init; cc->tlb_fill = tricore_cpu_tlb_fill;