QEMU AVR 8 bit cores
v36 cover QEMU AVR 8 bit cores
This series of patches adds 8bit AVR cores to QEMU.
All instruction, except BREAK/DES/SPM/SPMX, are implemented. Not fully tested yet. However I was able to execute simple code with functions. e.g fibonacci calculation. This series of patches include a non real, sample board.
No fuses support yet. PC is set to 0 at reset.
the patches include the following
1. just a basic 8bit AVR CPU, without instruction decoding or translation
2. CPU features which allow define the following 8bit AVR cores
avr1
avr2 avr25
avr3 avr31 avr35
avr4
avr5 avr51
avr6
xmega2 xmega4 xmega5 xmega6 xmega73. a definition of sample machine with SRAM, FLASH and CPU which allows to execute simple code
4. encoding for all AVR instructions
5. interrupt handling
6. helpers for IN, OUT, SLEEP, WBR & unsupported instructions
7. a decoder which given an opcode decides what istruction it is
8. translation of AVR instruction into TCG
9. all features together
changes since v3
1. rampD/X/Y/Z registers are encoded as 0x00ff0000 (instead of 0x000000ff) for faster address manipulaton
2. ffs changed to ctz32
3. duplicate code removed at avr_cpu_do_interrupt
4. using andc instead of not + and
5. fixing V flag calculation in varios instructions
6. freeing local variables in PUSH
7. tcg_const_local_i32 -> tcg_const_i32
8. using sextract32 instead of my implementation
9. fixing BLD instruction
10.xor(r) instead of 0xff - r at COM
11.fixing MULS/MULSU not to modify inputs' content
12.using SUB for NEG
13.fixing tcg_gen_qemu_ld/st call in XCH
changes since v4
1. target is now defined as big endian in order to optimize push_ret/pop_ret
2. all style warnings are fixed
3. adding cpu_set/get_sreg functions
4. simplifying gen_goto_tb as there is no real paging
5. env->pc -> env->pc_w
6. making flag dump more compact
7. more spacing
8. renaming CODE/DATA_INDEX -> MMU_CODE/DATA_IDX
9. removing avr_set_feature
10. SPL/SPH set bug fix
11. switching stb_phys to cpu_stb_data
12. cleaning up avr_decode
13. saving sreg, rampD/X/Y/Z, eind in HW format (savevm)
14. saving CPU features (savevm)
changes since v5
1. BLD bug fix
2. decoder generator is added
chages since v6
1. using cpu_get_sreg/cpu_set_sreg in avr_cpu_gdb_read_register/avr_cpu_gdb_write_register
2. configure the target as little endian because otherwise GDB does not work
3. fixing and testing gen_push_ret/gen_pop_ret
changes since v7
1. folding back v6
2. logging at helper_outb and helper_inb are done for non supported yet registers only
3. MAINTAINERS updated
changes since v8
1. removing hw/avr from hw/Makefile.obj as it should not be built for all
2. making linux compilable
3. testing on
a. Mac, Apple LLVM version 7.0.0
b. Ubuntu 12.04, gcc 4.9.2
c. Fedora 23, gcc 5.3.14. folding back some patches
5. translation bug fixes for ORI, CPI, XOR instructions
6. propper handling of cpu register writes though memory
changes since v9
1. removing forward declarations of static functions
2. disabling debug prints
3. switching to case range instead of if else if ...
4. LD/ST IN/OUT accessing CPU maintainder registers are not routed to any device
5. commenst about sample board and sample IO device added
6. sample board description is more descriptive now
7. memory_region_allocate_system_memory is used to create RAM
8. now there are helper_fullrd & helper_fullwr when LD/ST try to access registers
changes since v10
1. movig back fullwr & fullrd into the commit where outb and inb were introduced
2. changing tlb_fill function signature
3. adding empty line between functions
4. adding newline on the last line of the file
5. using tb->flags to generae full access ST/LD instructions
6. fixing SBRC bug
7. folding back 10th commit
8. whenever a new file is introduced it's added to Makefile.objs
changes since v11
1. updating to v2.7.0-rc
2. removing assignment to env->fullacc from gen_intermediate_code
changes since v12
1. fixing spacing
2. fixing get/put_segment functions
3. removing target-avr/machine.h file
4. VMSTATE_SINGLE_TEST -> VMSTATE_SINGLE
5. comment spelling
6. removing hw/avr/sample_io.c
7. char const* -> const char*
8. proper ram allocation
9. fixing breakpoint functionality.
10.env1 -> env
11.fixing avr_cpu_gdb_write_register & avr_cpu_gdb_read_register functions 12.any cpu is removed
12.feature bits are not saved into vm state
changes since v13
1. rebasing to v2.7.0-rc1
changes since v14
1. I made self review with git gui tool. (I did not know such a thing exists)
2. removing all double/tripple spaces
3. removing comment reference to SampleIO
4. folding back some changes, so there is not deleted lines in my code
5. moving avr configuration, within configure file, before chris
changes since v15
1. removing IO registers cache from CPU
2. implementing CBI/SBI as read(helper_inb), modify, write(helper_outb)
3. implementing CBIC/SBIC as read(helper_inb), check, branch
4. adding missing tcg_temp_free_i32 for tcg_const_i32
changes since v16
1. removing EXT IO registers knoledge from CPU. These registers are accessible by LD/ST only. CPU has no interest in them
changes since v17 (by Richard Henderson)
This is Michael's v17, with some adjustments of my own:
1. Fix the whitespace errors reported by "git am",
2. Replace the utf-8 characters with normal ascii,
3. Ditch the separate compilation of translate.c.
I retained the two separate files that could be regenerated from the included cpugen program, but merged in translate-insn.c. Not that it matters, but the code generated is about 3k smaller.
changes since v18
1. moving target-avr into target/avr 2. do not call cpu_exec_initfn function from avr_cpu_initfn 3. call cpu_exec_realizefn avr_cpu_realizefn 4. do not fail sample machine creation if no rom is suplied 5. add tcg_gen_exit_tb(0) for BS_BRANCH in gen_intermediate_code 6. fix a register getters/setters in machine.c 7. changing QEMU_ARCH_AVR from 1<<17 to 1<<18
changes since v19
1. use decodetree.py tool to decode instructions 2. adding USART 3. adding 16 bit timer peripherals 4. changing QEMU_ARCH_AVR from 1<<18 to 1<<20 5. renaming tlb_fill to avr_cpu_tlb_fill
changes since v20
1. use one CPU naming convention 2. merging insn16.decode & insn32.decode files 3. modifying skip next instruction mechanizm 4. translate BREAK as NOP for now
changes since v21
1. Reorganize bstate.
This will make transition to <exec/translator.h> easier, and fixes a couple of bugs wrt single stepping by [email protected]
2. Drop cpc and fix page cross condition.
by [email protected]
3. Refactor checking supported/unsupported instructions
4. Add gdb-xml/avr-cpu.xml
changes since v22
1. Rebase
2. Split long comment
changes since v23
1. remove avr_cpu_list_compare function 2. modify avr_cpu_class_by_name function 3. modify avr_cpu_list_entry function 4. modify avr_cpu_list function
changes since v24
1. remove AVR_CPU_TYPE_NAME macro
changes since v25
1. fix patches. every file belong to one patch only 2. change copyright year from 2016 to 2019 3. create mask device to emulate prr0/prr1
changes since v26
1. add avocado acceptence test
2. add boot serial test
changes since v27
1. list atmel2560 devices as unimplemented
2. fix sram base/size
changes since v28
1. rebase
2. fix includes & build
changes since v29
1. fixing ownership
2. using 'since' instread of 'added in'
changes since v30
1. rebase
changes since v31
1. splitting 'Add instruction translation' commit 2. fixing typo in qapi/machine.json sicne -> since 3. removing unintended changes in configure file 4. adding Richard Henderson as a co developer to 'Add instruction translation - CPU main translation funcions' commit
changes since v32
1. modify cpu_get_sreg to treat sreg C as other flags, except sreg Z
changes since v33
1. ensure flag C is always calculated as one bit
2. calculate flag Z as one bit, without using inverse logic
changes since v34
1. rebase
changes since v35
1. rebase
2. use NANOSECONDS_PER_SECOND instead of 1000000000 in avr_timer16.c
3. split "target/avr: Register AVR support with the rest of QEMU" into three patches
1. "target/avr: Register AVR support with the rest of QEMU"
2. "target/avr: Update build system"
3. "target/avr: Update MAINTAINERS file"4. split "target/avr: Add tests" patch into two patches
1. "target/avr: Add Avocado test"
2. "target/avr: Add boot serial test"
5. Add instruction disassembly function
6. change "since 4.2" to "since 5.0"
Michael Rolnik (16):
target/avr: Add outward facing interfaces and core CPU logic target/avr: Add instruction helpers
target/avr: Add instruction decoding
target/avr: Add instruction translation - Registers definition target/avr: Add instruction translation - Arithmetic and Logic
Instructions
target/avr: Add instruction translation - Branch Instructions target/avr: Add instruction translation - Bit and Bit-test
Instructions
target/avr: Add instruction translation - MCU Control Instructions target/avr: Add instruction translation - CPU main translation
function
target/avr: Add instruction disassembly function target/avr: Add example board configuration
target/avr: Register AVR support with the rest of QEMU target/avr: Update build system
target/avr: Add boot serial test
target/avr: Add Avocado test
target/avr: Update MAINTAINERS file
Sarah Harris (1):
target/avr: Add limited support for USART and 16 bit timer peripherals
configure | 7 + default-configs/avr-softmmu.mak | 5 + qapi/machine.json | 3 +- include/disas/dis-asm.h | 6 + include/hw/char/avr_usart.h | 97 + include/hw/misc/avr_mask.h | 47 + include/hw/timer/avr_timer16.h | 97 + include/sysemu/arch_init.h | 1 + target/avr/cpu-param.h | 37 + target/avr/cpu-qom.h | 54 + target/avr/cpu.h | 254 +++ target/avr/helper.h | 29 + arch_init.c | 2 + hw/avr/sample.c | 282 +++ hw/char/avr_usart.c | 324 ++++ hw/misc/avr_mask.c | 112 ++ hw/timer/avr_timer16.c | 605 ++++++ target/avr/cpu.c | 576 ++++++ target/avr/disas.c | 214 +++ target/avr/gdbstub.c | 85 + target/avr/helper.c | 354 ++++ target/avr/machine.c | 121 ++ target/avr/translate.c | 3039 ++++++++++++++++++++++++++++++ tests/boot-serial-test.c | 10 + tests/machine-none-test.c | 1 + MAINTAINERS | 9 + gdb-xml/avr-cpu.xml | 49 + hw/Kconfig | 1 + hw/avr/Kconfig | 6 + hw/avr/Makefile.objs | 1 + hw/char/Kconfig | 3 + hw/char/Makefile.objs | 1 + hw/misc/Kconfig | 3 + hw/misc/Makefile.objs | 2 + hw/timer/Kconfig | 3 + hw/timer/Makefile.objs | 2 + target/avr/Makefile.objs | 34 + target/avr/insn.decode | 175 ++ tests/Makefile.include | 2 + tests/acceptance/machine_avr6.py | 36 + 40 files changed, 6688 insertions(+), 1 deletion(-) create mode 100644 default-configs/avr-softmmu.mak create mode 100644 include/hw/char/avr_usart.h create mode 100644 include/hw/misc/avr_mask.h create mode 100644 include/hw/timer/avr_timer16.h create mode 100644 target/avr/cpu-param.h create mode 100644 target/avr/cpu-qom.h create mode 100644 target/avr/cpu.h create mode 100644 target/avr/helper.h create mode 100644 hw/avr/sample.c create mode 100644 hw/char/avr_usart.c create mode 100644 hw/misc/avr_mask.c create mode 100644 hw/timer/avr_timer16.c create mode 100644 target/avr/cpu.c create mode 100644 target/avr/disas.c create mode 100644 target/avr/gdbstub.c create mode 100644 target/avr/helper.c create mode 100644 target/avr/machine.c create mode 100644 target/avr/translate.c create mode 100644 gdb-xml/avr-cpu.xml create mode 100644 hw/avr/Kconfig create mode 100644 hw/avr/Makefile.objs create mode 100644 target/avr/Makefile.objs create mode 100644 target/avr/insn.decode create mode 100644 tests/acceptance/machine_avr6.py
Signature · 1 line
2.17.2 (Apple Git-113)
PATCH v36 1/17 target/avr: Add outward facing interfaces and core CPU logic
This includes:
- CPU data structures
- object model classes and functions
- migration functions
- GDB hooks
--- target/avr/cpu-param.h | 37 +++ target/avr/cpu-qom.h | 54 ++++ target/avr/cpu.h | 253 ++++++++++++++++++ target/avr/cpu.c | 576 +++++++++++++++++++++++++++++++++++++++++ target/avr/gdbstub.c | 85 ++++++ target/avr/machine.c | 121 +++++++++ gdb-xml/avr-cpu.xml | 49 ++++ 7 files changed, 1175 insertions(+) create mode 100644 target/avr/cpu-param.h create mode 100644 target/avr/cpu-qom.h create mode 100644 target/avr/cpu.h create mode 100644 target/avr/cpu.c create mode 100644 target/avr/gdbstub.c create mode 100644 target/avr/machine.c create mode 100644 gdb-xml/avr-cpu.xml
target/avr/cpu-param.h new file +37 -0
@@ -0,0 +1,37 @@ +/* +* QEMU AVR CPU +* +* Copyright (c) 2019 Michael Rolnik +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see +* <http://www.gnu.org/licenses/lgpl-2.1.html> +*/ + +#ifndef AVR_CPU_PARAM_H +#define AVR_CPU_PARAM_H 1 + +#define TARGET_LONG_BITS 32 +/* +* TARGET_PAGE_BITS cannot be more than 8 bits because +* 1. all IO registers occupy [0x0000 .. 0x00ff] address range, and they +* should be implemented as a device and not memory +* 2. SRAM starts at the address 0x0100 +*/ +#define TARGET_PAGE_BITS 8 +#define TARGET_PHYS_ADDR_SPACE_BITS 24 +#define TARGET_VIRT_ADDR_SPACE_BITS 24 +#define NB_MMU_MODES 2 + + +#endif
target/avr/cpu-qom.h new file +54 -0
54 lines not on this page · raw message
target/avr/cpu.h new file +253 -0
253 lines not on this page · raw message
target/avr/cpu.c new file +576 -0
576 lines not on this page · raw message
target/avr/gdbstub.c new file +85 -0
85 lines not on this page · raw message
target/avr/machine.c new file +121 -0
121 lines not on this page · raw message
gdb-xml/avr-cpu.xml new file +49 -0
49 lines not on this page · raw message
Signature · 1 line
2.17.2 (Apple Git-113)
Re: [PATCH v36 01/17] target/avr: Add outward facing interfaces and core CPU logic
Quoted 35 lines · Michael Rolnik
This includes:
- CPU data structures
- object model classes and functions
- migration functions
- GDB hooksCo-developed-by Michael Rolnik <[email protected]>Co-developed-by Sarah Harris <[email protected]>Signed-off-by Michael Rolnik <[email protected]>Signed-off-by Sarah Harris <[email protected]>Signed-off-by Michael Rolnik <[email protected]>Acked-by Igor Mammedov <[email protected]>--- target/avr/cpu-param.h | 37 +++ target/avr/cpu-qom.h | 54 ++++ target/avr/cpu.h | 253 ++++++++++++++++++ target/avr/cpu.c | 576 +++++++++++++++++++++++++++++++++++++++++ target/avr/gdbstub.c | 85 ++++++ target/avr/machine.c | 121 +++++++++ gdb-xml/avr-cpu.xml | 49 ++++ 7 files changed, 1175 insertions(+) create mode 100644 target/avr/cpu-param.h create mode 100644 target/avr/cpu-qom.h create mode 100644 target/avr/cpu.h create mode 100644 target/avr/cpu.c create mode 100644 target/avr/gdbstub.c create mode 100644 target/avr/machine.c create mode 100644 gdb-xml/avr-cpu.xmltarget/avr/cpu-param.h new file +0
-0
target/avr/cpu-param.h line 10
Quoted 10 lines
target/avr/cpu-param.h new file +10
-0@@ -0,0 +1,37 @@ +/* +* QEMU AVR CPU +* +* Copyright (c) 2019 Michael Rolnik +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +*
I think version 2 would be more fitting to QEMU ovarall license than 2.1 (see LICENCE file in QEMU root dir).
Peter, am I right or wrong regarding GPL 2 vs. 2.1 (My interpretation is that 2 is the best "default" for new files)? The wording in "LICENSE" is frankly not entirely clear, and I see many new files using 2.1.
Michael, please make sure that all files added by the serues hava an appropriate and preferably consistent licence preamble.
Yours,
Aleksandar
Quoted 1,209 lines
target/avr/cpu-param.h new file +27
-0+* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see +* <http://www.gnu.org/licenses/lgpl-2.1.html> +*/ + +#ifndef AVR_CPU_PARAM_H +#define AVR_CPU_PARAM_H 1 + +#define TARGET_LONG_BITS 32 +/* +* TARGET_PAGE_BITS cannot be more than 8 bits because +* 1. all IO registers occupy [0x0000 .. 0x00ff] address range, and they +* should be implemented as a device and not memory +* 2. SRAM starts at the address 0x0100 +*/ +#define TARGET_PAGE_BITS 8 +#define TARGET_PHYS_ADDR_SPACE_BITS 24 +#define TARGET_VIRT_ADDR_SPACE_BITS 24 +#define NB_MMU_MODES 2 + + +#endif target/avr/cpu-qom.h new file +54
-0@@ -0,0 +1,54 @@ +/* +* QEMU AVR CPU +* +* Copyright (c) 2019 Michael Rolnik +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see +* <http://www.gnu.org/licenses/lgpl-2.1.html> +*/ + +#ifndef QEMU_AVR_QOM_H +#define QEMU_AVR_QOM_H + +#include "hw/core/cpu.h" + +#define TYPE_AVR_CPU "avr-cpu" + +#define AVR_CPU_CLASS (klass) \ + OBJECT_CLASS_CHECK(AVRCPUClass, (klass), TYPE_AVR_CPU) +#define AVR_CPU (obj) \ + OBJECT_CHECK(AVRCPU, (obj), TYPE_AVR_CPU) +#define AVR_CPU_GET_CLASS (obj) \ + OBJECT_GET_CLASS(AVRCPUClass, (obj), TYPE_AVR_CPU) + +/** +* AVRCPUClass: +* @parent_realize: The parent class' realize handler. +* @parent_reset: The parent class' reset handler. +* @vr: Version Register value. +* +* A AVR CPU model. +*/ +typedef struct AVRCPUClass { +/*< private >*/ +CPUClass parent_class; +/*< public >*/ +DeviceRealize parent_realize; +void (*parent_reset)(CPUState *cpu); +}AVRCPUClass ; + +typedef struct AVRCPU AVRCPU ; + + +#endif /* !defined (QEMU_AVR_CPU_QOM_H) */ target/avr/cpu.h new file +195
-0@@ -0,0 +1,253 @@ +/* +* QEMU AVR CPU +* +* Copyright (c) 2019 Michael Rolnik +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see +* <http://www.gnu.org/licenses/lgpl-2.1.html> +*/ + +#ifndef QEMU_AVR_CPU_H +#define QEMU_AVR_CPU_H + +#include "cpu-qom.h" +#include "exec/cpu-defs.h" + +#define TCG_GUEST_DEFAULT_MO 0 + +#define CPU_RESOLVING_TYPE TYPE_AVR_CPU + +/* +* AVR has two memory spaces, data & code. +* e.g. both have 0 address +* ST/LD instructions access data space +* LPM/SPM and instruction fetching access code memory space +*/ +#define MMU_CODE_IDX 0 +#define MMU_DATA_IDX 1 + +#define EXCP_RESET 1 +#define EXCP_INT (n) (EXCP_RESET + (n) + 1) + +/* Number of CPU registers */ +#define NO_CPU_REGISTERS 32 +/* Number of IO registers accessible by ld/st/in/out */ +#define NO_IO_REGISTERS 64 + +/* +* Offsets of AVR memory regions in host memory space. +* +* This is needed because the AVR has separate code and data address +* spaces that both have start from zero but have to go somewhere in +* host memory. +* +* It's also useful to know where some things are, like the IO registers. +*/ +/* Flash program memory */ +#define OFFSET_CODE 0x00000000 +/* CPU registers, IO registers, and SRAM */ +#define OFFSET_DATA 0x00800000 +/* CPU registers specifically, these are mapped at the start of data */ +#define OFFSET_CPU_REGISTERS OFFSET_DATA +/* +* IO registers, including status register, stack pointer, and memory +* mapped peripherals, mapped just after CPU registers +*/ +#define OFFSET_IO_REGISTERS (OFFSET_DATA + NO_CPU_REGISTERS) + +enum avr_features { +AVR_FEATURE_SRAM , + +AVR_FEATURE_1_BYTE_PC , +AVR_FEATURE_2_BYTE_PC , +AVR_FEATURE_3_BYTE_PC , + +AVR_FEATURE_1_BYTE_SP , +AVR_FEATURE_2_BYTE_SP , + +AVR_FEATURE_BREAK , +AVR_FEATURE_DES , +AVR_FEATURE_RMW ,/* Read Modify Write - XCH LAC LAS LAT */ + +AVR_FEATURE_EIJMP_EICALL , +AVR_FEATURE_IJMP_ICALL , +AVR_FEATURE_JMP_CALL , + +AVR_FEATURE_ADIW_SBIW , + +AVR_FEATURE_SPM , +AVR_FEATURE_SPMX , + +AVR_FEATURE_ELPMX , +AVR_FEATURE_ELPM , +AVR_FEATURE_LPMX , +AVR_FEATURE_LPM , + +AVR_FEATURE_MOVW , +AVR_FEATURE_MUL , +AVR_FEATURE_RAMPD , +AVR_FEATURE_RAMPX , +AVR_FEATURE_RAMPY , +AVR_FEATURE_RAMPZ , +}; + +typedef struct CPUAVRState CPUAVRState ; + +struct CPUAVRState { +uint32_t pc_w;/* 0x003fffff up to 22 bits */ + +uint32_t sregC;/* 0x00000001 1 bit */ +uint32_t sregZ;/* 0x00000001 1 bit */ +uint32_t sregN;/* 0x00000001 1 bit */ +uint32_t sregV;/* 0x00000001 1 bit */ +uint32_t sregS;/* 0x00000001 1 bit */ +uint32_t sregH;/* 0x00000001 1 bit */ +uint32_t sregT;/* 0x00000001 1 bit */ +uint32_t sregI;/* 0x00000001 1 bit */ + +uint32_t rampD;/* 0x00ff0000 8 bits */ +uint32_t rampX;/* 0x00ff0000 8 bits */ +uint32_t rampY;/* 0x00ff0000 8 bits */ +uint32_t rampZ;/* 0x00ff0000 8 bits */ +uint32_t eind;/* 0x00ff0000 8 bits */ + +uint32_t r[NO_CPU_REGISTERS ];/* 8 bits each */ +uint32_t sp;/* 16 bits */ + +uint32_t skip;/* if set skip instruction */ + +uint64_t intsrc;/* interrupt sources */ +bool fullacc;/* CPU/MEM if true MEM only otherwise */ + +uint32_t features; +}; + +/** +* AVRCPU: +* @env: #CPUAVRState +* +* A AVR CPU. +*/ +typedef struct AVRCPU { +/*< private >*/ +CPUState parent_obj; +/*< public >*/ + +CPUNegativeOffsetState neg; +CPUAVRState env; +}AVRCPU ; + +#ifndef CONFIG_USER_ONLY +extern const struct VMStateDescription vms_avr_cpu; +#endif + +void avr_cpu_do_interrupt (CPUState *cpu); +bool avr_cpu_exec_interrupt (CPUState *cpu,int int_req); +hwaddr avr_cpu_get_phys_page_debug (CPUState *cpu,vaddr addr); +int avr_cpu_gdb_read_register (CPUState *cpu,uint8_t *buf,int reg); +int avr_cpu_gdb_write_register (CPUState *cpu,uint8_t *buf,int reg); + +static inline int avr_feature (CPUAVRState *env,int feature) +{ +return (env->features & (1U << feature)) !=0 ; +} + +static inline void avr_set_feature (CPUAVRState *env,int feature) +{ + env->features |= (1U << feature); +} + +#define cpu_list avr_cpu_list +#define cpu_signal_handler cpu_avr_signal_handler +#define cpu_mmu_index avr_cpu_mmu_index + +static inline int avr_cpu_mmu_index (CPUAVRState *env,bool ifetch) +{ +return ifetch ?MMU_CODE_IDX :MMU_DATA_IDX ; +} + +void avr_cpu_tcg_init (void ); + +void avr_cpu_list (void ); +int cpu_avr_exec (CPUState *cpu); +int cpu_avr_signal_handler (int host_signum,void *pinfo,void *puc); +int avr_cpu_handle_mmu_fault (CPUState *cpu,vaddr address,int size, +int rw,int mmu_idx); +int avr_cpu_memory_rw_debug (CPUState *cs,vaddr address,uint8_t *buf, +int len,bool is_write); + +enum { +TB_FLAGS_FULL_ACCESS =1 , +TB_FLAGS_SKIP =2 , +}; + +static inline void cpu_get_tb_cpu_state(CPUAVRState *env, target_ulong*pc,
target/avr/cpu.h new file +58
-0+ target_ulong *cs_base, uint32_t *pflags) +{ +uint32_t flags =0 ; + + *pc = env->pc_w *2 ; + *cs_base =0 ; + +if (env->fullacc) { + flags |=TB_FLAGS_FULL_ACCESS ; + } +if (env->skip) { + flags |=TB_FLAGS_SKIP ; + } + + *pflags = flags; +} + +static inline int cpu_interrupts_enabled (CPUAVRState *env) +{ +return env->sregI !=0 ; +} + +static inline uint8_t cpu_get_sreg (CPUAVRState *env) +{ +uint8_t sreg; + sreg = (env->sregC) <<0 + | (env->sregZ) <<1 + | (env->sregN) <<2 + | (env->sregV) <<3 + | (env->sregS) <<4 + | (env->sregH) <<5 + | (env->sregT) <<6 + | (env->sregI) <<7 ; +return sreg; +} + +static inline void cpu_set_sreg (CPUAVRState *env,uint8_t sreg) +{ + env->sregC = (sreg >>0 ) &0x01 ; + env->sregZ = (sreg >>1 ) &0x01 ; + env->sregN = (sreg >>2 ) &0x01 ; + env->sregV = (sreg >>3 ) &0x01 ; + env->sregS = (sreg >>4 ) &0x01 ; + env->sregH = (sreg >>5 ) &0x01 ; + env->sregT = (sreg >>6 ) &0x01 ; + env->sregI = (sreg >>7 ) &0x01 ; +} + +bool avr_cpu_tlb_fill (CPUState *cs,vaddr address,int size, +MMUAccessType access_type,int mmu_idx, +bool probe,uintptr_t retaddr); + +typedef CPUAVRState CPUArchState ; +typedef AVRCPU ArchCPU ; + +#include "exec/cpu-all.h" + +#endif /* !defined (QEMU_AVR_CPU_H) */ target/avr/cpu.c new file +39
-0@@ -0,0 +1,576 @@ +/* +* QEMU AVR CPU +* +* Copyright (c) 2019 Michael Rolnik +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see +* <http://www.gnu.org/licenses/lgpl-2.1.html> +*/ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qemu/qemu-print.h" +#include "exec/exec-all.h" +#include "cpu.h" + +static void avr_cpu_set_pc (CPUState *cs,vaddr value) +{ +AVRCPU *cpu =AVR_CPU (cs); + + cpu->env.pc_w = value /2 ;/* internally PC points to words */ +} + +static bool avr_cpu_has_work (CPUState *cs) +{ +AVRCPU *cpu =AVR_CPU (cs); +CPUAVRState *env = &cpu->env; + + return (cs->interrupt_request & (CPU_INTERRUPT_HARD |
CPU_INTERRUPT_RESET))target/avr/cpu.c new file +4
-0+ &&cpu_interrupts_enabled (env); +} + +static void avr_cpu_synchronize_from_tb(CPUState *cs, TranslationBlock*tb)
target/avr/cpu.c new file +128
-0+{ +AVRCPU *cpu =AVR_CPU (cs); +CPUAVRState *env = &cpu->env; + + env->pc_w = tb->pc /2 ;/* internally PC points to words */ +} + +static void avr_cpu_reset (CPUState *cs) +{ +AVRCPU *cpu =AVR_CPU (cs); +AVRCPUClass *mcc =AVR_CPU_GET_CLASS (cpu); +CPUAVRState *env = &cpu->env; + + mcc->parent_reset (cs); + + env->pc_w =0 ; + env->sregI =1 ; + env->sregC =0 ; + env->sregZ =0 ; + env->sregN =0 ; + env->sregV =0 ; + env->sregS =0 ; + env->sregH =0 ; + env->sregT =0 ; + + env->rampD =0 ; + env->rampX =0 ; + env->rampY =0 ; + env->rampZ =0 ; + env->eind =0 ; + env->sp =0 ; + + env->skip =0 ; + +memset (env->r,0 ,sizeof (env->r)); + +tlb_flush (cs); +} + +static void avr_cpu_disas_set_info (CPUState *cpu,disassemble_info *info) +{ + info->mach = bfd_arch_avr; + info->print_insn =NULL ; +} + +static void avr_cpu_realizefn (DeviceState *dev,Error **errp) +{ +CPUState *cs =CPU (dev); +AVRCPUClass *mcc =AVR_CPU_GET_CLASS (dev); +Error *local_err =NULL ; + +cpu_exec_realizefn (cs, &local_err); +if (local_err !=NULL ) { +error_propagate (errp, local_err); +return ; + } +qemu_init_vcpu (cs); +cpu_reset (cs); + + mcc->parent_realize (dev, errp); +} + +static void avr_cpu_set_int (void *opaque,int irq,int level) +{ +AVRCPU *cpu = opaque; +CPUAVRState *env = &cpu->env; +CPUState *cs =CPU (cpu); + +uint64_t mask = (1ull << irq); +if (level) { + env->intsrc |= mask; +cpu_interrupt (cs,CPU_INTERRUPT_HARD ); + }else { + env->intsrc &= ~mask; +if (env->intsrc ==0 ) { +cpu_reset_interrupt (cs,CPU_INTERRUPT_HARD ); + } + } +} + +static void avr_cpu_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); + +cpu_set_cpustate_pointers (cpu); + +#ifndef CONFIG_USER_ONLY +/* Set the number of interrupts supported by the CPU. */ +qdev_init_gpio_in (DEVICE (cpu), avr_cpu_set_int,57 ); +#endif +} + +static ObjectClass *avr_cpu_class_by_name (const char *cpu_model) +{ +ObjectClass *oc; + + oc =object_class_by_name (cpu_model); +if (object_class_dynamic_cast (oc,TYPE_AVR_CPU ) ==NULL || +object_class_is_abstract (oc)) { + oc =NULL ; + } +return oc; +} + +static void avr_cpu_dump_state (CPUState *cs,FILE *f,int flags) +{ +AVRCPU *cpu =AVR_CPU (cs); +CPUAVRState *env = &cpu->env; +int i; + +qemu_fprintf (f,"\n" ); +qemu_fprintf (f,"PC: %06x\n" , env->pc_w); +qemu_fprintf (f,"SP: %04x\n" , env->sp); +qemu_fprintf (f,"rampD: %02x\n" , env->rampD >>16 ); +qemu_fprintf (f,"rampX: %02x\n" , env->rampX >>16 ); +qemu_fprintf (f,"rampY: %02x\n" , env->rampY >>16 ); +qemu_fprintf (f,"rampZ: %02x\n" , env->rampZ >>16 ); +qemu_fprintf (f,"EIND: %02x\n" , env->eind >>16 ); +qemu_fprintf (f,"X: %02x%02x\n" , env->r[27 ], env->r[26 ]); +qemu_fprintf (f,"Y: %02x%02x\n" , env->r[29 ], env->r[28 ]); +qemu_fprintf (f,"Z: %02x%02x\n" , env->r[31 ], env->r[30 ]); + qemu_fprintf(f, "SREG: [ %c %c %c %c %c %c %c %c ]\n", + env->sregI ? 'I' : '-', + env->sregT ? 'T' : '-', + env->sregH ? 'H' : '-', + env->sregS ? 'S' : '-', + env->sregV ? 'V' : '-', + env->sregN ? '-' : 'N', /* Zf has negative logic*/
target/avr/cpu.c new file +405
-0+ env->sregZ ?'Z' :'-' , + env->sregC ? 'I' : '-'); +qemu_fprintf (f,"SKIP: %02x\n" , env->skip); + +qemu_fprintf (f,"\n" ); +for (i =0 ; i <ARRAY_SIZE (env->r); i++) { +qemu_fprintf (f,"R[%02d]: %02x " , i, env->r[i]); + +if ((i %8 ) ==7 ) { +qemu_fprintf (f,"\n" ); + } + } +qemu_fprintf (f,"\n" ); +} + +static void avr_cpu_class_init (ObjectClass *oc,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (oc); +CPUClass *cc =CPU_CLASS (oc); +AVRCPUClass *mcc =AVR_CPU_CLASS (oc); + + mcc->parent_realize = dc->realize; + dc->realize = avr_cpu_realizefn; + + mcc->parent_reset = cc->reset; + cc->reset = avr_cpu_reset; + + cc->class_by_name = avr_cpu_class_by_name; + + cc->has_work = avr_cpu_has_work; + cc->do_interrupt = avr_cpu_do_interrupt; + cc->cpu_exec_interrupt = avr_cpu_exec_interrupt; + cc->dump_state = avr_cpu_dump_state; + cc->set_pc = avr_cpu_set_pc; +#if !defined(CONFIG_USER_ONLY ) + cc->memory_rw_debug = avr_cpu_memory_rw_debug; +#endif +#ifdef CONFIG_USER_ONLY + cc->handle_mmu_fault = avr_cpu_handle_mmu_fault; +#else + cc->get_phys_page_debug = avr_cpu_get_phys_page_debug; + cc->vmsd = &vms_avr_cpu; +#endif + cc->disas_set_info = avr_cpu_disas_set_info; + cc->tlb_fill = avr_cpu_tlb_fill; + cc->tcg_initialize = avr_cpu_tcg_init; + cc->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 ; + cc->gdb_core_xml_file ="avr-cpu.xml" ; +} + +static void avr_avr1_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +} + +static void avr_avr2_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +} + +static void avr_avr25_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +} + +static void avr_avr3_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +} + +static void avr_avr31_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_RAMPZ ); +avr_set_feature (env,AVR_FEATURE_ELPM ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +} + +static void avr_avr35_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +} + +static void avr_avr4_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +} + +static void avr_avr5_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +} + +static void avr_avr51_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_RAMPZ ); +avr_set_feature (env,AVR_FEATURE_ELPMX ); +avr_set_feature (env,AVR_FEATURE_ELPM ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +} + +static void avr_avr6_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_3_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_RAMPZ ); +avr_set_feature (env,AVR_FEATURE_EIJMP_EICALL ); +avr_set_feature (env,AVR_FEATURE_ELPMX ); +avr_set_feature (env,AVR_FEATURE_ELPM ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +} + +static void avr_xmega2_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +avr_set_feature (env,AVR_FEATURE_RMW ); +} + +static void avr_xmega4_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_RAMPZ ); +avr_set_feature (env,AVR_FEATURE_ELPMX ); +avr_set_feature (env,AVR_FEATURE_ELPM ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +avr_set_feature (env,AVR_FEATURE_RMW ); +} + +static void avr_xmega5_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_RAMPD ); +avr_set_feature (env,AVR_FEATURE_RAMPX ); +avr_set_feature (env,AVR_FEATURE_RAMPY ); +avr_set_feature (env,AVR_FEATURE_RAMPZ ); +avr_set_feature (env,AVR_FEATURE_ELPMX ); +avr_set_feature (env,AVR_FEATURE_ELPM ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +avr_set_feature (env,AVR_FEATURE_RMW ); +} + +static void avr_xmega6_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_3_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_RAMPZ ); +avr_set_feature (env,AVR_FEATURE_EIJMP_EICALL ); +avr_set_feature (env,AVR_FEATURE_ELPMX ); +avr_set_feature (env,AVR_FEATURE_ELPM ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +avr_set_feature (env,AVR_FEATURE_RMW ); +} + +static void avr_xmega7_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_3_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_RAMPD ); +avr_set_feature (env,AVR_FEATURE_RAMPX ); +avr_set_feature (env,AVR_FEATURE_RAMPY ); +avr_set_feature (env,AVR_FEATURE_RAMPZ ); +avr_set_feature (env,AVR_FEATURE_EIJMP_EICALL ); +avr_set_feature (env,AVR_FEATURE_ELPMX ); +avr_set_feature (env,AVR_FEATURE_ELPM ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +avr_set_feature (env,AVR_FEATURE_RMW ); +} + +typedef struct AVRCPUInfo { +const char *name; +void (*initfn)(Object *obj); +}AVRCPUInfo ; + + +static void avr_cpu_list_entry (gpointer data,gpointer user_data) +{ +const char *typename =object_class_get_name (OBJECT_CLASS (data)); + +qemu_printf ("%s\n" , typename); +} + +void avr_cpu_list (void ) +{ +GSList *list; + list =object_class_get_list_sorted (TYPE_AVR_CPU , false); +g_slist_foreach (list, avr_cpu_list_entry,NULL ); +g_slist_free (list); +} + +#define DEFINE_AVR_CPU_TYPE (model, initfn) \ + { \ + .parent = TYPE_AVR_CPU, \ + .instance_init = initfn, \ + .name = model "-avr-cpu", \ + } + +static const TypeInfo avr_cpu_type_info[] = { + { + .name =TYPE_AVR_CPU , + .parent =TYPE_CPU , + .instance_size =sizeof (AVRCPU ), + .instance_init = avr_cpu_initfn, + .class_size =sizeof (AVRCPUClass), + .class_init = avr_cpu_class_init, + .abstract = true, + }, +DEFINE_AVR_CPU_TYPE ("avr1" , avr_avr1_initfn), +DEFINE_AVR_CPU_TYPE ("avr2" , avr_avr2_initfn), +DEFINE_AVR_CPU_TYPE ("avr25" , avr_avr25_initfn), +DEFINE_AVR_CPU_TYPE ("avr3" , avr_avr3_initfn), +DEFINE_AVR_CPU_TYPE ("avr31" , avr_avr31_initfn), +DEFINE_AVR_CPU_TYPE ("avr35" , avr_avr35_initfn), +DEFINE_AVR_CPU_TYPE ("avr4" , avr_avr4_initfn), +DEFINE_AVR_CPU_TYPE ("avr5" , avr_avr5_initfn), +DEFINE_AVR_CPU_TYPE ("avr51" , avr_avr51_initfn), +DEFINE_AVR_CPU_TYPE ("avr6" , avr_avr6_initfn), +DEFINE_AVR_CPU_TYPE ("xmega2" , avr_xmega2_initfn), +DEFINE_AVR_CPU_TYPE ("xmega4" , avr_xmega4_initfn), +DEFINE_AVR_CPU_TYPE ("xmega5" , avr_xmega5_initfn), +DEFINE_AVR_CPU_TYPE ("xmega6" , avr_xmega6_initfn), +DEFINE_AVR_CPU_TYPE ("xmega7" , avr_xmega7_initfn), +}; + +DEFINE_TYPES (avr_cpu_type_info)target/avr/gdbstub.c new file +85
-0@@ -0,0 +1,85 @@ +/* +* QEMU AVR CPU +* +* Copyright (c) 2019 Michael Rolnik +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see +* <http://www.gnu.org/licenses/lgpl-2.1.html> +*/ + +#include "qemu/osdep.h" +#include "qemu-common.h" +#include "exec/gdbstub.h" + +int avr_cpu_gdb_read_register (CPUState *cs,uint8_t *mem_buf,int n) +{ +AVRCPU *cpu =AVR_CPU (cs); +CPUAVRState *env = &cpu->env; + +/* R */ +if (n <32 ) { +return gdb_get_reg8 (mem_buf, env->r[n]); + } + +/* SREG */ +if (n ==32 ) { +uint8_t sreg =cpu_get_sreg (env); + +return gdb_get_reg8 (mem_buf, sreg); + } + +/* SP */ +if (n ==33 ) { +return gdb_get_reg16 (mem_buf, env->sp &0x0000ffff ); + } + +/* PC */ +if (n ==34 ) { +return gdb_get_reg32 (mem_buf, env->pc_w *2 ); + } + +return 0 ; +} + +int avr_cpu_gdb_write_register (CPUState *cs,uint8_t *mem_buf,int n) +{ +AVRCPU *cpu =AVR_CPU (cs); +CPUAVRState *env = &cpu->env; + +/* R */ +if (n <32 ) { + env->r[n] = *mem_buf; +return 1 ; + } + +/* SREG */ +if (n ==32 ) { +cpu_set_sreg (env, *mem_buf); +return 1 ; + } + +/* SP */ +if (n ==33 ) { + env->sp =lduw_p (mem_buf); +return 2 ; + } + +/* PC */ +if (n ==34 ) { + env->pc_w =ldl_p (mem_buf) /2 ; +return 4 ; + } + +return 0 ; +}target/avr/machine.c new file +121
-0@@ -0,0 +1,121 @@ +/* +* QEMU AVR CPU +* +* Copyright (c) 2019 Michael Rolnik +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see +* <http://www.gnu.org/licenses/lgpl-2.1.html> +*/ + +#include "qemu/osdep.h" +#include "cpu.h" +#include "migration/cpu.h" + +static int get_sreg (QEMUFile *f,void *opaque,size_t size, +const VMStateField *field) +{ +CPUAVRState *env = opaque; +uint8_t sreg; + + sreg =qemu_get_byte (f); +cpu_set_sreg (env, sreg); +return 0 ; +} + +static int put_sreg ( +QEMUFile *f,void *opaque,size_t size, +const VMStateField *field,QJSON *vmdesc) +{ +CPUAVRState *env = opaque; +uint8_t sreg =cpu_get_sreg (env); + +qemu_put_byte (f, sreg); +return 0 ; +} + +static const VMStateInfo vms_sreg = { + .name ="sreg" , + .get = get_sreg, + .put = put_sreg, +}; + +static int get_segment ( +QEMUFile *f,void *opaque,size_t size,const VMStateField *field) +{ +uint32_t *ramp = opaque; +uint8_t temp; + + temp =qemu_get_byte (f); + *ramp = ((uint32_t )temp) <<16 ; +return 0 ; +} + +static int put_segment ( +QEMUFile *f,void *opaque,size_t size, +const VMStateField *field,QJSON *vmdesc) +{ +uint32_t *ramp = opaque; +uint8_t temp = *ramp >>16 ; + +qemu_put_byte (f, temp); +return 0 ; +} + +static const VMStateInfo vms_rampD = { + .name ="rampD" , + .get = get_segment, + .put = put_segment, +}; +static const VMStateInfo vms_rampX = { + .name ="rampX" , + .get = get_segment, + .put = put_segment, +}; +static const VMStateInfo vms_rampY = { + .name ="rampY" , + .get = get_segment, + .put = put_segment, +}; +static const VMStateInfo vms_rampZ = { + .name ="rampZ" , + .get = get_segment, + .put = put_segment, +}; +static const VMStateInfo vms_eind = { + .name ="eind" , + .get = get_segment, + .put = put_segment, +}; + +const VMStateDescription vms_avr_cpu = { + .name ="cpu" , + .version_id =0 , + .minimum_version_id =0 , + .fields = (VMStateField []) { +VMSTATE_UINT32 (env.pc_w,AVRCPU ), +VMSTATE_UINT32 (env.sp,AVRCPU ), +VMSTATE_UINT32 (env.skip,AVRCPU ), + +VMSTATE_UINT32_ARRAY (env.r,AVRCPU ,NO_CPU_REGISTERS ), + +VMSTATE_SINGLE (env,AVRCPU ,0 , vms_sreg, CPUAVRState), +VMSTATE_SINGLE (env.rampD,AVRCPU ,0 , vms_rampD, uint32_t), +VMSTATE_SINGLE (env.rampX,AVRCPU ,0 , vms_rampX, uint32_t), +VMSTATE_SINGLE (env.rampY,AVRCPU ,0 , vms_rampY, uint32_t), +VMSTATE_SINGLE (env.rampZ,AVRCPU ,0 , vms_rampZ, uint32_t), +VMSTATE_SINGLE (env.eind,AVRCPU ,0 , vms_eind, uint32_t), + +VMSTATE_END_OF_LIST () + } +};gdb-xml/avr-cpu.xml new file +49
-1@@ -0,0 +1,49 @@ +<?xml version="1.0"?> +<!-- Copyright (C) 2018-2019 Free Software Foundation, Inc. + + Copying and distribution of this file, with or without modification, + are permitted in any medium without royalty provided the copyright + notice and this notice are preserved. --> + +<!-- Register numbers are hard-coded in order to maintain backward + compatibility with older versions of tools that didn't use xml + register descriptions. --> + +<!DOCTYPE feature SYSTEM "gdb-target.dtd"> +<feature name="org.gnu.gdb.riscv.cpu"> + <reg name="r0" bitsize="8" type="int" regnum="0"/> + <reg name="r1" bitsize="8" type="int"/> + <reg name="r2" bitsize="8" type="int"/> + <reg name="r3" bitsize="8" type="int"/> + <reg name="r4" bitsize="8" type="int"/> + <reg name="r5" bitsize="8" type="int"/> + <reg name="r6" bitsize="8" type="int"/> + <reg name="r7" bitsize="8" type="int"/> + <reg name="r8" bitsize="8" type="int"/> + <reg name="r9" bitsize="8" type="int"/> + <reg name="r10" bitsize="8" type="int"/> + <reg name="r11" bitsize="8" type="int"/> + <reg name="r12" bitsize="8" type="int"/> + <reg name="r13" bitsize="8" type="int"/> + <reg name="r14" bitsize="8" type="int"/> + <reg name="r15" bitsize="8" type="int"/> + <reg name="r16" bitsize="8" type="int"/> + <reg name="r17" bitsize="8" type="int"/> + <reg name="r18" bitsize="8" type="int"/> + <reg name="r19" bitsize="8" type="int"/> + <reg name="r20" bitsize="8" type="int"/> + <reg name="r21" bitsize="8" type="int"/> + <reg name="r22" bitsize="8" type="int"/> + <reg name="r23" bitsize="8" type="int"/> + <reg name="r24" bitsize="8" type="int"/> + <reg name="r25" bitsize="8" type="int"/> + <reg name="r26" bitsize="8" type="int"/> + <reg name="r27" bitsize="8" type="int"/> + <reg name="r28" bitsize="8" type="int"/> + <reg name="r29" bitsize="8" type="int"/> + <reg name="r30" bitsize="8" type="int"/> + <reg name="r31" bitsize="8" type="int"/> + <reg name="sreg" bitsize="8" type="int"/> + <reg name="sp" bitsize="8" type="int"/> + <reg name="pc" bitsize="8" type="int"/> +</feature> --2.17.2 (Apple Git-113)
Re: [PATCH v36 01/17] target/avr: Add outward facing interfaces and core CPU logic
Quoted 58 lines · Aleksandar Markovic
On Sunday, November 24, 2019, Michael Rolnik <[email protected] <mailto:[email protected]>> wrote:
This includes:
- CPU data structures
- object model classes and functions
- migration functions
- GDB hooksCo-developed-by Michael Rolnik <[email protected]<mailto:[email protected]>>
Co-developed-by Sarah Harris <[email protected]<mailto:[email protected]>>
Signed-off-by Michael Rolnik <[email protected]<mailto:[email protected]>>
Signed-off-by Sarah Harris <[email protected]<mailto:[email protected]>>
Signed-off-by Michael Rolnik <[email protected]<mailto:[email protected]>>
Acked-by Igor Mammedov <[email protected]<mailto:[email protected]>>
---
target/avr/cpu-param.h | 37 +++
target/avr/cpu-qom.h | 54 ++++
target/avr/cpu.h | 253 ++++++++++++++++++ target/avr/cpu.c | 576 +++++++++++++++++++++++++++++++++++++++++ target/avr/gdbstub.c | 85 ++++++
target/avr/machine.c | 121 +++++++++
gdb-xml/avr-cpu.xml | 49 ++++
7 files changed, 1175 insertions(+)
create mode 100644target/avr/cpu-param.h
create mode 100644target/avr/cpu-qom.h
create mode 100644target/avr/cpu.h
create mode 100644target/avr/cpu.c
create mode 100644target/avr/gdbstub.c
create mode 100644target/avr/machine.c
create mode 100644gdb-xml/avr-cpu.xmldiff --git
a/target/avr/cpu-param.hb/target/avr/cpu-param.hnew file mode 100644
index 0000000000..ccd1ea3429
---/dev/null
+++b/target/avr/cpu-param.h
@@ -0,0 +1,37 @@
+/*
+ * QEMU AVR CPU
+ *
+ * Copyright (c) 2019 Michael Rolnik
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
Quoted 6 lines
I think version 2 would be more fitting to QEMU ovarall license than 2.1 (see LICENCE file in QEMU root dir).
Peter, am I right or wrong regarding GPL 2 vs. 2.1 (My interpretation is that 2 is the best "default" for new files)? The wording in "LICENSE" is frankly not entirely clear, and I see many new files using 2.1.
Hi Aleksandar,
I think you mix up GPL and LGPL here. This file is licensed under the LGPL, so version 2.1 is perfectly fine here (see COPYING.LIB in the root directory). For the GPL, there was never a 2.1, so if it would be GPL, version 2 would be appropriate. Bit since it's LGPL, 2.1 is better indeed.
Thomas
Re: [PATCH v36 01/17] target/avr: Add outward facing interfaces and core CPU logic
Quoted 67 lines · Thomas Huth
Quoted 58 lines · Aleksandar Markovic
On Sunday, November 24, 2019, Michael Rolnik <[email protected] <mailto:[email protected]>> wrote:
This includes:
- CPU data structures
- object model classes and functions
- migration functions
- GDB hooksCo-developed-by Michael Rolnik <[email protected]<mailto:[email protected]>>
Co-developed-by Sarah Harris <[email protected]<mailto:[email protected]>>
Signed-off-by Michael Rolnik <[email protected]<mailto:[email protected]>>
Signed-off-by Sarah Harris <[email protected]<mailto:[email protected]>>
Signed-off-by Michael Rolnik <[email protected]<mailto:[email protected]>>
Acked-by Igor Mammedov <[email protected]<mailto:[email protected]>>
---
target/avr/cpu-param.h| 37 +++
target/avr/cpu-qom.h| 54 ++++
target/avr/cpu.h| 253 ++++++++++++++++++
target/avr/cpu.c| 576 +++++++++++++++++++++++++++++++++++++++++
target/avr/gdbstub.c| 85 ++++++
target/avr/machine.c| 121 +++++++++
gdb-xml/avr-cpu.xml| 49 ++++
7 files changed, 1175 insertions(+)
create mode 100644target/avr/cpu-param.h
create mode 100644target/avr/cpu-qom.h
create mode 100644target/avr/cpu.h
create mode 100644target/avr/cpu.c
create mode 100644target/avr/gdbstub.c
create mode 100644target/avr/machine.c
create mode 100644gdb-xml/avr-cpu.xmldiff --git
a/target/avr/cpu-param.hb/target/avr/cpu-param.hnew file mode 100644
index 0000000000..ccd1ea3429
---/dev/null
+++b/target/avr/cpu-param.h
@@ -0,0 +1,37 @@
+/*
+ * QEMU AVR CPU
+ *
+ * Copyright (c) 2019 Michael Rolnik
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *Quoted 6 lines
I think version 2 would be more fitting to QEMU ovarall license than 2.1 (see LICENCE file in QEMU root dir).
Peter, am I right or wrong regarding GPL 2 vs. 2.1 (My interpretation is that 2 is the best "default" for new files)? The wording in "LICENSE" is frankly not entirely clear, and I see many new files using 2.1.
Quoted 7 lines
Hi Aleksandar,
I think you mix up GPL and LGPL here. This file is licensed under the LGPL, so version 2.1 is perfectly fine here (see COPYING.LIB in the root directory). For the GPL, there was never a 2.1, so if it would be GPL, version 2 would be appropriate. Bit since it's LGPL, 2.1 is better indeed.
Thanks, Thomas. I already feel dizzy of this GPL/LGPL thing. :-)
If you find appropriate and feel comfortable about it, you can respond to my general question on the lis too, where it is also obvious that I mixed up GPL and LGPL:
https://lists.gnu.org/archive/html/qemu-devel/2019-11/msg04179.html
Yours,
Aleksandar
Quoted 2 lines
Thomas
Re: [PATCH v36 01/17] target/avr: Add outward facing interfaces and core CPU logic
In reply to Michael RolnikQuoted 6 lines · Michael Rolnik
This includes:
- CPU data structures
- object model classes and functions
- migration functions
- GDB hooks
Quoted 7 lines
Co-developed-by Michael Rolnik <[email protected]>Co-developed-by Sarah Harris <[email protected]>Signed-off-by Michael Rolnik <[email protected]>Signed-off-by Sarah Harris <[email protected]>Signed-off-by Michael Rolnik <[email protected]>Acked-by Igor Mammedov <[email protected]>---
Unfortunately, it appears to me that support for AVR-specific gdb command "info io_registers" is missing. This command looks very important in overall AVR/gdb context, and I think we shouldn't leave it unsupported. (please prove me wrong if I am mistaken here in any way).
Cc- ing Alex as he is the maintainer for gdbstub QEMU component, for his opinion and advice.
Philippe, what happens in your experimental AVR setups, if the gdb command
"info io_registers" is used?
Aleksandar
From gdb docs:
21.3.8 Atmel AVR
When configured for debugging the Atmel AVR, GDB supports the following AVR-specific commands:
info io_registers
This command displays information about the AVR I/O registers. For each register, GDB prints its number and value.
Quoted 1,241 lines
target/avr/cpu-param.h | 37 +++ target/avr/cpu-qom.h | 54 ++++ target/avr/cpu.h | 253 ++++++++++++++++++ target/avr/cpu.c | 576 +++++++++++++++++++++++++++++++++++++++++ target/avr/gdbstub.c | 85 ++++++ target/avr/machine.c | 121 +++++++++ gdb-xml/avr-cpu.xml | 49 ++++ 7 files changed, 1175 insertions(+) create mode 100644 target/avr/cpu-param.h create mode 100644 target/avr/cpu-qom.h create mode 100644 target/avr/cpu.h create mode 100644 target/avr/cpu.c create mode 100644 target/avr/gdbstub.c create mode 100644 target/avr/machine.c create mode 100644 gdb-xml/avr-cpu.xmltarget/avr/cpu-param.h new file +37
-0@@ -0,0 +1,37 @@ +/* +* QEMU AVR CPU +* +* Copyright (c) 2019 Michael Rolnik +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see +* <http://www.gnu.org/licenses/lgpl-2.1.html> +*/ + +#ifndef AVR_CPU_PARAM_H +#define AVR_CPU_PARAM_H 1 + +#define TARGET_LONG_BITS 32 +/* +* TARGET_PAGE_BITS cannot be more than 8 bits because +* 1. all IO registers occupy [0x0000 .. 0x00ff] address range, and they +* should be implemented as a device and not memory +* 2. SRAM starts at the address 0x0100 +*/ +#define TARGET_PAGE_BITS 8 +#define TARGET_PHYS_ADDR_SPACE_BITS 24 +#define TARGET_VIRT_ADDR_SPACE_BITS 24 +#define NB_MMU_MODES 2 + + +#endif target/avr/cpu-qom.h new file +54
-0@@ -0,0 +1,54 @@ +/* +* QEMU AVR CPU +* +* Copyright (c) 2019 Michael Rolnik +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see +* <http://www.gnu.org/licenses/lgpl-2.1.html> +*/ + +#ifndef QEMU_AVR_QOM_H +#define QEMU_AVR_QOM_H + +#include "hw/core/cpu.h" + +#define TYPE_AVR_CPU "avr-cpu" + +#define AVR_CPU_CLASS (klass) \ + OBJECT_CLASS_CHECK(AVRCPUClass, (klass), TYPE_AVR_CPU) +#define AVR_CPU (obj) \ + OBJECT_CHECK(AVRCPU, (obj), TYPE_AVR_CPU) +#define AVR_CPU_GET_CLASS (obj) \ + OBJECT_GET_CLASS(AVRCPUClass, (obj), TYPE_AVR_CPU) + +/** +* AVRCPUClass: +* @parent_realize: The parent class' realize handler. +* @parent_reset: The parent class' reset handler. +* @vr: Version Register value. +* +* A AVR CPU model. +*/ +typedef struct AVRCPUClass { +/*< private >*/ +CPUClass parent_class; +/*< public >*/ +DeviceRealize parent_realize; +void (*parent_reset)(CPUState *cpu); +}AVRCPUClass ; + +typedef struct AVRCPU AVRCPU ; + + +#endif /* !defined (QEMU_AVR_CPU_QOM_H) */ target/avr/cpu.h new file +195
-0@@ -0,0 +1,253 @@ +/* +* QEMU AVR CPU +* +* Copyright (c) 2019 Michael Rolnik +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see +* <http://www.gnu.org/licenses/lgpl-2.1.html> +*/ + +#ifndef QEMU_AVR_CPU_H +#define QEMU_AVR_CPU_H + +#include "cpu-qom.h" +#include "exec/cpu-defs.h" + +#define TCG_GUEST_DEFAULT_MO 0 + +#define CPU_RESOLVING_TYPE TYPE_AVR_CPU + +/* +* AVR has two memory spaces, data & code. +* e.g. both have 0 address +* ST/LD instructions access data space +* LPM/SPM and instruction fetching access code memory space +*/ +#define MMU_CODE_IDX 0 +#define MMU_DATA_IDX 1 + +#define EXCP_RESET 1 +#define EXCP_INT (n) (EXCP_RESET + (n) + 1) + +/* Number of CPU registers */ +#define NO_CPU_REGISTERS 32 +/* Number of IO registers accessible by ld/st/in/out */ +#define NO_IO_REGISTERS 64 + +/* +* Offsets of AVR memory regions in host memory space. +* +* This is needed because the AVR has separate code and data address +* spaces that both have start from zero but have to go somewhere in +* host memory. +* +* It's also useful to know where some things are, like the IO registers. +*/ +/* Flash program memory */ +#define OFFSET_CODE 0x00000000 +/* CPU registers, IO registers, and SRAM */ +#define OFFSET_DATA 0x00800000 +/* CPU registers specifically, these are mapped at the start of data */ +#define OFFSET_CPU_REGISTERS OFFSET_DATA +/* +* IO registers, including status register, stack pointer, and memory +* mapped peripherals, mapped just after CPU registers +*/ +#define OFFSET_IO_REGISTERS (OFFSET_DATA + NO_CPU_REGISTERS) + +enum avr_features { +AVR_FEATURE_SRAM , + +AVR_FEATURE_1_BYTE_PC , +AVR_FEATURE_2_BYTE_PC , +AVR_FEATURE_3_BYTE_PC , + +AVR_FEATURE_1_BYTE_SP , +AVR_FEATURE_2_BYTE_SP , + +AVR_FEATURE_BREAK , +AVR_FEATURE_DES , +AVR_FEATURE_RMW ,/* Read Modify Write - XCH LAC LAS LAT */ + +AVR_FEATURE_EIJMP_EICALL , +AVR_FEATURE_IJMP_ICALL , +AVR_FEATURE_JMP_CALL , + +AVR_FEATURE_ADIW_SBIW , + +AVR_FEATURE_SPM , +AVR_FEATURE_SPMX , + +AVR_FEATURE_ELPMX , +AVR_FEATURE_ELPM , +AVR_FEATURE_LPMX , +AVR_FEATURE_LPM , + +AVR_FEATURE_MOVW , +AVR_FEATURE_MUL , +AVR_FEATURE_RAMPD , +AVR_FEATURE_RAMPX , +AVR_FEATURE_RAMPY , +AVR_FEATURE_RAMPZ , +}; + +typedef struct CPUAVRState CPUAVRState ; + +struct CPUAVRState { +uint32_t pc_w;/* 0x003fffff up to 22 bits */ + +uint32_t sregC;/* 0x00000001 1 bit */ +uint32_t sregZ;/* 0x00000001 1 bit */ +uint32_t sregN;/* 0x00000001 1 bit */ +uint32_t sregV;/* 0x00000001 1 bit */ +uint32_t sregS;/* 0x00000001 1 bit */ +uint32_t sregH;/* 0x00000001 1 bit */ +uint32_t sregT;/* 0x00000001 1 bit */ +uint32_t sregI;/* 0x00000001 1 bit */ + +uint32_t rampD;/* 0x00ff0000 8 bits */ +uint32_t rampX;/* 0x00ff0000 8 bits */ +uint32_t rampY;/* 0x00ff0000 8 bits */ +uint32_t rampZ;/* 0x00ff0000 8 bits */ +uint32_t eind;/* 0x00ff0000 8 bits */ + +uint32_t r[NO_CPU_REGISTERS ];/* 8 bits each */ +uint32_t sp;/* 16 bits */ + +uint32_t skip;/* if set skip instruction */ + +uint64_t intsrc;/* interrupt sources */ +bool fullacc;/* CPU/MEM if true MEM only otherwise */ + +uint32_t features; +}; + +/** +* AVRCPU: +* @env: #CPUAVRState +* +* A AVR CPU. +*/ +typedef struct AVRCPU { +/*< private >*/ +CPUState parent_obj; +/*< public >*/ + +CPUNegativeOffsetState neg; +CPUAVRState env; +}AVRCPU ; + +#ifndef CONFIG_USER_ONLY +extern const struct VMStateDescription vms_avr_cpu; +#endif + +void avr_cpu_do_interrupt (CPUState *cpu); +bool avr_cpu_exec_interrupt (CPUState *cpu,int int_req); +hwaddr avr_cpu_get_phys_page_debug (CPUState *cpu,vaddr addr); +int avr_cpu_gdb_read_register (CPUState *cpu,uint8_t *buf,int reg); +int avr_cpu_gdb_write_register (CPUState *cpu,uint8_t *buf,int reg); + +static inline int avr_feature (CPUAVRState *env,int feature) +{ +return (env->features & (1U << feature)) !=0 ; +} + +static inline void avr_set_feature (CPUAVRState *env,int feature) +{ + env->features |= (1U << feature); +} + +#define cpu_list avr_cpu_list +#define cpu_signal_handler cpu_avr_signal_handler +#define cpu_mmu_index avr_cpu_mmu_index + +static inline int avr_cpu_mmu_index (CPUAVRState *env,bool ifetch) +{ +return ifetch ?MMU_CODE_IDX :MMU_DATA_IDX ; +} + +void avr_cpu_tcg_init (void ); + +void avr_cpu_list (void ); +int cpu_avr_exec (CPUState *cpu); +int cpu_avr_signal_handler (int host_signum,void *pinfo,void *puc); +int avr_cpu_handle_mmu_fault (CPUState *cpu,vaddr address,int size, +int rw,int mmu_idx); +int avr_cpu_memory_rw_debug (CPUState *cs,vaddr address,uint8_t *buf, +int len,bool is_write); + +enum { +TB_FLAGS_FULL_ACCESS =1 , +TB_FLAGS_SKIP =2 , +}; + +static inline void cpu_get_tb_cpu_state(CPUAVRState *env, target_ulong*pc,
target/avr/cpu.h new file +58
-0+ target_ulong *cs_base, uint32_t *pflags) +{ +uint32_t flags =0 ; + + *pc = env->pc_w *2 ; + *cs_base =0 ; + +if (env->fullacc) { + flags |=TB_FLAGS_FULL_ACCESS ; + } +if (env->skip) { + flags |=TB_FLAGS_SKIP ; + } + + *pflags = flags; +} + +static inline int cpu_interrupts_enabled (CPUAVRState *env) +{ +return env->sregI !=0 ; +} + +static inline uint8_t cpu_get_sreg (CPUAVRState *env) +{ +uint8_t sreg; + sreg = (env->sregC) <<0 + | (env->sregZ) <<1 + | (env->sregN) <<2 + | (env->sregV) <<3 + | (env->sregS) <<4 + | (env->sregH) <<5 + | (env->sregT) <<6 + | (env->sregI) <<7 ; +return sreg; +} + +static inline void cpu_set_sreg (CPUAVRState *env,uint8_t sreg) +{ + env->sregC = (sreg >>0 ) &0x01 ; + env->sregZ = (sreg >>1 ) &0x01 ; + env->sregN = (sreg >>2 ) &0x01 ; + env->sregV = (sreg >>3 ) &0x01 ; + env->sregS = (sreg >>4 ) &0x01 ; + env->sregH = (sreg >>5 ) &0x01 ; + env->sregT = (sreg >>6 ) &0x01 ; + env->sregI = (sreg >>7 ) &0x01 ; +} + +bool avr_cpu_tlb_fill (CPUState *cs,vaddr address,int size, +MMUAccessType access_type,int mmu_idx, +bool probe,uintptr_t retaddr); + +typedef CPUAVRState CPUArchState ; +typedef AVRCPU ArchCPU ; + +#include "exec/cpu-all.h" + +#endif /* !defined (QEMU_AVR_CPU_H) */ target/avr/cpu.c new file +39
-0@@ -0,0 +1,576 @@ +/* +* QEMU AVR CPU +* +* Copyright (c) 2019 Michael Rolnik +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see +* <http://www.gnu.org/licenses/lgpl-2.1.html> +*/ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qemu/qemu-print.h" +#include "exec/exec-all.h" +#include "cpu.h" + +static void avr_cpu_set_pc (CPUState *cs,vaddr value) +{ +AVRCPU *cpu =AVR_CPU (cs); + + cpu->env.pc_w = value /2 ;/* internally PC points to words */ +} + +static bool avr_cpu_has_work (CPUState *cs) +{ +AVRCPU *cpu =AVR_CPU (cs); +CPUAVRState *env = &cpu->env; + + return (cs->interrupt_request & (CPU_INTERRUPT_HARD |
CPU_INTERRUPT_RESET))target/avr/cpu.c new file +4
-0+ &&cpu_interrupts_enabled (env); +} + +static void avr_cpu_synchronize_from_tb(CPUState *cs, TranslationBlock*tb)
target/avr/cpu.c new file +128
-0+{ +AVRCPU *cpu =AVR_CPU (cs); +CPUAVRState *env = &cpu->env; + + env->pc_w = tb->pc /2 ;/* internally PC points to words */ +} + +static void avr_cpu_reset (CPUState *cs) +{ +AVRCPU *cpu =AVR_CPU (cs); +AVRCPUClass *mcc =AVR_CPU_GET_CLASS (cpu); +CPUAVRState *env = &cpu->env; + + mcc->parent_reset (cs); + + env->pc_w =0 ; + env->sregI =1 ; + env->sregC =0 ; + env->sregZ =0 ; + env->sregN =0 ; + env->sregV =0 ; + env->sregS =0 ; + env->sregH =0 ; + env->sregT =0 ; + + env->rampD =0 ; + env->rampX =0 ; + env->rampY =0 ; + env->rampZ =0 ; + env->eind =0 ; + env->sp =0 ; + + env->skip =0 ; + +memset (env->r,0 ,sizeof (env->r)); + +tlb_flush (cs); +} + +static void avr_cpu_disas_set_info (CPUState *cpu,disassemble_info *info) +{ + info->mach = bfd_arch_avr; + info->print_insn =NULL ; +} + +static void avr_cpu_realizefn (DeviceState *dev,Error **errp) +{ +CPUState *cs =CPU (dev); +AVRCPUClass *mcc =AVR_CPU_GET_CLASS (dev); +Error *local_err =NULL ; + +cpu_exec_realizefn (cs, &local_err); +if (local_err !=NULL ) { +error_propagate (errp, local_err); +return ; + } +qemu_init_vcpu (cs); +cpu_reset (cs); + + mcc->parent_realize (dev, errp); +} + +static void avr_cpu_set_int (void *opaque,int irq,int level) +{ +AVRCPU *cpu = opaque; +CPUAVRState *env = &cpu->env; +CPUState *cs =CPU (cpu); + +uint64_t mask = (1ull << irq); +if (level) { + env->intsrc |= mask; +cpu_interrupt (cs,CPU_INTERRUPT_HARD ); + }else { + env->intsrc &= ~mask; +if (env->intsrc ==0 ) { +cpu_reset_interrupt (cs,CPU_INTERRUPT_HARD ); + } + } +} + +static void avr_cpu_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); + +cpu_set_cpustate_pointers (cpu); + +#ifndef CONFIG_USER_ONLY +/* Set the number of interrupts supported by the CPU. */ +qdev_init_gpio_in (DEVICE (cpu), avr_cpu_set_int,57 ); +#endif +} + +static ObjectClass *avr_cpu_class_by_name (const char *cpu_model) +{ +ObjectClass *oc; + + oc =object_class_by_name (cpu_model); +if (object_class_dynamic_cast (oc,TYPE_AVR_CPU ) ==NULL || +object_class_is_abstract (oc)) { + oc =NULL ; + } +return oc; +} + +static void avr_cpu_dump_state (CPUState *cs,FILE *f,int flags) +{ +AVRCPU *cpu =AVR_CPU (cs); +CPUAVRState *env = &cpu->env; +int i; + +qemu_fprintf (f,"\n" ); +qemu_fprintf (f,"PC: %06x\n" , env->pc_w); +qemu_fprintf (f,"SP: %04x\n" , env->sp); +qemu_fprintf (f,"rampD: %02x\n" , env->rampD >>16 ); +qemu_fprintf (f,"rampX: %02x\n" , env->rampX >>16 ); +qemu_fprintf (f,"rampY: %02x\n" , env->rampY >>16 ); +qemu_fprintf (f,"rampZ: %02x\n" , env->rampZ >>16 ); +qemu_fprintf (f,"EIND: %02x\n" , env->eind >>16 ); +qemu_fprintf (f,"X: %02x%02x\n" , env->r[27 ], env->r[26 ]); +qemu_fprintf (f,"Y: %02x%02x\n" , env->r[29 ], env->r[28 ]); +qemu_fprintf (f,"Z: %02x%02x\n" , env->r[31 ], env->r[30 ]); + qemu_fprintf(f, "SREG: [ %c %c %c %c %c %c %c %c ]\n", + env->sregI ? 'I' : '-', + env->sregT ? 'T' : '-', + env->sregH ? 'H' : '-', + env->sregS ? 'S' : '-', + env->sregV ? 'V' : '-', + env->sregN ? '-' : 'N', /* Zf has negative logic*/
target/avr/cpu.c new file +405
-0+ env->sregZ ?'Z' :'-' , + env->sregC ? 'I' : '-'); +qemu_fprintf (f,"SKIP: %02x\n" , env->skip); + +qemu_fprintf (f,"\n" ); +for (i =0 ; i <ARRAY_SIZE (env->r); i++) { +qemu_fprintf (f,"R[%02d]: %02x " , i, env->r[i]); + +if ((i %8 ) ==7 ) { +qemu_fprintf (f,"\n" ); + } + } +qemu_fprintf (f,"\n" ); +} + +static void avr_cpu_class_init (ObjectClass *oc,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (oc); +CPUClass *cc =CPU_CLASS (oc); +AVRCPUClass *mcc =AVR_CPU_CLASS (oc); + + mcc->parent_realize = dc->realize; + dc->realize = avr_cpu_realizefn; + + mcc->parent_reset = cc->reset; + cc->reset = avr_cpu_reset; + + cc->class_by_name = avr_cpu_class_by_name; + + cc->has_work = avr_cpu_has_work; + cc->do_interrupt = avr_cpu_do_interrupt; + cc->cpu_exec_interrupt = avr_cpu_exec_interrupt; + cc->dump_state = avr_cpu_dump_state; + cc->set_pc = avr_cpu_set_pc; +#if !defined(CONFIG_USER_ONLY ) + cc->memory_rw_debug = avr_cpu_memory_rw_debug; +#endif +#ifdef CONFIG_USER_ONLY + cc->handle_mmu_fault = avr_cpu_handle_mmu_fault; +#else + cc->get_phys_page_debug = avr_cpu_get_phys_page_debug; + cc->vmsd = &vms_avr_cpu; +#endif + cc->disas_set_info = avr_cpu_disas_set_info; + cc->tlb_fill = avr_cpu_tlb_fill; + cc->tcg_initialize = avr_cpu_tcg_init; + cc->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 ; + cc->gdb_core_xml_file ="avr-cpu.xml" ; +} + +static void avr_avr1_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +} + +static void avr_avr2_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +} + +static void avr_avr25_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +} + +static void avr_avr3_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +} + +static void avr_avr31_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_RAMPZ ); +avr_set_feature (env,AVR_FEATURE_ELPM ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +} + +static void avr_avr35_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +} + +static void avr_avr4_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +} + +static void avr_avr5_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +} + +static void avr_avr51_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_RAMPZ ); +avr_set_feature (env,AVR_FEATURE_ELPMX ); +avr_set_feature (env,AVR_FEATURE_ELPM ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +} + +static void avr_avr6_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_3_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_RAMPZ ); +avr_set_feature (env,AVR_FEATURE_EIJMP_EICALL ); +avr_set_feature (env,AVR_FEATURE_ELPMX ); +avr_set_feature (env,AVR_FEATURE_ELPM ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +} + +static void avr_xmega2_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +avr_set_feature (env,AVR_FEATURE_RMW ); +} + +static void avr_xmega4_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_RAMPZ ); +avr_set_feature (env,AVR_FEATURE_ELPMX ); +avr_set_feature (env,AVR_FEATURE_ELPM ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +avr_set_feature (env,AVR_FEATURE_RMW ); +} + +static void avr_xmega5_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_RAMPD ); +avr_set_feature (env,AVR_FEATURE_RAMPX ); +avr_set_feature (env,AVR_FEATURE_RAMPY ); +avr_set_feature (env,AVR_FEATURE_RAMPZ ); +avr_set_feature (env,AVR_FEATURE_ELPMX ); +avr_set_feature (env,AVR_FEATURE_ELPM ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +avr_set_feature (env,AVR_FEATURE_RMW ); +} + +static void avr_xmega6_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_3_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_RAMPZ ); +avr_set_feature (env,AVR_FEATURE_EIJMP_EICALL ); +avr_set_feature (env,AVR_FEATURE_ELPMX ); +avr_set_feature (env,AVR_FEATURE_ELPM ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +avr_set_feature (env,AVR_FEATURE_RMW ); +} + +static void avr_xmega7_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_3_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_RAMPD ); +avr_set_feature (env,AVR_FEATURE_RAMPX ); +avr_set_feature (env,AVR_FEATURE_RAMPY ); +avr_set_feature (env,AVR_FEATURE_RAMPZ ); +avr_set_feature (env,AVR_FEATURE_EIJMP_EICALL ); +avr_set_feature (env,AVR_FEATURE_ELPMX ); +avr_set_feature (env,AVR_FEATURE_ELPM ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +avr_set_feature (env,AVR_FEATURE_RMW ); +} + +typedef struct AVRCPUInfo { +const char *name; +void (*initfn)(Object *obj); +}AVRCPUInfo ; + + +static void avr_cpu_list_entry (gpointer data,gpointer user_data) +{ +const char *typename =object_class_get_name (OBJECT_CLASS (data)); + +qemu_printf ("%s\n" , typename); +} + +void avr_cpu_list (void ) +{ +GSList *list; + list =object_class_get_list_sorted (TYPE_AVR_CPU , false); +g_slist_foreach (list, avr_cpu_list_entry,NULL ); +g_slist_free (list); +} + +#define DEFINE_AVR_CPU_TYPE (model, initfn) \ + { \ + .parent = TYPE_AVR_CPU, \ + .instance_init = initfn, \ + .name = model "-avr-cpu", \ + } + +static const TypeInfo avr_cpu_type_info[] = { + { + .name =TYPE_AVR_CPU , + .parent =TYPE_CPU , + .instance_size =sizeof (AVRCPU ), + .instance_init = avr_cpu_initfn, + .class_size =sizeof (AVRCPUClass), + .class_init = avr_cpu_class_init, + .abstract = true, + }, +DEFINE_AVR_CPU_TYPE ("avr1" , avr_avr1_initfn), +DEFINE_AVR_CPU_TYPE ("avr2" , avr_avr2_initfn), +DEFINE_AVR_CPU_TYPE ("avr25" , avr_avr25_initfn), +DEFINE_AVR_CPU_TYPE ("avr3" , avr_avr3_initfn), +DEFINE_AVR_CPU_TYPE ("avr31" , avr_avr31_initfn), +DEFINE_AVR_CPU_TYPE ("avr35" , avr_avr35_initfn), +DEFINE_AVR_CPU_TYPE ("avr4" , avr_avr4_initfn), +DEFINE_AVR_CPU_TYPE ("avr5" , avr_avr5_initfn), +DEFINE_AVR_CPU_TYPE ("avr51" , avr_avr51_initfn), +DEFINE_AVR_CPU_TYPE ("avr6" , avr_avr6_initfn), +DEFINE_AVR_CPU_TYPE ("xmega2" , avr_xmega2_initfn), +DEFINE_AVR_CPU_TYPE ("xmega4" , avr_xmega4_initfn), +DEFINE_AVR_CPU_TYPE ("xmega5" , avr_xmega5_initfn), +DEFINE_AVR_CPU_TYPE ("xmega6" , avr_xmega6_initfn), +DEFINE_AVR_CPU_TYPE ("xmega7" , avr_xmega7_initfn), +}; + +DEFINE_TYPES (avr_cpu_type_info)target/avr/gdbstub.c new file +85
-0@@ -0,0 +1,85 @@ +/* +* QEMU AVR CPU +* +* Copyright (c) 2019 Michael Rolnik +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see +* <http://www.gnu.org/licenses/lgpl-2.1.html> +*/ + +#include "qemu/osdep.h" +#include "qemu-common.h" +#include "exec/gdbstub.h" + +int avr_cpu_gdb_read_register (CPUState *cs,uint8_t *mem_buf,int n) +{ +AVRCPU *cpu =AVR_CPU (cs); +CPUAVRState *env = &cpu->env; + +/* R */ +if (n <32 ) { +return gdb_get_reg8 (mem_buf, env->r[n]); + } + +/* SREG */ +if (n ==32 ) { +uint8_t sreg =cpu_get_sreg (env); + +return gdb_get_reg8 (mem_buf, sreg); + } + +/* SP */ +if (n ==33 ) { +return gdb_get_reg16 (mem_buf, env->sp &0x0000ffff ); + } + +/* PC */ +if (n ==34 ) { +return gdb_get_reg32 (mem_buf, env->pc_w *2 ); + } + +return 0 ; +} + +int avr_cpu_gdb_write_register (CPUState *cs,uint8_t *mem_buf,int n) +{ +AVRCPU *cpu =AVR_CPU (cs); +CPUAVRState *env = &cpu->env; + +/* R */ +if (n <32 ) { + env->r[n] = *mem_buf; +return 1 ; + } + +/* SREG */ +if (n ==32 ) { +cpu_set_sreg (env, *mem_buf); +return 1 ; + } + +/* SP */ +if (n ==33 ) { + env->sp =lduw_p (mem_buf); +return 2 ; + } + +/* PC */ +if (n ==34 ) { + env->pc_w =ldl_p (mem_buf) /2 ; +return 4 ; + } + +return 0 ; +}target/avr/machine.c new file +121
-0@@ -0,0 +1,121 @@ +/* +* QEMU AVR CPU +* +* Copyright (c) 2019 Michael Rolnik +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see +* <http://www.gnu.org/licenses/lgpl-2.1.html> +*/ + +#include "qemu/osdep.h" +#include "cpu.h" +#include "migration/cpu.h" + +static int get_sreg (QEMUFile *f,void *opaque,size_t size, +const VMStateField *field) +{ +CPUAVRState *env = opaque; +uint8_t sreg; + + sreg =qemu_get_byte (f); +cpu_set_sreg (env, sreg); +return 0 ; +} + +static int put_sreg ( +QEMUFile *f,void *opaque,size_t size, +const VMStateField *field,QJSON *vmdesc) +{ +CPUAVRState *env = opaque; +uint8_t sreg =cpu_get_sreg (env); + +qemu_put_byte (f, sreg); +return 0 ; +} + +static const VMStateInfo vms_sreg = { + .name ="sreg" , + .get = get_sreg, + .put = put_sreg, +}; + +static int get_segment ( +QEMUFile *f,void *opaque,size_t size,const VMStateField *field) +{ +uint32_t *ramp = opaque; +uint8_t temp; + + temp =qemu_get_byte (f); + *ramp = ((uint32_t )temp) <<16 ; +return 0 ; +} + +static int put_segment ( +QEMUFile *f,void *opaque,size_t size, +const VMStateField *field,QJSON *vmdesc) +{ +uint32_t *ramp = opaque; +uint8_t temp = *ramp >>16 ; + +qemu_put_byte (f, temp); +return 0 ; +} + +static const VMStateInfo vms_rampD = { + .name ="rampD" , + .get = get_segment, + .put = put_segment, +}; +static const VMStateInfo vms_rampX = { + .name ="rampX" , + .get = get_segment, + .put = put_segment, +}; +static const VMStateInfo vms_rampY = { + .name ="rampY" , + .get = get_segment, + .put = put_segment, +}; +static const VMStateInfo vms_rampZ = { + .name ="rampZ" , + .get = get_segment, + .put = put_segment, +}; +static const VMStateInfo vms_eind = { + .name ="eind" , + .get = get_segment, + .put = put_segment, +}; + +const VMStateDescription vms_avr_cpu = { + .name ="cpu" , + .version_id =0 , + .minimum_version_id =0 , + .fields = (VMStateField []) { +VMSTATE_UINT32 (env.pc_w,AVRCPU ), +VMSTATE_UINT32 (env.sp,AVRCPU ), +VMSTATE_UINT32 (env.skip,AVRCPU ), + +VMSTATE_UINT32_ARRAY (env.r,AVRCPU ,NO_CPU_REGISTERS ), + +VMSTATE_SINGLE (env,AVRCPU ,0 , vms_sreg, CPUAVRState), +VMSTATE_SINGLE (env.rampD,AVRCPU ,0 , vms_rampD, uint32_t), +VMSTATE_SINGLE (env.rampX,AVRCPU ,0 , vms_rampX, uint32_t), +VMSTATE_SINGLE (env.rampY,AVRCPU ,0 , vms_rampY, uint32_t), +VMSTATE_SINGLE (env.rampZ,AVRCPU ,0 , vms_rampZ, uint32_t), +VMSTATE_SINGLE (env.eind,AVRCPU ,0 , vms_eind, uint32_t), + +VMSTATE_END_OF_LIST () + } +};gdb-xml/avr-cpu.xml new file +49
-1@@ -0,0 +1,49 @@ +<?xml version="1.0"?> +<!-- Copyright (C) 2018-2019 Free Software Foundation, Inc. + + Copying and distribution of this file, with or without modification, + are permitted in any medium without royalty provided the copyright + notice and this notice are preserved. --> + +<!-- Register numbers are hard-coded in order to maintain backward + compatibility with older versions of tools that didn't use xml + register descriptions. --> + +<!DOCTYPE feature SYSTEM "gdb-target.dtd"> +<feature name="org.gnu.gdb.riscv.cpu"> + <reg name="r0" bitsize="8" type="int" regnum="0"/> + <reg name="r1" bitsize="8" type="int"/> + <reg name="r2" bitsize="8" type="int"/> + <reg name="r3" bitsize="8" type="int"/> + <reg name="r4" bitsize="8" type="int"/> + <reg name="r5" bitsize="8" type="int"/> + <reg name="r6" bitsize="8" type="int"/> + <reg name="r7" bitsize="8" type="int"/> + <reg name="r8" bitsize="8" type="int"/> + <reg name="r9" bitsize="8" type="int"/> + <reg name="r10" bitsize="8" type="int"/> + <reg name="r11" bitsize="8" type="int"/> + <reg name="r12" bitsize="8" type="int"/> + <reg name="r13" bitsize="8" type="int"/> + <reg name="r14" bitsize="8" type="int"/> + <reg name="r15" bitsize="8" type="int"/> + <reg name="r16" bitsize="8" type="int"/> + <reg name="r17" bitsize="8" type="int"/> + <reg name="r18" bitsize="8" type="int"/> + <reg name="r19" bitsize="8" type="int"/> + <reg name="r20" bitsize="8" type="int"/> + <reg name="r21" bitsize="8" type="int"/> + <reg name="r22" bitsize="8" type="int"/> + <reg name="r23" bitsize="8" type="int"/> + <reg name="r24" bitsize="8" type="int"/> + <reg name="r25" bitsize="8" type="int"/> + <reg name="r26" bitsize="8" type="int"/> + <reg name="r27" bitsize="8" type="int"/> + <reg name="r28" bitsize="8" type="int"/> + <reg name="r29" bitsize="8" type="int"/> + <reg name="r30" bitsize="8" type="int"/> + <reg name="r31" bitsize="8" type="int"/> + <reg name="sreg" bitsize="8" type="int"/> + <reg name="sp" bitsize="8" type="int"/> + <reg name="pc" bitsize="8" type="int"/> +</feature> --2.17.2 (Apple Git-113)
Re: [PATCH v36 01/17] target/avr: Add outward facing interfaces and core CPU logic
Quoted 19 lines · Aleksandar Markovic
Quoted 6 lines · Michael Rolnik
This includes:
- CPU data structures
- object model classes and functions
- migration functions
- GDB hooksQuoted 7 lines
Co-developed-by Michael Rolnik <[email protected]>Co-developed-by Sarah Harris <[email protected]>Signed-off-by Michael Rolnik <[email protected]>Signed-off-by Sarah Harris <[email protected]>Signed-off-by Michael Rolnik <[email protected]>Acked-by Igor Mammedov <[email protected]>---
Quoted 3 lines
Unfortunately, it appears to me that support for AVR-specific gdb command "info
io_registers" is missing.
Upon further investigation, I am not quite sure QEMU's AVR gdb stub is wrong. (I thought there is a special command in gdb protocol for AVR-specific "info io_registers", but that may not be true.)
In any case, here is the piece of gdb code that handles this command: (line 1551):
https://github.com/bminor/binutils-gdb/blob/502c64b9ac12cf2a35d3cb55c51e2eefd33a2494/gdb/avr-tdep.c
It wouldn't hurt if somebody tests that command on QEMU-emulated AVR machine.
Yours,
Aleksandar
Quoted 1,273 lines
This command looks very important in overall AVR/gdb context, and I think we shouldn't leave it unsupported. (please prove me wrong if I am mistaken here in any way).
Cc- ing Alex as he is the maintainer for gdbstub QEMU component, for his opinion and advice.
Philippe, what happens in your experimental AVR setups, if the gdb command
"infoio_registers" is used?Aleksandar
From gdb docs:
21.3.8 Atmel AVR
When configured for debugging the Atmel AVR, GDB supports the following AVR-specific commands:
infoio_registersThis command displays information about the AVR I/O registers. For each register, GDB prints its number and value.
Quoted 1,242 lines
target/avr/cpu-param.h | 37 +++ target/avr/cpu-qom.h | 54 ++++ target/avr/cpu.h | 253 ++++++++++++++++++ target/avr/cpu.c | 576 +++++++++++++++++++++++++++++++++++++++++ target/avr/gdbstub.c | 85 ++++++ target/avr/machine.c | 121 +++++++++ gdb-xml/avr-cpu.xml | 49 ++++ 7 files changed, 1175 insertions(+) create mode 100644 target/avr/cpu-param.h create mode 100644 target/avr/cpu-qom.h create mode 100644 target/avr/cpu.h create mode 100644 target/avr/cpu.c create mode 100644 target/avr/gdbstub.c create mode 100644 target/avr/machine.c create mode 100644 gdb-xml/avr-cpu.xmltarget/avr/cpu-param.h new file +37
-0@@ -0,0 +1,37 @@ +/* +* QEMU AVR CPU +* +* Copyright (c) 2019 Michael Rolnik +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see +* <http://www.gnu.org/licenses/lgpl-2.1.html> +*/ + +#ifndef AVR_CPU_PARAM_H +#define AVR_CPU_PARAM_H 1 + +#define TARGET_LONG_BITS 32 +/* +* TARGET_PAGE_BITS cannot be more than 8 bits because +* 1. all IO registers occupy [0x0000 .. 0x00ff] address range, and they +* should be implemented as a device and not memory +* 2. SRAM starts at the address 0x0100 +*/ +#define TARGET_PAGE_BITS 8 +#define TARGET_PHYS_ADDR_SPACE_BITS 24 +#define TARGET_VIRT_ADDR_SPACE_BITS 24 +#define NB_MMU_MODES 2 + + +#endif target/avr/cpu-qom.h new file +54
-0@@ -0,0 +1,54 @@ +/* +* QEMU AVR CPU +* +* Copyright (c) 2019 Michael Rolnik +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see +* <http://www.gnu.org/licenses/lgpl-2.1.html> +*/ + +#ifndef QEMU_AVR_QOM_H +#define QEMU_AVR_QOM_H + +#include "hw/core/cpu.h" + +#define TYPE_AVR_CPU "avr-cpu" + +#define AVR_CPU_CLASS (klass) \ + OBJECT_CLASS_CHECK(AVRCPUClass, (klass), TYPE_AVR_CPU) +#define AVR_CPU (obj) \ + OBJECT_CHECK(AVRCPU, (obj), TYPE_AVR_CPU) +#define AVR_CPU_GET_CLASS (obj) \ + OBJECT_GET_CLASS(AVRCPUClass, (obj), TYPE_AVR_CPU) + +/** +* AVRCPUClass: +* @parent_realize: The parent class' realize handler. +* @parent_reset: The parent class' reset handler. +* @vr: Version Register value. +* +* A AVR CPU model. +*/ +typedef struct AVRCPUClass { +/*< private >*/ +CPUClass parent_class; +/*< public >*/ +DeviceRealize parent_realize; +void (*parent_reset)(CPUState *cpu); +}AVRCPUClass ; + +typedef struct AVRCPU AVRCPU ; + + +#endif /* !defined (QEMU_AVR_CPU_QOM_H) */ target/avr/cpu.h new file +195
-0@@ -0,0 +1,253 @@ +/* +* QEMU AVR CPU +* +* Copyright (c) 2019 Michael Rolnik +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see +* <http://www.gnu.org/licenses/lgpl-2.1.html> +*/ + +#ifndef QEMU_AVR_CPU_H +#define QEMU_AVR_CPU_H + +#include "cpu-qom.h" +#include "exec/cpu-defs.h" + +#define TCG_GUEST_DEFAULT_MO 0 + +#define CPU_RESOLVING_TYPE TYPE_AVR_CPU + +/* +* AVR has two memory spaces, data & code. +* e.g. both have 0 address +* ST/LD instructions access data space +* LPM/SPM and instruction fetching access code memory space +*/ +#define MMU_CODE_IDX 0 +#define MMU_DATA_IDX 1 + +#define EXCP_RESET 1 +#define EXCP_INT (n) (EXCP_RESET + (n) + 1) + +/* Number of CPU registers */ +#define NO_CPU_REGISTERS 32 +/* Number of IO registers accessible by ld/st/in/out */ +#define NO_IO_REGISTERS 64 + +/* +* Offsets of AVR memory regions in host memory space. +* +* This is needed because the AVR has separate code and data address +* spaces that both have start from zero but have to go somewhere in +* host memory. +* +* It's also useful to know where some things are, like the IO registers. +*/ +/* Flash program memory */ +#define OFFSET_CODE 0x00000000 +/* CPU registers, IO registers, and SRAM */ +#define OFFSET_DATA 0x00800000 +/* CPU registers specifically, these are mapped at the start of data */ +#define OFFSET_CPU_REGISTERS OFFSET_DATA +/* +* IO registers, including status register, stack pointer, and memory +* mapped peripherals, mapped just after CPU registers +*/ +#define OFFSET_IO_REGISTERS (OFFSET_DATA + NO_CPU_REGISTERS) + +enum avr_features { +AVR_FEATURE_SRAM , + +AVR_FEATURE_1_BYTE_PC , +AVR_FEATURE_2_BYTE_PC , +AVR_FEATURE_3_BYTE_PC , + +AVR_FEATURE_1_BYTE_SP , +AVR_FEATURE_2_BYTE_SP , + +AVR_FEATURE_BREAK , +AVR_FEATURE_DES , +AVR_FEATURE_RMW ,/* Read Modify Write - XCH LAC LAS LAT */ + +AVR_FEATURE_EIJMP_EICALL , +AVR_FEATURE_IJMP_ICALL , +AVR_FEATURE_JMP_CALL , + +AVR_FEATURE_ADIW_SBIW , + +AVR_FEATURE_SPM , +AVR_FEATURE_SPMX , + +AVR_FEATURE_ELPMX , +AVR_FEATURE_ELPM , +AVR_FEATURE_LPMX , +AVR_FEATURE_LPM , + +AVR_FEATURE_MOVW , +AVR_FEATURE_MUL , +AVR_FEATURE_RAMPD , +AVR_FEATURE_RAMPX , +AVR_FEATURE_RAMPY , +AVR_FEATURE_RAMPZ , +}; + +typedef struct CPUAVRState CPUAVRState ; + +struct CPUAVRState { +uint32_t pc_w;/* 0x003fffff up to 22 bits */ + +uint32_t sregC;/* 0x00000001 1 bit */ +uint32_t sregZ;/* 0x00000001 1 bit */ +uint32_t sregN;/* 0x00000001 1 bit */ +uint32_t sregV;/* 0x00000001 1 bit */ +uint32_t sregS;/* 0x00000001 1 bit */ +uint32_t sregH;/* 0x00000001 1 bit */ +uint32_t sregT;/* 0x00000001 1 bit */ +uint32_t sregI;/* 0x00000001 1 bit */ + +uint32_t rampD;/* 0x00ff0000 8 bits */ +uint32_t rampX;/* 0x00ff0000 8 bits */ +uint32_t rampY;/* 0x00ff0000 8 bits */ +uint32_t rampZ;/* 0x00ff0000 8 bits */ +uint32_t eind;/* 0x00ff0000 8 bits */ + +uint32_t r[NO_CPU_REGISTERS ];/* 8 bits each */ +uint32_t sp;/* 16 bits */ + +uint32_t skip;/* if set skip instruction */ + +uint64_t intsrc;/* interrupt sources */ +bool fullacc;/* CPU/MEM if true MEM only otherwise */ + +uint32_t features; +}; + +/** +* AVRCPU: +* @env: #CPUAVRState +* +* A AVR CPU. +*/ +typedef struct AVRCPU { +/*< private >*/ +CPUState parent_obj; +/*< public >*/ + +CPUNegativeOffsetState neg; +CPUAVRState env; +}AVRCPU ; + +#ifndef CONFIG_USER_ONLY +extern const struct VMStateDescription vms_avr_cpu; +#endif + +void avr_cpu_do_interrupt (CPUState *cpu); +bool avr_cpu_exec_interrupt (CPUState *cpu,int int_req); +hwaddr avr_cpu_get_phys_page_debug (CPUState *cpu,vaddr addr); +int avr_cpu_gdb_read_register (CPUState *cpu,uint8_t *buf,int reg); +int avr_cpu_gdb_write_register (CPUState *cpu,uint8_t *buf,int reg); + +static inline int avr_feature (CPUAVRState *env,int feature) +{ +return (env->features & (1U << feature)) !=0 ; +} + +static inline void avr_set_feature (CPUAVRState *env,int feature) +{ + env->features |= (1U << feature); +} + +#define cpu_list avr_cpu_list +#define cpu_signal_handler cpu_avr_signal_handler +#define cpu_mmu_index avr_cpu_mmu_index + +static inline int avr_cpu_mmu_index (CPUAVRState *env,bool ifetch) +{ +return ifetch ?MMU_CODE_IDX :MMU_DATA_IDX ; +} + +void avr_cpu_tcg_init (void ); + +void avr_cpu_list (void ); +int cpu_avr_exec (CPUState *cpu); +int cpu_avr_signal_handler (int host_signum,void *pinfo,void *puc); +int avr_cpu_handle_mmu_fault (CPUState *cpu,vaddr address,int size, +int rw,int mmu_idx); +int avr_cpu_memory_rw_debug (CPUState *cs,vaddr address,uint8_t *buf, +int len,bool is_write); + +enum { +TB_FLAGS_FULL_ACCESS =1 , +TB_FLAGS_SKIP =2 , +}; + +static inline void cpu_get_tb_cpu_state(CPUAVRState *env, target_ulong*pc,
target/avr/cpu.h new file +58
-0+ target_ulong *cs_base, uint32_t *pflags) +{ +uint32_t flags =0 ; + + *pc = env->pc_w *2 ; + *cs_base =0 ; + +if (env->fullacc) { + flags |=TB_FLAGS_FULL_ACCESS ; + } +if (env->skip) { + flags |=TB_FLAGS_SKIP ; + } + + *pflags = flags; +} + +static inline int cpu_interrupts_enabled (CPUAVRState *env) +{ +return env->sregI !=0 ; +} + +static inline uint8_t cpu_get_sreg (CPUAVRState *env) +{ +uint8_t sreg; + sreg = (env->sregC) <<0 + | (env->sregZ) <<1 + | (env->sregN) <<2 + | (env->sregV) <<3 + | (env->sregS) <<4 + | (env->sregH) <<5 + | (env->sregT) <<6 + | (env->sregI) <<7 ; +return sreg; +} + +static inline void cpu_set_sreg (CPUAVRState *env,uint8_t sreg) +{ + env->sregC = (sreg >>0 ) &0x01 ; + env->sregZ = (sreg >>1 ) &0x01 ; + env->sregN = (sreg >>2 ) &0x01 ; + env->sregV = (sreg >>3 ) &0x01 ; + env->sregS = (sreg >>4 ) &0x01 ; + env->sregH = (sreg >>5 ) &0x01 ; + env->sregT = (sreg >>6 ) &0x01 ; + env->sregI = (sreg >>7 ) &0x01 ; +} + +bool avr_cpu_tlb_fill (CPUState *cs,vaddr address,int size, +MMUAccessType access_type,int mmu_idx, +bool probe,uintptr_t retaddr); + +typedef CPUAVRState CPUArchState ; +typedef AVRCPU ArchCPU ; + +#include "exec/cpu-all.h" + +#endif /* !defined (QEMU_AVR_CPU_H) */ target/avr/cpu.c new file +39
-0@@ -0,0 +1,576 @@ +/* +* QEMU AVR CPU +* +* Copyright (c) 2019 Michael Rolnik +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see +* <http://www.gnu.org/licenses/lgpl-2.1.html> +*/ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qemu/qemu-print.h" +#include "exec/exec-all.h" +#include "cpu.h" + +static void avr_cpu_set_pc (CPUState *cs,vaddr value) +{ +AVRCPU *cpu =AVR_CPU (cs); + + cpu->env.pc_w = value /2 ;/* internally PC points to words */ +} + +static bool avr_cpu_has_work (CPUState *cs) +{ +AVRCPU *cpu =AVR_CPU (cs); +CPUAVRState *env = &cpu->env; + + return (cs->interrupt_request & (CPU_INTERRUPT_HARD |
CPU_INTERRUPT_RESET))target/avr/cpu.c new file +4
-0+ &&cpu_interrupts_enabled (env); +} + +static void avr_cpu_synchronize_from_tb(CPUState *cs, TranslationBlock*tb)
target/avr/cpu.c new file +40
-0+{ +AVRCPU *cpu =AVR_CPU (cs); +CPUAVRState *env = &cpu->env; + + env->pc_w = tb->pc /2 ;/* internally PC points to words */ +} + +static void avr_cpu_reset (CPUState *cs) +{ +AVRCPU *cpu =AVR_CPU (cs); +AVRCPUClass *mcc =AVR_CPU_GET_CLASS (cpu); +CPUAVRState *env = &cpu->env; + + mcc->parent_reset (cs); + + env->pc_w =0 ; + env->sregI =1 ; + env->sregC =0 ; + env->sregZ =0 ; + env->sregN =0 ; + env->sregV =0 ; + env->sregS =0 ; + env->sregH =0 ; + env->sregT =0 ; + + env->rampD =0 ; + env->rampX =0 ; + env->rampY =0 ; + env->rampZ =0 ; + env->eind =0 ; + env->sp =0 ; + + env->skip =0 ; + +memset (env->r,0 ,sizeof (env->r)); + +tlb_flush (cs); +} + +static void avr_cpu_disas_set_info(CPUState *cpu, disassemble_info*info)
target/avr/cpu.c new file +88
-0+{ + info->mach = bfd_arch_avr; + info->print_insn =NULL ; +} + +static void avr_cpu_realizefn (DeviceState *dev,Error **errp) +{ +CPUState *cs =CPU (dev); +AVRCPUClass *mcc =AVR_CPU_GET_CLASS (dev); +Error *local_err =NULL ; + +cpu_exec_realizefn (cs, &local_err); +if (local_err !=NULL ) { +error_propagate (errp, local_err); +return ; + } +qemu_init_vcpu (cs); +cpu_reset (cs); + + mcc->parent_realize (dev, errp); +} + +static void avr_cpu_set_int (void *opaque,int irq,int level) +{ +AVRCPU *cpu = opaque; +CPUAVRState *env = &cpu->env; +CPUState *cs =CPU (cpu); + +uint64_t mask = (1ull << irq); +if (level) { + env->intsrc |= mask; +cpu_interrupt (cs,CPU_INTERRUPT_HARD ); + }else { + env->intsrc &= ~mask; +if (env->intsrc ==0 ) { +cpu_reset_interrupt (cs,CPU_INTERRUPT_HARD ); + } + } +} + +static void avr_cpu_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); + +cpu_set_cpustate_pointers (cpu); + +#ifndef CONFIG_USER_ONLY +/* Set the number of interrupts supported by the CPU. */ +qdev_init_gpio_in (DEVICE (cpu), avr_cpu_set_int,57 ); +#endif +} + +static ObjectClass *avr_cpu_class_by_name (const char *cpu_model) +{ +ObjectClass *oc; + + oc =object_class_by_name (cpu_model); +if (object_class_dynamic_cast (oc,TYPE_AVR_CPU ) ==NULL || +object_class_is_abstract (oc)) { + oc =NULL ; + } +return oc; +} + +static void avr_cpu_dump_state (CPUState *cs,FILE *f,int flags) +{ +AVRCPU *cpu =AVR_CPU (cs); +CPUAVRState *env = &cpu->env; +int i; + +qemu_fprintf (f,"\n" ); +qemu_fprintf (f,"PC: %06x\n" , env->pc_w); +qemu_fprintf (f,"SP: %04x\n" , env->sp); +qemu_fprintf (f,"rampD: %02x\n" , env->rampD >>16 ); +qemu_fprintf (f,"rampX: %02x\n" , env->rampX >>16 ); +qemu_fprintf (f,"rampY: %02x\n" , env->rampY >>16 ); +qemu_fprintf (f,"rampZ: %02x\n" , env->rampZ >>16 ); +qemu_fprintf (f,"EIND: %02x\n" , env->eind >>16 ); +qemu_fprintf (f,"X: %02x%02x\n" , env->r[27 ], env->r[26 ]); +qemu_fprintf (f,"Y: %02x%02x\n" , env->r[29 ], env->r[28 ]); +qemu_fprintf (f,"Z: %02x%02x\n" , env->r[31 ], env->r[30 ]); + qemu_fprintf(f, "SREG: [ %c %c %c %c %c %c %c %c ]\n", + env->sregI ? 'I' : '-', + env->sregT ? 'T' : '-', + env->sregH ? 'H' : '-', + env->sregS ? 'S' : '-', + env->sregV ? 'V' : '-', + env->sregN ? '-' : 'N', /* Zf has negative logic*/
target/avr/cpu.c new file +405
-0+ env->sregZ ?'Z' :'-' , + env->sregC ? 'I' : '-'); +qemu_fprintf (f,"SKIP: %02x\n" , env->skip); + +qemu_fprintf (f,"\n" ); +for (i =0 ; i <ARRAY_SIZE (env->r); i++) { +qemu_fprintf (f,"R[%02d]: %02x " , i, env->r[i]); + +if ((i %8 ) ==7 ) { +qemu_fprintf (f,"\n" ); + } + } +qemu_fprintf (f,"\n" ); +} + +static void avr_cpu_class_init (ObjectClass *oc,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (oc); +CPUClass *cc =CPU_CLASS (oc); +AVRCPUClass *mcc =AVR_CPU_CLASS (oc); + + mcc->parent_realize = dc->realize; + dc->realize = avr_cpu_realizefn; + + mcc->parent_reset = cc->reset; + cc->reset = avr_cpu_reset; + + cc->class_by_name = avr_cpu_class_by_name; + + cc->has_work = avr_cpu_has_work; + cc->do_interrupt = avr_cpu_do_interrupt; + cc->cpu_exec_interrupt = avr_cpu_exec_interrupt; + cc->dump_state = avr_cpu_dump_state; + cc->set_pc = avr_cpu_set_pc; +#if !defined(CONFIG_USER_ONLY ) + cc->memory_rw_debug = avr_cpu_memory_rw_debug; +#endif +#ifdef CONFIG_USER_ONLY + cc->handle_mmu_fault = avr_cpu_handle_mmu_fault; +#else + cc->get_phys_page_debug = avr_cpu_get_phys_page_debug; + cc->vmsd = &vms_avr_cpu; +#endif + cc->disas_set_info = avr_cpu_disas_set_info; + cc->tlb_fill = avr_cpu_tlb_fill; + cc->tcg_initialize = avr_cpu_tcg_init; + cc->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 ; + cc->gdb_core_xml_file ="avr-cpu.xml" ; +} + +static void avr_avr1_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +} + +static void avr_avr2_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +} + +static void avr_avr25_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +} + +static void avr_avr3_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +} + +static void avr_avr31_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_RAMPZ ); +avr_set_feature (env,AVR_FEATURE_ELPM ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +} + +static void avr_avr35_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +} + +static void avr_avr4_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +} + +static void avr_avr5_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +} + +static void avr_avr51_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_RAMPZ ); +avr_set_feature (env,AVR_FEATURE_ELPMX ); +avr_set_feature (env,AVR_FEATURE_ELPM ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +} + +static void avr_avr6_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_3_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_RAMPZ ); +avr_set_feature (env,AVR_FEATURE_EIJMP_EICALL ); +avr_set_feature (env,AVR_FEATURE_ELPMX ); +avr_set_feature (env,AVR_FEATURE_ELPM ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +} + +static void avr_xmega2_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +avr_set_feature (env,AVR_FEATURE_RMW ); +} + +static void avr_xmega4_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_RAMPZ ); +avr_set_feature (env,AVR_FEATURE_ELPMX ); +avr_set_feature (env,AVR_FEATURE_ELPM ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +avr_set_feature (env,AVR_FEATURE_RMW ); +} + +static void avr_xmega5_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_RAMPD ); +avr_set_feature (env,AVR_FEATURE_RAMPX ); +avr_set_feature (env,AVR_FEATURE_RAMPY ); +avr_set_feature (env,AVR_FEATURE_RAMPZ ); +avr_set_feature (env,AVR_FEATURE_ELPMX ); +avr_set_feature (env,AVR_FEATURE_ELPM ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +avr_set_feature (env,AVR_FEATURE_RMW ); +} + +static void avr_xmega6_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_3_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_RAMPZ ); +avr_set_feature (env,AVR_FEATURE_EIJMP_EICALL ); +avr_set_feature (env,AVR_FEATURE_ELPMX ); +avr_set_feature (env,AVR_FEATURE_ELPM ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +avr_set_feature (env,AVR_FEATURE_RMW ); +} + +static void avr_xmega7_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_3_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_RAMPD ); +avr_set_feature (env,AVR_FEATURE_RAMPX ); +avr_set_feature (env,AVR_FEATURE_RAMPY ); +avr_set_feature (env,AVR_FEATURE_RAMPZ ); +avr_set_feature (env,AVR_FEATURE_EIJMP_EICALL ); +avr_set_feature (env,AVR_FEATURE_ELPMX ); +avr_set_feature (env,AVR_FEATURE_ELPM ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +avr_set_feature (env,AVR_FEATURE_RMW ); +} + +typedef struct AVRCPUInfo { +const char *name; +void (*initfn)(Object *obj); +}AVRCPUInfo ; + + +static void avr_cpu_list_entry (gpointer data,gpointer user_data) +{ +const char *typename =object_class_get_name (OBJECT_CLASS (data)); + +qemu_printf ("%s\n" , typename); +} + +void avr_cpu_list (void ) +{ +GSList *list; + list =object_class_get_list_sorted (TYPE_AVR_CPU , false); +g_slist_foreach (list, avr_cpu_list_entry,NULL ); +g_slist_free (list); +} + +#define DEFINE_AVR_CPU_TYPE (model, initfn) \ + { \ + .parent = TYPE_AVR_CPU, \ + .instance_init = initfn, \ + .name = model "-avr-cpu", \ + } + +static const TypeInfo avr_cpu_type_info[] = { + { + .name =TYPE_AVR_CPU , + .parent =TYPE_CPU , + .instance_size =sizeof (AVRCPU ), + .instance_init = avr_cpu_initfn, + .class_size =sizeof (AVRCPUClass), + .class_init = avr_cpu_class_init, + .abstract = true, + }, +DEFINE_AVR_CPU_TYPE ("avr1" , avr_avr1_initfn), +DEFINE_AVR_CPU_TYPE ("avr2" , avr_avr2_initfn), +DEFINE_AVR_CPU_TYPE ("avr25" , avr_avr25_initfn), +DEFINE_AVR_CPU_TYPE ("avr3" , avr_avr3_initfn), +DEFINE_AVR_CPU_TYPE ("avr31" , avr_avr31_initfn), +DEFINE_AVR_CPU_TYPE ("avr35" , avr_avr35_initfn), +DEFINE_AVR_CPU_TYPE ("avr4" , avr_avr4_initfn), +DEFINE_AVR_CPU_TYPE ("avr5" , avr_avr5_initfn), +DEFINE_AVR_CPU_TYPE ("avr51" , avr_avr51_initfn), +DEFINE_AVR_CPU_TYPE ("avr6" , avr_avr6_initfn), +DEFINE_AVR_CPU_TYPE ("xmega2" , avr_xmega2_initfn), +DEFINE_AVR_CPU_TYPE ("xmega4" , avr_xmega4_initfn), +DEFINE_AVR_CPU_TYPE ("xmega5" , avr_xmega5_initfn), +DEFINE_AVR_CPU_TYPE ("xmega6" , avr_xmega6_initfn), +DEFINE_AVR_CPU_TYPE ("xmega7" , avr_xmega7_initfn), +}; + +DEFINE_TYPES (avr_cpu_type_info)target/avr/gdbstub.c new file +85
-0@@ -0,0 +1,85 @@ +/* +* QEMU AVR CPU +* +* Copyright (c) 2019 Michael Rolnik +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see +* <http://www.gnu.org/licenses/lgpl-2.1.html> +*/ + +#include "qemu/osdep.h" +#include "qemu-common.h" +#include "exec/gdbstub.h" + +int avr_cpu_gdb_read_register (CPUState *cs,uint8_t *mem_buf,int n) +{ +AVRCPU *cpu =AVR_CPU (cs); +CPUAVRState *env = &cpu->env; + +/* R */ +if (n <32 ) { +return gdb_get_reg8 (mem_buf, env->r[n]); + } + +/* SREG */ +if (n ==32 ) { +uint8_t sreg =cpu_get_sreg (env); + +return gdb_get_reg8 (mem_buf, sreg); + } + +/* SP */ +if (n ==33 ) { +return gdb_get_reg16 (mem_buf, env->sp &0x0000ffff ); + } + +/* PC */ +if (n ==34 ) { +return gdb_get_reg32 (mem_buf, env->pc_w *2 ); + } + +return 0 ; +} + +int avr_cpu_gdb_write_register (CPUState *cs,uint8_t *mem_buf,int n) +{ +AVRCPU *cpu =AVR_CPU (cs); +CPUAVRState *env = &cpu->env; + +/* R */ +if (n <32 ) { + env->r[n] = *mem_buf; +return 1 ; + } + +/* SREG */ +if (n ==32 ) { +cpu_set_sreg (env, *mem_buf); +return 1 ; + } + +/* SP */ +if (n ==33 ) { + env->sp =lduw_p (mem_buf); +return 2 ; + } + +/* PC */ +if (n ==34 ) { + env->pc_w =ldl_p (mem_buf) /2 ; +return 4 ; + } + +return 0 ; +}target/avr/machine.c new file +121
-0@@ -0,0 +1,121 @@ +/* +* QEMU AVR CPU +* +* Copyright (c) 2019 Michael Rolnik +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see +* <http://www.gnu.org/licenses/lgpl-2.1.html> +*/ + +#include "qemu/osdep.h" +#include "cpu.h" +#include "migration/cpu.h" + +static int get_sreg (QEMUFile *f,void *opaque,size_t size, +const VMStateField *field) +{ +CPUAVRState *env = opaque; +uint8_t sreg; + + sreg =qemu_get_byte (f); +cpu_set_sreg (env, sreg); +return 0 ; +} + +static int put_sreg ( +QEMUFile *f,void *opaque,size_t size, +const VMStateField *field,QJSON *vmdesc) +{ +CPUAVRState *env = opaque; +uint8_t sreg =cpu_get_sreg (env); + +qemu_put_byte (f, sreg); +return 0 ; +} + +static const VMStateInfo vms_sreg = { + .name ="sreg" , + .get = get_sreg, + .put = put_sreg, +}; + +static int get_segment ( +QEMUFile *f,void *opaque,size_t size,const VMStateField *field) +{ +uint32_t *ramp = opaque; +uint8_t temp; + + temp =qemu_get_byte (f); + *ramp = ((uint32_t )temp) <<16 ; +return 0 ; +} + +static int put_segment ( +QEMUFile *f,void *opaque,size_t size, +const VMStateField *field,QJSON *vmdesc) +{ +uint32_t *ramp = opaque; +uint8_t temp = *ramp >>16 ; + +qemu_put_byte (f, temp); +return 0 ; +} + +static const VMStateInfo vms_rampD = { + .name ="rampD" , + .get = get_segment, + .put = put_segment, +}; +static const VMStateInfo vms_rampX = { + .name ="rampX" , + .get = get_segment, + .put = put_segment, +}; +static const VMStateInfo vms_rampY = { + .name ="rampY" , + .get = get_segment, + .put = put_segment, +}; +static const VMStateInfo vms_rampZ = { + .name ="rampZ" , + .get = get_segment, + .put = put_segment, +}; +static const VMStateInfo vms_eind = { + .name ="eind" , + .get = get_segment, + .put = put_segment, +}; + +const VMStateDescription vms_avr_cpu = { + .name ="cpu" , + .version_id =0 , + .minimum_version_id =0 , + .fields = (VMStateField []) { +VMSTATE_UINT32 (env.pc_w,AVRCPU ), +VMSTATE_UINT32 (env.sp,AVRCPU ), +VMSTATE_UINT32 (env.skip,AVRCPU ), + +VMSTATE_UINT32_ARRAY (env.r,AVRCPU ,NO_CPU_REGISTERS ), + +VMSTATE_SINGLE (env,AVRCPU ,0 , vms_sreg, CPUAVRState), +VMSTATE_SINGLE (env.rampD,AVRCPU ,0 , vms_rampD, uint32_t), +VMSTATE_SINGLE (env.rampX,AVRCPU ,0 , vms_rampX, uint32_t), +VMSTATE_SINGLE (env.rampY,AVRCPU ,0 , vms_rampY, uint32_t), +VMSTATE_SINGLE (env.rampZ,AVRCPU ,0 , vms_rampZ, uint32_t), +VMSTATE_SINGLE (env.eind,AVRCPU ,0 , vms_eind, uint32_t), + +VMSTATE_END_OF_LIST () + } +};gdb-xml/avr-cpu.xml new file +49
-1@@ -0,0 +1,49 @@ +<?xml version="1.0"?> +<!-- Copyright (C) 2018-2019 Free Software Foundation, Inc. + + Copying and distribution of this file, with or without modification, + are permitted in any medium without royalty provided the copyright + notice and this notice are preserved. --> + +<!-- Register numbers are hard-coded in order to maintain backward + compatibility with older versions of tools that didn't use xml + register descriptions. --> + +<!DOCTYPE feature SYSTEM "gdb-target.dtd"> +<feature name="org.gnu.gdb.riscv.cpu"> + <reg name="r0" bitsize="8" type="int" regnum="0"/> + <reg name="r1" bitsize="8" type="int"/> + <reg name="r2" bitsize="8" type="int"/> + <reg name="r3" bitsize="8" type="int"/> + <reg name="r4" bitsize="8" type="int"/> + <reg name="r5" bitsize="8" type="int"/> + <reg name="r6" bitsize="8" type="int"/> + <reg name="r7" bitsize="8" type="int"/> + <reg name="r8" bitsize="8" type="int"/> + <reg name="r9" bitsize="8" type="int"/> + <reg name="r10" bitsize="8" type="int"/> + <reg name="r11" bitsize="8" type="int"/> + <reg name="r12" bitsize="8" type="int"/> + <reg name="r13" bitsize="8" type="int"/> + <reg name="r14" bitsize="8" type="int"/> + <reg name="r15" bitsize="8" type="int"/> + <reg name="r16" bitsize="8" type="int"/> + <reg name="r17" bitsize="8" type="int"/> + <reg name="r18" bitsize="8" type="int"/> + <reg name="r19" bitsize="8" type="int"/> + <reg name="r20" bitsize="8" type="int"/> + <reg name="r21" bitsize="8" type="int"/> + <reg name="r22" bitsize="8" type="int"/> + <reg name="r23" bitsize="8" type="int"/> + <reg name="r24" bitsize="8" type="int"/> + <reg name="r25" bitsize="8" type="int"/> + <reg name="r26" bitsize="8" type="int"/> + <reg name="r27" bitsize="8" type="int"/> + <reg name="r28" bitsize="8" type="int"/> + <reg name="r29" bitsize="8" type="int"/> + <reg name="r30" bitsize="8" type="int"/> + <reg name="r31" bitsize="8" type="int"/> + <reg name="sreg" bitsize="8" type="int"/> + <reg name="sp" bitsize="8" type="int"/> + <reg name="pc" bitsize="8" type="int"/> +</feature> --2.17.2 (Apple Git-113)
Philippe Mathieu-Daudé
Tested-byRe: [PATCH v36 01/17] target/avr: Add outward facing interfaces and core CPU logic
In reply to Aleksandar MarkovicHi Aleksandar,
Quoted 23 lines · Aleksandar Markovic
On Sunday, November 24, 2019, Michael Rolnik <[email protected] <mailto:[email protected]>> wrote:
This includes:
- CPU data structures
- object model classes and functions
- migration functions
- GDB hooksCo-developed-by Michael Rolnik <[email protected]<mailto:[email protected]>>
Co-developed-by Sarah Harris <[email protected]<mailto:[email protected]>>
Signed-off-by Michael Rolnik <[email protected]<mailto:[email protected]>>
Signed-off-by Sarah Harris <[email protected]<mailto:[email protected]>>
Signed-off-by Michael Rolnik <[email protected]<mailto:[email protected]>>
Acked-by Igor Mammedov <[email protected]<mailto:[email protected]>>
---
Quoted 5 lines
Unfortunately, it appears to me that support for AVR-specific gdb command "info
io_registers" is missing. This command looks very important in overall AVR/gdb context, and I think we shouldn't leave it unsupported. (please prove me wrong if I am mistaken here in any way).Cc- ing Alex as he is the maintainer for gdbstub QEMU component, for his opinion and advice.
Philippe, what happens in your experimental AVR setups, if the gdb command "info
io_registers" is used?
I use gdb-multiarch which doesn't have the AVR target:
$ gdb-multiarch -q (gdb) set pagination off (gdb) set architecture <tab> Display all 200 possibilities? (y or n)y aarch64 mips:4120 aarch64:ilp32 mips:4300 alpha mips:4400 alpha:ev4 mips:4600 alpha:ev5 mips:4650 alpha:ev6 mips:5000 arm mips:5400 arm_any mips:5500 armv2 mips:5900 armv2a mips:6000 armv3 mips:7000 armv3m mips:8000 armv4 mips:9000 armv4t mips:interaptiv-mr2 armv5 mips:isa32 armv5t mips:isa32r2 armv5te mips:isa32r3 armv5tej mips:isa32r5 armv6 mips:isa32r6 armv6-m mips:isa64 armv6k mips:isa64r2 armv6kz mips:isa64r3 armv6s-m mips:isa64r5 armv6t2 mips:isa64r6 armv7 mips:loongson_2e armv7e-m mips:loongson_2f armv8-a mips:loongson_3a armv8-m.base mips:micromips armv8-m.main mips:mips5 armv8-r mips:octeon ep9312 mips:octeon+ hppa1.0 mips:octeon2 i386 mips:octeon3 i386:intel mips:sb1 i386:nacl mips:xlr i386:x64-32 powerpc:403 i386:x64-32:intel powerpc:601 i386:x64-32:nacl powerpc:603 i386:x86-64 powerpc:604 i386:x86-64:intel powerpc:620 i386:x86-64:nacl powerpc:630 i8086 powerpc:7400 ia64-elf32 powerpc:750 ia64-elf64 powerpc:EC603e iwmmxt powerpc:MPC8XX iwmmxt2 powerpc:a35 m68k powerpc:common m68k:5200 powerpc:common64 m68k:5206e powerpc:e500 m68k:521x powerpc:e500mc m68k:5249 powerpc:e500mc64 m68k:528x powerpc:e5500 m68k:5307 powerpc:e6500 m68k:5407 powerpc:rs64ii m68k:547x powerpc:rs64iii m68k:548x powerpc:titan m68k:68000 powerpc:vle m68k:68008 rs6000:6000 m68k:68010 rs6000:rs1 m68k:68020 rs6000:rs2 m68k:68030 rs6000:rsc m68k:68040 s390:31-bit m68k:68060 s390:64-bit m68k:cfv4e sh m68k:cpu32 sh-dsp m68k:fido sh2 m68k:isa-a sh2a m68k:isa-a:emac sh2a-nofpu m68k:isa-a:mac sh2a-nofpu-or-sh3-nommu m68k:isa-a:nodiv sh2a-nofpu-or-sh4-nommu-nofpu m68k:isa-aplus sh2a-or-sh3e m68k:isa-aplus:emac sh2a-or-sh4 m68k:isa-aplus:mac sh2e m68k:isa-b sh3 m68k:isa-b:emac sh3-dsp m68k:isa-b:float sh3-nommu m68k:isa-b:float:emac sh3e m68k:isa-b:float:mac sh4 m68k:isa-b:mac sh4-nofpu m68k:isa-b:nousp sh4-nommu-nofpu m68k:isa-b:nousp:emac sh4a m68k:isa-b:nousp:mac sh4a-nofpu m68k:isa-c sh4al-dsp m68k:isa-c:emac sparc m68k:isa-c:mac sparc:sparclet m68k:isa-c:nodiv sparc:sparclite m68k:isa-c:nodiv:emac sparc:sparclite_le m68k:isa-c:nodiv:mac sparc:v8plus mips sparc:v8plusa mips:10000 sparc:v8plusb mips:12000 sparc:v8plusc mips:14000 sparc:v8plusd mips:16 sparc:v8pluse mips:16000 sparc:v9 mips:3000 sparc:v9a mips:3900 sparc:v9b mips:4000 sparc:v9c mips:4010 sparc:v9d mips:4100 sparc:v9e mips:4111 xscale *** List may be truncated, max-completions reached. *** (gdb)
I used trace events to test this port (the FreeRTOS test, and trying to boot some Atmega328 firmware.
So for the non-gdb part:
Quoted 1,265 lines
From gdb docs:
21.3.8 Atmel AVRWhen configured for debugging the Atmel AVR, GDB supports the following AVR-specific commands:
|info io_registers|
This command displays information about the AVR I/O registers. For each register, GDB prints its number and value. target/avr/cpu-param.h | 37 +++ target/avr/cpu-qom.h | 54 ++++ target/avr/cpu.h | 253 ++++++++++++++++++ target/avr/cpu.c | 576 +++++++++++++++++++++++++++++++++++++++++ target/avr/gdbstub.c | 85 ++++++ target/avr/machine.c | 121 +++++++++ gdb-xml/avr-cpu.xml | 49 ++++ 7 files changed, 1175 insertions(+) create mode 100644 target/avr/cpu-param.h create mode 100644 target/avr/cpu-qom.h create mode 100644 target/avr/cpu.h create mode 100644 target/avr/cpu.c create mode 100644 target/avr/gdbstub.c create mode 100644 target/avr/machine.c create mode 100644 gdb-xml/avr-cpu.xml diff --git a/target/avr/cpu-param.h b/target/avr/cpu-param.h new file mode 100644 index 0000000000..ccd1ea3429 --- /dev/null +++ b/target/avr/cpu-param.h @@ -0,0 +1,37 @@ +/* + * QEMU AVR CPU + * + * Copyright (c) 2019 Michael Rolnik + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see + * <http://www.gnu.org/licenses/lgpl-2.1.html <http://www.gnu.org/licenses/lgpl-2.1.html>> + */ + +#ifndef AVR_CPU_PARAM_H +#define AVR_CPU_PARAM_H 1 + +#define TARGET_LONG_BITS 32 +/* + * TARGET_PAGE_BITS cannot be more than 8 bits because + * 1. all IO registers occupy [0x0000 .. 0x00ff] address range, and they + * should be implemented as a device and not memory + * 2. SRAM starts at the address 0x0100 + */ +#define TARGET_PAGE_BITS 8 +#define TARGET_PHYS_ADDR_SPACE_BITS 24 +#define TARGET_VIRT_ADDR_SPACE_BITS 24 +#define NB_MMU_MODES 2 + + +#endif diff --git a/target/avr/cpu-qom.h b/target/avr/cpu-qom.h new file mode 100644 index 0000000000..e28b58c897 --- /dev/null +++ b/target/avr/cpu-qom.h @@ -0,0 +1,54 @@ +/* + * QEMU AVR CPU + * + * Copyright (c) 2019 Michael Rolnik + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see + * <http://www.gnu.org/licenses/lgpl-2.1.html <http://www.gnu.org/licenses/lgpl-2.1.html>> + */ + +#ifndef QEMU_AVR_QOM_H +#define QEMU_AVR_QOM_H + +#include "hw/core/cpu.h" + +#define TYPE_AVR_CPU "avr-cpu" + +#define AVR_CPU_CLASS(klass) \ + OBJECT_CLASS_CHECK(AVRCPUClass, (klass), TYPE_AVR_CPU) +#define AVR_CPU(obj) \ + OBJECT_CHECK(AVRCPU, (obj), TYPE_AVR_CPU) +#define AVR_CPU_GET_CLASS(obj) \ + OBJECT_GET_CLASS(AVRCPUClass, (obj), TYPE_AVR_CPU) + +/** + * AVRCPUClass: + * @parent_realize: The parent class' realize handler. + * @parent_reset: The parent class' reset handler. + * @vr: Version Register value. + * + * A AVR CPU model. + */ +typedef struct AVRCPUClass { + /*< private >*/ + CPUClass parent_class; + /*< public >*/ + DeviceRealize parent_realize; + void (*parent_reset)(CPUState *cpu); +} AVRCPUClass; + +typedef struct AVRCPU AVRCPU; + + +#endif /* !defined (QEMU_AVR_CPU_QOM_H) */ diff --git a/target/avr/cpu.h b/target/avr/cpu.h new file mode 100644 index 0000000000..ed9218af5f --- /dev/null +++ b/target/avr/cpu.h @@ -0,0 +1,253 @@ +/* + * QEMU AVR CPU + * + * Copyright (c) 2019 Michael Rolnik + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see + * <http://www.gnu.org/licenses/lgpl-2.1.html <http://www.gnu.org/licenses/lgpl-2.1.html>> + */ + +#ifndef QEMU_AVR_CPU_H +#define QEMU_AVR_CPU_H + +#include "cpu-qom.h" +#include "exec/cpu-defs.h" + +#define TCG_GUEST_DEFAULT_MO 0 + +#define CPU_RESOLVING_TYPE TYPE_AVR_CPU + +/* + * AVR has two memory spaces, data & code. + * e.g. both have 0 address + * ST/LD instructions access data space + * LPM/SPM and instruction fetching access code memory space + */ +#define MMU_CODE_IDX 0 +#define MMU_DATA_IDX 1 + +#define EXCP_RESET 1 +#define EXCP_INT(n) (EXCP_RESET + (n) + 1) + +/* Number of CPU registers */ +#define NO_CPU_REGISTERS 32 +/* Number of IO registers accessible by ld/st/in/out */ +#define NO_IO_REGISTERS 64 + +/* + * Offsets of AVR memory regions in host memory space. + * + * This is needed because the AVR has separate code and data address + * spaces that both have start from zero but have to go somewhere in + * host memory. + * + * It's also useful to know where some things are, like the IO registers. + */ +/* Flash program memory */ +#define OFFSET_CODE 0x00000000 +/* CPU registers, IO registers, and SRAM */ +#define OFFSET_DATA 0x00800000 +/* CPU registers specifically, these are mapped at the start of data */ +#define OFFSET_CPU_REGISTERS OFFSET_DATA +/* + * IO registers, including status register, stack pointer, and memory + * mapped peripherals, mapped just after CPU registers + */ +#define OFFSET_IO_REGISTERS (OFFSET_DATA + NO_CPU_REGISTERS) + +enum avr_features { + AVR_FEATURE_SRAM, + + AVR_FEATURE_1_BYTE_PC, + AVR_FEATURE_2_BYTE_PC, + AVR_FEATURE_3_BYTE_PC, + + AVR_FEATURE_1_BYTE_SP, + AVR_FEATURE_2_BYTE_SP, + + AVR_FEATURE_BREAK, + AVR_FEATURE_DES, + AVR_FEATURE_RMW, /* Read Modify Write - XCH LAC LAS LAT */ + + AVR_FEATURE_EIJMP_EICALL, + AVR_FEATURE_IJMP_ICALL, + AVR_FEATURE_JMP_CALL, + + AVR_FEATURE_ADIW_SBIW, + + AVR_FEATURE_SPM, + AVR_FEATURE_SPMX, + + AVR_FEATURE_ELPMX, + AVR_FEATURE_ELPM, + AVR_FEATURE_LPMX, + AVR_FEATURE_LPM, + + AVR_FEATURE_MOVW, + AVR_FEATURE_MUL, + AVR_FEATURE_RAMPD, + AVR_FEATURE_RAMPX, + AVR_FEATURE_RAMPY, + AVR_FEATURE_RAMPZ, +}; + +typedef struct CPUAVRState CPUAVRState; + +struct CPUAVRState { + uint32_t pc_w; /* 0x003fffff up to 22 bits */ + + uint32_t sregC; /* 0x00000001 1 bit */ + uint32_t sregZ; /* 0x00000001 1 bit */ + uint32_t sregN; /* 0x00000001 1 bit */ + uint32_t sregV; /* 0x00000001 1 bit */ + uint32_t sregS; /* 0x00000001 1 bit */ + uint32_t sregH; /* 0x00000001 1 bit */ + uint32_t sregT; /* 0x00000001 1 bit */ + uint32_t sregI; /* 0x00000001 1 bit */ + + uint32_t rampD; /* 0x00ff0000 8 bits */ + uint32_t rampX; /* 0x00ff0000 8 bits */ + uint32_t rampY; /* 0x00ff0000 8 bits */ + uint32_t rampZ; /* 0x00ff0000 8 bits */ + uint32_t eind; /* 0x00ff0000 8 bits */ + + uint32_t r[NO_CPU_REGISTERS]; /* 8 bits each */ + uint32_t sp; /* 16 bits */ + + uint32_t skip; /* if set skip instruction */ + + uint64_t intsrc; /* interrupt sources */ + bool fullacc; /* CPU/MEM if true MEM only otherwise */ + + uint32_t features; +}; + +/** + * AVRCPU: + * @env: #CPUAVRState + * + * A AVR CPU. + */ +typedef struct AVRCPU { + /*< private >*/ + CPUState parent_obj; + /*< public >*/ + + CPUNegativeOffsetState neg; + CPUAVRState env; +} AVRCPU; + +#ifndef CONFIG_USER_ONLY +extern const struct VMStateDescription vms_avr_cpu; +#endif + +void avr_cpu_do_interrupt(CPUState *cpu); +bool avr_cpu_exec_interrupt(CPUState *cpu, int int_req); +hwaddr avr_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); +int avr_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg); +int avr_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); + +static inline int avr_feature(CPUAVRState *env, int feature) +{ + return (env->features & (1U << feature)) != 0; +} + +static inline void avr_set_feature(CPUAVRState *env, int feature) +{ + env->features |= (1U << feature); +} + +#define cpu_list avr_cpu_list +#define cpu_signal_handler cpu_avr_signal_handler +#define cpu_mmu_index avr_cpu_mmu_index + +static inline int avr_cpu_mmu_index(CPUAVRState *env, bool ifetch) +{ + return ifetch ? MMU_CODE_IDX : MMU_DATA_IDX; +} + +void avr_cpu_tcg_init(void); + +void avr_cpu_list(void); +int cpu_avr_exec(CPUState *cpu); +int cpu_avr_signal_handler(int host_signum, void *pinfo, void *puc); +int avr_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int size, + int rw, int mmu_idx); +int avr_cpu_memory_rw_debug(CPUState *cs, vaddr address, uint8_t *buf, + int len, bool is_write); + +enum { + TB_FLAGS_FULL_ACCESS = 1, + TB_FLAGS_SKIP = 2, +}; + +static inline void cpu_get_tb_cpu_state(CPUAVRState *env, target_ulong *pc, + target_ulong *cs_base, uint32_t *pflags) +{ + uint32_t flags = 0; + + *pc = env->pc_w * 2; + *cs_base = 0; + + if (env->fullacc) { + flags |= TB_FLAGS_FULL_ACCESS; + } + if (env->skip) { + flags |= TB_FLAGS_SKIP; + } + + *pflags = flags; +} + +static inline int cpu_interrupts_enabled(CPUAVRState *env) +{ + return env->sregI != 0; +} + +static inline uint8_t cpu_get_sreg(CPUAVRState *env) +{ + uint8_t sreg; + sreg = (env->sregC) << 0 + | (env->sregZ) << 1 + | (env->sregN) << 2 + | (env->sregV) << 3 + | (env->sregS) << 4 + | (env->sregH) << 5 + | (env->sregT) << 6 + | (env->sregI) << 7; + return sreg; +} + +static inline void cpu_set_sreg(CPUAVRState *env, uint8_t sreg) +{ + env->sregC = (sreg >> 0) & 0x01; + env->sregZ = (sreg >> 1) & 0x01; + env->sregN = (sreg >> 2) & 0x01; + env->sregV = (sreg >> 3) & 0x01; + env->sregS = (sreg >> 4) & 0x01; + env->sregH = (sreg >> 5) & 0x01; + env->sregT = (sreg >> 6) & 0x01; + env->sregI = (sreg >> 7) & 0x01; +} + +bool avr_cpu_tlb_fill(CPUState *cs, vaddr address, int size, + MMUAccessType access_type, int mmu_idx, + bool probe, uintptr_t retaddr); + +typedef CPUAVRState CPUArchState; +typedef AVRCPU ArchCPU; + +#include "exec/cpu-all.h" + +#endif /* !defined (QEMU_AVR_CPU_H) */ diff --git a/target/avr/cpu.c b/target/avr/cpu.c new file mode 100644 index 0000000000..dae56d7845 --- /dev/null +++ b/target/avr/cpu.c @@ -0,0 +1,576 @@ +/* + * QEMU AVR CPU + * + * Copyright (c) 2019 Michael Rolnik + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see + * <http://www.gnu.org/licenses/lgpl-2.1.html <http://www.gnu.org/licenses/lgpl-2.1.html>> + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qemu/qemu-print.h" +#include "exec/exec-all.h" +#include "cpu.h" + +static void avr_cpu_set_pc(CPUState *cs, vaddr value) +{ + AVRCPU *cpu = AVR_CPU(cs); + + cpu->env.pc_w = value / 2; /* internally PC points to words */ +} + +static bool avr_cpu_has_work(CPUState *cs) +{ + AVRCPU *cpu = AVR_CPU(cs); + CPUAVRState *env = &cpu->env; + + return (cs->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_RESET)) + && cpu_interrupts_enabled(env); +} + +static void avr_cpu_synchronize_from_tb(CPUState *cs, TranslationBlock *tb) +{ + AVRCPU *cpu = AVR_CPU(cs); + CPUAVRState *env = &cpu->env; + + env->pc_w = tb->pc / 2; /* internally PC points to words */ +} + +static void avr_cpu_reset(CPUState *cs) +{ + AVRCPU *cpu = AVR_CPU(cs); + AVRCPUClass *mcc = AVR_CPU_GET_CLASS(cpu); + CPUAVRState *env = &cpu->env; + + mcc->parent_reset(cs); + + env->pc_w = 0; + env->sregI = 1; + env->sregC = 0; + env->sregZ = 0; + env->sregN = 0; + env->sregV = 0; + env->sregS = 0; + env->sregH = 0; + env->sregT = 0; + + env->rampD = 0; + env->rampX = 0; + env->rampY = 0; + env->rampZ = 0; + env->eind = 0; + env->sp = 0; + + env->skip = 0; + + memset(env->r, 0, sizeof(env->r)); + + tlb_flush(cs); +} + +static void avr_cpu_disas_set_info(CPUState *cpu, disassemble_info *info) +{ + info->mach = bfd_arch_avr; + info->print_insn = NULL; +} + +static void avr_cpu_realizefn(DeviceState *dev, Error **errp) +{ + CPUState *cs = CPU(dev); + AVRCPUClass *mcc = AVR_CPU_GET_CLASS(dev); + Error *local_err = NULL; + + cpu_exec_realizefn(cs, &local_err); + if (local_err != NULL) { + error_propagate(errp, local_err); + return; + } + qemu_init_vcpu(cs); + cpu_reset(cs); + + mcc->parent_realize(dev, errp); +} + +static void avr_cpu_set_int(void *opaque, int irq, int level) +{ + AVRCPU *cpu = opaque; + CPUAVRState *env = &cpu->env; + CPUState *cs = CPU(cpu); + + uint64_t mask = (1ull << irq); + if (level) { + env->intsrc |= mask; + cpu_interrupt(cs, CPU_INTERRUPT_HARD); + } else { + env->intsrc &= ~mask; + if (env->intsrc == 0) { + cpu_reset_interrupt(cs, CPU_INTERRUPT_HARD); + } + } +} + +static void avr_cpu_initfn(Object *obj) +{ + AVRCPU *cpu = AVR_CPU(obj); + + cpu_set_cpustate_pointers(cpu); + +#ifndef CONFIG_USER_ONLY + /* Set the number of interrupts supported by the CPU. */ + qdev_init_gpio_in(DEVICE(cpu), avr_cpu_set_int, 57); +#endif +} + +static ObjectClass *avr_cpu_class_by_name(const char *cpu_model) +{ + ObjectClass *oc; + + oc = object_class_by_name(cpu_model); + if (object_class_dynamic_cast(oc, TYPE_AVR_CPU) == NULL || + object_class_is_abstract(oc)) { + oc = NULL; + } + return oc; +} + +static void avr_cpu_dump_state(CPUState *cs, FILE *f, int flags) +{ + AVRCPU *cpu = AVR_CPU(cs); + CPUAVRState *env = &cpu->env; + int i; + + qemu_fprintf(f, "\n"); + qemu_fprintf(f, "PC: %06x\n", env->pc_w); + qemu_fprintf(f, "SP: %04x\n", env->sp); + qemu_fprintf(f, "rampD: %02x\n", env->rampD >> 16); + qemu_fprintf(f, "rampX: %02x\n", env->rampX >> 16); + qemu_fprintf(f, "rampY: %02x\n", env->rampY >> 16); + qemu_fprintf(f, "rampZ: %02x\n", env->rampZ >> 16); + qemu_fprintf(f, "EIND: %02x\n", env->eind >> 16); + qemu_fprintf(f, "X: %02x%02x\n", env->r[27], env->r[26]); + qemu_fprintf(f, "Y: %02x%02x\n", env->r[29], env->r[28]); + qemu_fprintf(f, "Z: %02x%02x\n", env->r[31], env->r[30]); + qemu_fprintf(f, "SREG: [ %c %c %c %c %c %c %c %c ]\n", + env->sregI ? 'I' : '-', + env->sregT ? 'T' : '-', + env->sregH ? 'H' : '-', + env->sregS ? 'S' : '-', + env->sregV ? 'V' : '-', + env->sregN ? '-' : 'N', /* Zf has negative logic */ + env->sregZ ? 'Z' : '-', + env->sregC ? 'I' : '-'); + qemu_fprintf(f, "SKIP: %02x\n", env->skip); + + qemu_fprintf(f, "\n"); + for (i = 0; i < ARRAY_SIZE(env->r); i++) { + qemu_fprintf(f, "R[%02d]: %02x ", i, env->r[i]); + + if ((i % 8) == 7) { + qemu_fprintf(f, "\n"); + } + } + qemu_fprintf(f, "\n"); +} + +static void avr_cpu_class_init(ObjectClass *oc, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(oc); + CPUClass *cc = CPU_CLASS(oc); + AVRCPUClass *mcc = AVR_CPU_CLASS(oc); + + mcc->parent_realize = dc->realize; + dc->realize = avr_cpu_realizefn; + + mcc->parent_reset = cc->reset; + cc->reset = avr_cpu_reset; + + cc->class_by_name = avr_cpu_class_by_name; + + cc->has_work = avr_cpu_has_work; + cc->do_interrupt = avr_cpu_do_interrupt; + cc->cpu_exec_interrupt = avr_cpu_exec_interrupt; + cc->dump_state = avr_cpu_dump_state; + cc->set_pc = avr_cpu_set_pc; +#if !defined(CONFIG_USER_ONLY) + cc->memory_rw_debug = avr_cpu_memory_rw_debug; +#endif +#ifdef CONFIG_USER_ONLY + cc->handle_mmu_fault = avr_cpu_handle_mmu_fault; +#else + cc->get_phys_page_debug = avr_cpu_get_phys_page_debug; + cc->vmsd = &vms_avr_cpu; +#endif + cc->disas_set_info = avr_cpu_disas_set_info; + cc->tlb_fill = avr_cpu_tlb_fill; + cc->tcg_initialize = avr_cpu_tcg_init; + cc->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; + cc->gdb_core_xml_file = "avr-cpu.xml"; +} + +static void avr_avr1_initfn(Object *obj) +{ + AVRCPU *cpu = AVR_CPU(obj); + CPUAVRState *env = &cpu->env; + + avr_set_feature(env, AVR_FEATURE_LPM); + avr_set_feature(env, AVR_FEATURE_2_BYTE_SP); + avr_set_feature(env, AVR_FEATURE_2_BYTE_PC); +} + +static void avr_avr2_initfn(Object *obj) +{ + AVRCPU *cpu = AVR_CPU(obj); + CPUAVRState *env = &cpu->env; + + avr_set_feature(env, AVR_FEATURE_LPM); + avr_set_feature(env, AVR_FEATURE_IJMP_ICALL); + avr_set_feature(env, AVR_FEATURE_ADIW_SBIW); + avr_set_feature(env, AVR_FEATURE_SRAM); + avr_set_feature(env, AVR_FEATURE_BREAK); + + avr_set_feature(env, AVR_FEATURE_2_BYTE_PC); + avr_set_feature(env, AVR_FEATURE_2_BYTE_SP); +} + +static void avr_avr25_initfn(Object *obj) +{ + AVRCPU *cpu = AVR_CPU(obj); + CPUAVRState *env = &cpu->env; + + avr_set_feature(env, AVR_FEATURE_LPM); + avr_set_feature(env, AVR_FEATURE_IJMP_ICALL); + avr_set_feature(env, AVR_FEATURE_ADIW_SBIW); + avr_set_feature(env, AVR_FEATURE_SRAM); + avr_set_feature(env, AVR_FEATURE_BREAK); + + avr_set_feature(env, AVR_FEATURE_2_BYTE_PC); + avr_set_feature(env, AVR_FEATURE_2_BYTE_SP); + avr_set_feature(env, AVR_FEATURE_LPMX); + avr_set_feature(env, AVR_FEATURE_MOVW); +} + +static void avr_avr3_initfn(Object *obj) +{ + AVRCPU *cpu = AVR_CPU(obj); + CPUAVRState *env = &cpu->env; + + avr_set_feature(env, AVR_FEATURE_LPM); + avr_set_feature(env, AVR_FEATURE_IJMP_ICALL); + avr_set_feature(env, AVR_FEATURE_ADIW_SBIW); + avr_set_feature(env, AVR_FEATURE_SRAM); + avr_set_feature(env, AVR_FEATURE_BREAK); + + avr_set_feature(env, AVR_FEATURE_2_BYTE_PC); + avr_set_feature(env, AVR_FEATURE_2_BYTE_SP); + avr_set_feature(env, AVR_FEATURE_JMP_CALL); +} + +static void avr_avr31_initfn(Object *obj) +{ + AVRCPU *cpu = AVR_CPU(obj); + CPUAVRState *env = &cpu->env; + + avr_set_feature(env, AVR_FEATURE_LPM); + avr_set_feature(env, AVR_FEATURE_IJMP_ICALL); + avr_set_feature(env, AVR_FEATURE_ADIW_SBIW); + avr_set_feature(env, AVR_FEATURE_SRAM); + avr_set_feature(env, AVR_FEATURE_BREAK); + + avr_set_feature(env, AVR_FEATURE_2_BYTE_PC); + avr_set_feature(env, AVR_FEATURE_2_BYTE_SP); + avr_set_feature(env, AVR_FEATURE_RAMPZ); + avr_set_feature(env, AVR_FEATURE_ELPM); + avr_set_feature(env, AVR_FEATURE_JMP_CALL); +} + +static void avr_avr35_initfn(Object *obj) +{ + AVRCPU *cpu = AVR_CPU(obj); + CPUAVRState *env = &cpu->env; + + avr_set_feature(env, AVR_FEATURE_LPM); + avr_set_feature(env, AVR_FEATURE_IJMP_ICALL); + avr_set_feature(env, AVR_FEATURE_ADIW_SBIW); + avr_set_feature(env, AVR_FEATURE_SRAM); + avr_set_feature(env, AVR_FEATURE_BREAK); + + avr_set_feature(env, AVR_FEATURE_2_BYTE_PC); + avr_set_feature(env, AVR_FEATURE_2_BYTE_SP); + avr_set_feature(env, AVR_FEATURE_JMP_CALL); + avr_set_feature(env, AVR_FEATURE_LPMX); + avr_set_feature(env, AVR_FEATURE_MOVW); +} + +static void avr_avr4_initfn(Object *obj) +{ + AVRCPU *cpu = AVR_CPU(obj); + CPUAVRState *env = &cpu->env; + + avr_set_feature(env, AVR_FEATURE_LPM); + avr_set_feature(env, AVR_FEATURE_IJMP_ICALL); + avr_set_feature(env, AVR_FEATURE_ADIW_SBIW); + avr_set_feature(env, AVR_FEATURE_SRAM); + avr_set_feature(env, AVR_FEATURE_BREAK); + + avr_set_feature(env, AVR_FEATURE_2_BYTE_PC); + avr_set_feature(env, AVR_FEATURE_2_BYTE_SP); + avr_set_feature(env, AVR_FEATURE_LPMX); + avr_set_feature(env, AVR_FEATURE_MOVW); + avr_set_feature(env, AVR_FEATURE_MUL); +} + +static void avr_avr5_initfn(Object *obj) +{ + AVRCPU *cpu = AVR_CPU(obj); + CPUAVRState *env = &cpu->env; + + avr_set_feature(env, AVR_FEATURE_LPM); + avr_set_feature(env, AVR_FEATURE_IJMP_ICALL); + avr_set_feature(env, AVR_FEATURE_ADIW_SBIW); + avr_set_feature(env, AVR_FEATURE_SRAM); + avr_set_feature(env, AVR_FEATURE_BREAK); + + avr_set_feature(env, AVR_FEATURE_2_BYTE_PC); + avr_set_feature(env, AVR_FEATURE_2_BYTE_SP); + avr_set_feature(env, AVR_FEATURE_JMP_CALL); + avr_set_feature(env, AVR_FEATURE_LPMX); + avr_set_feature(env, AVR_FEATURE_MOVW); + avr_set_feature(env, AVR_FEATURE_MUL); +} + +static void avr_avr51_initfn(Object *obj) +{ + AVRCPU *cpu = AVR_CPU(obj); + CPUAVRState *env = &cpu->env; + + avr_set_feature(env, AVR_FEATURE_LPM); + avr_set_feature(env, AVR_FEATURE_IJMP_ICALL); + avr_set_feature(env, AVR_FEATURE_ADIW_SBIW); + avr_set_feature(env, AVR_FEATURE_SRAM); + avr_set_feature(env, AVR_FEATURE_BREAK); + + avr_set_feature(env, AVR_FEATURE_2_BYTE_PC); + avr_set_feature(env, AVR_FEATURE_2_BYTE_SP); + avr_set_feature(env, AVR_FEATURE_RAMPZ); + avr_set_feature(env, AVR_FEATURE_ELPMX); + avr_set_feature(env, AVR_FEATURE_ELPM); + avr_set_feature(env, AVR_FEATURE_JMP_CALL); + avr_set_feature(env, AVR_FEATURE_LPMX); + avr_set_feature(env, AVR_FEATURE_MOVW); + avr_set_feature(env, AVR_FEATURE_MUL); +} + +static void avr_avr6_initfn(Object *obj) +{ + AVRCPU *cpu = AVR_CPU(obj); + CPUAVRState *env = &cpu->env; + + avr_set_feature(env, AVR_FEATURE_LPM); + avr_set_feature(env, AVR_FEATURE_IJMP_ICALL); + avr_set_feature(env, AVR_FEATURE_ADIW_SBIW); + avr_set_feature(env, AVR_FEATURE_SRAM); + avr_set_feature(env, AVR_FEATURE_BREAK); + + avr_set_feature(env, AVR_FEATURE_3_BYTE_PC); + avr_set_feature(env, AVR_FEATURE_2_BYTE_SP); + avr_set_feature(env, AVR_FEATURE_RAMPZ); + avr_set_feature(env, AVR_FEATURE_EIJMP_EICALL); + avr_set_feature(env, AVR_FEATURE_ELPMX); + avr_set_feature(env, AVR_FEATURE_ELPM); + avr_set_feature(env, AVR_FEATURE_JMP_CALL); + avr_set_feature(env, AVR_FEATURE_LPMX); + avr_set_feature(env, AVR_FEATURE_MOVW); + avr_set_feature(env, AVR_FEATURE_MUL); +} + +static void avr_xmega2_initfn(Object *obj) +{ + AVRCPU *cpu = AVR_CPU(obj); + CPUAVRState *env = &cpu->env; + + avr_set_feature(env, AVR_FEATURE_LPM); + avr_set_feature(env, AVR_FEATURE_IJMP_ICALL); + avr_set_feature(env, AVR_FEATURE_ADIW_SBIW); + avr_set_feature(env, AVR_FEATURE_SRAM); + avr_set_feature(env, AVR_FEATURE_BREAK); + + avr_set_feature(env, AVR_FEATURE_2_BYTE_PC); + avr_set_feature(env, AVR_FEATURE_2_BYTE_SP); + avr_set_feature(env, AVR_FEATURE_JMP_CALL); + avr_set_feature(env, AVR_FEATURE_LPMX); + avr_set_feature(env, AVR_FEATURE_MOVW); + avr_set_feature(env, AVR_FEATURE_MUL); + avr_set_feature(env, AVR_FEATURE_RMW); +} + +static void avr_xmega4_initfn(Object *obj) +{ + AVRCPU *cpu = AVR_CPU(obj); + CPUAVRState *env = &cpu->env; + + avr_set_feature(env, AVR_FEATURE_LPM); + avr_set_feature(env, AVR_FEATURE_IJMP_ICALL); + avr_set_feature(env, AVR_FEATURE_ADIW_SBIW); + avr_set_feature(env, AVR_FEATURE_SRAM); + avr_set_feature(env, AVR_FEATURE_BREAK); + + avr_set_feature(env, AVR_FEATURE_2_BYTE_PC); + avr_set_feature(env, AVR_FEATURE_2_BYTE_SP); + avr_set_feature(env, AVR_FEATURE_RAMPZ); + avr_set_feature(env, AVR_FEATURE_ELPMX); + avr_set_feature(env, AVR_FEATURE_ELPM); + avr_set_feature(env, AVR_FEATURE_JMP_CALL); + avr_set_feature(env, AVR_FEATURE_LPMX); + avr_set_feature(env, AVR_FEATURE_MOVW); + avr_set_feature(env, AVR_FEATURE_MUL); + avr_set_feature(env, AVR_FEATURE_RMW); +} + +static void avr_xmega5_initfn(Object *obj) +{ + AVRCPU *cpu = AVR_CPU(obj); + CPUAVRState *env = &cpu->env; + + avr_set_feature(env, AVR_FEATURE_LPM); + avr_set_feature(env, AVR_FEATURE_IJMP_ICALL); + avr_set_feature(env, AVR_FEATURE_ADIW_SBIW); + avr_set_feature(env, AVR_FEATURE_SRAM); + avr_set_feature(env, AVR_FEATURE_BREAK); + + avr_set_feature(env, AVR_FEATURE_2_BYTE_PC); + avr_set_feature(env, AVR_FEATURE_2_BYTE_SP); + avr_set_feature(env, AVR_FEATURE_RAMPD); + avr_set_feature(env, AVR_FEATURE_RAMPX); + avr_set_feature(env, AVR_FEATURE_RAMPY); + avr_set_feature(env, AVR_FEATURE_RAMPZ); + avr_set_feature(env, AVR_FEATURE_ELPMX); + avr_set_feature(env, AVR_FEATURE_ELPM); + avr_set_feature(env, AVR_FEATURE_JMP_CALL); + avr_set_feature(env, AVR_FEATURE_LPMX); + avr_set_feature(env, AVR_FEATURE_MOVW); + avr_set_feature(env, AVR_FEATURE_MUL); + avr_set_feature(env, AVR_FEATURE_RMW); +} + +static void avr_xmega6_initfn(Object *obj) +{ + AVRCPU *cpu = AVR_CPU(obj); + CPUAVRState *env = &cpu->env; + + avr_set_feature(env, AVR_FEATURE_LPM); + avr_set_feature(env, AVR_FEATURE_IJMP_ICALL); + avr_set_feature(env, AVR_FEATURE_ADIW_SBIW); + avr_set_feature(env, AVR_FEATURE_SRAM); + avr_set_feature(env, AVR_FEATURE_BREAK); + + avr_set_feature(env, AVR_FEATURE_3_BYTE_PC); + avr_set_feature(env, AVR_FEATURE_2_BYTE_SP); + avr_set_feature(env, AVR_FEATURE_RAMPZ); + avr_set_feature(env, AVR_FEATURE_EIJMP_EICALL); + avr_set_feature(env, AVR_FEATURE_ELPMX); + avr_set_feature(env, AVR_FEATURE_ELPM); + avr_set_feature(env, AVR_FEATURE_JMP_CALL); + avr_set_feature(env, AVR_FEATURE_LPMX); + avr_set_feature(env, AVR_FEATURE_MOVW); + avr_set_feature(env, AVR_FEATURE_MUL); + avr_set_feature(env, AVR_FEATURE_RMW); +} + +static void avr_xmega7_initfn(Object *obj) +{ + AVRCPU *cpu = AVR_CPU(obj); + CPUAVRState *env = &cpu->env; + + avr_set_feature(env, AVR_FEATURE_LPM); + avr_set_feature(env, AVR_FEATURE_IJMP_ICALL); + avr_set_feature(env, AVR_FEATURE_ADIW_SBIW); + avr_set_feature(env, AVR_FEATURE_SRAM); + avr_set_feature(env, AVR_FEATURE_BREAK); + + avr_set_feature(env, AVR_FEATURE_3_BYTE_PC); + avr_set_feature(env, AVR_FEATURE_2_BYTE_SP); + avr_set_feature(env, AVR_FEATURE_RAMPD); + avr_set_feature(env, AVR_FEATURE_RAMPX); + avr_set_feature(env, AVR_FEATURE_RAMPY); + avr_set_feature(env, AVR_FEATURE_RAMPZ); + avr_set_feature(env, AVR_FEATURE_EIJMP_EICALL); + avr_set_feature(env, AVR_FEATURE_ELPMX); + avr_set_feature(env, AVR_FEATURE_ELPM); + avr_set_feature(env, AVR_FEATURE_JMP_CALL); + avr_set_feature(env, AVR_FEATURE_LPMX); + avr_set_feature(env, AVR_FEATURE_MOVW); + avr_set_feature(env, AVR_FEATURE_MUL); + avr_set_feature(env, AVR_FEATURE_RMW); +} + +typedef struct AVRCPUInfo { + const char *name; + void (*initfn)(Object *obj); +} AVRCPUInfo; + + +static void avr_cpu_list_entry(gpointer data, gpointer user_data) +{ + const char *typename = object_class_get_name(OBJECT_CLASS(data)); + + qemu_printf("%s\n", typename); +} + +void avr_cpu_list(void) +{ + GSList *list; + list = object_class_get_list_sorted(TYPE_AVR_CPU, false); + g_slist_foreach(list, avr_cpu_list_entry, NULL); + g_slist_free(list); +} + +#define DEFINE_AVR_CPU_TYPE(model, initfn) \ + { \ + .parent = TYPE_AVR_CPU, \ + .instance_init = initfn, \ + .name = model "-avr-cpu", \ + } + +static const TypeInfo avr_cpu_type_info[] = { + { + .name = TYPE_AVR_CPU, + .parent = TYPE_CPU, + .instance_size = sizeof(AVRCPU), + .instance_init = avr_cpu_initfn, + .class_size = sizeof(AVRCPUClass), + .class_init = avr_cpu_class_init, + .abstract = true, + }, + DEFINE_AVR_CPU_TYPE("avr1", avr_avr1_initfn), + DEFINE_AVR_CPU_TYPE("avr2", avr_avr2_initfn), + DEFINE_AVR_CPU_TYPE("avr25", avr_avr25_initfn), + DEFINE_AVR_CPU_TYPE("avr3", avr_avr3_initfn), + DEFINE_AVR_CPU_TYPE("avr31", avr_avr31_initfn), + DEFINE_AVR_CPU_TYPE("avr35", avr_avr35_initfn), + DEFINE_AVR_CPU_TYPE("avr4", avr_avr4_initfn), + DEFINE_AVR_CPU_TYPE("avr5", avr_avr5_initfn), + DEFINE_AVR_CPU_TYPE("avr51", avr_avr51_initfn), + DEFINE_AVR_CPU_TYPE("avr6", avr_avr6_initfn), + DEFINE_AVR_CPU_TYPE("xmega2", avr_xmega2_initfn), + DEFINE_AVR_CPU_TYPE("xmega4", avr_xmega4_initfn), + DEFINE_AVR_CPU_TYPE("xmega5", avr_xmega5_initfn), + DEFINE_AVR_CPU_TYPE("xmega6", avr_xmega6_initfn), + DEFINE_AVR_CPU_TYPE("xmega7", avr_xmega7_initfn), +}; + +DEFINE_TYPES(avr_cpu_type_info) diff --git a/target/avr/gdbstub.c b/target/avr/gdbstub.c new file mode 100644 index 0000000000..20a5252482 --- /dev/null +++ b/target/avr/gdbstub.c @@ -0,0 +1,85 @@ +/* + * QEMU AVR CPU + * + * Copyright (c) 2019 Michael Rolnik + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see + * <http://www.gnu.org/licenses/lgpl-2.1.html <http://www.gnu.org/licenses/lgpl-2.1.html>> + */ + +#include "qemu/osdep.h" +#include "qemu-common.h" +#include "exec/gdbstub.h" + +int avr_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n) +{ + AVRCPU *cpu = AVR_CPU(cs); + CPUAVRState *env = &cpu->env; + + /* R */ + if (n < 32) { + return gdb_get_reg8(mem_buf, env->r[n]); + } + + /* SREG */ + if (n == 32) { + uint8_t sreg = cpu_get_sreg(env); + + return gdb_get_reg8(mem_buf, sreg); + } + + /* SP */ + if (n == 33) { + return gdb_get_reg16(mem_buf, env->sp & 0x0000ffff); + } + + /* PC */ + if (n == 34) { + return gdb_get_reg32(mem_buf, env->pc_w * 2); + } + + return 0; +} + +int avr_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n) +{ + AVRCPU *cpu = AVR_CPU(cs); + CPUAVRState *env = &cpu->env; + + /* R */ + if (n < 32) { + env->r[n] = *mem_buf; + return 1; + } + + /* SREG */ + if (n == 32) { + cpu_set_sreg(env, *mem_buf); + return 1; + } + + /* SP */ + if (n == 33) { + env->sp = lduw_p(mem_buf); + return 2; + } + + /* PC */ + if (n == 34) { + env->pc_w = ldl_p(mem_buf) / 2; + return 4; + } + + return 0; +} diff --git a/target/avr/machine.c b/target/avr/machine.c new file mode 100644 index 0000000000..f6dcda7adc --- /dev/null +++ b/target/avr/machine.c @@ -0,0 +1,121 @@ +/* + * QEMU AVR CPU + * + * Copyright (c) 2019 Michael Rolnik + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see + * <http://www.gnu.org/licenses/lgpl-2.1.html <http://www.gnu.org/licenses/lgpl-2.1.html>> + */ + +#include "qemu/osdep.h" +#include "cpu.h" +#include "migration/cpu.h" + +static int get_sreg(QEMUFile *f, void *opaque, size_t size, + const VMStateField *field) +{ + CPUAVRState *env = opaque; + uint8_t sreg; + + sreg = qemu_get_byte(f); + cpu_set_sreg(env, sreg); + return 0; +} + +static int put_sreg( + QEMUFile *f, void *opaque, size_t size, + const VMStateField *field, QJSON *vmdesc) +{ + CPUAVRState *env = opaque; + uint8_t sreg = cpu_get_sreg(env); + + qemu_put_byte(f, sreg); + return 0; +} + +static const VMStateInfo vms_sreg = { + .name = "sreg", + .get = get_sreg, + .put = put_sreg, +}; + +static int get_segment( + QEMUFile *f, void *opaque, size_t size, const VMStateField *field) +{ + uint32_t *ramp = opaque; + uint8_t temp; + + temp = qemu_get_byte(f); + *ramp = ((uint32_t)temp) << 16; + return 0; +} + +static int put_segment( + QEMUFile *f, void *opaque, size_t size, + const VMStateField *field, QJSON *vmdesc) +{ + uint32_t *ramp = opaque; + uint8_t temp = *ramp >> 16; + + qemu_put_byte(f, temp); + return 0; +} + +static const VMStateInfo vms_rampD = { + .name = "rampD", + .get = get_segment, + .put = put_segment, +}; +static const VMStateInfo vms_rampX = { + .name = "rampX", + .get = get_segment, + .put = put_segment, +}; +static const VMStateInfo vms_rampY = { + .name = "rampY", + .get = get_segment, + .put = put_segment, +}; +static const VMStateInfo vms_rampZ = { + .name = "rampZ", + .get = get_segment, + .put = put_segment, +}; +static const VMStateInfo vms_eind = { + .name = "eind", + .get = get_segment, + .put = put_segment, +}; + +const VMStateDescription vms_avr_cpu = { + .name = "cpu", + .version_id = 0, + .minimum_version_id = 0, + .fields = (VMStateField[]) { + VMSTATE_UINT32(env.pc_w, AVRCPU), + VMSTATE_UINT32(env.sp, AVRCPU), + VMSTATE_UINT32(env.skip, AVRCPU), + + VMSTATE_UINT32_ARRAY(env.r, AVRCPU, NO_CPU_REGISTERS), + + VMSTATE_SINGLE(env, AVRCPU, 0, vms_sreg, CPUAVRState), + VMSTATE_SINGLE(env.rampD, AVRCPU, 0, vms_rampD, uint32_t), + VMSTATE_SINGLE(env.rampX, AVRCPU, 0, vms_rampX, uint32_t), + VMSTATE_SINGLE(env.rampY, AVRCPU, 0, vms_rampY, uint32_t), + VMSTATE_SINGLE(env.rampZ, AVRCPU, 0, vms_rampZ, uint32_t), + VMSTATE_SINGLE(env.eind, AVRCPU, 0, vms_eind, uint32_t), + + VMSTATE_END_OF_LIST() + } +}; diff --git a/gdb-xml/avr-cpu.xml b/gdb-xml/avr-cpu.xml new file mode 100644 index 0000000000..c4747f5b40 --- /dev/null +++ b/gdb-xml/avr-cpu.xml @@ -0,0 +1,49 @@ +<?xml version="1.0"?> +<!-- Copyright (C) 2018-2019 Free Software Foundation, Inc. + + Copying and distribution of this file, with or without modification, + are permitted in any medium without royalty provided the copyright + notice and this notice are preserved. --> + +<!-- Register numbers are hard-coded in order to maintain backward + compatibility with older versions of tools that didn't use xml + register descriptions. --> + +<!DOCTYPE feature SYSTEM "gdb-target.dtd"> +<feature name="org.gnu.gdb.riscv.cpu"> + <reg name="r0" bitsize="8" type="int" regnum="0"/> + <reg name="r1" bitsize="8" type="int"/> + <reg name="r2" bitsize="8" type="int"/> + <reg name="r3" bitsize="8" type="int"/> + <reg name="r4" bitsize="8" type="int"/> + <reg name="r5" bitsize="8" type="int"/> + <reg name="r6" bitsize="8" type="int"/> + <reg name="r7" bitsize="8" type="int"/> + <reg name="r8" bitsize="8" type="int"/> + <reg name="r9" bitsize="8" type="int"/> + <reg name="r10" bitsize="8" type="int"/> + <reg name="r11" bitsize="8" type="int"/> + <reg name="r12" bitsize="8" type="int"/> + <reg name="r13" bitsize="8" type="int"/> + <reg name="r14" bitsize="8" type="int"/> + <reg name="r15" bitsize="8" type="int"/> + <reg name="r16" bitsize="8" type="int"/> + <reg name="r17" bitsize="8" type="int"/> + <reg name="r18" bitsize="8" type="int"/> + <reg name="r19" bitsize="8" type="int"/> + <reg name="r20" bitsize="8" type="int"/> + <reg name="r21" bitsize="8" type="int"/> + <reg name="r22" bitsize="8" type="int"/> + <reg name="r23" bitsize="8" type="int"/> + <reg name="r24" bitsize="8" type="int"/> + <reg name="r25" bitsize="8" type="int"/> + <reg name="r26" bitsize="8" type="int"/> + <reg name="r27" bitsize="8" type="int"/> + <reg name="r28" bitsize="8" type="int"/> + <reg name="r29" bitsize="8" type="int"/> + <reg name="r30" bitsize="8" type="int"/> + <reg name="r31" bitsize="8" type="int"/> + <reg name="sreg" bitsize="8" type="int"/> + <reg name="sp" bitsize="8" type="int"/> + <reg name="pc" bitsize="8" type="int"/> +</feature> -- 2.17.2 (Apple Git-113)
Re: [PATCH v36 01/17] target/avr: Add outward facing interfaces and core CPU logic
In reply to Michael RolnikQuoted 12 lines · Michael Rolnik
This includes:
- CPU data structures
- object model classes and functions
- migration functions
- GDB hooksCo-developed-by Michael Rolnik <[email protected]>Co-developed-by Sarah Harris <[email protected]>Signed-off-by Michael Rolnik <[email protected]>Signed-off-by Sarah Harris <[email protected]>Signed-off-by Michael Rolnik <[email protected]>Acked-by Igor Mammedov <[email protected]>
Quoted 9 lines
--- target/avr/cpu-param.h | 37 +++ target/avr/cpu-qom.h | 54 ++++ target/avr/cpu.h | 253 ++++++++++++++++++ target/avr/cpu.c | 576 +++++++++++++++++++++++++++++++++++++++++ target/avr/gdbstub.c | 85 ++++++ target/avr/machine.c | 121 +++++++++ gdb-xml/avr-cpu.xml | 49 ++++ 7 files changed, 1175 insertions(+)
Very good!! Thanks a lot!! I see you ran the script git.orderfile, and now headers appear before c files! Even in thsi changed file summary. In v35, it used to be:
gdb-xml/avr-cpu.xml | 49 ++++ target/avr/cpu-param.h | 37 +++ target/avr/cpu-qom.h | 54 ++++ target/avr/cpu.c | 576 +++++++++++++++++++++++++++++++++++++++++ target/avr/cpu.h | 253 ++++++++++++++++++ target/avr/gdbstub.c | 85 ++++++ target/avr/machine.c | 121 +++++++++ 7 files changed, 1175 insertions(+)
Quoted 1,233 lines
create mode 100644 target/avr/cpu-param.h create mode 100644 target/avr/cpu-qom.h create mode 100644 target/avr/cpu.h create mode 100644 target/avr/cpu.c create mode 100644 target/avr/gdbstub.c create mode 100644 target/avr/machine.c create mode 100644 gdb-xml/avr-cpu.xmltarget/avr/cpu-param.h new file +37
-0@@ -0,0 +1,37 @@ +/* +* QEMU AVR CPU +* +* Copyright (c) 2019 Michael Rolnik +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see +* <http://www.gnu.org/licenses/lgpl-2.1.html> +*/ + +#ifndef AVR_CPU_PARAM_H +#define AVR_CPU_PARAM_H 1 + +#define TARGET_LONG_BITS 32 +/* +* TARGET_PAGE_BITS cannot be more than 8 bits because +* 1. all IO registers occupy [0x0000 .. 0x00ff] address range, and they +* should be implemented as a device and not memory +* 2. SRAM starts at the address 0x0100 +*/ +#define TARGET_PAGE_BITS 8 +#define TARGET_PHYS_ADDR_SPACE_BITS 24 +#define TARGET_VIRT_ADDR_SPACE_BITS 24 +#define NB_MMU_MODES 2 + + +#endif target/avr/cpu-qom.h new file +54
-0@@ -0,0 +1,54 @@ +/* +* QEMU AVR CPU +* +* Copyright (c) 2019 Michael Rolnik +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see +* <http://www.gnu.org/licenses/lgpl-2.1.html> +*/ + +#ifndef QEMU_AVR_QOM_H +#define QEMU_AVR_QOM_H + +#include "hw/core/cpu.h" + +#define TYPE_AVR_CPU "avr-cpu" + +#define AVR_CPU_CLASS (klass) \ + OBJECT_CLASS_CHECK(AVRCPUClass, (klass), TYPE_AVR_CPU) +#define AVR_CPU (obj) \ + OBJECT_CHECK(AVRCPU, (obj), TYPE_AVR_CPU) +#define AVR_CPU_GET_CLASS (obj) \ + OBJECT_GET_CLASS(AVRCPUClass, (obj), TYPE_AVR_CPU) + +/** +* AVRCPUClass: +* @parent_realize: The parent class' realize handler. +* @parent_reset: The parent class' reset handler. +* @vr: Version Register value. +* +* A AVR CPU model. +*/ +typedef struct AVRCPUClass { +/*< private >*/ +CPUClass parent_class; +/*< public >*/ +DeviceRealize parent_realize; +void (*parent_reset)(CPUState *cpu); +}AVRCPUClass ; + +typedef struct AVRCPU AVRCPU ; + + +#endif /* !defined (QEMU_AVR_CPU_QOM_H) */ target/avr/cpu.h new file +195
-0@@ -0,0 +1,253 @@ +/* +* QEMU AVR CPU +* +* Copyright (c) 2019 Michael Rolnik +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see +* <http://www.gnu.org/licenses/lgpl-2.1.html> +*/ + +#ifndef QEMU_AVR_CPU_H +#define QEMU_AVR_CPU_H + +#include "cpu-qom.h" +#include "exec/cpu-defs.h" + +#define TCG_GUEST_DEFAULT_MO 0 + +#define CPU_RESOLVING_TYPE TYPE_AVR_CPU + +/* +* AVR has two memory spaces, data & code. +* e.g. both have 0 address +* ST/LD instructions access data space +* LPM/SPM and instruction fetching access code memory space +*/ +#define MMU_CODE_IDX 0 +#define MMU_DATA_IDX 1 + +#define EXCP_RESET 1 +#define EXCP_INT (n) (EXCP_RESET + (n) + 1) + +/* Number of CPU registers */ +#define NO_CPU_REGISTERS 32 +/* Number of IO registers accessible by ld/st/in/out */ +#define NO_IO_REGISTERS 64 + +/* +* Offsets of AVR memory regions in host memory space. +* +* This is needed because the AVR has separate code and data address +* spaces that both have start from zero but have to go somewhere in +* host memory. +* +* It's also useful to know where some things are, like the IO registers. +*/ +/* Flash program memory */ +#define OFFSET_CODE 0x00000000 +/* CPU registers, IO registers, and SRAM */ +#define OFFSET_DATA 0x00800000 +/* CPU registers specifically, these are mapped at the start of data */ +#define OFFSET_CPU_REGISTERS OFFSET_DATA +/* +* IO registers, including status register, stack pointer, and memory +* mapped peripherals, mapped just after CPU registers +*/ +#define OFFSET_IO_REGISTERS (OFFSET_DATA + NO_CPU_REGISTERS) + +enum avr_features { +AVR_FEATURE_SRAM , + +AVR_FEATURE_1_BYTE_PC , +AVR_FEATURE_2_BYTE_PC , +AVR_FEATURE_3_BYTE_PC , + +AVR_FEATURE_1_BYTE_SP , +AVR_FEATURE_2_BYTE_SP , + +AVR_FEATURE_BREAK , +AVR_FEATURE_DES , +AVR_FEATURE_RMW ,/* Read Modify Write - XCH LAC LAS LAT */ + +AVR_FEATURE_EIJMP_EICALL , +AVR_FEATURE_IJMP_ICALL , +AVR_FEATURE_JMP_CALL , + +AVR_FEATURE_ADIW_SBIW , + +AVR_FEATURE_SPM , +AVR_FEATURE_SPMX , + +AVR_FEATURE_ELPMX , +AVR_FEATURE_ELPM , +AVR_FEATURE_LPMX , +AVR_FEATURE_LPM , + +AVR_FEATURE_MOVW , +AVR_FEATURE_MUL , +AVR_FEATURE_RAMPD , +AVR_FEATURE_RAMPX , +AVR_FEATURE_RAMPY , +AVR_FEATURE_RAMPZ , +}; + +typedef struct CPUAVRState CPUAVRState ; + +struct CPUAVRState { +uint32_t pc_w;/* 0x003fffff up to 22 bits */ + +uint32_t sregC;/* 0x00000001 1 bit */ +uint32_t sregZ;/* 0x00000001 1 bit */ +uint32_t sregN;/* 0x00000001 1 bit */ +uint32_t sregV;/* 0x00000001 1 bit */ +uint32_t sregS;/* 0x00000001 1 bit */ +uint32_t sregH;/* 0x00000001 1 bit */ +uint32_t sregT;/* 0x00000001 1 bit */ +uint32_t sregI;/* 0x00000001 1 bit */ + +uint32_t rampD;/* 0x00ff0000 8 bits */ +uint32_t rampX;/* 0x00ff0000 8 bits */ +uint32_t rampY;/* 0x00ff0000 8 bits */ +uint32_t rampZ;/* 0x00ff0000 8 bits */ +uint32_t eind;/* 0x00ff0000 8 bits */ + +uint32_t r[NO_CPU_REGISTERS ];/* 8 bits each */ +uint32_t sp;/* 16 bits */ + +uint32_t skip;/* if set skip instruction */ + +uint64_t intsrc;/* interrupt sources */ +bool fullacc;/* CPU/MEM if true MEM only otherwise */ + +uint32_t features; +}; + +/** +* AVRCPU: +* @env: #CPUAVRState +* +* A AVR CPU. +*/ +typedef struct AVRCPU { +/*< private >*/ +CPUState parent_obj; +/*< public >*/ + +CPUNegativeOffsetState neg; +CPUAVRState env; +}AVRCPU ; + +#ifndef CONFIG_USER_ONLY +extern const struct VMStateDescription vms_avr_cpu; +#endif + +void avr_cpu_do_interrupt (CPUState *cpu); +bool avr_cpu_exec_interrupt (CPUState *cpu,int int_req); +hwaddr avr_cpu_get_phys_page_debug (CPUState *cpu,vaddr addr); +int avr_cpu_gdb_read_register (CPUState *cpu,uint8_t *buf,int reg); +int avr_cpu_gdb_write_register (CPUState *cpu,uint8_t *buf,int reg); + +static inline int avr_feature (CPUAVRState *env,int feature) +{ +return (env->features & (1U << feature)) !=0 ; +} + +static inline void avr_set_feature (CPUAVRState *env,int feature) +{ + env->features |= (1U << feature); +} + +#define cpu_list avr_cpu_list +#define cpu_signal_handler cpu_avr_signal_handler +#define cpu_mmu_index avr_cpu_mmu_index + +static inline int avr_cpu_mmu_index (CPUAVRState *env,bool ifetch) +{ +return ifetch ?MMU_CODE_IDX :MMU_DATA_IDX ; +} + +void avr_cpu_tcg_init (void ); + +void avr_cpu_list (void ); +int cpu_avr_exec (CPUState *cpu); +int cpu_avr_signal_handler (int host_signum,void *pinfo,void *puc); +int avr_cpu_handle_mmu_fault (CPUState *cpu,vaddr address,int size, +int rw,int mmu_idx); +int avr_cpu_memory_rw_debug (CPUState *cs,vaddr address,uint8_t *buf, +int len,bool is_write); + +enum { +TB_FLAGS_FULL_ACCESS =1 , +TB_FLAGS_SKIP =2 , +}; + +static inline void cpu_get_tb_cpu_state(CPUAVRState *env, target_ulong*pc,
target/avr/cpu.h new file +58
-0+ target_ulong *cs_base, uint32_t *pflags) +{ +uint32_t flags =0 ; + + *pc = env->pc_w *2 ; + *cs_base =0 ; + +if (env->fullacc) { + flags |=TB_FLAGS_FULL_ACCESS ; + } +if (env->skip) { + flags |=TB_FLAGS_SKIP ; + } + + *pflags = flags; +} + +static inline int cpu_interrupts_enabled (CPUAVRState *env) +{ +return env->sregI !=0 ; +} + +static inline uint8_t cpu_get_sreg (CPUAVRState *env) +{ +uint8_t sreg; + sreg = (env->sregC) <<0 + | (env->sregZ) <<1 + | (env->sregN) <<2 + | (env->sregV) <<3 + | (env->sregS) <<4 + | (env->sregH) <<5 + | (env->sregT) <<6 + | (env->sregI) <<7 ; +return sreg; +} + +static inline void cpu_set_sreg (CPUAVRState *env,uint8_t sreg) +{ + env->sregC = (sreg >>0 ) &0x01 ; + env->sregZ = (sreg >>1 ) &0x01 ; + env->sregN = (sreg >>2 ) &0x01 ; + env->sregV = (sreg >>3 ) &0x01 ; + env->sregS = (sreg >>4 ) &0x01 ; + env->sregH = (sreg >>5 ) &0x01 ; + env->sregT = (sreg >>6 ) &0x01 ; + env->sregI = (sreg >>7 ) &0x01 ; +} + +bool avr_cpu_tlb_fill (CPUState *cs,vaddr address,int size, +MMUAccessType access_type,int mmu_idx, +bool probe,uintptr_t retaddr); + +typedef CPUAVRState CPUArchState ; +typedef AVRCPU ArchCPU ; + +#include "exec/cpu-all.h" + +#endif /* !defined (QEMU_AVR_CPU_H) */ target/avr/cpu.c new file +39
-0@@ -0,0 +1,576 @@ +/* +* QEMU AVR CPU +* +* Copyright (c) 2019 Michael Rolnik +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see +* <http://www.gnu.org/licenses/lgpl-2.1.html> +*/ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qemu/qemu-print.h" +#include "exec/exec-all.h" +#include "cpu.h" + +static void avr_cpu_set_pc (CPUState *cs,vaddr value) +{ +AVRCPU *cpu =AVR_CPU (cs); + + cpu->env.pc_w = value /2 ;/* internally PC points to words */ +} + +static bool avr_cpu_has_work (CPUState *cs) +{ +AVRCPU *cpu =AVR_CPU (cs); +CPUAVRState *env = &cpu->env; + + return (cs->interrupt_request & (CPU_INTERRUPT_HARD |
CPU_INTERRUPT_RESET))target/avr/cpu.c new file +4
-0+ &&cpu_interrupts_enabled (env); +} + +static void avr_cpu_synchronize_from_tb(CPUState *cs, TranslationBlock*tb)
target/avr/cpu.c new file +128
-0+{ +AVRCPU *cpu =AVR_CPU (cs); +CPUAVRState *env = &cpu->env; + + env->pc_w = tb->pc /2 ;/* internally PC points to words */ +} + +static void avr_cpu_reset (CPUState *cs) +{ +AVRCPU *cpu =AVR_CPU (cs); +AVRCPUClass *mcc =AVR_CPU_GET_CLASS (cpu); +CPUAVRState *env = &cpu->env; + + mcc->parent_reset (cs); + + env->pc_w =0 ; + env->sregI =1 ; + env->sregC =0 ; + env->sregZ =0 ; + env->sregN =0 ; + env->sregV =0 ; + env->sregS =0 ; + env->sregH =0 ; + env->sregT =0 ; + + env->rampD =0 ; + env->rampX =0 ; + env->rampY =0 ; + env->rampZ =0 ; + env->eind =0 ; + env->sp =0 ; + + env->skip =0 ; + +memset (env->r,0 ,sizeof (env->r)); + +tlb_flush (cs); +} + +static void avr_cpu_disas_set_info (CPUState *cpu,disassemble_info *info) +{ + info->mach = bfd_arch_avr; + info->print_insn =NULL ; +} + +static void avr_cpu_realizefn (DeviceState *dev,Error **errp) +{ +CPUState *cs =CPU (dev); +AVRCPUClass *mcc =AVR_CPU_GET_CLASS (dev); +Error *local_err =NULL ; + +cpu_exec_realizefn (cs, &local_err); +if (local_err !=NULL ) { +error_propagate (errp, local_err); +return ; + } +qemu_init_vcpu (cs); +cpu_reset (cs); + + mcc->parent_realize (dev, errp); +} + +static void avr_cpu_set_int (void *opaque,int irq,int level) +{ +AVRCPU *cpu = opaque; +CPUAVRState *env = &cpu->env; +CPUState *cs =CPU (cpu); + +uint64_t mask = (1ull << irq); +if (level) { + env->intsrc |= mask; +cpu_interrupt (cs,CPU_INTERRUPT_HARD ); + }else { + env->intsrc &= ~mask; +if (env->intsrc ==0 ) { +cpu_reset_interrupt (cs,CPU_INTERRUPT_HARD ); + } + } +} + +static void avr_cpu_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); + +cpu_set_cpustate_pointers (cpu); + +#ifndef CONFIG_USER_ONLY +/* Set the number of interrupts supported by the CPU. */ +qdev_init_gpio_in (DEVICE (cpu), avr_cpu_set_int,57 ); +#endif +} + +static ObjectClass *avr_cpu_class_by_name (const char *cpu_model) +{ +ObjectClass *oc; + + oc =object_class_by_name (cpu_model); +if (object_class_dynamic_cast (oc,TYPE_AVR_CPU ) ==NULL || +object_class_is_abstract (oc)) { + oc =NULL ; + } +return oc; +} + +static void avr_cpu_dump_state (CPUState *cs,FILE *f,int flags) +{ +AVRCPU *cpu =AVR_CPU (cs); +CPUAVRState *env = &cpu->env; +int i; + +qemu_fprintf (f,"\n" ); +qemu_fprintf (f,"PC: %06x\n" , env->pc_w); +qemu_fprintf (f,"SP: %04x\n" , env->sp); +qemu_fprintf (f,"rampD: %02x\n" , env->rampD >>16 ); +qemu_fprintf (f,"rampX: %02x\n" , env->rampX >>16 ); +qemu_fprintf (f,"rampY: %02x\n" , env->rampY >>16 ); +qemu_fprintf (f,"rampZ: %02x\n" , env->rampZ >>16 ); +qemu_fprintf (f,"EIND: %02x\n" , env->eind >>16 ); +qemu_fprintf (f,"X: %02x%02x\n" , env->r[27 ], env->r[26 ]); +qemu_fprintf (f,"Y: %02x%02x\n" , env->r[29 ], env->r[28 ]); +qemu_fprintf (f,"Z: %02x%02x\n" , env->r[31 ], env->r[30 ]); + qemu_fprintf(f, "SREG: [ %c %c %c %c %c %c %c %c ]\n", + env->sregI ? 'I' : '-', + env->sregT ? 'T' : '-', + env->sregH ? 'H' : '-', + env->sregS ? 'S' : '-', + env->sregV ? 'V' : '-', + env->sregN ? '-' : 'N', /* Zf has negative logic*/
target/avr/cpu.c new file +405
-0+ env->sregZ ?'Z' :'-' , + env->sregC ? 'I' : '-'); +qemu_fprintf (f,"SKIP: %02x\n" , env->skip); + +qemu_fprintf (f,"\n" ); +for (i =0 ; i <ARRAY_SIZE (env->r); i++) { +qemu_fprintf (f,"R[%02d]: %02x " , i, env->r[i]); + +if ((i %8 ) ==7 ) { +qemu_fprintf (f,"\n" ); + } + } +qemu_fprintf (f,"\n" ); +} + +static void avr_cpu_class_init (ObjectClass *oc,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (oc); +CPUClass *cc =CPU_CLASS (oc); +AVRCPUClass *mcc =AVR_CPU_CLASS (oc); + + mcc->parent_realize = dc->realize; + dc->realize = avr_cpu_realizefn; + + mcc->parent_reset = cc->reset; + cc->reset = avr_cpu_reset; + + cc->class_by_name = avr_cpu_class_by_name; + + cc->has_work = avr_cpu_has_work; + cc->do_interrupt = avr_cpu_do_interrupt; + cc->cpu_exec_interrupt = avr_cpu_exec_interrupt; + cc->dump_state = avr_cpu_dump_state; + cc->set_pc = avr_cpu_set_pc; +#if !defined(CONFIG_USER_ONLY ) + cc->memory_rw_debug = avr_cpu_memory_rw_debug; +#endif +#ifdef CONFIG_USER_ONLY + cc->handle_mmu_fault = avr_cpu_handle_mmu_fault; +#else + cc->get_phys_page_debug = avr_cpu_get_phys_page_debug; + cc->vmsd = &vms_avr_cpu; +#endif + cc->disas_set_info = avr_cpu_disas_set_info; + cc->tlb_fill = avr_cpu_tlb_fill; + cc->tcg_initialize = avr_cpu_tcg_init; + cc->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 ; + cc->gdb_core_xml_file ="avr-cpu.xml" ; +} + +static void avr_avr1_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +} + +static void avr_avr2_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +} + +static void avr_avr25_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +} + +static void avr_avr3_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +} + +static void avr_avr31_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_RAMPZ ); +avr_set_feature (env,AVR_FEATURE_ELPM ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +} + +static void avr_avr35_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +} + +static void avr_avr4_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +} + +static void avr_avr5_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +} + +static void avr_avr51_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_RAMPZ ); +avr_set_feature (env,AVR_FEATURE_ELPMX ); +avr_set_feature (env,AVR_FEATURE_ELPM ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +} + +static void avr_avr6_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_3_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_RAMPZ ); +avr_set_feature (env,AVR_FEATURE_EIJMP_EICALL ); +avr_set_feature (env,AVR_FEATURE_ELPMX ); +avr_set_feature (env,AVR_FEATURE_ELPM ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +} + +static void avr_xmega2_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +avr_set_feature (env,AVR_FEATURE_RMW ); +} + +static void avr_xmega4_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_RAMPZ ); +avr_set_feature (env,AVR_FEATURE_ELPMX ); +avr_set_feature (env,AVR_FEATURE_ELPM ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +avr_set_feature (env,AVR_FEATURE_RMW ); +} + +static void avr_xmega5_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_RAMPD ); +avr_set_feature (env,AVR_FEATURE_RAMPX ); +avr_set_feature (env,AVR_FEATURE_RAMPY ); +avr_set_feature (env,AVR_FEATURE_RAMPZ ); +avr_set_feature (env,AVR_FEATURE_ELPMX ); +avr_set_feature (env,AVR_FEATURE_ELPM ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +avr_set_feature (env,AVR_FEATURE_RMW ); +} + +static void avr_xmega6_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_3_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_RAMPZ ); +avr_set_feature (env,AVR_FEATURE_EIJMP_EICALL ); +avr_set_feature (env,AVR_FEATURE_ELPMX ); +avr_set_feature (env,AVR_FEATURE_ELPM ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +avr_set_feature (env,AVR_FEATURE_RMW ); +} + +static void avr_xmega7_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_3_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_RAMPD ); +avr_set_feature (env,AVR_FEATURE_RAMPX ); +avr_set_feature (env,AVR_FEATURE_RAMPY ); +avr_set_feature (env,AVR_FEATURE_RAMPZ ); +avr_set_feature (env,AVR_FEATURE_EIJMP_EICALL ); +avr_set_feature (env,AVR_FEATURE_ELPMX ); +avr_set_feature (env,AVR_FEATURE_ELPM ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +avr_set_feature (env,AVR_FEATURE_RMW ); +} + +typedef struct AVRCPUInfo { +const char *name; +void (*initfn)(Object *obj); +}AVRCPUInfo ; + + +static void avr_cpu_list_entry (gpointer data,gpointer user_data) +{ +const char *typename =object_class_get_name (OBJECT_CLASS (data)); + +qemu_printf ("%s\n" , typename); +} + +void avr_cpu_list (void ) +{ +GSList *list; + list =object_class_get_list_sorted (TYPE_AVR_CPU , false); +g_slist_foreach (list, avr_cpu_list_entry,NULL ); +g_slist_free (list); +} + +#define DEFINE_AVR_CPU_TYPE (model, initfn) \ + { \ + .parent = TYPE_AVR_CPU, \ + .instance_init = initfn, \ + .name = model "-avr-cpu", \ + } + +static const TypeInfo avr_cpu_type_info[] = { + { + .name =TYPE_AVR_CPU , + .parent =TYPE_CPU , + .instance_size =sizeof (AVRCPU ), + .instance_init = avr_cpu_initfn, + .class_size =sizeof (AVRCPUClass), + .class_init = avr_cpu_class_init, + .abstract = true, + }, +DEFINE_AVR_CPU_TYPE ("avr1" , avr_avr1_initfn), +DEFINE_AVR_CPU_TYPE ("avr2" , avr_avr2_initfn), +DEFINE_AVR_CPU_TYPE ("avr25" , avr_avr25_initfn), +DEFINE_AVR_CPU_TYPE ("avr3" , avr_avr3_initfn), +DEFINE_AVR_CPU_TYPE ("avr31" , avr_avr31_initfn), +DEFINE_AVR_CPU_TYPE ("avr35" , avr_avr35_initfn), +DEFINE_AVR_CPU_TYPE ("avr4" , avr_avr4_initfn), +DEFINE_AVR_CPU_TYPE ("avr5" , avr_avr5_initfn), +DEFINE_AVR_CPU_TYPE ("avr51" , avr_avr51_initfn), +DEFINE_AVR_CPU_TYPE ("avr6" , avr_avr6_initfn), +DEFINE_AVR_CPU_TYPE ("xmega2" , avr_xmega2_initfn), +DEFINE_AVR_CPU_TYPE ("xmega4" , avr_xmega4_initfn), +DEFINE_AVR_CPU_TYPE ("xmega5" , avr_xmega5_initfn), +DEFINE_AVR_CPU_TYPE ("xmega6" , avr_xmega6_initfn), +DEFINE_AVR_CPU_TYPE ("xmega7" , avr_xmega7_initfn), +}; + +DEFINE_TYPES (avr_cpu_type_info)target/avr/gdbstub.c new file +85
-0@@ -0,0 +1,85 @@ +/* +* QEMU AVR CPU +* +* Copyright (c) 2019 Michael Rolnik +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see +* <http://www.gnu.org/licenses/lgpl-2.1.html> +*/ + +#include "qemu/osdep.h" +#include "qemu-common.h" +#include "exec/gdbstub.h" + +int avr_cpu_gdb_read_register (CPUState *cs,uint8_t *mem_buf,int n) +{ +AVRCPU *cpu =AVR_CPU (cs); +CPUAVRState *env = &cpu->env; + +/* R */ +if (n <32 ) { +return gdb_get_reg8 (mem_buf, env->r[n]); + } + +/* SREG */ +if (n ==32 ) { +uint8_t sreg =cpu_get_sreg (env); + +return gdb_get_reg8 (mem_buf, sreg); + } + +/* SP */ +if (n ==33 ) { +return gdb_get_reg16 (mem_buf, env->sp &0x0000ffff ); + } + +/* PC */ +if (n ==34 ) { +return gdb_get_reg32 (mem_buf, env->pc_w *2 ); + } + +return 0 ; +} + +int avr_cpu_gdb_write_register (CPUState *cs,uint8_t *mem_buf,int n) +{ +AVRCPU *cpu =AVR_CPU (cs); +CPUAVRState *env = &cpu->env; + +/* R */ +if (n <32 ) { + env->r[n] = *mem_buf; +return 1 ; + } + +/* SREG */ +if (n ==32 ) { +cpu_set_sreg (env, *mem_buf); +return 1 ; + } + +/* SP */ +if (n ==33 ) { + env->sp =lduw_p (mem_buf); +return 2 ; + } + +/* PC */ +if (n ==34 ) { + env->pc_w =ldl_p (mem_buf) /2 ; +return 4 ; + } + +return 0 ; +}target/avr/machine.c new file +121
-0@@ -0,0 +1,121 @@ +/* +* QEMU AVR CPU +* +* Copyright (c) 2019 Michael Rolnik +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see +* <http://www.gnu.org/licenses/lgpl-2.1.html> +*/ + +#include "qemu/osdep.h" +#include "cpu.h" +#include "migration/cpu.h" + +static int get_sreg (QEMUFile *f,void *opaque,size_t size, +const VMStateField *field) +{ +CPUAVRState *env = opaque; +uint8_t sreg; + + sreg =qemu_get_byte (f); +cpu_set_sreg (env, sreg); +return 0 ; +} + +static int put_sreg ( +QEMUFile *f,void *opaque,size_t size, +const VMStateField *field,QJSON *vmdesc) +{ +CPUAVRState *env = opaque; +uint8_t sreg =cpu_get_sreg (env); + +qemu_put_byte (f, sreg); +return 0 ; +} + +static const VMStateInfo vms_sreg = { + .name ="sreg" , + .get = get_sreg, + .put = put_sreg, +}; + +static int get_segment ( +QEMUFile *f,void *opaque,size_t size,const VMStateField *field) +{ +uint32_t *ramp = opaque; +uint8_t temp; + + temp =qemu_get_byte (f); + *ramp = ((uint32_t )temp) <<16 ; +return 0 ; +} + +static int put_segment ( +QEMUFile *f,void *opaque,size_t size, +const VMStateField *field,QJSON *vmdesc) +{ +uint32_t *ramp = opaque; +uint8_t temp = *ramp >>16 ; + +qemu_put_byte (f, temp); +return 0 ; +} + +static const VMStateInfo vms_rampD = { + .name ="rampD" , + .get = get_segment, + .put = put_segment, +}; +static const VMStateInfo vms_rampX = { + .name ="rampX" , + .get = get_segment, + .put = put_segment, +}; +static const VMStateInfo vms_rampY = { + .name ="rampY" , + .get = get_segment, + .put = put_segment, +}; +static const VMStateInfo vms_rampZ = { + .name ="rampZ" , + .get = get_segment, + .put = put_segment, +}; +static const VMStateInfo vms_eind = { + .name ="eind" , + .get = get_segment, + .put = put_segment, +}; + +const VMStateDescription vms_avr_cpu = { + .name ="cpu" , + .version_id =0 , + .minimum_version_id =0 , + .fields = (VMStateField []) { +VMSTATE_UINT32 (env.pc_w,AVRCPU ), +VMSTATE_UINT32 (env.sp,AVRCPU ), +VMSTATE_UINT32 (env.skip,AVRCPU ), + +VMSTATE_UINT32_ARRAY (env.r,AVRCPU ,NO_CPU_REGISTERS ), + +VMSTATE_SINGLE (env,AVRCPU ,0 , vms_sreg, CPUAVRState), +VMSTATE_SINGLE (env.rampD,AVRCPU ,0 , vms_rampD, uint32_t), +VMSTATE_SINGLE (env.rampX,AVRCPU ,0 , vms_rampX, uint32_t), +VMSTATE_SINGLE (env.rampY,AVRCPU ,0 , vms_rampY, uint32_t), +VMSTATE_SINGLE (env.rampZ,AVRCPU ,0 , vms_rampZ, uint32_t), +VMSTATE_SINGLE (env.eind,AVRCPU ,0 , vms_eind, uint32_t), + +VMSTATE_END_OF_LIST () + } +};gdb-xml/avr-cpu.xml new file +49
-1@@ -0,0 +1,49 @@ +<?xml version="1.0"?> +<!-- Copyright (C) 2018-2019 Free Software Foundation, Inc. + + Copying and distribution of this file, with or without modification, + are permitted in any medium without royalty provided the copyright + notice and this notice are preserved. --> + +<!-- Register numbers are hard-coded in order to maintain backward + compatibility with older versions of tools that didn't use xml + register descriptions. --> + +<!DOCTYPE feature SYSTEM "gdb-target.dtd"> +<feature name="org.gnu.gdb.riscv.cpu"> + <reg name="r0" bitsize="8" type="int" regnum="0"/> + <reg name="r1" bitsize="8" type="int"/> + <reg name="r2" bitsize="8" type="int"/> + <reg name="r3" bitsize="8" type="int"/> + <reg name="r4" bitsize="8" type="int"/> + <reg name="r5" bitsize="8" type="int"/> + <reg name="r6" bitsize="8" type="int"/> + <reg name="r7" bitsize="8" type="int"/> + <reg name="r8" bitsize="8" type="int"/> + <reg name="r9" bitsize="8" type="int"/> + <reg name="r10" bitsize="8" type="int"/> + <reg name="r11" bitsize="8" type="int"/> + <reg name="r12" bitsize="8" type="int"/> + <reg name="r13" bitsize="8" type="int"/> + <reg name="r14" bitsize="8" type="int"/> + <reg name="r15" bitsize="8" type="int"/> + <reg name="r16" bitsize="8" type="int"/> + <reg name="r17" bitsize="8" type="int"/> + <reg name="r18" bitsize="8" type="int"/> + <reg name="r19" bitsize="8" type="int"/> + <reg name="r20" bitsize="8" type="int"/> + <reg name="r21" bitsize="8" type="int"/> + <reg name="r22" bitsize="8" type="int"/> + <reg name="r23" bitsize="8" type="int"/> + <reg name="r24" bitsize="8" type="int"/> + <reg name="r25" bitsize="8" type="int"/> + <reg name="r26" bitsize="8" type="int"/> + <reg name="r27" bitsize="8" type="int"/> + <reg name="r28" bitsize="8" type="int"/> + <reg name="r29" bitsize="8" type="int"/> + <reg name="r30" bitsize="8" type="int"/> + <reg name="r31" bitsize="8" type="int"/> + <reg name="sreg" bitsize="8" type="int"/> + <reg name="sp" bitsize="8" type="int"/> + <reg name="pc" bitsize="8" type="int"/> +</feature> --2.17.2 (Apple Git-113)
Re: [PATCH v36 01/17] target/avr: Add outward facing interfaces and core CPU logic
In reply to Michael RolnikQuoted 175 lines · Michael Rolnik
This includes:
- CPU data structures
- object model classes and functions
- migration functions
- GDB hooksCo-developed-by Michael Rolnik <[email protected]>Co-developed-by Sarah Harris <[email protected]>Signed-off-by Michael Rolnik <[email protected]>Signed-off-by Sarah Harris <[email protected]>Signed-off-by Michael Rolnik <[email protected]>Acked-by Igor Mammedov <[email protected]>--- target/avr/cpu-param.h | 37 +++ target/avr/cpu-qom.h | 54 ++++ target/avr/cpu.h | 253 ++++++++++++++++++ target/avr/cpu.c | 576 +++++++++++++++++++++++++++++++++++++++++ target/avr/gdbstub.c | 85 ++++++ target/avr/machine.c | 121 +++++++++ gdb-xml/avr-cpu.xml | 49 ++++ 7 files changed, 1175 insertions(+) create mode 100644 target/avr/cpu-param.h create mode 100644 target/avr/cpu-qom.h create mode 100644 target/avr/cpu.h create mode 100644 target/avr/cpu.c create mode 100644 target/avr/gdbstub.c create mode 100644 target/avr/machine.c create mode 100644 gdb-xml/avr-cpu.xmltarget/avr/cpu-param.h new file +37
-0@@ -0,0 +1,37 @@ +/* +* QEMU AVR CPU +* +* Copyright (c) 2019 Michael Rolnik +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see +* <http://www.gnu.org/licenses/lgpl-2.1.html> +*/ + +#ifndef AVR_CPU_PARAM_H +#define AVR_CPU_PARAM_H 1 + +#define TARGET_LONG_BITS 32 +/* +* TARGET_PAGE_BITS cannot be more than 8 bits because +* 1. all IO registers occupy [0x0000 .. 0x00ff] address range, and they +* should be implemented as a device and not memory +* 2. SRAM starts at the address 0x0100 +*/ +#define TARGET_PAGE_BITS 8 +#define TARGET_PHYS_ADDR_SPACE_BITS 24 +#define TARGET_VIRT_ADDR_SPACE_BITS 24 +#define NB_MMU_MODES 2 + + +#endif target/avr/cpu-qom.h new file +54
-0@@ -0,0 +1,54 @@ +/* +* QEMU AVR CPU +* +* Copyright (c) 2019 Michael Rolnik +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see +* <http://www.gnu.org/licenses/lgpl-2.1.html> +*/ + +#ifndef QEMU_AVR_QOM_H +#define QEMU_AVR_QOM_H + +#include "hw/core/cpu.h" + +#define TYPE_AVR_CPU "avr-cpu" + +#define AVR_CPU_CLASS (klass) \ + OBJECT_CLASS_CHECK(AVRCPUClass, (klass), TYPE_AVR_CPU) +#define AVR_CPU (obj) \ + OBJECT_CHECK(AVRCPU, (obj), TYPE_AVR_CPU) +#define AVR_CPU_GET_CLASS (obj) \ + OBJECT_GET_CLASS(AVRCPUClass, (obj), TYPE_AVR_CPU) + +/** +* AVRCPUClass: +* @parent_realize: The parent class' realize handler. +* @parent_reset: The parent class' reset handler. +* @vr: Version Register value. +* +* A AVR CPU model. +*/ +typedef struct AVRCPUClass { +/*< private >*/ +CPUClass parent_class; +/*< public >*/ +DeviceRealize parent_realize; +void (*parent_reset)(CPUState *cpu); +}AVRCPUClass ; + +typedef struct AVRCPU AVRCPU ; + + +#endif /* !defined (QEMU_AVR_CPU_QOM_H) */ target/avr/cpu.h new file +37
-0@@ -0,0 +1,253 @@ +/* +* QEMU AVR CPU +* +* Copyright (c) 2019 Michael Rolnik +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see +* <http://www.gnu.org/licenses/lgpl-2.1.html> +*/ + +#ifndef QEMU_AVR_CPU_H +#define QEMU_AVR_CPU_H + +#include "cpu-qom.h" +#include "exec/cpu-defs.h" + +#define TCG_GUEST_DEFAULT_MO 0 + +#define CPU_RESOLVING_TYPE TYPE_AVR_CPU + +/* +* AVR has two memory spaces, data & code. +* e.g. both have 0 address +* ST/LD instructions access data space +* LPM/SPM and instruction fetching access code memory space +*/ +#define MMU_CODE_IDX 0
target/avr/cpu.h line 47
Quoted 10 lines
target/avr/cpu.h new file +10
-0+#define MMU_DATA_IDX 1 + +#define EXCP_RESET 1 +#define EXCP_INT (n) (EXCP_RESET + (n) + 1) + +/* Number of CPU registers */ +#define NO_CPU_REGISTERS 32 +/* Number of IO registers accessible by ld/st/in/out */ +#define NO_IO_REGISTERS 64 +
May I ask you to do a global replace of names of these two constants to CPU_REGISTERS_COUNT / IO_REGISTERS_COUNT or NUMBER_OF_CPU_REGISTERS / NUMBER_OF_IO_REGISTERS, or whatever else you find suitable (the reason being "NO_" is visually/perceptually very confusing - many readers would have first impression that it means a negative ("no"), not a "number of" as you, for sure, want.
Thanks,
Aleksandar
Quoted 1,069 lines
target/avr/cpu.h new file +148
-0+/* +* Offsets of AVR memory regions in host memory space. +* +* This is needed because the AVR has separate code and data address +* spaces that both have start from zero but have to go somewhere in +* host memory. +* +* It's also useful to know where some things are, like the IO registers. +*/ +/* Flash program memory */ +#define OFFSET_CODE 0x00000000 +/* CPU registers, IO registers, and SRAM */ +#define OFFSET_DATA 0x00800000 +/* CPU registers specifically, these are mapped at the start of data */ +#define OFFSET_CPU_REGISTERS OFFSET_DATA +/* +* IO registers, including status register, stack pointer, and memory +* mapped peripherals, mapped just after CPU registers +*/ +#define OFFSET_IO_REGISTERS (OFFSET_DATA + NO_CPU_REGISTERS) + +enum avr_features { +AVR_FEATURE_SRAM , + +AVR_FEATURE_1_BYTE_PC , +AVR_FEATURE_2_BYTE_PC , +AVR_FEATURE_3_BYTE_PC , + +AVR_FEATURE_1_BYTE_SP , +AVR_FEATURE_2_BYTE_SP , + +AVR_FEATURE_BREAK , +AVR_FEATURE_DES , +AVR_FEATURE_RMW ,/* Read Modify Write - XCH LAC LAS LAT */ + +AVR_FEATURE_EIJMP_EICALL , +AVR_FEATURE_IJMP_ICALL , +AVR_FEATURE_JMP_CALL , + +AVR_FEATURE_ADIW_SBIW , + +AVR_FEATURE_SPM , +AVR_FEATURE_SPMX , + +AVR_FEATURE_ELPMX , +AVR_FEATURE_ELPM , +AVR_FEATURE_LPMX , +AVR_FEATURE_LPM , + +AVR_FEATURE_MOVW , +AVR_FEATURE_MUL , +AVR_FEATURE_RAMPD , +AVR_FEATURE_RAMPX , +AVR_FEATURE_RAMPY , +AVR_FEATURE_RAMPZ , +}; + +typedef struct CPUAVRState CPUAVRState ; + +struct CPUAVRState { +uint32_t pc_w;/* 0x003fffff up to 22 bits */ + +uint32_t sregC;/* 0x00000001 1 bit */ +uint32_t sregZ;/* 0x00000001 1 bit */ +uint32_t sregN;/* 0x00000001 1 bit */ +uint32_t sregV;/* 0x00000001 1 bit */ +uint32_t sregS;/* 0x00000001 1 bit */ +uint32_t sregH;/* 0x00000001 1 bit */ +uint32_t sregT;/* 0x00000001 1 bit */ +uint32_t sregI;/* 0x00000001 1 bit */ + +uint32_t rampD;/* 0x00ff0000 8 bits */ +uint32_t rampX;/* 0x00ff0000 8 bits */ +uint32_t rampY;/* 0x00ff0000 8 bits */ +uint32_t rampZ;/* 0x00ff0000 8 bits */ +uint32_t eind;/* 0x00ff0000 8 bits */ + +uint32_t r[NO_CPU_REGISTERS ];/* 8 bits each */ +uint32_t sp;/* 16 bits */ + +uint32_t skip;/* if set skip instruction */ + +uint64_t intsrc;/* interrupt sources */ +bool fullacc;/* CPU/MEM if true MEM only otherwise */ + +uint32_t features; +}; + +/** +* AVRCPU: +* @env: #CPUAVRState +* +* A AVR CPU. +*/ +typedef struct AVRCPU { +/*< private >*/ +CPUState parent_obj; +/*< public >*/ + +CPUNegativeOffsetState neg; +CPUAVRState env; +}AVRCPU ; + +#ifndef CONFIG_USER_ONLY +extern const struct VMStateDescription vms_avr_cpu; +#endif + +void avr_cpu_do_interrupt (CPUState *cpu); +bool avr_cpu_exec_interrupt (CPUState *cpu,int int_req); +hwaddr avr_cpu_get_phys_page_debug (CPUState *cpu,vaddr addr); +int avr_cpu_gdb_read_register (CPUState *cpu,uint8_t *buf,int reg); +int avr_cpu_gdb_write_register (CPUState *cpu,uint8_t *buf,int reg); + +static inline int avr_feature (CPUAVRState *env,int feature) +{ +return (env->features & (1U << feature)) !=0 ; +} + +static inline void avr_set_feature (CPUAVRState *env,int feature) +{ + env->features |= (1U << feature); +} + +#define cpu_list avr_cpu_list +#define cpu_signal_handler cpu_avr_signal_handler +#define cpu_mmu_index avr_cpu_mmu_index + +static inline int avr_cpu_mmu_index (CPUAVRState *env,bool ifetch) +{ +return ifetch ?MMU_CODE_IDX :MMU_DATA_IDX ; +} + +void avr_cpu_tcg_init (void ); + +void avr_cpu_list (void ); +int cpu_avr_exec (CPUState *cpu); +int cpu_avr_signal_handler (int host_signum,void *pinfo,void *puc); +int avr_cpu_handle_mmu_fault (CPUState *cpu,vaddr address,int size, +int rw,int mmu_idx); +int avr_cpu_memory_rw_debug (CPUState *cs,vaddr address,uint8_t *buf, +int len,bool is_write); + +enum { +TB_FLAGS_FULL_ACCESS =1 , +TB_FLAGS_SKIP =2 , +}; + +static inline void cpu_get_tb_cpu_state(CPUAVRState *env, target_ulong*pc,
target/avr/cpu.h new file +58
-0+ target_ulong *cs_base, uint32_t *pflags) +{ +uint32_t flags =0 ; + + *pc = env->pc_w *2 ; + *cs_base =0 ; + +if (env->fullacc) { + flags |=TB_FLAGS_FULL_ACCESS ; + } +if (env->skip) { + flags |=TB_FLAGS_SKIP ; + } + + *pflags = flags; +} + +static inline int cpu_interrupts_enabled (CPUAVRState *env) +{ +return env->sregI !=0 ; +} + +static inline uint8_t cpu_get_sreg (CPUAVRState *env) +{ +uint8_t sreg; + sreg = (env->sregC) <<0 + | (env->sregZ) <<1 + | (env->sregN) <<2 + | (env->sregV) <<3 + | (env->sregS) <<4 + | (env->sregH) <<5 + | (env->sregT) <<6 + | (env->sregI) <<7 ; +return sreg; +} + +static inline void cpu_set_sreg (CPUAVRState *env,uint8_t sreg) +{ + env->sregC = (sreg >>0 ) &0x01 ; + env->sregZ = (sreg >>1 ) &0x01 ; + env->sregN = (sreg >>2 ) &0x01 ; + env->sregV = (sreg >>3 ) &0x01 ; + env->sregS = (sreg >>4 ) &0x01 ; + env->sregH = (sreg >>5 ) &0x01 ; + env->sregT = (sreg >>6 ) &0x01 ; + env->sregI = (sreg >>7 ) &0x01 ; +} + +bool avr_cpu_tlb_fill (CPUState *cs,vaddr address,int size, +MMUAccessType access_type,int mmu_idx, +bool probe,uintptr_t retaddr); + +typedef CPUAVRState CPUArchState ; +typedef AVRCPU ArchCPU ; + +#include "exec/cpu-all.h" + +#endif /* !defined (QEMU_AVR_CPU_H) */ target/avr/cpu.c new file +39
-0@@ -0,0 +1,576 @@ +/* +* QEMU AVR CPU +* +* Copyright (c) 2019 Michael Rolnik +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see +* <http://www.gnu.org/licenses/lgpl-2.1.html> +*/ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qemu/qemu-print.h" +#include "exec/exec-all.h" +#include "cpu.h" + +static void avr_cpu_set_pc (CPUState *cs,vaddr value) +{ +AVRCPU *cpu =AVR_CPU (cs); + + cpu->env.pc_w = value /2 ;/* internally PC points to words */ +} + +static bool avr_cpu_has_work (CPUState *cs) +{ +AVRCPU *cpu =AVR_CPU (cs); +CPUAVRState *env = &cpu->env; + + return (cs->interrupt_request & (CPU_INTERRUPT_HARD |
CPU_INTERRUPT_RESET))target/avr/cpu.c new file +4
-0+ &&cpu_interrupts_enabled (env); +} + +static void avr_cpu_synchronize_from_tb(CPUState *cs, TranslationBlock*tb)
target/avr/cpu.c new file +128
-0+{ +AVRCPU *cpu =AVR_CPU (cs); +CPUAVRState *env = &cpu->env; + + env->pc_w = tb->pc /2 ;/* internally PC points to words */ +} + +static void avr_cpu_reset (CPUState *cs) +{ +AVRCPU *cpu =AVR_CPU (cs); +AVRCPUClass *mcc =AVR_CPU_GET_CLASS (cpu); +CPUAVRState *env = &cpu->env; + + mcc->parent_reset (cs); + + env->pc_w =0 ; + env->sregI =1 ; + env->sregC =0 ; + env->sregZ =0 ; + env->sregN =0 ; + env->sregV =0 ; + env->sregS =0 ; + env->sregH =0 ; + env->sregT =0 ; + + env->rampD =0 ; + env->rampX =0 ; + env->rampY =0 ; + env->rampZ =0 ; + env->eind =0 ; + env->sp =0 ; + + env->skip =0 ; + +memset (env->r,0 ,sizeof (env->r)); + +tlb_flush (cs); +} + +static void avr_cpu_disas_set_info (CPUState *cpu,disassemble_info *info) +{ + info->mach = bfd_arch_avr; + info->print_insn =NULL ; +} + +static void avr_cpu_realizefn (DeviceState *dev,Error **errp) +{ +CPUState *cs =CPU (dev); +AVRCPUClass *mcc =AVR_CPU_GET_CLASS (dev); +Error *local_err =NULL ; + +cpu_exec_realizefn (cs, &local_err); +if (local_err !=NULL ) { +error_propagate (errp, local_err); +return ; + } +qemu_init_vcpu (cs); +cpu_reset (cs); + + mcc->parent_realize (dev, errp); +} + +static void avr_cpu_set_int (void *opaque,int irq,int level) +{ +AVRCPU *cpu = opaque; +CPUAVRState *env = &cpu->env; +CPUState *cs =CPU (cpu); + +uint64_t mask = (1ull << irq); +if (level) { + env->intsrc |= mask; +cpu_interrupt (cs,CPU_INTERRUPT_HARD ); + }else { + env->intsrc &= ~mask; +if (env->intsrc ==0 ) { +cpu_reset_interrupt (cs,CPU_INTERRUPT_HARD ); + } + } +} + +static void avr_cpu_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); + +cpu_set_cpustate_pointers (cpu); + +#ifndef CONFIG_USER_ONLY +/* Set the number of interrupts supported by the CPU. */ +qdev_init_gpio_in (DEVICE (cpu), avr_cpu_set_int,57 ); +#endif +} + +static ObjectClass *avr_cpu_class_by_name (const char *cpu_model) +{ +ObjectClass *oc; + + oc =object_class_by_name (cpu_model); +if (object_class_dynamic_cast (oc,TYPE_AVR_CPU ) ==NULL || +object_class_is_abstract (oc)) { + oc =NULL ; + } +return oc; +} + +static void avr_cpu_dump_state (CPUState *cs,FILE *f,int flags) +{ +AVRCPU *cpu =AVR_CPU (cs); +CPUAVRState *env = &cpu->env; +int i; + +qemu_fprintf (f,"\n" ); +qemu_fprintf (f,"PC: %06x\n" , env->pc_w); +qemu_fprintf (f,"SP: %04x\n" , env->sp); +qemu_fprintf (f,"rampD: %02x\n" , env->rampD >>16 ); +qemu_fprintf (f,"rampX: %02x\n" , env->rampX >>16 ); +qemu_fprintf (f,"rampY: %02x\n" , env->rampY >>16 ); +qemu_fprintf (f,"rampZ: %02x\n" , env->rampZ >>16 ); +qemu_fprintf (f,"EIND: %02x\n" , env->eind >>16 ); +qemu_fprintf (f,"X: %02x%02x\n" , env->r[27 ], env->r[26 ]); +qemu_fprintf (f,"Y: %02x%02x\n" , env->r[29 ], env->r[28 ]); +qemu_fprintf (f,"Z: %02x%02x\n" , env->r[31 ], env->r[30 ]); + qemu_fprintf(f, "SREG: [ %c %c %c %c %c %c %c %c ]\n", + env->sregI ? 'I' : '-', + env->sregT ? 'T' : '-', + env->sregH ? 'H' : '-', + env->sregS ? 'S' : '-', + env->sregV ? 'V' : '-', + env->sregN ? '-' : 'N', /* Zf has negative logic*/
target/avr/cpu.c new file +405
-0+ env->sregZ ?'Z' :'-' , + env->sregC ? 'I' : '-'); +qemu_fprintf (f,"SKIP: %02x\n" , env->skip); + +qemu_fprintf (f,"\n" ); +for (i =0 ; i <ARRAY_SIZE (env->r); i++) { +qemu_fprintf (f,"R[%02d]: %02x " , i, env->r[i]); + +if ((i %8 ) ==7 ) { +qemu_fprintf (f,"\n" ); + } + } +qemu_fprintf (f,"\n" ); +} + +static void avr_cpu_class_init (ObjectClass *oc,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (oc); +CPUClass *cc =CPU_CLASS (oc); +AVRCPUClass *mcc =AVR_CPU_CLASS (oc); + + mcc->parent_realize = dc->realize; + dc->realize = avr_cpu_realizefn; + + mcc->parent_reset = cc->reset; + cc->reset = avr_cpu_reset; + + cc->class_by_name = avr_cpu_class_by_name; + + cc->has_work = avr_cpu_has_work; + cc->do_interrupt = avr_cpu_do_interrupt; + cc->cpu_exec_interrupt = avr_cpu_exec_interrupt; + cc->dump_state = avr_cpu_dump_state; + cc->set_pc = avr_cpu_set_pc; +#if !defined(CONFIG_USER_ONLY ) + cc->memory_rw_debug = avr_cpu_memory_rw_debug; +#endif +#ifdef CONFIG_USER_ONLY + cc->handle_mmu_fault = avr_cpu_handle_mmu_fault; +#else + cc->get_phys_page_debug = avr_cpu_get_phys_page_debug; + cc->vmsd = &vms_avr_cpu; +#endif + cc->disas_set_info = avr_cpu_disas_set_info; + cc->tlb_fill = avr_cpu_tlb_fill; + cc->tcg_initialize = avr_cpu_tcg_init; + cc->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 ; + cc->gdb_core_xml_file ="avr-cpu.xml" ; +} + +static void avr_avr1_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +} + +static void avr_avr2_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +} + +static void avr_avr25_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +} + +static void avr_avr3_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +} + +static void avr_avr31_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_RAMPZ ); +avr_set_feature (env,AVR_FEATURE_ELPM ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +} + +static void avr_avr35_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +} + +static void avr_avr4_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +} + +static void avr_avr5_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +} + +static void avr_avr51_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_RAMPZ ); +avr_set_feature (env,AVR_FEATURE_ELPMX ); +avr_set_feature (env,AVR_FEATURE_ELPM ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +} + +static void avr_avr6_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_3_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_RAMPZ ); +avr_set_feature (env,AVR_FEATURE_EIJMP_EICALL ); +avr_set_feature (env,AVR_FEATURE_ELPMX ); +avr_set_feature (env,AVR_FEATURE_ELPM ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +} + +static void avr_xmega2_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +avr_set_feature (env,AVR_FEATURE_RMW ); +} + +static void avr_xmega4_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_RAMPZ ); +avr_set_feature (env,AVR_FEATURE_ELPMX ); +avr_set_feature (env,AVR_FEATURE_ELPM ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +avr_set_feature (env,AVR_FEATURE_RMW ); +} + +static void avr_xmega5_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_2_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_RAMPD ); +avr_set_feature (env,AVR_FEATURE_RAMPX ); +avr_set_feature (env,AVR_FEATURE_RAMPY ); +avr_set_feature (env,AVR_FEATURE_RAMPZ ); +avr_set_feature (env,AVR_FEATURE_ELPMX ); +avr_set_feature (env,AVR_FEATURE_ELPM ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +avr_set_feature (env,AVR_FEATURE_RMW ); +} + +static void avr_xmega6_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_3_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_RAMPZ ); +avr_set_feature (env,AVR_FEATURE_EIJMP_EICALL ); +avr_set_feature (env,AVR_FEATURE_ELPMX ); +avr_set_feature (env,AVR_FEATURE_ELPM ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +avr_set_feature (env,AVR_FEATURE_RMW ); +} + +static void avr_xmega7_initfn (Object *obj) +{ +AVRCPU *cpu =AVR_CPU (obj); +CPUAVRState *env = &cpu->env; + +avr_set_feature (env,AVR_FEATURE_LPM ); +avr_set_feature (env,AVR_FEATURE_IJMP_ICALL ); +avr_set_feature (env,AVR_FEATURE_ADIW_SBIW ); +avr_set_feature (env,AVR_FEATURE_SRAM ); +avr_set_feature (env,AVR_FEATURE_BREAK ); + +avr_set_feature (env,AVR_FEATURE_3_BYTE_PC ); +avr_set_feature (env,AVR_FEATURE_2_BYTE_SP ); +avr_set_feature (env,AVR_FEATURE_RAMPD ); +avr_set_feature (env,AVR_FEATURE_RAMPX ); +avr_set_feature (env,AVR_FEATURE_RAMPY ); +avr_set_feature (env,AVR_FEATURE_RAMPZ ); +avr_set_feature (env,AVR_FEATURE_EIJMP_EICALL ); +avr_set_feature (env,AVR_FEATURE_ELPMX ); +avr_set_feature (env,AVR_FEATURE_ELPM ); +avr_set_feature (env,AVR_FEATURE_JMP_CALL ); +avr_set_feature (env,AVR_FEATURE_LPMX ); +avr_set_feature (env,AVR_FEATURE_MOVW ); +avr_set_feature (env,AVR_FEATURE_MUL ); +avr_set_feature (env,AVR_FEATURE_RMW ); +} + +typedef struct AVRCPUInfo { +const char *name; +void (*initfn)(Object *obj); +}AVRCPUInfo ; + + +static void avr_cpu_list_entry (gpointer data,gpointer user_data) +{ +const char *typename =object_class_get_name (OBJECT_CLASS (data)); + +qemu_printf ("%s\n" , typename); +} + +void avr_cpu_list (void ) +{ +GSList *list; + list =object_class_get_list_sorted (TYPE_AVR_CPU , false); +g_slist_foreach (list, avr_cpu_list_entry,NULL ); +g_slist_free (list); +} + +#define DEFINE_AVR_CPU_TYPE (model, initfn) \ + { \ + .parent = TYPE_AVR_CPU, \ + .instance_init = initfn, \ + .name = model "-avr-cpu", \ + } + +static const TypeInfo avr_cpu_type_info[] = { + { + .name =TYPE_AVR_CPU , + .parent =TYPE_CPU , + .instance_size =sizeof (AVRCPU ), + .instance_init = avr_cpu_initfn, + .class_size =sizeof (AVRCPUClass), + .class_init = avr_cpu_class_init, + .abstract = true, + }, +DEFINE_AVR_CPU_TYPE ("avr1" , avr_avr1_initfn), +DEFINE_AVR_CPU_TYPE ("avr2" , avr_avr2_initfn), +DEFINE_AVR_CPU_TYPE ("avr25" , avr_avr25_initfn), +DEFINE_AVR_CPU_TYPE ("avr3" , avr_avr3_initfn), +DEFINE_AVR_CPU_TYPE ("avr31" , avr_avr31_initfn), +DEFINE_AVR_CPU_TYPE ("avr35" , avr_avr35_initfn), +DEFINE_AVR_CPU_TYPE ("avr4" , avr_avr4_initfn), +DEFINE_AVR_CPU_TYPE ("avr5" , avr_avr5_initfn), +DEFINE_AVR_CPU_TYPE ("avr51" , avr_avr51_initfn), +DEFINE_AVR_CPU_TYPE ("avr6" , avr_avr6_initfn), +DEFINE_AVR_CPU_TYPE ("xmega2" , avr_xmega2_initfn), +DEFINE_AVR_CPU_TYPE ("xmega4" , avr_xmega4_initfn), +DEFINE_AVR_CPU_TYPE ("xmega5" , avr_xmega5_initfn), +DEFINE_AVR_CPU_TYPE ("xmega6" , avr_xmega6_initfn), +DEFINE_AVR_CPU_TYPE ("xmega7" , avr_xmega7_initfn), +}; + +DEFINE_TYPES (avr_cpu_type_info)target/avr/gdbstub.c new file +85
-0@@ -0,0 +1,85 @@ +/* +* QEMU AVR CPU +* +* Copyright (c) 2019 Michael Rolnik +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see +* <http://www.gnu.org/licenses/lgpl-2.1.html> +*/ + +#include "qemu/osdep.h" +#include "qemu-common.h" +#include "exec/gdbstub.h" + +int avr_cpu_gdb_read_register (CPUState *cs,uint8_t *mem_buf,int n) +{ +AVRCPU *cpu =AVR_CPU (cs); +CPUAVRState *env = &cpu->env; + +/* R */ +if (n <32 ) { +return gdb_get_reg8 (mem_buf, env->r[n]); + } + +/* SREG */ +if (n ==32 ) { +uint8_t sreg =cpu_get_sreg (env); + +return gdb_get_reg8 (mem_buf, sreg); + } + +/* SP */ +if (n ==33 ) { +return gdb_get_reg16 (mem_buf, env->sp &0x0000ffff ); + } + +/* PC */ +if (n ==34 ) { +return gdb_get_reg32 (mem_buf, env->pc_w *2 ); + } + +return 0 ; +} + +int avr_cpu_gdb_write_register (CPUState *cs,uint8_t *mem_buf,int n) +{ +AVRCPU *cpu =AVR_CPU (cs); +CPUAVRState *env = &cpu->env; + +/* R */ +if (n <32 ) { + env->r[n] = *mem_buf; +return 1 ; + } + +/* SREG */ +if (n ==32 ) { +cpu_set_sreg (env, *mem_buf); +return 1 ; + } + +/* SP */ +if (n ==33 ) { + env->sp =lduw_p (mem_buf); +return 2 ; + } + +/* PC */ +if (n ==34 ) { + env->pc_w =ldl_p (mem_buf) /2 ; +return 4 ; + } + +return 0 ; +}target/avr/machine.c new file +121
-0@@ -0,0 +1,121 @@ +/* +* QEMU AVR CPU +* +* Copyright (c) 2019 Michael Rolnik +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see +* <http://www.gnu.org/licenses/lgpl-2.1.html> +*/ + +#include "qemu/osdep.h" +#include "cpu.h" +#include "migration/cpu.h" + +static int get_sreg (QEMUFile *f,void *opaque,size_t size, +const VMStateField *field) +{ +CPUAVRState *env = opaque; +uint8_t sreg; + + sreg =qemu_get_byte (f); +cpu_set_sreg (env, sreg); +return 0 ; +} + +static int put_sreg ( +QEMUFile *f,void *opaque,size_t size, +const VMStateField *field,QJSON *vmdesc) +{ +CPUAVRState *env = opaque; +uint8_t sreg =cpu_get_sreg (env); + +qemu_put_byte (f, sreg); +return 0 ; +} + +static const VMStateInfo vms_sreg = { + .name ="sreg" , + .get = get_sreg, + .put = put_sreg, +}; + +static int get_segment ( +QEMUFile *f,void *opaque,size_t size,const VMStateField *field) +{ +uint32_t *ramp = opaque; +uint8_t temp; + + temp =qemu_get_byte (f); + *ramp = ((uint32_t )temp) <<16 ; +return 0 ; +} + +static int put_segment ( +QEMUFile *f,void *opaque,size_t size, +const VMStateField *field,QJSON *vmdesc) +{ +uint32_t *ramp = opaque; +uint8_t temp = *ramp >>16 ; + +qemu_put_byte (f, temp); +return 0 ; +} + +static const VMStateInfo vms_rampD = { + .name ="rampD" , + .get = get_segment, + .put = put_segment, +}; +static const VMStateInfo vms_rampX = { + .name ="rampX" , + .get = get_segment, + .put = put_segment, +}; +static const VMStateInfo vms_rampY = { + .name ="rampY" , + .get = get_segment, + .put = put_segment, +}; +static const VMStateInfo vms_rampZ = { + .name ="rampZ" , + .get = get_segment, + .put = put_segment, +}; +static const VMStateInfo vms_eind = { + .name ="eind" , + .get = get_segment, + .put = put_segment, +}; + +const VMStateDescription vms_avr_cpu = { + .name ="cpu" , + .version_id =0 , + .minimum_version_id =0 , + .fields = (VMStateField []) { +VMSTATE_UINT32 (env.pc_w,AVRCPU ), +VMSTATE_UINT32 (env.sp,AVRCPU ), +VMSTATE_UINT32 (env.skip,AVRCPU ), + +VMSTATE_UINT32_ARRAY (env.r,AVRCPU ,NO_CPU_REGISTERS ), + +VMSTATE_SINGLE (env,AVRCPU ,0 , vms_sreg, CPUAVRState), +VMSTATE_SINGLE (env.rampD,AVRCPU ,0 , vms_rampD, uint32_t), +VMSTATE_SINGLE (env.rampX,AVRCPU ,0 , vms_rampX, uint32_t), +VMSTATE_SINGLE (env.rampY,AVRCPU ,0 , vms_rampY, uint32_t), +VMSTATE_SINGLE (env.rampZ,AVRCPU ,0 , vms_rampZ, uint32_t), +VMSTATE_SINGLE (env.eind,AVRCPU ,0 , vms_eind, uint32_t), + +VMSTATE_END_OF_LIST () + } +};gdb-xml/avr-cpu.xml new file +49
-1@@ -0,0 +1,49 @@ +<?xml version="1.0"?> +<!-- Copyright (C) 2018-2019 Free Software Foundation, Inc. + + Copying and distribution of this file, with or without modification, + are permitted in any medium without royalty provided the copyright + notice and this notice are preserved. --> + +<!-- Register numbers are hard-coded in order to maintain backward + compatibility with older versions of tools that didn't use xml + register descriptions. --> + +<!DOCTYPE feature SYSTEM "gdb-target.dtd"> +<feature name="org.gnu.gdb.riscv.cpu"> + <reg name="r0" bitsize="8" type="int" regnum="0"/> + <reg name="r1" bitsize="8" type="int"/> + <reg name="r2" bitsize="8" type="int"/> + <reg name="r3" bitsize="8" type="int"/> + <reg name="r4" bitsize="8" type="int"/> + <reg name="r5" bitsize="8" type="int"/> + <reg name="r6" bitsize="8" type="int"/> + <reg name="r7" bitsize="8" type="int"/> + <reg name="r8" bitsize="8" type="int"/> + <reg name="r9" bitsize="8" type="int"/> + <reg name="r10" bitsize="8" type="int"/> + <reg name="r11" bitsize="8" type="int"/> + <reg name="r12" bitsize="8" type="int"/> + <reg name="r13" bitsize="8" type="int"/> + <reg name="r14" bitsize="8" type="int"/> + <reg name="r15" bitsize="8" type="int"/> + <reg name="r16" bitsize="8" type="int"/> + <reg name="r17" bitsize="8" type="int"/> + <reg name="r18" bitsize="8" type="int"/> + <reg name="r19" bitsize="8" type="int"/> + <reg name="r20" bitsize="8" type="int"/> + <reg name="r21" bitsize="8" type="int"/> + <reg name="r22" bitsize="8" type="int"/> + <reg name="r23" bitsize="8" type="int"/> + <reg name="r24" bitsize="8" type="int"/> + <reg name="r25" bitsize="8" type="int"/> + <reg name="r26" bitsize="8" type="int"/> + <reg name="r27" bitsize="8" type="int"/> + <reg name="r28" bitsize="8" type="int"/> + <reg name="r29" bitsize="8" type="int"/> + <reg name="r30" bitsize="8" type="int"/> + <reg name="r31" bitsize="8" type="int"/> + <reg name="sreg" bitsize="8" type="int"/> + <reg name="sp" bitsize="8" type="int"/> + <reg name="pc" bitsize="8" type="int"/> +</feature> --2.17.2 (Apple Git-113)
PATCH v36 2/17 target/avr: Add instruction helpers
In reply to Michael RolnikStubs for unimplemented instructions and helpers for instructions that need to interact with QEMU. SPM and WDR are unimplemented because they require emulation of complex peripherals.
The implementation of SLEEP is very limited due to the lack of peripherals to generate wake interrupts. Memory access instructions are implemented here because some address ranges actually refer to CPU registers.
--- target/avr/helper.h | 29 ++++ target/avr/helper.c | 354 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 383 insertions(+) create mode 100644 target/avr/helper.h create mode 100644 target/avr/helper.c
target/avr/helper.h new file +29 -0
@@ -0,0 +1,29 @@ +/* +* QEMU AVR CPU +* +* Copyright (c) 2019 Michael Rolnik +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see +* <http://www.gnu.org/licenses/lgpl-2.1.html> +*/ + +DEF_HELPER_1(wdr, void, env) +DEF_HELPER_1(debug, void, env) +DEF_HELPER_1(break, void, env) +DEF_HELPER_1(sleep, void, env) +DEF_HELPER_1(unsupported, void, env) +DEF_HELPER_3(outb, void, env, i32, i32) +DEF_HELPER_2(inb, tl, env, i32) +DEF_HELPER_3(fullwr, void, env, i32, i32) +DEF_HELPER_2 (fullrd, tl, env, i32)
target/avr/helper.c new file +354 -0
354 lines not on this page · raw message
Signature · 1 line
2.17.2 (Apple Git-113)
PATCH v36 3/17 target/avr: Add instruction decoding
In reply to Michael RolnikThis includes:
- encoding of all 16 bit instructions
- encoding of all 32 bit instructions
--- target/avr/insn.decode | 175 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 175 insertions(+) create mode 100644 target/avr/insn.decode
target/avr/insn.decode new file +175 -0
@@ -0,0 +1,175 @@ +# +# A = [16 .. 31] +# B = [16 .. 23] +# C = [24, 26, 28, 30] +# D = [0, 2, 4, 6, 8, .. 30] + +%rd 4:5 +%rr 9:1 0:4 + +&rd_rr rd rr +&rd_imm rd imm + +@op_rd_rr .... .. . ..... .... &rd_rr rd=%rd rr=%rr +ADD 0000 11 . ..... .... @op_rd_rr +ADC 0001 11 . ..... .... @op_rd_rr +AND 0010 00 . ..... .... @op_rd_rr +CP 0001 01 . ..... .... @op_rd_rr +CPC 0000 01 . ..... .... @op_rd_rr +CPSE 0001 00 . ..... .... @op_rd_rr +EOR 0010 01 . ..... .... @op_rd_rr +MOV 0010 11 . ..... .... @op_rd_rr +MUL 1001 11 . ..... .... @op_rd_rr +OR 0010 10 . ..... .... @op_rd_rr +SBC 0000 10 . ..... .... @op_rd_rr +SUB 0001 10 . ..... .... @op_rd_rr + + +%rd_c 4:2 !function=to_C +%imm6 6:2 0:4 + +@op_rd_imm6 .... .... .. .. .... &rd_imm rd=%rd_c imm=%imm6 +ADIW 1001 0110 .. .. .... @op_rd_imm6 +SBIW 1001 0111 .. .. .... @op_rd_imm6 + + +%rd_a 4:4 !function=to_A +%rr_a 0:4 !function=to_A +%rd_d 4:4 !function=to_D +%rr_d 0:4 !function=to_D +%imm8 8:4 0:4 + +@op_rd_imm8 .... .... .... .... &rd_imm rd=%rd_a imm=%imm8 +ANDI 0111 .... .... .... @op_rd_imm8 +CPI 0011 .... .... .... @op_rd_imm8 +LDI 1110 .... .... .... @op_rd_imm8 +ORI 0110 .... .... .... @op_rd_imm8 +SBCI 0100 .... .... .... @op_rd_imm8 +SUBI 0101 .... .... .... @op_rd_imm8 + + +@op_rd .... ... rd:5 .... +ASR 1001 010 ..... 0101 @op_rd +COM 1001 010 ..... 0000 @op_rd +DEC 1001 010 ..... 1010 @op_rd +ELPM2 1001 000 ..... 0110 @op_rd +ELPMX 1001 000 ..... 0111 @op_rd +INC 1001 010 ..... 0011 @op_rd +LDX1 1001 000 ..... 1100 @op_rd +LDX2 1001 000 ..... 1101 @op_rd +LDX3 1001 000 ..... 1110 @op_rd +LDY2 1001 000 ..... 1001 @op_rd +LDY3 1001 000 ..... 1010 @op_rd +LDZ2 1001 000 ..... 0001 @op_rd +LDZ3 1001 000 ..... 0010 @op_rd +LPM2 1001 000 ..... 0100 @op_rd +LPMX 1001 000 ..... 0101 @op_rd +LSR 1001 010 ..... 0110 @op_rd +NEG 1001 010 ..... 0001 @op_rd +POP 1001 000 ..... 1111 @op_rd +PUSH 1001 001 ..... 1111 @op_rd +ROR 1001 010 ..... 0111 @op_rd +STY2 1001 001 ..... 1001 @op_rd +STY3 1001 001 ..... 1010 @op_rd +STZ2 1001 001 ..... 0001 @op_rd +STZ3 1001 001 ..... 0010 @op_rd +SWAP 1001 010 ..... 0010 @op_rd + + +@op_bit .... .... . bit:3 .... +BCLR 1001 0100 1 ... 1000 @op_bit +BSET 1001 0100 0 ... 1000 @op_bit + + +@op_rd_bit .... ... rd:5 . bit:3 +BLD 1111 100 ..... 0 ... @op_rd_bit +BST 1111 101 ..... 0 ... @op_rd_bit + + +@op_bit_imm .... .. imm:s7 bit:3 +BRBC 1111 01 ....... ... @op_bit_imm +BRBS 1111 00 ....... ... @op_bit_imm + + +BREAK 1001 0101 1001 1000 +EICALL 1001 0101 0001 1001 +EIJMP 1001 0100 0001 1001 +ELPM1 1001 0101 1101 1000 +ICALL 1001 0101 0000 1001 +IJMP 1001 0100 0000 1001 +LPM1 1001 0101 1100 1000 +NOP 0000 0000 0000 0000 +RET 1001 0101 0000 1000 +RETI 1001 0101 0001 1000 +SLEEP 1001 0101 1000 1000 +SPM 1001 0101 1110 1000 +SPMX 1001 0101 1111 1000 +WDR 1001 0101 1010 1000 + + +@op_reg_bit .... .... reg:5 bit:3 +CBI 1001 1000 ..... ... @op_reg_bit +SBI 1001 1010 ..... ... @op_reg_bit +SBIC 1001 1001 ..... ... @op_reg_bit +SBIS 1001 1011 ..... ... @op_reg_bit + + +DES 1001 0100 imm:4 1011 + + +%rd_b 4:3 !function=to_B +%rr_b 0:3 !function=to_B +@fmul .... .... . ... . ... &rd_rr rd=%rd_b rr=%rr_b +FMUL 0000 0011 0 ... 1 ... @fmul +FMULS 0000 0011 1 ... 0 ... @fmul +FMULSU 0000 0011 1 ... 1 ... @fmul +MULSU 0000 0011 0 ... 0 ... @fmul + + +%io_imm 9:2 0:4 +@io_rd_imm .... . .. ..... .... &rd_imm rd=%rd imm=%io_imm +IN 1011 0 .. ..... .... @io_rd_imm +OUT 1011 1 .. ..... .... @io_rd_imm + + +XCH 1001 001 rd:5 0100 +LAC 1001 001 rd:5 0110 +LAS 1001 001 rd:5 0101 +LAT 1001 001 rd:5 0111 +STX1 1001 001 rr:5 1100 +STX2 1001 001 rr:5 1101 +STX3 1001 001 rr:5 1110 + + +%ldst_d_imm 13:1 10:2 0:3 +@ldst_d .. . . .. . rd:5 . ... &rd_imm imm=%ldst_d_imm +LDDY 10 . 0 .. 0 ..... 1 ... @ldst_d +LDDZ 10 . 0 .. 0 ..... 0 ... @ldst_d +STDY 10 . 0 .. 1 ..... 1 ... @ldst_d +STDZ 10 . 0 .. 1 ..... 0 ... @ldst_d + + +MOVW 0000 0001 .... .... &rd_rr rd=%rd_d rr=%rr_d +MULS 0000 0010 .... .... &rd_rr rd=%rd_a rr=%rr_a + +RCALL 1101 imm:s12 +RJMP 1100 imm:s12 + +SBRC 1111 110 rr:5 0 bit:3 +SBRS 1111 111 rr:5 0 bit:3 + +# The 22-bit immediate is partially in the opcode word, +# and partially in the next. Use append_16 to build the +# complete 22-bit value. +%imm_call 4:5 0:1 !function=append_16 +CALL 1001 010 ..... 111 . imm=%imm_call +JMP 1001 010 ..... 110 . imm=%imm_call + + +# The 16-bit immediate is completely in the next word. +# Fields cannot be defined with no bits, so we cannot play +# the same trick and append to a zero-bit value. +# Defer reading the immediate until trans_{LDS,STS}. +@ldst_s .... ... rd:5 .... imm=0 +LDS 1001 000 ..... 0000 @ldst_s +STS 1001 001 ..... 0000 @ldst_s
Signature · 1 line
2.17.2 (Apple Git-113)
Re: [PATCH v36 03/17] target/avr: Add instruction decoding
Quoted 7 lines · Michael Rolnik
This includes:
- encoding of all 16 bit instructions
- encoding of all 32 bit instructionsSigned-off-by Michael Rolnik <[email protected]>---
License preamble missing.
Quoted 189 lines
target/avr/insn.decode | 175 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 175 insertions(+) create mode 100644 target/avr/insn.decodetarget/avr/insn.decode new file +175
-1@@ -0,0 +1,175 @@ +# +# A = [16 .. 31] +# B = [16 .. 23] +# C = [24, 26, 28, 30] +# D = [0, 2, 4, 6, 8, .. 30] + +%rd 4:5 +%rr 9:1 0:4 + +&rd_rr rd rr +&rd_imm rd imm + +@op_rd_rr .... .. . ..... .... &rd_rr rd=%rd rr=%rr +ADD 0000 11 . ..... .... @op_rd_rr +ADC 0001 11 . ..... .... @op_rd_rr +AND 0010 00 . ..... .... @op_rd_rr +CP 0001 01 . ..... .... @op_rd_rr +CPC 0000 01 . ..... .... @op_rd_rr +CPSE 0001 00 . ..... .... @op_rd_rr +EOR 0010 01 . ..... .... @op_rd_rr +MOV 0010 11 . ..... .... @op_rd_rr +MUL 1001 11 . ..... .... @op_rd_rr +OR 0010 10 . ..... .... @op_rd_rr +SBC 0000 10 . ..... .... @op_rd_rr +SUB 0001 10 . ..... .... @op_rd_rr + + +%rd_c 4:2 !function=to_C +%imm6 6:2 0:4 + +@op_rd_imm6 .... .... .. .. .... &rd_imm rd=%rd_c imm=%imm6 +ADIW 1001 0110 .. .. .... @op_rd_imm6 +SBIW 1001 0111 .. .. .... @op_rd_imm6 + + +%rd_a 4:4 !function=to_A +%rr_a 0:4 !function=to_A +%rd_d 4:4 !function=to_D +%rr_d 0:4 !function=to_D +%imm8 8:4 0:4 + +@op_rd_imm8 .... .... .... .... &rd_imm rd=%rd_a imm=%imm8 +ANDI 0111 .... .... .... @op_rd_imm8 +CPI 0011 .... .... .... @op_rd_imm8 +LDI 1110 .... .... .... @op_rd_imm8 +ORI 0110 .... .... .... @op_rd_imm8 +SBCI 0100 .... .... .... @op_rd_imm8 +SUBI 0101 .... .... .... @op_rd_imm8 + + +@op_rd .... ... rd:5 .... +ASR 1001 010 ..... 0101 @op_rd +COM 1001 010 ..... 0000 @op_rd +DEC 1001 010 ..... 1010 @op_rd +ELPM2 1001 000 ..... 0110 @op_rd +ELPMX 1001 000 ..... 0111 @op_rd +INC 1001 010 ..... 0011 @op_rd +LDX1 1001 000 ..... 1100 @op_rd +LDX2 1001 000 ..... 1101 @op_rd +LDX3 1001 000 ..... 1110 @op_rd +LDY2 1001 000 ..... 1001 @op_rd +LDY3 1001 000 ..... 1010 @op_rd +LDZ2 1001 000 ..... 0001 @op_rd +LDZ3 1001 000 ..... 0010 @op_rd +LPM2 1001 000 ..... 0100 @op_rd +LPMX 1001 000 ..... 0101 @op_rd +LSR 1001 010 ..... 0110 @op_rd +NEG 1001 010 ..... 0001 @op_rd +POP 1001 000 ..... 1111 @op_rd +PUSH 1001 001 ..... 1111 @op_rd +ROR 1001 010 ..... 0111 @op_rd +STY2 1001 001 ..... 1001 @op_rd +STY3 1001 001 ..... 1010 @op_rd +STZ2 1001 001 ..... 0001 @op_rd +STZ3 1001 001 ..... 0010 @op_rd +SWAP 1001 010 ..... 0010 @op_rd + + +@op_bit .... .... . bit:3 .... +BCLR 1001 0100 1 ... 1000 @op_bit +BSET 1001 0100 0 ... 1000 @op_bit + + +@op_rd_bit .... ... rd:5 . bit:3 +BLD 1111 100 ..... 0 ... @op_rd_bit +BST 1111 101 ..... 0 ... @op_rd_bit + + +@op_bit_imm .... .. imm:s7 bit:3 +BRBC 1111 01 ....... ... @op_bit_imm +BRBS 1111 00 ....... ... @op_bit_imm + + +BREAK 1001 0101 1001 1000 +EICALL 1001 0101 0001 1001 +EIJMP 1001 0100 0001 1001 +ELPM1 1001 0101 1101 1000 +ICALL 1001 0101 0000 1001 +IJMP 1001 0100 0000 1001 +LPM1 1001 0101 1100 1000 +NOP 0000 0000 0000 0000 +RET 1001 0101 0000 1000 +RETI 1001 0101 0001 1000 +SLEEP 1001 0101 1000 1000 +SPM 1001 0101 1110 1000 +SPMX 1001 0101 1111 1000 +WDR 1001 0101 1010 1000 + + +@op_reg_bit .... .... reg:5 bit:3 +CBI 1001 1000 ..... ... @op_reg_bit +SBI 1001 1010 ..... ... @op_reg_bit +SBIC 1001 1001 ..... ... @op_reg_bit +SBIS 1001 1011 ..... ... @op_reg_bit + + +DES 1001 0100 imm:4 1011 + + +%rd_b 4:3 !function=to_B +%rr_b 0:3 !function=to_B +@fmul .... .... . ... . ... &rd_rr rd=%rd_b rr=%rr_b +FMUL 0000 0011 0 ... 1 ... @fmul +FMULS 0000 0011 1 ... 0 ... @fmul +FMULSU 0000 0011 1 ... 1 ... @fmul +MULSU 0000 0011 0 ... 0 ... @fmul + + +%io_imm 9:2 0:4 +@io_rd_imm .... . .. ..... .... &rd_imm rd=%rd imm=%io_imm +IN 1011 0 .. ..... .... @io_rd_imm +OUT 1011 1 .. ..... .... @io_rd_imm + + +XCH 1001 001 rd:5 0100 +LAC 1001 001 rd:5 0110 +LAS 1001 001 rd:5 0101 +LAT 1001 001 rd:5 0111 +STX1 1001 001 rr:5 1100 +STX2 1001 001 rr:5 1101 +STX3 1001 001 rr:5 1110 + + +%ldst_d_imm 13:1 10:2 0:3 +@ldst_d .. . . .. . rd:5 . ... &rd_imm imm=%ldst_d_imm +LDDY 10 . 0 .. 0 ..... 1 ... @ldst_d +LDDZ 10 . 0 .. 0 ..... 0 ... @ldst_d +STDY 10 . 0 .. 1 ..... 1 ... @ldst_d +STDZ 10 . 0 .. 1 ..... 0 ... @ldst_d + + +MOVW 0000 0001 .... .... &rd_rr rd=%rd_d rr=%rr_d +MULS 0000 0010 .... .... &rd_rr rd=%rd_a rr=%rr_a + +RCALL 1101 imm:s12 +RJMP 1100 imm:s12 + +SBRC 1111 110 rr:5 0 bit:3 +SBRS 1111 111 rr:5 0 bit:3 + +# The 22-bit immediate is partially in the opcode word, +# and partially in the next. Use append_16 to build the +# complete 22-bit value. +%imm_call 4:5 0:1 !function=append_16 +CALL 1001 010 ..... 111 . imm=%imm_call +JMP 1001 010 ..... 110 . imm=%imm_call + + +# The 16-bit immediate is completely in the next word. +# Fields cannot be defined with no bits, so we cannot play +# the same trick and append to a zero-bit value. +# Defer reading the immediate until trans_{LDS,STS}. +@ldst_s .... ... rd:5 .... imm=0 +LDS 1001 000 ..... 0000 @ldst_s +STS 1001 001 ..... 0000 @ldst_s --2.17.2 (Apple Git-113)
PATCH v36 4/17 target/avr: Add instruction translation - Registers definition
In reply to Michael Rolnik--- target/avr/translate.c | 132 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 132 insertions(+) create mode 100644 target/avr/translate.c
target/avr/translate.c new file +132 -0
@@ -0,0 +1,132 @@ +/* +* QEMU AVR CPU +* +* Copyright (c) 2019 Michael Rolnik +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see +* <http://www.gnu.org/licenses/lgpl-2.1.html> +*/ + +#include "qemu/osdep.h" +#include "qemu/qemu-print.h" +#include "tcg/tcg.h" +#include "cpu.h" +#include "exec/exec-all.h" +#include "disas/disas.h" +#include "tcg-op.h" +#include "exec/cpu_ldst.h" +#include "exec/helper-proto.h" +#include "exec/helper-gen.h" +#include "exec/log.h" +#include "exec/gdbstub.h" +#include "exec/translator.h" +#include "exec/gen-icount.h" + +/* +* Define if you want a BREAK instruction translated to a breakpoint +* Active debugging connection is assumed +* This is for +* https://github.com/seharris/qemu-avr-tests/tree/master/instruction-tests +* tests +*/ +#undef BREAKPOINT_ON_BREAK + +static TCGv cpu_pc; + +static TCGv cpu_Cf; +static TCGv cpu_Zf; +static TCGv cpu_Nf; +static TCGv cpu_Vf; +static TCGv cpu_Sf; +static TCGv cpu_Hf; +static TCGv cpu_Tf; +static TCGv cpu_If; + +static TCGv cpu_rampD; +static TCGv cpu_rampX; +static TCGv cpu_rampY; +static TCGv cpu_rampZ; + +static TCGv cpu_r[NO_CPU_REGISTERS ]; +static TCGv cpu_eind; +static TCGv cpu_sp; + +static TCGv cpu_skip; + +static const char reg_names[NO_CPU_REGISTERS ][8 ] = { +"r0" ,"r1" ,"r2" ,"r3" ,"r4" ,"r5" ,"r6" ,"r7" , +"r8" ,"r9" ,"r10" ,"r11" ,"r12" ,"r13" ,"r14" ,"r15" , +"r16" ,"r17" ,"r18" ,"r19" ,"r20" ,"r21" ,"r22" ,"r23" , +"r24" ,"r25" ,"r26" ,"r27" ,"r28" ,"r29" ,"r30" ,"r31" , +}; +#define REG (x) (cpu_r[x]) + +enum { +DISAS_EXIT =DISAS_TARGET_0 ,/* We want return to the cpu main loop. */ +DISAS_LOOKUP =DISAS_TARGET_1 ,/* We have a variable condition exit. */ +DISAS_CHAIN =DISAS_TARGET_2 ,/* We have a single condition exit. */ +}; + +typedef struct DisasContext DisasContext ; + +/* This is the state at translation time. */ +struct DisasContext { +TranslationBlock *tb; + +CPUAVRState *env; +CPUState *cs; + +target_long npc; +uint32_t opcode; + +/* Routine used to access memory */ +int memidx; +int bstate; +int singlestep; + +TCGv skip_var0; +TCGv skip_var1; +TCGCond skip_cond; +bool free_skip_var0; +}; + +static int to_A (DisasContext *ctx,int indx) {return 16 + (indx %16 ); } +static int to_B (DisasContext *ctx,int indx) {return 16 + (indx %8 ); } +static int to_C (DisasContext *ctx,int indx) {return 24 + (indx %4 ) *2 ; } +static int to_D (DisasContext *ctx,int indx) {return (indx %16 ) *2 ; } + +static uint16_t next_word (DisasContext *ctx) +{ +return cpu_lduw_code (ctx->env, ctx->npc++ *2 ); +} + +static int append_16 (DisasContext *ctx,int x) +{ +return x <<16 |next_word (ctx); +} + + +static bool avr_have_feature (DisasContext *ctx,int feature) +{ +if (!avr_feature (ctx->env, feature)) { +gen_helper_unsupported (cpu_env); + ctx->bstate =DISAS_NORETURN ; +return false; + } +return true; +} + +static bool decode_insn (DisasContext *ctx,uint16_t insn); +#include "decode_insn.inc.c" +
Signature · 1 line
2.17.2 (Apple Git-113)
Re: [PATCH v36 04/17] target/avr: Add instruction translation - Registers definition
Quoted 104 lines · Michael Rolnik
Signed-off-by Michael Rolnik <[email protected]>--- target/avr/translate.c | 132 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 132 insertions(+) create mode 100644 target/avr/translate.ctarget/avr/translate.c new file +91
-0@@ -0,0 +1,132 @@ +/* +* QEMU AVR CPU +* +* Copyright (c) 2019 Michael Rolnik +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see +* <http://www.gnu.org/licenses/lgpl-2.1.html> +*/ + +#include "qemu/osdep.h" +#include "qemu/qemu-print.h" +#include "tcg/tcg.h" +#include "cpu.h" +#include "exec/exec-all.h" +#include "disas/disas.h" +#include "tcg-op.h" +#include "exec/cpu_ldst.h" +#include "exec/helper-proto.h" +#include "exec/helper-gen.h" +#include "exec/log.h" +#include "exec/gdbstub.h" +#include "exec/translator.h" +#include "exec/gen-icount.h" + +/* +* Define if you want a BREAK instruction translated to a breakpoint +* Active debugging connection is assumed +* This is for +* https://github.com/seharris/qemu-avr-tests/tree/master/instruction-tests +* tests +*/ +#undef BREAKPOINT_ON_BREAK + +static TCGv cpu_pc; + +static TCGv cpu_Cf; +static TCGv cpu_Zf; +static TCGv cpu_Nf; +static TCGv cpu_Vf; +static TCGv cpu_Sf; +static TCGv cpu_Hf; +static TCGv cpu_Tf; +static TCGv cpu_If; + +static TCGv cpu_rampD; +static TCGv cpu_rampX; +static TCGv cpu_rampY; +static TCGv cpu_rampZ; + +static TCGv cpu_r[NO_CPU_REGISTERS ]; +static TCGv cpu_eind; +static TCGv cpu_sp; + +static TCGv cpu_skip; + +static const char reg_names[NO_CPU_REGISTERS ][8 ] = { +"r0" ,"r1" ,"r2" ,"r3" ,"r4" ,"r5" ,"r6" ,"r7" , +"r8" ,"r9" ,"r10" ,"r11" ,"r12" ,"r13" ,"r14" ,"r15" , +"r16" ,"r17" ,"r18" ,"r19" ,"r20" ,"r21" ,"r22" ,"r23" , +"r24" ,"r25" ,"r26" ,"r27" ,"r28" ,"r29" ,"r30" ,"r31" , +}; +#define REG (x) (cpu_r[x]) + +enum { +DISAS_EXIT =DISAS_TARGET_0 ,/* We want return to the cpu main loop. */ +DISAS_LOOKUP =DISAS_TARGET_1 ,/* We have a variable condition exit. */ +DISAS_CHAIN =DISAS_TARGET_2 ,/* We have a single condition exit. */ +}; + +typedef struct DisasContext DisasContext ; + +/* This is the state at translation time. */ +struct DisasContext { +TranslationBlock *tb; + +CPUAVRState *env; +CPUState *cs; + +target_long npc; +uint32_t opcode;
target/avr/translate.c line 101
Quoted 10 lines
target/avr/translate.c new file +10
-0+ +/* Routine used to access memory */ +int memidx; +int bstate; +int singlestep; + +TCGv skip_var0; +TCGv skip_var1; +TCGCond skip_cond; +bool free_skip_var0;
This set of four lines are by far the hardest to connect to the documentation.
Please add before them a sizable comment with explanations for:
- the reson these variables are introduced
- why are they here (part of DisasContext)
- what they affect
- summary of the way they work
Perhaps add comments to other places where "skip"-related data fields are introduced.
(I believe the implementation is correct, but it is extremely hard to the reader to reverse-engineer the intentions)
Yours,
Aleksandar
Quoted 34 lines
target/avr/translate.c new file +31
-1+}; + +static int to_A (DisasContext *ctx,int indx) {return 16 + (indx %16 ); } +static int to_B (DisasContext *ctx,int indx) {return 16 + (indx %8 ); } +static int to_C (DisasContext *ctx,int indx) {return 24 + (indx %4 ) *2 ; } +static int to_D (DisasContext *ctx,int indx) {return (indx %16 ) *2 ; } + +static uint16_t next_word (DisasContext *ctx) +{ +return cpu_lduw_code (ctx->env, ctx->npc++ *2 ); +} + +static int append_16 (DisasContext *ctx,int x) +{ +return x <<16 |next_word (ctx); +} + + +static bool avr_have_feature (DisasContext *ctx,int feature) +{ +if (!avr_feature (ctx->env, feature)) { +gen_helper_unsupported (cpu_env); + ctx->bstate =DISAS_NORETURN ; +return false; + } +return true; +} + +static bool decode_insn (DisasContext *ctx,uint16_t insn); +#include "decode_insn.inc.c" + --2.17.2 (Apple Git-113)
Re: [PATCH v36 04/17] target/avr: Add instruction translation - Registers definition
Quoted 133 lines · Aleksandar Markovic
Quoted 43 lines · Michael Rolnik
Signed-off-by Michael Rolnik <[email protected]>--- target/avr/translate.c | 132 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 132 insertions(+) create mode 100644 target/avr/translate.ctarget/avr/translate.c new file +30
-0@@ -0,0 +1,132 @@ +/* +* QEMU AVR CPU +* +* Copyright (c) 2019 Michael Rolnik +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, see +* <http://www.gnu.org/licenses/lgpl-2.1.html> +*/ + +#include "qemu/osdep.h" +#include "qemu/qemu-print.h" +#include "tcg/tcg.h" +#include "cpu.h" +#include "exec/exec-all.h" +#include "disas/disas.h" +#include "tcg-op.h" +#include "exec/cpu_ldst.h" +#include "exec/helper-proto.h" +#include "exec/helper-gen.h" target/avr/translate.c line 40
Quoted 10 lines
target/avr/translate.c new file +10
-0+#include "exec/log.h" +#include "exec/gdbstub.h" +#include "exec/translator.h" +#include "exec/gen-icount.h" + +/* +* Define if you want a BREAK instruction translated to a breakpoint +* Active debugging connection is assumed +* This is for +* https://github.com/seharris/qemu-avr-tests/tree/master/instruction-tests
Quoted 26 lines
target/avr/translate.c new file +26
-0+* tests +*/ +#undef BREAKPOINT_ON_BREAK + +static TCGv cpu_pc; + +static TCGv cpu_Cf; +static TCGv cpu_Zf; +static TCGv cpu_Nf; +static TCGv cpu_Vf; +static TCGv cpu_Sf; +static TCGv cpu_Hf; +static TCGv cpu_Tf; +static TCGv cpu_If; + +static TCGv cpu_rampD; +static TCGv cpu_rampX; +static TCGv cpu_rampY; +static TCGv cpu_rampZ; + +static TCGv cpu_r[NO_CPU_REGISTERS ]; +static TCGv cpu_eind; +static TCGv cpu_sp; + +static TCGv cpu_skip; +target/avr/translate.c
Quoted 10 lines
target/avr/translate.c new file +10
-0+static const char reg_names[NO_CPU_REGISTERS ][8 ] = { +"r0" ,"r1" ,"r2" ,"r3" ,"r4" ,"r5" ,"r6" ,"r7" , +"r8" ,"r9" ,"r10" ,"r11" ,"r12" ,"r13" ,"r14" ,"r15" , +"r16" ,"r17" ,"r18" ,"r19" ,"r20" ,"r21" ,"r22" ,"r23" , +"r24" ,"r25" ,"r26" ,"r27" ,"r28" ,"r29" ,"r30" ,"r31" , +}; +#define REG (x) (cpu_r[x]) + +enum { +DISAS_EXIT =DISAS_TARGET_0 ,/* We want return to the cpu main loop. */ > + DISAS_LOOKUP = DISAS_TARGET_1, /* We have a variable condition exit. */ > + DISAS_CHAIN = DISAS_TARGET_2, /* We have a single condition exit. */Quoted 13 lines
target/avr/translate.c new file +13
-0+}; + +typedef struct DisasContext DisasContext ; + +/* This is the state at translation time. */ +struct DisasContext { +TranslationBlock *tb; + +CPUAVRState *env; +CPUState *cs; + +target_long npc; +uint32_t opcode;target/avr/translate.c line 101
Quoted 10 lines
target/avr/translate.c new file +10
-0+ +/* Routine used to access memory */ +int memidx; +int bstate; +int singlestep; + +TCGv skip_var0; +TCGv skip_var1; +TCGCond skip_cond; +bool free_skip_var0;This set of four lines are by far the hardest to connect to the documentation.
Please add before them a sizable comment with explanations for:
- the reson these variables are introduced
- why are they here (part of DisasContext)
- what they affect
- summary of the way they workPerhaps add comments to other places where "skip"-related data fields are introduced.
Quoted 7 lines
(I believe the implementation is correct, but it is extremely hard to the reader
to reverse-engineer the intentions)Yours,
Aleksandar
Aleksandar,
My original implementation was different. This piece of code belongs to Richard (he also listed as a co developer). so, if Richard has time, I prefer him to answer otherwise I will try to explain myself.
Regards,
Michael
Quoted 38 lines
target/avr/translate.c
Quoted 4 lines
target/avr/translate.c new file +3
-0+}; + +static int to_A (DisasContext *ctx,int indx) {return 16 + (indx %16 );}
target/avr/translate.c line 104
Quoted 2 lines
target/avr/translate.c new file +2
-0+static int to_B (DisasContext *ctx,int indx) {return 16 + (indx %8 ); } +static int to_C(DisasContext *ctx, int indx) { return 24 + (indx % 4) *2; }
Quoted 29 lines
target/avr/translate.c new file +26
-1+static int to_D (DisasContext *ctx,int indx) {return (indx %16 ) *2 ; } + +static uint16_t next_word (DisasContext *ctx) +{ +return cpu_lduw_code (ctx->env, ctx->npc++ *2 ); +} + +static int append_16 (DisasContext *ctx,int x) +{ +return x <<16 |next_word (ctx); +} + + +static bool avr_have_feature (DisasContext *ctx,int feature) +{ +if (!avr_feature (ctx->env, feature)) { +gen_helper_unsupported (cpu_env); + ctx->bstate =DISAS_NORETURN ; +return false; + } +return true; +} + +static bool decode_insn (DisasContext *ctx,uint16_t insn); +#include "decode_insn.inc.c" + --2.17.2 (Apple Git-113)
Signature · 2 lines
Best Regards, Michael Rolnik
Re: [PATCH v36 04/17] target/avr: Add instruction translation - Registers definition
In reply to Michael RolnikQuoted 5 lines · Michael Rolnik
Signed-off-by Michael Rolnik <[email protected]>--- target/avr/translate.c | 132 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 132 insertions(+)create mode 100644
target/avr/translate.c
PATCH v36 5/17 target/avr: Add instruction translation - Arithmetic and Logic Instructions
In reply to Michael RolnikThis includes:
- ADD, ADC, ADIW
- SBIW, SUB, SUBI, SBC, SBCI
- AND, ANDI
- OR, ORI, EOR
- COM, NEG
- INC, DEC
- MUL, MULS, MULSU
- FMUL, FMULS, FMULSU
- DES
--- target/avr/translate.c | 822 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 822 insertions(+)
target/avr/translate.c +822 -0
@@ -130,3 +130,825 @@ static bool avr_have_feature(DisasContext *ctx, int feature)static bool decode_insn (DisasContext *ctx,uint16_t insn);#include "decode_insn.inc.c" + +static void gen_add_CHf (TCGv R ,TCGv Rd,TCGv Rr) +{ +TCGv t1 =tcg_temp_new_i32 (); +TCGv t2 =tcg_temp_new_i32 (); +TCGv t3 =tcg_temp_new_i32 (); + +tcg_gen_and_tl (t1, Rd, Rr);/* t1 = Rd & Rr */ +tcg_gen_andc_tl (t2, Rd,R );/* t2 = Rd & ~R */ +tcg_gen_andc_tl (t3, Rr,R );/* t3 = Rr & ~R */ +tcg_gen_or_tl (t1, t1, t2);/* t1 = t1 | t2 | t3 */ +tcg_gen_or_tl (t1, t1, t3); + +tcg_gen_shri_tl (cpu_Cf, t1,7 );/* Cf = t1(7) */ +tcg_gen_shri_tl (cpu_Hf, t1,3 );/* Hf = t1(3) */ +tcg_gen_andi_tl (cpu_Hf, cpu_Hf,1 ); + +tcg_temp_free_i32 (t3); +tcg_temp_free_i32 (t2); +tcg_temp_free_i32 (t1); +} + + +static void gen_add_Vf (TCGv R ,TCGv Rd,TCGv Rr) +{ +TCGv t1 =tcg_temp_new_i32 (); +TCGv t2 =tcg_temp_new_i32 (); + +/* t1 = Rd & Rr & ~R | ~Rd & ~Rr & R = (Rd ^ R) & ~(Rd ^ Rr) */ +tcg_gen_xor_tl (t1, Rd,R ); +tcg_gen_xor_tl (t2, Rd, Rr); +tcg_gen_andc_tl (t1, t1, t2); + +tcg_gen_shri_tl (cpu_Vf, t1,7 );/* Vf = t1(7) */ + +tcg_temp_free_i32 (t2); +tcg_temp_free_i32 (t1); +} + + +static void gen_sub_CHf (TCGv R ,TCGv Rd,TCGv Rr) +{ +TCGv t1 =tcg_temp_new_i32 (); +TCGv t2 =tcg_temp_new_i32 (); +TCGv t3 =tcg_temp_new_i32 (); + +/* Cf & Hf */ +tcg_gen_not_tl (t1, Rd);/* t1 = ~Rd */ +tcg_gen_and_tl (t2, t1, Rr);/* t2 = ~Rd & Rr */ +tcg_gen_or_tl (t3, t1, Rr);/* t3 = (~Rd | Rr) & R */ +tcg_gen_and_tl (t3, t3,R ); +tcg_gen_or_tl (t2, t2, t3);/* t2 = ~Rd & Rr | ~Rd & R | R & Rr */ +tcg_gen_shri_tl (cpu_Cf, t2,7 );/* Cf = t2(7) */ +tcg_gen_shri_tl (cpu_Hf, t2,3 );/* Hf = t2(3) */ +tcg_gen_andi_tl (cpu_Hf, cpu_Hf,1 ); + +tcg_temp_free_i32 (t3); +tcg_temp_free_i32 (t2); +tcg_temp_free_i32 (t1); +} + + +static void gen_sub_Vf (TCGv R ,TCGv Rd,TCGv Rr) +{ +TCGv t1 =tcg_temp_new_i32 (); +TCGv t2 =tcg_temp_new_i32 (); + +/* Vf */ +/* t1 = Rd & ~Rr & ~R | ~Rd & Rr & R = (Rd ^ R) & (Rd ^ R) */ +tcg_gen_xor_tl (t1, Rd,R ); +tcg_gen_xor_tl (t2, Rd, Rr); +tcg_gen_and_tl (t1, t1, t2); +tcg_gen_shri_tl (cpu_Vf, t1,7 );/* Vf = t1(7) */ + +tcg_temp_free_i32 (t2); +tcg_temp_free_i32 (t1); +} + + +static void gen_NSf (TCGv R ) +{ +tcg_gen_shri_tl (cpu_Nf,R ,7 );/* Nf = R(7) */ +tcg_gen_xor_tl (cpu_Sf, cpu_Nf, cpu_Vf);/* Sf = Nf ^ Vf */ +} + + +static void gen_ZNSf (TCGv R ) +{ +tcg_gen_setcondi_tl (TCG_COND_EQ , cpu_Zf,R ,0 );/* Zf = R == 0 */ +tcg_gen_shri_tl (cpu_Nf,R ,7 );/* Nf = R(7) */ +tcg_gen_xor_tl (cpu_Sf, cpu_Nf, cpu_Vf);/* Sf = Nf ^ Vf */ +} + + +/* +* Adds two registers without the C Flag and places the result in the +* destination register Rd. +*/ +static bool trans_ADD (DisasContext *ctx,arg_ADD *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv Rr = cpu_r[a->rr]; +TCGv R =tcg_temp_new_i32 (); + +/* op */ +tcg_gen_add_tl (R , Rd, Rr);/* Rd = Rd + Rr */ +tcg_gen_andi_tl (R ,R ,0xff );/* make it 8 bits */ + +gen_add_CHf (R , Rd, Rr); +gen_add_Vf (R , Rd, Rr); +gen_ZNSf (R ); + +/* R */ +tcg_gen_mov_tl (Rd,R ); + +tcg_temp_free_i32 (R ); + +return true; +} + + +/* +* Adds two registers and the contents of the C Flag and places the result in +* the destination register Rd. +*/ +static bool trans_ADC (DisasContext *ctx,arg_ADC *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv Rr = cpu_r[a->rr]; +TCGv R =tcg_temp_new_i32 (); + +/* op */ +tcg_gen_add_tl (R , Rd, Rr);/* R = Rd + Rr + Cf */ +tcg_gen_add_tl (R ,R , cpu_Cf); +tcg_gen_andi_tl (R ,R ,0xff );/* make it 8 bits */ + +gen_add_CHf (R , Rd, Rr); +gen_add_Vf (R , Rd, Rr); +gen_ZNSf (R ); + +/* R */ +tcg_gen_mov_tl (Rd,R ); + +tcg_temp_free_i32 (R ); + +return true; +} + + +/* +* Subtracts an immediate value (0-63) from a register pair and places the +* result in the register pair. This instruction operates on the upper four +* register pairs, and is well suited for operations on the Pointer Registers. +* This instruction is not available in all devices. Refer to the device +* specific instruction set summary. +*/ +static bool trans_SBIW (DisasContext *ctx,arg_SBIW *a) +{ +if (!avr_have_feature (ctx,AVR_FEATURE_ADIW_SBIW )) { +return true; + } + +TCGv RdL = cpu_r[a->rd]; +TCGv RdH = cpu_r[a->rd +1 ]; +int Imm = (a->imm); +TCGv R =tcg_temp_new_i32 (); +TCGv Rd =tcg_temp_new_i32 (); + +/* op */ +tcg_gen_deposit_tl (Rd, RdL, RdH,8 ,8 );/* Rd = RdH:RdL */ +tcg_gen_subi_tl (R , Rd, Imm);/* R = Rd - Imm */ +tcg_gen_andi_tl (R ,R ,0xffff );/* make it 16 bits */ + +/* Cf */ +tcg_gen_andc_tl (cpu_Cf,R , Rd); +tcg_gen_shri_tl (cpu_Cf, cpu_Cf,15 );/* Cf = R & ~Rd */ + +/* Vf */ +tcg_gen_andc_tl (cpu_Vf, Rd,R ); +tcg_gen_shri_tl (cpu_Vf, cpu_Vf,15 );/* Vf = Rd & ~R */ + +/* Zf */ +tcg_gen_setcondi_tl (TCG_COND_EQ , cpu_Zf,R ,0 );/* Zf = R == 0 */ + +/* Nf */ +tcg_gen_shri_tl (cpu_Nf,R ,15 );/* Nf = R(15) */ + +/* Sf */ +tcg_gen_xor_tl (cpu_Sf, cpu_Nf, cpu_Vf);/* Sf = Nf ^ Vf */ + +/* R */ +tcg_gen_andi_tl (RdL,R ,0xff ); +tcg_gen_shri_tl (RdH,R ,8 ); + +tcg_temp_free_i32 (Rd); +tcg_temp_free_i32 (R ); + +return true; +} + + +/* +* Adds an immediate value (0 - 63) to a register pair and places the result +* in the register pair. This instruction operates on the upper four register +* pairs, and is well suited for operations on the pointer registers. This +* instruction is not available in all devices. Refer to the device specific +* instruction set summary. +*/ +static bool trans_ADIW (DisasContext *ctx,arg_ADIW *a) +{ +if (!avr_have_feature (ctx,AVR_FEATURE_ADIW_SBIW )) { +return true; + } + +TCGv RdL = cpu_r[a->rd]; +TCGv RdH = cpu_r[a->rd +1 ]; +int Imm = (a->imm); +TCGv R =tcg_temp_new_i32 (); +TCGv Rd =tcg_temp_new_i32 (); + +/* op */ +tcg_gen_deposit_tl (Rd, RdL, RdH,8 ,8 );/* Rd = RdH:RdL */ +tcg_gen_addi_tl (R , Rd, Imm);/* R = Rd + Imm */ +tcg_gen_andi_tl (R ,R ,0xffff );/* make it 16 bits */ + +/* Cf */ +tcg_gen_andc_tl (cpu_Cf, Rd,R );/* Cf = Rd & ~R */ +tcg_gen_shri_tl (cpu_Cf, cpu_Cf,15 ); + +/* Vf */ +tcg_gen_andc_tl (cpu_Vf,R , Rd);/* Vf = R & ~Rd */ +tcg_gen_shri_tl (cpu_Vf, cpu_Vf,15 ); + +/* Zf */ +tcg_gen_setcondi_tl (TCG_COND_EQ , cpu_Zf,R ,0 );/* Zf = R == 0 */ + +/* Nf */ +tcg_gen_shri_tl (cpu_Nf,R ,15 );/* Nf = R(15) */ + +/* Sf */ +tcg_gen_xor_tl (cpu_Sf, cpu_Nf, cpu_Vf);/* Sf = Nf ^ Vf */ + +/* R */ +tcg_gen_andi_tl (RdL,R ,0xff ); +tcg_gen_shri_tl (RdH,R ,8 ); + +tcg_temp_free_i32 (Rd); +tcg_temp_free_i32 (R ); + +return true; +} + + +/* +* Subtracts two registers and places the result in the destination +* register Rd. +*/ +static bool trans_SUB (DisasContext *ctx,arg_SUB *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv Rr = cpu_r[a->rr]; +TCGv R =tcg_temp_new_i32 (); + +/* op */ +tcg_gen_sub_tl (R , Rd, Rr);/* R = Rd - Rr */ +tcg_gen_andi_tl (R ,R ,0xff );/* make it 8 bits */ + +gen_sub_CHf (R , Rd, Rr); +gen_sub_Vf (R , Rd, Rr); +gen_ZNSf (R ); + +/* R */ +tcg_gen_mov_tl (Rd,R ); + +tcg_temp_free_i32 (R ); + +return true; +} + +/* +* Subtracts a register and a constant and places the result in the +* destination register Rd. This instruction is working on Register R16 to R31 +* and is very well suited for operations on the X, Y, and Z-pointers. +*/ +static bool trans_SUBI (DisasContext *ctx,arg_SUBI *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv Rr =tcg_const_i32 (a->imm); +TCGv R =tcg_temp_new_i32 (); + +/* op */ +tcg_gen_sub_tl (R , Rd, Rr);/* R = Rd - Imm */ +tcg_gen_andi_tl (R ,R ,0xff );/* make it 8 bits */ + +gen_sub_CHf (R , Rd, Rr); +gen_sub_Vf (R , Rd, Rr); +gen_ZNSf (R ); + +/* R */ +tcg_gen_mov_tl (Rd,R ); + +tcg_temp_free_i32 (R ); +tcg_temp_free_i32 (Rr); + +return true; +} + + +/* +* Subtracts two registers and subtracts with the C Flag and places the +* result in the destination register Rd. +*/ +static bool trans_SBC (DisasContext *ctx,arg_SBC *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv Rr = cpu_r[a->rr]; +TCGv R =tcg_temp_new_i32 (); +TCGv zero =tcg_const_i32 (0 ); + +/* op */ +tcg_gen_sub_tl (R , Rd, Rr);/* R = Rd - Rr - Cf */ +tcg_gen_sub_tl (R ,R , cpu_Cf); +tcg_gen_andi_tl (R ,R ,0xff );/* make it 8 bits */ + +gen_sub_CHf (R , Rd, Rr); +gen_sub_Vf (R , Rd, Rr); +gen_NSf (R ); + +/* +* Previous value remains unchanged when the result is zero; +* cleared otherwise. +*/ +tcg_gen_movcond_tl (TCG_COND_EQ , cpu_Zf,R , zero, cpu_Zf, zero); + +/* R */ +tcg_gen_mov_tl (Rd,R ); + +tcg_temp_free_i32 (zero); +tcg_temp_free_i32 (R ); + +return true; +} + + +/* +* SBCI -- Subtract Immediate with Carry +*/ +static bool trans_SBCI (DisasContext *ctx,arg_SBCI *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv Rr =tcg_const_i32 (a->imm); +TCGv R =tcg_temp_new_i32 (); +TCGv zero =tcg_const_i32 (0 ); + +/* op */ +tcg_gen_sub_tl (R , Rd, Rr);/* R = Rd - Rr - Cf */ +tcg_gen_sub_tl (R ,R , cpu_Cf); +tcg_gen_andi_tl (R ,R ,0xff );/* make it 8 bits */ + +gen_sub_CHf (R , Rd, Rr); +gen_sub_Vf (R , Rd, Rr); +gen_NSf (R ); + +/* +* Previous value remains unchanged when the result is zero; +* cleared otherwise. +*/ +tcg_gen_movcond_tl (TCG_COND_EQ , cpu_Zf,R , zero, cpu_Zf, zero); + +/* R */ +tcg_gen_mov_tl (Rd,R ); + +tcg_temp_free_i32 (zero); +tcg_temp_free_i32 (R ); +tcg_temp_free_i32 (Rr); + +return true; +} + + +/* +* Performs the logical AND between the contents of register Rd and register +* Rr and places the result in the destination register Rd. +*/ +static bool trans_AND (DisasContext *ctx,arg_AND *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv Rr = cpu_r[a->rr]; +TCGv R =tcg_temp_new_i32 (); + +/* op */ +tcg_gen_and_tl (R , Rd, Rr);/* Rd = Rd and Rr */ + +/* Vf */ +tcg_gen_movi_tl (cpu_Vf,0 );/* Vf = 0 */ + +/* Zf */ +tcg_gen_setcondi_tl (TCG_COND_EQ , cpu_Zf,R ,0 );/* Zf = R == 0 */ + +gen_ZNSf (R ); + +/* R */ +tcg_gen_mov_tl (Rd,R ); + +tcg_temp_free_i32 (R ); + +return true; +} + + +/* +* Performs the logical AND between the contents of register Rd and a constant +* and places the result in the destination register Rd. +*/ +static bool trans_ANDI (DisasContext *ctx,arg_ANDI *a) +{ +TCGv Rd = cpu_r[a->rd]; +int Imm = (a->imm); + +/* op */ +tcg_gen_andi_tl (Rd, Rd, Imm);/* Rd = Rd & Imm */ + +tcg_gen_movi_tl (cpu_Vf,0x00 );/* Vf = 0 */ +gen_ZNSf (Rd); + +return true; +} + + +/* +* Performs the logical OR between the contents of register Rd and register +* Rr and places the result in the destination register Rd. +*/ +static bool trans_OR (DisasContext *ctx,arg_OR *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv Rr = cpu_r[a->rr]; +TCGv R =tcg_temp_new_i32 (); + +tcg_gen_or_tl (R , Rd, Rr); + +tcg_gen_movi_tl (cpu_Vf,0 ); +gen_ZNSf (R ); + +tcg_gen_mov_tl (Rd,R ); + +tcg_temp_free_i32 (R ); + +return true; +} + + +/* +* Performs the logical OR between the contents of register Rd and a +* constant and places the result in the destination register Rd. +*/ +static bool trans_ORI (DisasContext *ctx,arg_ORI *a) +{ +TCGv Rd = cpu_r[a->rd]; +int Imm = (a->imm); + +tcg_gen_ori_tl (Rd, Rd, Imm);/* Rd = Rd | Imm */ + +tcg_gen_movi_tl (cpu_Vf,0x00 );/* Vf = 0 */ +gen_ZNSf (Rd); + +return true; +} + + +/* +* Performs the logical EOR between the contents of register Rd and +* register Rr and places the result in the destination register Rd. +*/ +static bool trans_EOR (DisasContext *ctx,arg_EOR *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv Rr = cpu_r[a->rr]; + +tcg_gen_xor_tl (Rd, Rd, Rr); + +tcg_gen_movi_tl (cpu_Vf,0 ); +gen_ZNSf (Rd); + +return true; +} + + +/* +* Clears the specified bits in register Rd. Performs the logical AND +* between the contents of register Rd and the complement of the constant mask +* K. The result will be placed in register Rd. +*/ +static bool trans_COM (DisasContext *ctx,arg_COM *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv R =tcg_temp_new_i32 (); + +tcg_gen_xori_tl (Rd, Rd,0xff ); + +tcg_gen_movi_tl (cpu_Cf,1 );/* Cf = 1 */ +tcg_gen_movi_tl (cpu_Vf,0 );/* Vf = 0 */ +gen_ZNSf (Rd); + +tcg_temp_free_i32 (R ); + +return true; +} + + +/* +* Replaces the contents of register Rd with its two's complement; the +* value $80 is left unchanged. +*/ +static bool trans_NEG (DisasContext *ctx,arg_NEG *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv t0 =tcg_const_i32 (0 ); +TCGv R =tcg_temp_new_i32 (); + +/* op */ +tcg_gen_sub_tl (R , t0, Rd);/* R = 0 - Rd */ +tcg_gen_andi_tl (R ,R ,0xff );/* make it 8 bits */ + +gen_sub_CHf (R , t0, Rd); +gen_sub_Vf (R , t0, Rd); +gen_ZNSf (R ); + +/* R */ +tcg_gen_mov_tl (Rd,R ); + +tcg_temp_free_i32 (t0); +tcg_temp_free_i32 (R ); + +return true; +} + + +/* +* Adds one -1- to the contents of register Rd and places the result in the +* destination register Rd. The C Flag in SREG is not affected by the +* operation, thus allowing the INC instruction to be used on a loop counter in +* multiple-precision computations. When operating on unsigned numbers, only +* BREQ and BRNE branches can be expected to perform consistently. When +* operating on two's complement values, all signed branches are available. +*/ +static bool trans_INC (DisasContext *ctx,arg_INC *a) +{ +TCGv Rd = cpu_r[a->rd]; + +tcg_gen_addi_tl (Rd, Rd,1 ); +tcg_gen_andi_tl (Rd, Rd,0xff ); + +/* cpu_Vf = Rd == 0x80 */ +tcg_gen_setcondi_tl (TCG_COND_EQ , cpu_Vf, Rd,0x80 ); +gen_ZNSf (Rd); + +return true; +} + + +/* +* Subtracts one -1- from the contents of register Rd and places the result +* in the destination register Rd. The C Flag in SREG is not affected by the +* operation, thus allowing the DEC instruction to be used on a loop counter in +* multiple-precision computations. When operating on unsigned values, only +* BREQ and BRNE branches can be expected to perform consistently. When +* operating on two's complement values, all signed branches are available. +*/ +static bool trans_DEC (DisasContext *ctx,arg_DEC *a) +{ +TCGv Rd = cpu_r[a->rd]; + +tcg_gen_subi_tl (Rd, Rd,1 );/* Rd = Rd - 1 */ +tcg_gen_andi_tl (Rd, Rd,0xff );/* make it 8 bits */ + +/* cpu_Vf = Rd == 0x7f */ +tcg_gen_setcondi_tl (TCG_COND_EQ , cpu_Vf, Rd,0x7f ); +gen_ZNSf (Rd); + +return true; +} + + +/* +* This instruction performs 8-bit x 8-bit -> 16-bit unsigned multiplication. +*/ +static bool trans_MUL (DisasContext *ctx,arg_MUL *a) +{ +if (!avr_have_feature (ctx,AVR_FEATURE_MUL )) { +return true; + } + +TCGv R0 = cpu_r[0 ]; +TCGv R1 = cpu_r[1 ]; +TCGv Rd = cpu_r[a->rd]; +TCGv Rr = cpu_r[a->rr]; +TCGv R =tcg_temp_new_i32 (); + +tcg_gen_mul_tl (R , Rd, Rr);/* R = Rd * Rr */ + +tcg_gen_andi_tl (R0 ,R ,0xff ); +tcg_gen_shri_tl (R1 ,R ,8 ); + +tcg_gen_shri_tl (cpu_Cf,R ,15 );/* Cf = R(15) */ +tcg_gen_setcondi_tl (TCG_COND_EQ , cpu_Zf,R ,0 );/* Zf = R == 0 */ + +tcg_temp_free_i32 (R ); + +return true; +} + + +/* +* This instruction performs 8-bit x 8-bit -> 16-bit signed multiplication. +*/ +static bool trans_MULS (DisasContext *ctx,arg_MULS *a) +{ +if (!avr_have_feature (ctx,AVR_FEATURE_MUL )) { +return true; + } + +TCGv R0 = cpu_r[0 ]; +TCGv R1 = cpu_r[1 ]; +TCGv Rd = cpu_r[a->rd]; +TCGv Rr = cpu_r[a->rr]; +TCGv R =tcg_temp_new_i32 (); +TCGv t0 =tcg_temp_new_i32 (); +TCGv t1 =tcg_temp_new_i32 (); + +tcg_gen_ext8s_tl (t0, Rd);/* make Rd full 32 bit signed */ +tcg_gen_ext8s_tl (t1, Rr);/* make Rr full 32 bit signed */ +tcg_gen_mul_tl (R , t0, t1);/* R = Rd * Rr */ +tcg_gen_andi_tl (R ,R ,0xffff );/* make it 16 bits */ + +tcg_gen_andi_tl (R0 ,R ,0xff ); +tcg_gen_shri_tl (R1 ,R ,8 ); + +tcg_gen_shri_tl (cpu_Cf,R ,15 );/* Cf = R(15) */ +tcg_gen_setcondi_tl (TCG_COND_EQ , cpu_Zf,R ,0 );/* Zf = R == 0 */ + +tcg_temp_free_i32 (t1); +tcg_temp_free_i32 (t0); +tcg_temp_free_i32 (R ); + +return true; +} + + +/* +* This instruction performs 8-bit x 8-bit -> 16-bit multiplication of a +* signed and an unsigned number. +*/ +static bool trans_MULSU (DisasContext *ctx,arg_MULSU *a) +{ +if (!avr_have_feature (ctx,AVR_FEATURE_MUL )) { +return true; + } + +TCGv R0 = cpu_r[0 ]; +TCGv R1 = cpu_r[1 ]; +TCGv Rd = cpu_r[a->rd]; +TCGv Rr = cpu_r[a->rr]; +TCGv R =tcg_temp_new_i32 (); +TCGv t0 =tcg_temp_new_i32 (); + +tcg_gen_ext8s_tl (t0, Rd);/* make Rd full 32 bit signed */ +tcg_gen_mul_tl (R , t0, Rr);/* R = Rd *Rr */ + +tcg_gen_andi_tl (R0 ,R ,0xff ); +tcg_gen_shri_tl (R1 ,R ,8 ); + +tcg_gen_shri_tl (cpu_Cf,R ,16 );/* Cf = R(16) */ +tcg_gen_mov_tl (cpu_Zf,R ); + +tcg_temp_free_i32 (t0); +tcg_temp_free_i32 (R ); + +return true; +} + + +/* +* This instruction performs 8-bit x 8-bit -> 16-bit unsigned +* multiplication and shifts the result one bit left. +*/ +static bool trans_FMUL (DisasContext *ctx,arg_FMUL *a) +{ +if (!avr_have_feature (ctx,AVR_FEATURE_MUL )) { +return true; + } + +TCGv R0 = cpu_r[0 ]; +TCGv R1 = cpu_r[1 ]; +TCGv Rd = cpu_r[a->rd]; +TCGv Rr = cpu_r[a->rr]; +TCGv R =tcg_temp_new_i32 (); + +tcg_gen_mul_tl (R , Rd, Rr);/* R = Rd * Rr */ + +tcg_gen_shri_tl (cpu_Cf,R ,15 );/* Cf = R(15) */ +tcg_gen_setcondi_tl (TCG_COND_EQ , cpu_Zf,R ,0 );/* Zf = R == 0 */ + +tcg_gen_shli_tl (R ,R ,1 ); + +tcg_gen_andi_tl (R0 ,R ,0xff ); +tcg_gen_shri_tl (R1 ,R ,8 ); +tcg_gen_andi_tl (R1 ,R1 ,0xff ); + + +tcg_temp_free_i32 (R ); + +return true; +} + + +/* +* This instruction performs 8-bit x 8-bit -> 16-bit signed multiplication +* and shifts the result one bit left. +*/ +static bool trans_FMULS (DisasContext *ctx,arg_FMULS *a) +{ +if (!avr_have_feature (ctx,AVR_FEATURE_MUL )) { +return true; + } + +TCGv R0 = cpu_r[0 ]; +TCGv R1 = cpu_r[1 ]; +TCGv Rd = cpu_r[a->rd]; +TCGv Rr = cpu_r[a->rr]; +TCGv R =tcg_temp_new_i32 (); +TCGv t0 =tcg_temp_new_i32 (); +TCGv t1 =tcg_temp_new_i32 (); + +tcg_gen_ext8s_tl (t0, Rd);/* make Rd full 32 bit signed */ +tcg_gen_ext8s_tl (t1, Rr);/* make Rr full 32 bit signed */ +tcg_gen_mul_tl (R , t0, t1);/* R = Rd * Rr */ +tcg_gen_andi_tl (R ,R ,0xffff );/* make it 16 bits */ + +tcg_gen_shri_tl (cpu_Cf,R ,15 );/* Cf = R(15) */ +tcg_gen_setcondi_tl (TCG_COND_EQ , cpu_Zf,R ,0 );/* Zf = R == 0 */ + +tcg_gen_shli_tl (R ,R ,1 ); + +tcg_gen_andi_tl (R0 ,R ,0xff ); +tcg_gen_shri_tl (R1 ,R ,8 ); +tcg_gen_andi_tl (R1 ,R1 ,0xff ); + +tcg_temp_free_i32 (t1); +tcg_temp_free_i32 (t0); +tcg_temp_free_i32 (R ); + +return true; +} + + +/* +* This instruction performs 8-bit x 8-bit -> 16-bit signed multiplication +* and shifts the result one bit left. +*/ +static bool trans_FMULSU (DisasContext *ctx,arg_FMULSU *a) +{ +if (!avr_have_feature (ctx,AVR_FEATURE_MUL )) { +return true; + } + +TCGv R0 = cpu_r[0 ]; +TCGv R1 = cpu_r[1 ]; +TCGv Rd = cpu_r[a->rd]; +TCGv Rr = cpu_r[a->rr]; +TCGv R =tcg_temp_new_i32 (); +TCGv t0 =tcg_temp_new_i32 (); + +tcg_gen_ext8s_tl (t0, Rd);/* make Rd full 32 bit signed */ +tcg_gen_mul_tl (R , t0, Rr);/* R = Rd * Rr */ +tcg_gen_andi_tl (R ,R ,0xffff );/* make it 16 bits */ + +tcg_gen_shri_tl (cpu_Cf,R ,15 );/* Cf = R(15) */ +tcg_gen_setcondi_tl (TCG_COND_EQ , cpu_Zf,R ,0 );/* Zf = R == 0 */ + +tcg_gen_shli_tl (R ,R ,1 ); + +tcg_gen_andi_tl (R0 ,R ,0xff ); +tcg_gen_shri_tl (R1 ,R ,8 ); +tcg_gen_andi_tl (R1 ,R1 ,0xff ); + +tcg_temp_free_i32 (t0); +tcg_temp_free_i32 (R ); + +return true; +} + + +/* +* The module is an instruction set extension to the AVR CPU, performing +* DES iterations. The 64-bit data block (plaintext or ciphertext) is placed in +* the CPU register file, registers R0-R7, where LSB of data is placed in LSB +* of R0 and MSB of data is placed in MSB of R7. The full 64-bit key (including +* parity bits) is placed in registers R8- R15, organized in the register file +* with LSB of key in LSB of R8 and MSB of key in MSB of R15. Executing one DES +* instruction performs one round in the DES algorithm. Sixteen rounds must be +* executed in increasing order to form the correct DES ciphertext or +* plaintext. Intermediate results are stored in the register file (R0-R15) +* after each DES instruction. The instruction's operand (K) determines which +* round is executed, and the half carry flag (H) determines whether encryption +* or decryption is performed. The DES algorithm is described in +* "Specifications for the Data Encryption Standard" (Federal Information +* Processing Standards Publication 46). Intermediate results in this +* implementation differ from the standard because the initial permutation and +* the inverse initial permutation are performed each iteration. This does not +* affect the result in the final ciphertext or plaintext, but reduces +* execution time. +*/ +static bool trans_DES (DisasContext *ctx,arg_DES *a) +{ +/* TODO */ +if (!avr_have_feature (ctx,AVR_FEATURE_DES )) { +return true; + } + +return true; +}
Signature · 1 line
2.17.2 (Apple Git-113)
Re: [PATCH v36 05/17] target/avr: Add instruction translation - Arithmetic and Logic Instructions
Quoted 11 lines · Michael Rolnik
This includes:
- ADD, ADC, ADIW
- SBIW, SUB, SUBI, SBC, SBCI
- AND, ANDI
- OR, ORI, EOR
- COM, NEG
- INC, DEC
- MUL, MULS, MULSU
- FMUL, FMULS, FMULSU
- DES
Quoted 4 lines
Signed-off-by Michael Rolnik <[email protected]>--- target/avr/translate.c | 822 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 822 insertions(+)
PATCH v36 6/17 target/avr: Add instruction translation - Branch Instructions
In reply to Michael RolnikThis includes:
- RJMP, IJMP, EIJMP, JMP
- RCALL, ICALL, EICALL, CALL
- RET, RETI
- CPSE, CP, CPC, CPI
- SBRC, SBRS, SBIC, SBIS
- BRBC, BRBS
--- target/avr/translate.c | 549 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 546 insertions(+), 3 deletions(-)
target/avr/translate.c +546 -3
@@ -224,6 +224,86 @@ static void gen_ZNSf(TCGv R) } +static void gen_push_ret (DisasContext *ctx,int ret) +{ +if (avr_feature (ctx->env,AVR_FEATURE_1_BYTE_PC )) { + +TCGv t0 =tcg_const_i32 ((ret &0x0000ff )); + +tcg_gen_qemu_st_tl (t0, cpu_sp,MMU_DATA_IDX ,MO_UB ); +tcg_gen_subi_tl (cpu_sp, cpu_sp,1 ); + +tcg_temp_free_i32 (t0); + }else if (avr_feature (ctx->env,AVR_FEATURE_2_BYTE_PC )) { + +TCGv t0 =tcg_const_i32 ((ret &0x00ffff )); + +tcg_gen_subi_tl (cpu_sp, cpu_sp,1 ); +tcg_gen_qemu_st_tl (t0, cpu_sp,MMU_DATA_IDX ,MO_BEUW ); +tcg_gen_subi_tl (cpu_sp, cpu_sp,1 ); + +tcg_temp_free_i32 (t0); + + }else if (avr_feature (ctx->env,AVR_FEATURE_3_BYTE_PC )) { + +TCGv lo =tcg_const_i32 ((ret &0x0000ff )); +TCGv hi =tcg_const_i32 ((ret &0xffff00 ) >>8 ); + +tcg_gen_qemu_st_tl (lo, cpu_sp,MMU_DATA_IDX ,MO_UB ); +tcg_gen_subi_tl (cpu_sp, cpu_sp,2 ); +tcg_gen_qemu_st_tl (hi, cpu_sp,MMU_DATA_IDX ,MO_BEUW ); +tcg_gen_subi_tl (cpu_sp, cpu_sp,1 ); + +tcg_temp_free_i32 (lo); +tcg_temp_free_i32 (hi); + } +} + + +static void gen_pop_ret (DisasContext *ctx,TCGv ret) +{ +if (avr_feature (ctx->env,AVR_FEATURE_1_BYTE_PC )) { +tcg_gen_addi_tl (cpu_sp, cpu_sp,1 ); +tcg_gen_qemu_ld_tl (ret, cpu_sp,MMU_DATA_IDX ,MO_UB ); + }else if (avr_feature (ctx->env,AVR_FEATURE_2_BYTE_PC )) { +tcg_gen_addi_tl (cpu_sp, cpu_sp,1 ); +tcg_gen_qemu_ld_tl (ret, cpu_sp,MMU_DATA_IDX ,MO_BEUW ); +tcg_gen_addi_tl (cpu_sp, cpu_sp,1 ); + }else if (avr_feature (ctx->env,AVR_FEATURE_3_BYTE_PC )) { +TCGv lo =tcg_temp_new_i32 (); +TCGv hi =tcg_temp_new_i32 (); + +tcg_gen_addi_tl (cpu_sp, cpu_sp,1 ); +tcg_gen_qemu_ld_tl (hi, cpu_sp,MMU_DATA_IDX ,MO_BEUW ); + +tcg_gen_addi_tl (cpu_sp, cpu_sp,2 ); +tcg_gen_qemu_ld_tl (lo, cpu_sp,MMU_DATA_IDX ,MO_UB ); + +tcg_gen_deposit_tl (ret, lo, hi,8 ,16 ); + +tcg_temp_free_i32 (lo); +tcg_temp_free_i32 (hi); + } +} + + +static void gen_goto_tb (DisasContext *ctx,int n,target_ulong dest) +{ +TranslationBlock *tb = ctx->tb; + +if (ctx->singlestep ==0 ) { +tcg_gen_goto_tb (n); +tcg_gen_movi_i32 (cpu_pc, dest); +tcg_gen_exit_tb (tb, n); + }else { +tcg_gen_movi_i32 (cpu_pc, dest); +gen_helper_debug (cpu_env); +tcg_gen_exit_tb (NULL ,0 ); + } + ctx->bstate =DISAS_NORETURN ; +} + +/* * Adds two registers without the C Flag and places the result in the * destination register Rd.
@@ -797,13 +877,14 @@ static bool trans_MULSU(DisasContext *ctx, arg_MULSU *a)TCGv t0 =tcg_temp_new_i32 ();tcg_gen_ext8s_tl (t0, Rd);/* make Rd full 32 bit signed */ -tcg_gen_mul_tl (R , t0, Rr);/* R = Rd *Rr */ +tcg_gen_mul_tl (R , t0, Rr);/* R = Rd * Rr */ +tcg_gen_andi_tl (R ,R ,0xffff );/* make R 16 bits */ tcg_gen_andi_tl (R0 ,R ,0xff );tcg_gen_shri_tl (R1 ,R ,8 ); -tcg_gen_shri_tl (cpu_Cf,R ,16 );/* Cf = R(16) */ -tcg_gen_mov_tl (cpu_Zf,R ); +tcg_gen_shri_tl (cpu_Cf,R ,15 );/* Cf = R(15) */ +tcg_gen_setcondi_tl (TCG_COND_EQ , cpu_Zf,R ,0 );/* Zf = R == 0 */ tcg_temp_free_i32 (t0);tcg_temp_free_i32 (R );
@@ -952,3 +1033,465 @@ static bool trans_DES(DisasContext *ctx, arg_DES *a)return true; } + + +/* +* Relative jump to an address within PC - 2K +1 and PC + 2K (words). For +* AVR microcontrollers with Program memory not exceeding 4K words (8KB) this +* instruction can address the entire memory from every address location. See +* also JMP. +*/ +static bool trans_RJMP (DisasContext *ctx,arg_RJMP *a) +{ +int dst = ctx->npc + a->imm; + +gen_goto_tb (ctx,0 , dst); + +return true; +} + + +/* +* Indirect jump to the address pointed to by the Z (16 bits) Pointer +* Register in the Register File. The Z-pointer Register is 16 bits wide and +* allows jump within the lowest 64K words (128KB) section of Program memory. +* This instruction is not available in all devices. Refer to the device +* specific instruction set summary. +*/ +static bool trans_IJMP (DisasContext *ctx,arg_IJMP *a) +{ +if (!avr_have_feature (ctx,AVR_FEATURE_IJMP_ICALL )) { +return true; + } + +gen_jmp_z (ctx); + +return true; +} + + +/* +* Indirect jump to the address pointed to by the Z (16 bits) Pointer +* Register in the Register File and the EIND Register in the I/O space. This +* instruction allows for indirect jumps to the entire 4M (words) Program +* memory space. See also IJMP. This instruction is not available in all +* devices. Refer to the device specific instruction set summary. +*/ +static bool trans_EIJMP (DisasContext *ctx,arg_EIJMP *a) +{ +if (!avr_have_feature (ctx,AVR_FEATURE_EIJMP_EICALL )) { +return true; + } + +gen_jmp_ez (ctx); +return true; +} + + +/* +* Jump to an address within the entire 4M (words) Program memory. See also +* RJMP. This instruction is not available in all devices. Refer to the device +* specific instruction set summary.0 +*/ +static bool trans_JMP (DisasContext *ctx,arg_JMP *a) +{ +if (!avr_have_feature (ctx,AVR_FEATURE_JMP_CALL )) { +return true; + } + +gen_goto_tb (ctx,0 , a->imm); + +return true; +} + + +/* +* Relative call to an address within PC - 2K + 1 and PC + 2K (words). The +* return address (the instruction after the RCALL) is stored onto the Stack. +* See also CALL. For AVR microcontrollers with Program memory not exceeding 4K +* words (8KB) this instruction can address the entire memory from every +* address location. The Stack Pointer uses a post-decrement scheme during +* RCALL. +*/ +static bool trans_RCALL (DisasContext *ctx,arg_RCALL *a) +{ +int ret = ctx->npc; +int dst = ctx->npc + a->imm; + +gen_push_ret (ctx, ret); +gen_goto_tb (ctx,0 , dst); + +return true; +} + + +/* +* Calls to a subroutine within the entire 4M (words) Program memory. The +* return address (to the instruction after the CALL) will be stored onto the +* Stack. See also RCALL. The Stack Pointer uses a post-decrement scheme during +* CALL. This instruction is not available in all devices. Refer to the device +* specific instruction set summary. +*/ +static bool trans_ICALL (DisasContext *ctx,arg_ICALL *a) +{ +if (!avr_have_feature (ctx,AVR_FEATURE_IJMP_ICALL )) { +return true; + } + +int ret = ctx->npc; + +gen_push_ret (ctx, ret); +gen_jmp_z (ctx); + +return true; +} + + +/* +* Indirect call of a subroutine pointed to by the Z (16 bits) Pointer +* Register in the Register File and the EIND Register in the I/O space. This +* instruction allows for indirect calls to the entire 4M (words) Program +* memory space. See also ICALL. The Stack Pointer uses a post-decrement scheme +* during EICALL. This instruction is not available in all devices. Refer to +* the device specific instruction set summary. +*/ +static bool trans_EICALL (DisasContext *ctx,arg_EICALL *a) +{ +if (!avr_have_feature (ctx,AVR_FEATURE_EIJMP_EICALL )) { +return true; + } + +int ret = ctx->npc; + +gen_push_ret (ctx, ret); +gen_jmp_ez (ctx); +return true; +} + + +/* +* Calls to a subroutine within the entire Program memory. The return +* address (to the instruction after the CALL) will be stored onto the Stack. +* (See also RCALL). The Stack Pointer uses a post-decrement scheme during +* CALL. This instruction is not available in all devices. Refer to the device +* specific instruction set summary. +*/ +static bool trans_CALL (DisasContext *ctx,arg_CALL *a) +{ +if (!avr_have_feature (ctx,AVR_FEATURE_JMP_CALL )) { +return true; + } + +int Imm = a->imm; +int ret = ctx->npc; + +gen_push_ret (ctx, ret); +gen_goto_tb (ctx,0 , Imm); + +return true; +} + + +/* +* Returns from subroutine. The return address is loaded from the STACK. +* The Stack Pointer uses a preincrement scheme during RET. +*/ +static bool trans_RET (DisasContext *ctx,arg_RET *a) +{ +gen_pop_ret (ctx, cpu_pc); + + ctx->bstate =DISAS_LOOKUP ; +return true; +} + + +/* +* Returns from interrupt. The return address is loaded from the STACK and +* the Global Interrupt Flag is set. Note that the Status Register is not +* automatically stored when entering an interrupt routine, and it is not +* restored when returning from an interrupt routine. This must be handled by +* the application program. The Stack Pointer uses a pre-increment scheme +* during RETI. +*/ +static bool trans_RETI (DisasContext *ctx,arg_RETI *a) +{ +gen_pop_ret (ctx, cpu_pc); +tcg_gen_movi_tl (cpu_If,1 ); + +/* Need to return to main loop to re-evaluate interrupts. */ + ctx->bstate =DISAS_EXIT ; +return true; +} + + +/* +* This instruction performs a compare between two registers Rd and Rr, and +* skips the next instruction if Rd = Rr. +*/ +static bool trans_CPSE (DisasContext *ctx,arg_CPSE *a) +{ + ctx->skip_cond =TCG_COND_EQ ; + ctx->skip_var0 = cpu_r[a->rd]; + ctx->skip_var1 = cpu_r[a->rr]; +return true; +} + + +/* +* This instruction performs a compare between two registers Rd and Rr. +* None of the registers are changed. All conditional branches can be used +* after this instruction. +*/ +static bool trans_CP (DisasContext *ctx,arg_CP *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv Rr = cpu_r[a->rr]; +TCGv R =tcg_temp_new_i32 (); + +/* op */ +tcg_gen_sub_tl (R , Rd, Rr);/* R = Rd - Rr */ +tcg_gen_andi_tl (R ,R ,0xff );/* make it 8 bits */ + +gen_sub_CHf (R , Rd, Rr); +gen_sub_Vf (R , Rd, Rr); +gen_ZNSf (R ); + +tcg_temp_free_i32 (R ); + +return true; +} + + +/* +* This instruction performs a compare between two registers Rd and Rr and +* also takes into account the previous carry. None of the registers are +* changed. All conditional branches can be used after this instruction. +*/ +static bool trans_CPC (DisasContext *ctx,arg_CPC *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv Rr = cpu_r[a->rr]; +TCGv R =tcg_temp_new_i32 (); +TCGv zero =tcg_const_i32 (0 ); + +/* op */ +tcg_gen_sub_tl (R , Rd, Rr);/* R = Rd - Rr - Cf */ +tcg_gen_sub_tl (R ,R , cpu_Cf); +tcg_gen_andi_tl (R ,R ,0xff );/* make it 8 bits */ + +gen_sub_CHf (R , Rd, Rr); +gen_sub_Vf (R , Rd, Rr); +gen_NSf (R ); + +/* +* Previous value remains unchanged when the result is zero; +* cleared otherwise. +*/ +tcg_gen_movcond_tl (TCG_COND_EQ , cpu_Zf,R , zero, cpu_Zf, zero); + +tcg_temp_free_i32 (zero); +tcg_temp_free_i32 (R ); + +return true; +} + + +/* +* This instruction performs a compare between register Rd and a constant. +* The register is not changed. All conditional branches can be used after this +* instruction. +*/ +static bool trans_CPI (DisasContext *ctx,arg_CPI *a) +{ +TCGv Rd = cpu_r[a->rd]; +int Imm = a->imm; +TCGv Rr =tcg_const_i32 (Imm); +TCGv R =tcg_temp_new_i32 (); + +/* op */ +tcg_gen_sub_tl (R , Rd, Rr);/* R = Rd - Rr */ +tcg_gen_andi_tl (R ,R ,0xff );/* make it 8 bits */ + +gen_sub_CHf (R , Rd, Rr); +gen_sub_Vf (R , Rd, Rr); +gen_ZNSf (R ); + +tcg_temp_free_i32 (R ); +tcg_temp_free_i32 (Rr); + +return true; +} + + +/* +* This instruction tests a single bit in a register and skips the next +* instruction if the bit is cleared. +*/ +static bool trans_SBRC (DisasContext *ctx,arg_SBRC *a) +{ +TCGv Rr = cpu_r[a->rr]; + + ctx->skip_cond =TCG_COND_EQ ; + ctx->skip_var0 =tcg_temp_new (); + ctx->free_skip_var0 = true; + +tcg_gen_andi_tl (ctx->skip_var0, Rr,1 << a->bit); +return true; +} + + +/* +* This instruction tests a single bit in a register and skips the next +* instruction if the bit is set. +*/ +static bool trans_SBRS (DisasContext *ctx,arg_SBRS *a) +{ +TCGv Rr = cpu_r[a->rr]; + + ctx->skip_cond =TCG_COND_NE ; + ctx->skip_var0 =tcg_temp_new (); + ctx->free_skip_var0 = true; + +tcg_gen_andi_tl (ctx->skip_var0, Rr,1 << a->bit); +return true; +} + + +/* +* This instruction tests a single bit in an I/O Register and skips the +* next instruction if the bit is cleared. This instruction operates on the +* lower 32 I/O Registers -- addresses 0-31. +*/ +static bool trans_SBIC (DisasContext *ctx,arg_SBIC *a) +{ +TCGv temp =tcg_const_i32 (a->reg); + +gen_helper_inb (temp, cpu_env, temp); +tcg_gen_andi_tl (temp, temp,1 << a->bit); + ctx->skip_cond =TCG_COND_EQ ; + ctx->skip_var0 = temp; + ctx->free_skip_var0 = true; + +return true; +} + + +/* +* This instruction tests a single bit in an I/O Register and skips the +* next instruction if the bit is set. This instruction operates on the lower +* 32 I/O Registers -- addresses 0-31. +*/ +static bool trans_SBIS (DisasContext *ctx,arg_SBIS *a) +{ +TCGv temp =tcg_const_i32 (a->reg); + +gen_helper_inb (temp, cpu_env, temp); +tcg_gen_andi_tl (temp, temp,1 << a->bit); + ctx->skip_cond =TCG_COND_NE ; + ctx->skip_var0 = temp; + ctx->free_skip_var0 = true; + +return true; +} + + +/* +* Conditional relative branch. Tests a single bit in SREG and branches +* relatively to PC if the bit is cleared. This instruction branches relatively +* to PC in either direction (PC - 63 < = destination <= PC + 64). The +* parameter k is the offset from PC and is represented in two's complement +* form. +*/ +static bool trans_BRBC (DisasContext *ctx,arg_BRBC *a) +{ +TCGLabel *not_taken =gen_new_label (); + +TCGv var; + +switch (a->bit) { +case 0x00 : + var = cpu_Cf; +break ; +case 0x01 : + var = cpu_Zf; +break ; +case 0x02 : + var = cpu_Nf; +break ; +case 0x03 : + var = cpu_Vf; +break ; +case 0x04 : + var = cpu_Sf; +break ; +case 0x05 : + var = cpu_Hf; +break ; +case 0x06 : + var = cpu_Tf; +break ; +case 0x07 : + var = cpu_If; +break ; +default : +g_assert_not_reached (); + } + +tcg_gen_brcondi_i32 (TCG_COND_NE , var,0 , not_taken); +gen_goto_tb (ctx,0 , ctx->npc + a->imm); +gen_set_label (not_taken); + + ctx->bstate =DISAS_CHAIN ; +return true; +} + + +/* +* Conditional relative branch. Tests a single bit in SREG and branches +* relatively to PC if the bit is set. This instruction branches relatively to +* PC in either direction (PC - 63 < = destination <= PC + 64). The parameter k +* is the offset from PC and is represented in two's complement form. +*/ +static bool trans_BRBS (DisasContext *ctx,arg_BRBS *a) +{ +TCGLabel *not_taken =gen_new_label (); + +TCGv var; + +switch (a->bit) { +case 0x00 : + var = cpu_Cf; +break ; +case 0x01 : + var = cpu_Zf; +break ; +case 0x02 : + var = cpu_Nf; +break ; +case 0x03 : + var = cpu_Vf; +break ; +case 0x04 : + var = cpu_Sf; +break ; +case 0x05 : + var = cpu_Hf; +break ; +case 0x06 : + var = cpu_Tf; +break ; +case 0x07 : + var = cpu_If; +break ; +default : +g_assert_not_reached (); + } + +tcg_gen_brcondi_i32 (TCG_COND_EQ , var,0 , not_taken); +gen_goto_tb (ctx,0 , ctx->npc + a->imm); +gen_set_label (not_taken); + + ctx->bstate =DISAS_CHAIN ; +return true; +} +
Signature · 1 line
2.17.2 (Apple Git-113)
Re: [PATCH v36 06/17] target/avr: Add instruction translation - Branch Instructions
Quoted 8 lines · Michael Rolnik
This includes:
- RJMP, IJMP, EIJMP, JMP
- RCALL, ICALL, EICALL, CALL
- RET, RETI
- CPSE, CP, CPC, CPI
- SBRC, SBRS, SBIC, SBIS
- BRBC, BRBS
Quoted 4 lines
Signed-off-by Michael Rolnik <[email protected]>--- target/avr/translate.c | 549 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 546 insertions(+), 3 deletions(-)
PATCH v36 7/17 target/avr: Add instruction translation - Bit and Bit-test Instructions
In reply to Michael RolnikThis includes:
- LSR, ROR
- ASR
- SWAP
- SBI, CBI
- BST, BLD
- BSET, BCLR
--- target/avr/translate.c | 1123 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1123 insertions(+)
target/avr/translate.c +1123 -0
@@ -304,6 +304,15 @@ static void gen_goto_tb(DisasContext *ctx, int n, target_ulong dest) } +static void gen_rshift_ZNVSf (TCGv R ) +{ +tcg_gen_setcondi_tl (TCG_COND_EQ , cpu_Zf,R ,0 );/* Zf = R == 0 */ +tcg_gen_shri_tl (cpu_Nf,R ,7 );/* Nf = R(7) */ +tcg_gen_xor_tl (cpu_Vf, cpu_Nf, cpu_Cf); +tcg_gen_xor_tl (cpu_Sf, cpu_Nf, cpu_Vf);/* Sf = Nf ^ Vf */ +} + +/* * Adds two registers without the C Flag and places the result in the * destination register Rd.
@@ -1495,3 +1504,1117 @@ static bool trans_BRBS(DisasContext *ctx, arg_BRBS *a)return true; } + +/* +* This instruction makes a copy of one register into another. The source +* register Rr is left unchanged, while the destination register Rd is loaded +* with a copy of Rr. +*/ +static bool trans_MOV (DisasContext *ctx,arg_MOV *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv Rr = cpu_r[a->rr]; + +tcg_gen_mov_tl (Rd, Rr); + +return true; +} + + +/* +* This instruction makes a copy of one register pair into another register +* pair. The source register pair Rr+1:Rr is left unchanged, while the +* destination register pair Rd+1:Rd is loaded with a copy of Rr + 1:Rr. This +* instruction is not available in all devices. Refer to the device specific +* instruction set summary. +*/ +static bool trans_MOVW (DisasContext *ctx,arg_MOVW *a) +{ +if (!avr_have_feature (ctx,AVR_FEATURE_MOVW )) { +return true; + } + +TCGv RdL = cpu_r[a->rd]; +TCGv RdH = cpu_r[a->rd +1 ]; +TCGv RrL = cpu_r[a->rr]; +TCGv RrH = cpu_r[a->rr +1 ]; + +tcg_gen_mov_tl (RdH, RrH); +tcg_gen_mov_tl (RdL, RrL); + +return true; +} + + +/* +* Loads an 8 bit constant directly to register 16 to 31. +*/ +static bool trans_LDI (DisasContext *ctx,arg_LDI *a) +{ +TCGv Rd = cpu_r[a->rd]; +int imm = a->imm; + +tcg_gen_movi_tl (Rd, imm); + +return true; +} + + +/* +* Loads one byte from the data space to a register. For parts with SRAM, +* the data space consists of the Register File, I/O memory and internal SRAM +* (and external SRAM if applicable). For parts without SRAM, the data space +* consists of the register file only. The EEPROM has a separate address space. +* A 16-bit address must be supplied. Memory access is limited to the current +* data segment of 64KB. The LDS instruction uses the RAMPD Register to access +* memory above 64KB. To access another data segment in devices with more than +* 64KB data space, the RAMPD in register in the I/O area has to be changed. +* This instruction is not available in all devices. Refer to the device +* specific instruction set summary. +*/ +static bool trans_LDS (DisasContext *ctx,arg_LDS *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv addr =tcg_temp_new_i32 (); +TCGv H = cpu_rampD; + a->imm =next_word (ctx); + +tcg_gen_mov_tl (addr,H );/* addr = H:M:L */ +tcg_gen_shli_tl (addr, addr,16 ); +tcg_gen_ori_tl (addr, addr, a->imm); + +gen_data_load (ctx, Rd, addr); + +tcg_temp_free_i32 (addr); + +return true; +} + + +/* +* Loads one byte indirect from the data space to a register. For parts +* with SRAM, the data space consists of the Register File, I/O memory and +* internal SRAM (and external SRAM if applicable). For parts without SRAM, the +* data space consists of the Register File only. In some parts the Flash +* Memory has been mapped to the data space and can be read using this command. +* The EEPROM has a separate address space. The data location is pointed to by +* the X (16 bits) Pointer Register in the Register File. Memory access is +* limited to the current data segment of 64KB. To access another data segment +* in devices with more than 64KB data space, the RAMPX in register in the I/O +* area has to be changed. The X-pointer Register can either be left unchanged +* by the operation, or it can be post-incremented or predecremented. These +* features are especially suited for accessing arrays, tables, and Stack +* Pointer usage of the X-pointer Register. Note that only the low byte of the +* X-pointer is updated in devices with no more than 256 bytes data space. For +* such devices, the high byte of the pointer is not used by this instruction +* and can be used for other purposes. The RAMPX Register in the I/O area is +* updated in parts with more than 64KB data space or more than 64KB Program +* memory, and the increment/decrement is added to the entire 24-bit address on +* such devices. Not all variants of this instruction is available in all +* devices. Refer to the device specific instruction set summary. In the +* Reduced Core tinyAVR the LD instruction can be used to achieve the same +* operation as LPM since the program memory is mapped to the data memory +* space. +*/ +static bool trans_LDX1 (DisasContext *ctx,arg_LDX1 *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv addr =gen_get_xaddr (); + +gen_data_load (ctx, Rd, addr); + +tcg_temp_free_i32 (addr); + +return true; +} + + +static bool trans_LDX2 (DisasContext *ctx,arg_LDX2 *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv addr =gen_get_xaddr (); + +gen_data_load (ctx, Rd, addr); +tcg_gen_addi_tl (addr, addr,1 );/* addr = addr + 1 */ + +gen_set_xaddr (addr); + +tcg_temp_free_i32 (addr); + +return true; +} + + +static bool trans_LDX3 (DisasContext *ctx,arg_LDX3 *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv addr =gen_get_xaddr (); + +tcg_gen_subi_tl (addr, addr,1 );/* addr = addr - 1 */ +gen_data_load (ctx, Rd, addr); +gen_set_xaddr (addr); + +tcg_temp_free_i32 (addr); + +return true; +} + + +static bool trans_STX1 (DisasContext *ctx,arg_STX1 *a) +{ +TCGv Rd = cpu_r[a->rr]; +TCGv addr =gen_get_xaddr (); + +gen_data_store (ctx, Rd, addr); + +tcg_temp_free_i32 (addr); + +return true; +} + +static bool trans_STX2 (DisasContext *ctx,arg_STX2 *a) +{ +TCGv Rd = cpu_r[a->rr]; +TCGv addr =gen_get_xaddr (); + +gen_data_store (ctx, Rd, addr); +tcg_gen_addi_tl (addr, addr,1 );/* addr = addr + 1 */ +gen_set_xaddr (addr); + +tcg_temp_free_i32 (addr); + +return true; +} + +static bool trans_STX3 (DisasContext *ctx,arg_STX3 *a) +{ +TCGv Rd = cpu_r[a->rr]; +TCGv addr =gen_get_xaddr (); + +tcg_gen_subi_tl (addr, addr,1 );/* addr = addr - 1 */ +gen_data_store (ctx, Rd, addr); +gen_set_xaddr (addr); + +tcg_temp_free_i32 (addr); + +return true; +} + + +/* +* Loads one byte indirect with or without displacement from the data space +* to a register. For parts with SRAM, the data space consists of the Register +* File, I/O memory and internal SRAM (and external SRAM if applicable). For +* parts without SRAM, the data space consists of the Register File only. In +* some parts the Flash Memory has been mapped to the data space and can be +* read using this command. The EEPROM has a separate address space. The data +* location is pointed to by the Y (16 bits) Pointer Register in the Register +* File. Memory access is limited to the current data segment of 64KB. To +* access another data segment in devices with more than 64KB data space, the +* RAMPY in register in the I/O area has to be changed. The Y-pointer Register +* can either be left unchanged by the operation, or it can be post-incremented +* or predecremented. These features are especially suited for accessing +* arrays, tables, and Stack Pointer usage of the Y-pointer Register. Note that +* only the low byte of the Y-pointer is updated in devices with no more than +* 256 bytes data space. For such devices, the high byte of the pointer is not +* used by this instruction and can be used for other purposes. The RAMPY +* Register in the I/O area is updated in parts with more than 64KB data space +* or more than 64KB Program memory, and the increment/decrement/displacement +* is added to the entire 24-bit address on such devices. Not all variants of +* this instruction is available in all devices. Refer to the device specific +* instruction set summary. In the Reduced Core tinyAVR the LD instruction can +* be used to achieve the same operation as LPM since the program memory is +* mapped to the data memory space. +*/ +static bool trans_LDY2 (DisasContext *ctx,arg_LDY2 *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv addr =gen_get_yaddr (); + +gen_data_load (ctx, Rd, addr); +tcg_gen_addi_tl (addr, addr,1 );/* addr = addr + 1 */ + +gen_set_yaddr (addr); + +tcg_temp_free_i32 (addr); + +return true; +} + + +static bool trans_LDY3 (DisasContext *ctx,arg_LDY3 *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv addr =gen_get_yaddr (); + +tcg_gen_subi_tl (addr, addr,1 );/* addr = addr - 1 */ +gen_data_load (ctx, Rd, addr); +gen_set_yaddr (addr); + +tcg_temp_free_i32 (addr); + +return true; +} + + +static bool trans_LDDY (DisasContext *ctx,arg_LDDY *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv addr =gen_get_yaddr (); + +tcg_gen_addi_tl (addr, addr, a->imm);/* addr = addr + q */ +gen_data_load (ctx, Rd, addr); + +tcg_temp_free_i32 (addr); + +return true; +} + + +static bool trans_STY2 (DisasContext *ctx,arg_STY2 *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv addr =gen_get_yaddr (); + +gen_data_store (ctx, Rd, addr); +tcg_gen_addi_tl (addr, addr,1 );/* addr = addr + 1 */ +gen_set_yaddr (addr); + +tcg_temp_free_i32 (addr); + +return true; +} + + +static bool trans_STY3 (DisasContext *ctx,arg_STY3 *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv addr =gen_get_yaddr (); + +tcg_gen_subi_tl (addr, addr,1 );/* addr = addr - 1 */ +gen_data_store (ctx, Rd, addr); +gen_set_yaddr (addr); + +tcg_temp_free_i32 (addr); + +return true; +} + + +static bool trans_STDY (DisasContext *ctx,arg_STDY *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv addr =gen_get_yaddr (); + +tcg_gen_addi_tl (addr, addr, a->imm);/* addr = addr + q */ +gen_data_store (ctx, Rd, addr); + +tcg_temp_free_i32 (addr); + +return true; +} + + +/* +* Loads one byte indirect with or without displacement from the data space +* to a register. For parts with SRAM, the data space consists of the Register +* File, I/O memory and internal SRAM (and external SRAM if applicable). For +* parts without SRAM, the data space consists of the Register File only. In +* some parts the Flash Memory has been mapped to the data space and can be +* read using this command. The EEPROM has a separate address space. The data +* location is pointed to by the Z (16 bits) Pointer Register in the Register +* File. Memory access is limited to the current data segment of 64KB. To +* access another data segment in devices with more than 64KB data space, the +* RAMPZ in register in the I/O area has to be changed. The Z-pointer Register +* can either be left unchanged by the operation, or it can be post-incremented +* or predecremented. These features are especially suited for Stack Pointer +* usage of the Z-pointer Register, however because the Z-pointer Register can +* be used for indirect subroutine calls, indirect jumps and table lookup, it +* is often more convenient to use the X or Y-pointer as a dedicated Stack +* Pointer. Note that only the low byte of the Z-pointer is updated in devices +* with no more than 256 bytes data space. For such devices, the high byte of +* the pointer is not used by this instruction and can be used for other +* purposes. The RAMPZ Register in the I/O area is updated in parts with more +* than 64KB data space or more than 64KB Program memory, and the +* increment/decrement/displacement is added to the entire 24-bit address on +* such devices. Not all variants of this instruction is available in all +* devices. Refer to the device specific instruction set summary. In the +* Reduced Core tinyAVR the LD instruction can be used to achieve the same +* operation as LPM since the program memory is mapped to the data memory +* space. For using the Z-pointer for table lookup in Program memory see the +* LPM and ELPM instructions. +*/ +static bool trans_LDZ2 (DisasContext *ctx,arg_LDZ2 *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv addr =gen_get_zaddr (); + +gen_data_load (ctx, Rd, addr); +tcg_gen_addi_tl (addr, addr,1 );/* addr = addr + 1 */ + +gen_set_zaddr (addr); + +tcg_temp_free_i32 (addr); + +return true; +} + + +static bool trans_LDZ3 (DisasContext *ctx,arg_LDZ3 *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv addr =gen_get_zaddr (); + +tcg_gen_subi_tl (addr, addr,1 );/* addr = addr - 1 */ +gen_data_load (ctx, Rd, addr); + +gen_set_zaddr (addr); + +tcg_temp_free_i32 (addr); + +return true; +} + + +static bool trans_LDDZ (DisasContext *ctx,arg_LDDZ *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv addr =gen_get_zaddr (); + +tcg_gen_addi_tl (addr, addr, a->imm);/* addr = addr + q */ +gen_data_load (ctx, Rd, addr); + +tcg_temp_free_i32 (addr); + +return true; +} + + +static bool trans_STZ2 (DisasContext *ctx,arg_STZ2 *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv addr =gen_get_zaddr (); + +gen_data_store (ctx, Rd, addr); +tcg_gen_addi_tl (addr, addr,1 );/* addr = addr + 1 */ + +gen_set_zaddr (addr); + +tcg_temp_free_i32 (addr); + +return true; +} + + +static bool trans_STZ3 (DisasContext *ctx,arg_STZ3 *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv addr =gen_get_zaddr (); + +tcg_gen_subi_tl (addr, addr,1 );/* addr = addr - 1 */ +gen_data_store (ctx, Rd, addr); + +gen_set_zaddr (addr); + +tcg_temp_free_i32 (addr); + +return true; +} + + +static bool trans_STDZ (DisasContext *ctx,arg_STDZ *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv addr =gen_get_zaddr (); + +tcg_gen_addi_tl (addr, addr, a->imm);/* addr = addr + q */ +gen_data_store (ctx, Rd, addr); + +tcg_temp_free_i32 (addr); + +return true; +} + + + +/* +* Stores one byte from a Register to the data space. For parts with SRAM, +* the data space consists of the Register File, I/O memory and internal SRAM +* (and external SRAM if applicable). For parts without SRAM, the data space +* consists of the Register File only. The EEPROM has a separate address space. +* A 16-bit address must be supplied. Memory access is limited to the current +* data segment of 64KB. The STS instruction uses the RAMPD Register to access +* memory above 64KB. To access another data segment in devices with more than +* 64KB data space, the RAMPD in register in the I/O area has to be changed. +* This instruction is not available in all devices. Refer to the device +* specific instruction set summary. +*/ +static bool trans_STS (DisasContext *ctx,arg_STS *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv addr =tcg_temp_new_i32 (); +TCGv H = cpu_rampD; + a->imm =next_word (ctx); + +tcg_gen_mov_tl (addr,H );/* addr = H:M:L */ +tcg_gen_shli_tl (addr, addr,16 ); +tcg_gen_ori_tl (addr, addr, a->imm); + +gen_data_store (ctx, Rd, addr); + +tcg_temp_free_i32 (addr); + +return true; +} + + +/* +* Loads one byte pointed to by the Z-register into the destination +* register Rd. This instruction features a 100% space effective constant +* initialization or constant data fetch. The Program memory is organized in +* 16-bit words while the Z-pointer is a byte address. Thus, the least +* significant bit of the Z-pointer selects either low byte (ZLSB = 0) or high +* byte (ZLSB = 1). This instruction can address the first 64KB (32K words) of +* Program memory. The Zpointer Register can either be left unchanged by the +* operation, or it can be incremented. The incrementation does not apply to +* the RAMPZ Register. Devices with Self-Programming capability can use the +* LPM instruction to read the Fuse and Lock bit values. Refer to the device +* documentation for a detailed description. The LPM instruction is not +* available in all devices. Refer to the device specific instruction set +* summary +*/ +static bool trans_LPM1 (DisasContext *ctx,arg_LPM1 *a) +{ +if (!avr_have_feature (ctx,AVR_FEATURE_LPM )) { +return true; + } + +TCGv Rd = cpu_r[0 ]; +TCGv addr =tcg_temp_new_i32 (); +TCGv H = cpu_r[31 ]; +TCGv L = cpu_r[30 ]; + +tcg_gen_shli_tl (addr,H ,8 );/* addr = H:L */ +tcg_gen_or_tl (addr, addr,L ); + +tcg_gen_qemu_ld8u (Rd, addr,MMU_CODE_IDX );/* Rd = mem[addr] */ + +tcg_temp_free_i32 (addr); + +return true; +} + + +static bool trans_LPM2 (DisasContext *ctx,arg_LPM2 *a) +{ +if (!avr_have_feature (ctx,AVR_FEATURE_LPM )) { +return true; + } + +TCGv Rd = cpu_r[a->rd]; +TCGv addr =tcg_temp_new_i32 (); +TCGv H = cpu_r[31 ]; +TCGv L = cpu_r[30 ]; + +tcg_gen_shli_tl (addr,H ,8 );/* addr = H:L */ +tcg_gen_or_tl (addr, addr,L ); + +tcg_gen_qemu_ld8u (Rd, addr,MMU_CODE_IDX );/* Rd = mem[addr] */ + +tcg_temp_free_i32 (addr); + +return true; +} + + +static bool trans_LPMX (DisasContext *ctx,arg_LPMX *a) +{ +if (!avr_have_feature (ctx,AVR_FEATURE_LPMX )) { +return true; + } + +TCGv Rd = cpu_r[a->rd]; +TCGv addr =tcg_temp_new_i32 (); +TCGv H = cpu_r[31 ]; +TCGv L = cpu_r[30 ]; + +tcg_gen_shli_tl (addr,H ,8 );/* addr = H:L */ +tcg_gen_or_tl (addr, addr,L ); + +tcg_gen_qemu_ld8u (Rd, addr,MMU_CODE_IDX );/* Rd = mem[addr] */ + +tcg_gen_addi_tl (addr, addr,1 );/* addr = addr + 1 */ + +tcg_gen_andi_tl (L , addr,0xff ); + +tcg_gen_shri_tl (addr, addr,8 ); +tcg_gen_andi_tl (H , addr,0xff ); + +tcg_temp_free_i32 (addr); + +return true; +} + + +/* +* Loads one byte pointed to by the Z-register and the RAMPZ Register in +* the I/O space, and places this byte in the destination register Rd. This +* instruction features a 100% space effective constant initialization or +* constant data fetch. The Program memory is organized in 16-bit words while +* the Z-pointer is a byte address. Thus, the least significant bit of the +* Z-pointer selects either low byte (ZLSB = 0) or high byte (ZLSB = 1). This +* instruction can address the entire Program memory space. The Z-pointer +* Register can either be left unchanged by the operation, or it can be +* incremented. The incrementation applies to the entire 24-bit concatenation +* of the RAMPZ and Z-pointer Registers. Devices with Self-Programming +* capability can use the ELPM instruction to read the Fuse and Lock bit value. +* Refer to the device documentation for a detailed description. This +* instruction is not available in all devices. Refer to the device specific +* instruction set summary. +*/ +static bool trans_ELPM1 (DisasContext *ctx,arg_ELPM1 *a) +{ +if (!avr_have_feature (ctx,AVR_FEATURE_ELPM )) { +return true; + } + +TCGv Rd = cpu_r[0 ]; +TCGv addr =gen_get_zaddr (); + +tcg_gen_qemu_ld8u (Rd, addr,MMU_CODE_IDX );/* Rd = mem[addr] */ + +tcg_temp_free_i32 (addr); + +return true; +} + + +static bool trans_ELPM2 (DisasContext *ctx,arg_ELPM2 *a) +{ +if (!avr_have_feature (ctx,AVR_FEATURE_ELPM )) { +return true; + } + +TCGv Rd = cpu_r[a->rd]; +TCGv addr =gen_get_zaddr (); + +tcg_gen_qemu_ld8u (Rd, addr,MMU_CODE_IDX );/* Rd = mem[addr] */ + +tcg_temp_free_i32 (addr); + +return true; +} + + +static bool trans_ELPMX (DisasContext *ctx,arg_ELPMX *a) +{ +if (!avr_have_feature (ctx,AVR_FEATURE_ELPMX )) { +return true; + } + +TCGv Rd = cpu_r[a->rd]; +TCGv addr =gen_get_zaddr (); + +tcg_gen_qemu_ld8u (Rd, addr,MMU_CODE_IDX );/* Rd = mem[addr] */ + +tcg_gen_addi_tl (addr, addr,1 );/* addr = addr + 1 */ + +gen_set_zaddr (addr); + +tcg_temp_free_i32 (addr); + +return true; +} + + +/* +* SPM can be used to erase a page in the Program memory, to write a page +* in the Program memory (that is already erased), and to set Boot Loader Lock +* bits. In some devices, the Program memory can be written one word at a time, +* in other devices an entire page can be programmed simultaneously after first +* filling a temporary page buffer. In all cases, the Program memory must be +* erased one page at a time. When erasing the Program memory, the RAMPZ and +* Z-register are used as page address. When writing the Program memory, the +* RAMPZ and Z-register are used as page or word address, and the R1:R0 +* register pair is used as data(1). When setting the Boot Loader Lock bits, +* the R1:R0 register pair is used as data. Refer to the device documentation +* for detailed description of SPM usage. This instruction can address the +* entire Program memory. The SPM instruction is not available in all devices. +* Refer to the device specific instruction set summary. Note: 1. R1 +* determines the instruction high byte, and R0 determines the instruction low +* byte. +*/ +static bool trans_SPM (DisasContext *ctx,arg_SPM *a) +{ +/* TODO */ +if (!avr_have_feature (ctx,AVR_FEATURE_SPM )) { +return true; + } + +return true; +} + + +static bool trans_SPMX (DisasContext *ctx,arg_SPMX *a) +{ +/* TODO */ +if (!avr_have_feature (ctx,AVR_FEATURE_SPMX )) { +return true; + } + +return true; +} + + +/* +* Loads data from the I/O Space (Ports, Timers, Configuration Registers, +* etc.) into register Rd in the Register File. +*/ +static bool trans_IN (DisasContext *ctx,arg_IN *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv port =tcg_const_i32 (a->imm); + +gen_helper_inb (Rd, cpu_env, port); + +tcg_temp_free_i32 (port); + +return true; +} + + +/* +* Stores data from register Rr in the Register File to I/O Space (Ports, +* Timers, Configuration Registers, etc.). +*/ +static bool trans_OUT (DisasContext *ctx,arg_OUT *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv port =tcg_const_i32 (a->imm); + +gen_helper_outb (cpu_env, port, Rd); + +tcg_temp_free_i32 (port); + +return true; +} + + +/* +* This instruction stores the contents of register Rr on the STACK. The +* Stack Pointer is post-decremented by 1 after the PUSH. This instruction is +* not available in all devices. Refer to the device specific instruction set +* summary. +*/ +static bool trans_PUSH (DisasContext *ctx,arg_PUSH *a) +{ +TCGv Rd = cpu_r[a->rd]; + +gen_data_store (ctx, Rd, cpu_sp); +tcg_gen_subi_tl (cpu_sp, cpu_sp,1 ); + +return true; +} + + +/* +* This instruction loads register Rd with a byte from the STACK. The Stack +* Pointer is pre-incremented by 1 before the POP. This instruction is not +* available in all devices. Refer to the device specific instruction set +* summary. +*/ +static bool trans_POP (DisasContext *ctx,arg_POP *a) +{ +/* +* Using a temp to work around some strange behaviour: +* tcg_gen_addi_tl(cpu_sp, cpu_sp, 1); +* gen_data_load(ctx, Rd, cpu_sp); +* seems to cause the add to happen twice. +* This doesn't happen if either the add or the load is removed. +*/ +TCGv t1 =tcg_temp_new_i32 (); +TCGv Rd = cpu_r[a->rd]; + +tcg_gen_addi_tl (t1, cpu_sp,1 ); +gen_data_load (ctx, Rd, t1); +tcg_gen_mov_tl (cpu_sp, t1); + +return true; +} + + +/* +* Exchanges one byte indirect between register and data space. The data +* location is pointed to by the Z (16 bits) Pointer Register in the Register +* File. Memory access is limited to the current data segment of 64KB. To +* access another data segment in devices with more than 64KB data space, the +* RAMPZ in register in the I/O area has to be changed. The Z-pointer Register +* is left unchanged by the operation. This instruction is especially suited +* for writing/reading status bits stored in SRAM. +*/ +static bool trans_XCH (DisasContext *ctx,arg_XCH *a) +{ +if (!avr_have_feature (ctx,AVR_FEATURE_RMW )) { +return true; + } + +TCGv Rd = cpu_r[a->rd]; +TCGv t0 =tcg_temp_new_i32 (); +TCGv addr =gen_get_zaddr (); + +gen_data_load (ctx, t0, addr); +gen_data_store (ctx, Rd, addr); +tcg_gen_mov_tl (Rd, t0); + +tcg_temp_free_i32 (t0); +tcg_temp_free_i32 (addr); + +return true; +} + + +/* +* Load one byte indirect from data space to register and set bits in data +* space specified by the register. The instruction can only be used towards +* internal SRAM. The data location is pointed to by the Z (16 bits) Pointer +* Register in the Register File. Memory access is limited to the current data +* segment of 64KB. To access another data segment in devices with more than +* 64KB data space, the RAMPZ in register in the I/O area has to be changed. +* The Z-pointer Register is left unchanged by the operation. This instruction +* is especially suited for setting status bits stored in SRAM. +*/ +static bool trans_LAS (DisasContext *ctx,arg_LAS *a) +{ +if (!avr_have_feature (ctx,AVR_FEATURE_RMW )) { +return true; + } + +TCGv Rr = cpu_r[a->rd]; +TCGv addr =gen_get_zaddr (); +TCGv t0 =tcg_temp_new_i32 (); +TCGv t1 =tcg_temp_new_i32 (); + +gen_data_load (ctx, t0, addr);/* t0 = mem[addr] */ +tcg_gen_or_tl (t1, t0, Rr); + +tcg_gen_mov_tl (Rr, t0);/* Rr = t0 */ +gen_data_store (ctx, t1, addr);/* mem[addr] = t1 */ + +tcg_temp_free_i32 (t1); +tcg_temp_free_i32 (t0); +tcg_temp_free_i32 (addr); + +return true; +} + + +/* +* Load one byte indirect from data space to register and stores and clear +* the bits in data space specified by the register. The instruction can +* only be used towards internal SRAM. The data location is pointed to by +* the Z (16 bits) Pointer Register in the Register File. Memory access is +* limited to the current data segment of 64KB. To access another data +* segment in devices with more than 64KB data space, the RAMPZ in register +* in the I/O area has to be changed. The Z-pointer Register is left +* unchanged by the operation. This instruction is especially suited for +* clearing status bits stored in SRAM. +*/ +static bool trans_LAC (DisasContext *ctx,arg_LAC *a) +{ +if (!avr_have_feature (ctx,AVR_FEATURE_RMW )) { +return true; + } + +TCGv Rr = cpu_r[a->rd]; +TCGv addr =gen_get_zaddr (); +TCGv t0 =tcg_temp_new_i32 (); +TCGv t1 =tcg_temp_new_i32 (); + +gen_data_load (ctx, t0, addr);/* t0 = mem[addr] */ +/* t1 = t0 & (0xff - Rr) = t0 and ~Rr */ +tcg_gen_andc_tl (t1, t0, Rr); + +tcg_gen_mov_tl (Rr, t0);/* Rr = t0 */ +gen_data_store (ctx, t1, addr);/* mem[addr] = t1 */ + +tcg_temp_free_i32 (t1); +tcg_temp_free_i32 (t0); +tcg_temp_free_i32 (addr); + +return true; +} + + +/* +* Load one byte indirect from data space to register and toggles bits in +* the data space specified by the register. The instruction can only be used +* towards SRAM. The data location is pointed to by the Z (16 bits) Pointer +* Register in the Register File. Memory access is limited to the current data +* segment of 64KB. To access another data segment in devices with more than +* 64KB data space, the RAMPZ in register in the I/O area has to be changed. +* The Z-pointer Register is left unchanged by the operation. This instruction +* is especially suited for changing status bits stored in SRAM. +*/ +static bool trans_LAT (DisasContext *ctx,arg_LAT *a) +{ +if (!avr_have_feature (ctx,AVR_FEATURE_RMW )) { +return true; + } + +TCGv Rd = cpu_r[a->rd]; +TCGv addr =gen_get_zaddr (); +TCGv t0 =tcg_temp_new_i32 (); +TCGv t1 =tcg_temp_new_i32 (); + +gen_data_load (ctx, t0, addr);/* t0 = mem[addr] */ +tcg_gen_xor_tl (t1, t0, Rd); + +tcg_gen_mov_tl (Rd, t0);/* Rd = t0 */ +gen_data_store (ctx, t1, addr);/* mem[addr] = t1 */ + +tcg_temp_free_i32 (t1); +tcg_temp_free_i32 (t0); +tcg_temp_free_i32 (addr); + +return true; +} + + +/* +* Shifts all bits in Rd one place to the right. Bit 7 is cleared. Bit 0 is +* loaded into the C Flag of the SREG. This operation effectively divides an +* unsigned value by two. The C Flag can be used to round the result. +*/ +static bool trans_LSR (DisasContext *ctx,arg_LSR *a) +{ +TCGv Rd = cpu_r[a->rd]; + +tcg_gen_andi_tl (cpu_Cf, Rd,1 ); + +tcg_gen_shri_tl (Rd, Rd,1 ); + +tcg_gen_setcondi_tl (TCG_COND_EQ , cpu_Zf, Rd,0 );/* Zf = Rd == 0 */ +tcg_gen_movi_tl (cpu_Nf,0 ); +tcg_gen_mov_tl (cpu_Vf, cpu_Cf); +tcg_gen_mov_tl (cpu_Sf, cpu_Vf); + +return true; +} + + +/* +* Shifts all bits in Rd one place to the right. The C Flag is shifted into +* bit 7 of Rd. Bit 0 is shifted into the C Flag. This operation, combined +* with ASR, effectively divides multi-byte signed values by two. Combined with +* LSR it effectively divides multi-byte unsigned values by two. The Carry Flag +* can be used to round the result. +*/ +static bool trans_ROR (DisasContext *ctx,arg_ROR *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv t0 =tcg_temp_new_i32 (); + +tcg_gen_shli_tl (t0, cpu_Cf,7 ); +tcg_gen_andi_tl (cpu_Cf, Rd,1 ); +tcg_gen_shri_tl (Rd, Rd,1 ); +tcg_gen_or_tl (Rd, Rd, t0); + +gen_rshift_ZNVSf (Rd); + +tcg_temp_free_i32 (t0); + +return true; +} + + +/* +* Shifts all bits in Rd one place to the right. Bit 7 is held constant. Bit 0 +* is loaded into the C Flag of the SREG. This operation effectively divides a +* signed value by two without changing its sign. The Carry Flag can be used to +* round the result. +*/ +static bool trans_ASR (DisasContext *ctx,arg_ASR *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv t0 =tcg_temp_new_i32 (); + +/* Cf */ +tcg_gen_andi_tl (cpu_Cf, Rd,1 );/* Cf = Rd(0) */ + +/* op */ +tcg_gen_andi_tl (t0, Rd,0x80 );/* Rd = (Rd & 0x80) | (Rd >> 1) */ +tcg_gen_shri_tl (Rd, Rd,1 ); +tcg_gen_or_tl (Rd, Rd, t0); + +gen_rshift_ZNVSf (Rd); + +tcg_temp_free_i32 (t0); + +return true; +} + + +/* +* Swaps high and low nibbles in a register. +*/ +static bool trans_SWAP (DisasContext *ctx,arg_SWAP *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv t0 =tcg_temp_new_i32 (); +TCGv t1 =tcg_temp_new_i32 (); + +tcg_gen_andi_tl (t0, Rd,0x0f ); +tcg_gen_shli_tl (t0, t0,4 ); +tcg_gen_andi_tl (t1, Rd,0xf0 ); +tcg_gen_shri_tl (t1, t1,4 ); +tcg_gen_or_tl (Rd, t0, t1); + +tcg_temp_free_i32 (t1); +tcg_temp_free_i32 (t0); + +return true; +} + + +/* +* Sets a specified bit in an I/O Register. This instruction operates on +* the lower 32 I/O Registers -- addresses 0-31. +*/ +static bool trans_SBI (DisasContext *ctx,arg_SBI *a) +{ +TCGv data =tcg_temp_new_i32 (); +TCGv port =tcg_const_i32 (a->reg); + +gen_helper_inb (data, cpu_env, port); +tcg_gen_ori_tl (data, data,1 << a->bit); +gen_helper_outb (cpu_env, port, data); + +tcg_temp_free_i32 (port); +tcg_temp_free_i32 (data); + +return true; +} + + +/* +* Clears a specified bit in an I/O Register. This instruction operates on +* the lower 32 I/O Registers -- addresses 0-31. +*/ +static bool trans_CBI (DisasContext *ctx,arg_CBI *a) +{ +TCGv data =tcg_temp_new_i32 (); +TCGv port =tcg_const_i32 (a->reg); + +gen_helper_inb (data, cpu_env, port); +tcg_gen_andi_tl (data, data, ~(1 << a->bit)); +gen_helper_outb (cpu_env, port, data); + +tcg_temp_free_i32 (data); +tcg_temp_free_i32 (port); + +return true; +} + + +/* +* Stores bit b from Rd to the T Flag in SREG (Status Register). +*/ +static bool trans_BST (DisasContext *ctx,arg_BST *a) +{ +TCGv Rd = cpu_r[a->rd]; + +tcg_gen_andi_tl (cpu_Tf, Rd,1 << a->bit); +tcg_gen_shri_tl (cpu_Tf, cpu_Tf, a->bit); + +return true; +} + + +/* +* Copies the T Flag in the SREG (Status Register) to bit b in register Rd. +*/ +static bool trans_BLD (DisasContext *ctx,arg_BLD *a) +{ +TCGv Rd = cpu_r[a->rd]; +TCGv t1 =tcg_temp_new_i32 (); + +tcg_gen_andi_tl (Rd, Rd, ~(1u << a->bit));/* clear bit */ +tcg_gen_shli_tl (t1, cpu_Tf, a->bit);/* create mask */ +tcg_gen_or_tl (Rd, Rd, t1); + +tcg_temp_free_i32 (t1); + +return true; +} + + +/* +* Sets a single Flag or bit in SREG. +*/ +static bool trans_BSET (DisasContext *ctx,arg_BSET *a) +{ +switch (a->bit) { +case 0x00 : +tcg_gen_movi_tl (cpu_Cf,0x01 ); +break ; +case 0x01 : +tcg_gen_movi_tl (cpu_Zf,0x01 ); +break ; +case 0x02 : +tcg_gen_movi_tl (cpu_Nf,0x01 ); +break ; +case 0x03 : +tcg_gen_movi_tl (cpu_Vf,0x01 ); +break ; +case 0x04 : +tcg_gen_movi_tl (cpu_Sf,0x01 ); +break ; +case 0x05 : +tcg_gen_movi_tl (cpu_Hf,0x01 ); +break ; +case 0x06 : +tcg_gen_movi_tl (cpu_Tf,0x01 ); +break ; +case 0x07 : +tcg_gen_movi_tl (cpu_If,0x01 ); +break ; + } + +return true; +} + + +/* +* Clears a single Flag in SREG. +*/ +static bool trans_BCLR (DisasContext *ctx,arg_BCLR *a) +{ +switch (a->bit) { +case 0x00 : +tcg_gen_movi_tl (cpu_Cf,0x00 ); +break ; +case 0x01 : +tcg_gen_movi_tl (cpu_Zf,0x00 ); +break ; +case 0x02 : +tcg_gen_movi_tl (cpu_Nf,0x00 ); +break ; +case 0x03 : +tcg_gen_movi_tl (cpu_Vf,0x00 ); +break ; +case 0x04 : +tcg_gen_movi_tl (cpu_Sf,0x00 ); +break ; +case 0x05 : +tcg_gen_movi_tl (cpu_Hf,0x00 ); +break ; +case 0x06 : +tcg_gen_movi_tl (cpu_Tf,0x00 ); +break ; +case 0x07 : +tcg_gen_movi_tl (cpu_If,0x00 ); +break ; + } + +return true; +}
Signature · 1 line
2.17.2 (Apple Git-113)
PATCH v36 8/17 target/avr: Add instruction translation - MCU Control Instructions
In reply to Michael RolnikThis includes:
- BREAK
- NOP
- SLEEP
- WDR
--- target/avr/translate.c | 174 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 174 insertions(+)
target/avr/translate.c +174 -0
@@ -368,6 +368,115 @@ static bool trans_ADC(DisasContext *ctx, arg_ADC *a) } +static void gen_jmp_ez (DisasContext *ctx) +{ +tcg_gen_deposit_tl (cpu_pc, cpu_r[30 ], cpu_r[31 ],8 ,8 ); +tcg_gen_or_tl (cpu_pc, cpu_pc, cpu_eind); + ctx->bstate =DISAS_LOOKUP ; +} + + +static void gen_jmp_z (DisasContext *ctx) +{ +tcg_gen_deposit_tl (cpu_pc, cpu_r[30 ], cpu_r[31 ],8 ,8 ); + ctx->bstate =DISAS_LOOKUP ; +} + + +/* +* in the gen_set_addr & gen_get_addr functions +* H assumed to be in 0x00ff0000 format +* M assumed to be in 0x000000ff format +* L assumed to be in 0x000000ff format +*/ +static void gen_set_addr (TCGv addr,TCGv H ,TCGv M ,TCGv L ) +{ + +tcg_gen_andi_tl (L , addr,0x000000ff ); + +tcg_gen_andi_tl (M , addr,0x0000ff00 ); +tcg_gen_shri_tl (M ,M ,8 ); + +tcg_gen_andi_tl (H , addr,0x00ff0000 ); +} + + +static void gen_set_xaddr (TCGv addr) +{ +gen_set_addr (addr, cpu_rampX, cpu_r[27 ], cpu_r[26 ]); +} + + +static void gen_set_yaddr (TCGv addr) +{ +gen_set_addr (addr, cpu_rampY, cpu_r[29 ], cpu_r[28 ]); +} + + +static void gen_set_zaddr (TCGv addr) +{ +gen_set_addr (addr, cpu_rampZ, cpu_r[31 ], cpu_r[30 ]); +} + + +static TCGv gen_get_addr (TCGv H ,TCGv M ,TCGv L ) +{ +TCGv addr =tcg_temp_new_i32 (); + +tcg_gen_deposit_tl (addr,M ,H ,8 ,8 ); +tcg_gen_deposit_tl (addr,L , addr,8 ,16 ); + +return addr; +} + + +static TCGv gen_get_xaddr (void ) +{ +return gen_get_addr (cpu_rampX, cpu_r[27 ], cpu_r[26 ]); +} + + +static TCGv gen_get_yaddr (void ) +{ +return gen_get_addr (cpu_rampY, cpu_r[29 ], cpu_r[28 ]); +} + + +static TCGv gen_get_zaddr (void ) +{ +return gen_get_addr (cpu_rampZ, cpu_r[31 ], cpu_r[30 ]); +} + + +/* +* Load one byte indirect from data space to register and stores an clear +* the bits in data space specified by the register. The instruction can only +* be used towards internal SRAM. The data location is pointed to by the Z (16 +* bits) Pointer Register in the Register File. Memory access is limited to the +* current data segment of 64KB. To access another data segment in devices with +* more than 64KB data space, the RAMPZ in register in the I/O area has to be +* changed. The Z-pointer Register is left unchanged by the operation. This +* instruction is especially suited for clearing status bits stored in SRAM. +*/ +static void gen_data_store (DisasContext *ctx,TCGv data,TCGv addr) +{ +if (ctx->tb->flags &TB_FLAGS_FULL_ACCESS ) { +gen_helper_fullwr (cpu_env, data, addr); + }else { +tcg_gen_qemu_st8 (data, addr,MMU_DATA_IDX );/* mem[addr] = data */ + } +} + +static void gen_data_load (DisasContext *ctx,TCGv data,TCGv addr) +{ +if (ctx->tb->flags &TB_FLAGS_FULL_ACCESS ) { +gen_helper_fullrd (data, cpu_env, addr); + }else { +tcg_gen_qemu_ld8u (data, addr,MMU_DATA_IDX );/* data = mem[addr] */ + } +} + +/* * Subtracts an immediate value (0-63) from a register pair and places the * result in the register pair. This instruction operates on the upper four
@@ -2618,3 +2727,68 @@ static bool trans_BCLR(DisasContext *ctx, arg_BCLR *a)return true; } + + +/* +* The BREAK instruction is used by the On-chip Debug system, and is +* normally not used in the application software. When the BREAK instruction is +* executed, the AVR CPU is set in the Stopped Mode. This gives the On-chip +* Debugger access to internal resources. If any Lock bits are set, or either +* the JTAGEN or OCDEN Fuses are unprogrammed, the CPU will treat the BREAK +* instruction as a NOP and will not enter the Stopped mode. This instruction +* is not available in all devices. Refer to the device specific instruction +* set summary. +*/ +static bool trans_BREAK (DisasContext *ctx,arg_BREAK *a) +{ +if (!avr_have_feature (ctx,AVR_FEATURE_BREAK )) { +return true; + } + +#ifdef BREAKPOINT_ON_BREAK +tcg_gen_movi_tl (cpu_pc, ctx->npc -1 ); +gen_helper_debug (cpu_env); + ctx->bstate =DISAS_EXIT ; +#else +/* NOP */ +#endif + +return true; +} + + +/* +* This instruction performs a single cycle No Operation. +*/ +static bool trans_NOP (DisasContext *ctx,arg_NOP *a) +{ + +/* NOP */ + +return true; +} + + +/* +* This instruction sets the circuit in sleep mode defined by the MCU +* Control Register. +*/ +static bool trans_SLEEP (DisasContext *ctx,arg_SLEEP *a) +{ +gen_helper_sleep (cpu_env); + ctx->bstate =DISAS_NORETURN ; +return true; +} + + +/* +* This instruction resets the Watchdog Timer. This instruction must be +* executed within a limited time given by the WD prescaler. See the Watchdog +* Timer hardware specification. +*/ +static bool trans_WDR (DisasContext *ctx,arg_WDR *a) +{ +gen_helper_wdr (cpu_env); + +return true; +}
Signature · 1 line
2.17.2 (Apple Git-113)
PATCH v36 9/17 target/avr: Add instruction translation - CPU main translation function
In reply to Michael Rolnik--- target/avr/translate.c | 234 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 234 insertions(+)
target/avr/translate.c +234 -0
@@ -2792,3 +2792,237 @@ static bool trans_WDR(DisasContext *ctx, arg_WDR *a)return true; } + + +void avr_cpu_tcg_init (void ) +{ +int i; + +#define AVR_REG_OFFS (x) offsetof(CPUAVRState, x) + cpu_pc =tcg_global_mem_new_i32 (cpu_env,AVR_REG_OFFS (pc_w),"pc" ); + cpu_Cf =tcg_global_mem_new_i32 (cpu_env,AVR_REG_OFFS (sregC),"Cf" ); + cpu_Zf =tcg_global_mem_new_i32 (cpu_env,AVR_REG_OFFS (sregZ),"Zf" ); + cpu_Nf =tcg_global_mem_new_i32 (cpu_env,AVR_REG_OFFS (sregN),"Nf" ); + cpu_Vf =tcg_global_mem_new_i32 (cpu_env,AVR_REG_OFFS (sregV),"Vf" ); + cpu_Sf =tcg_global_mem_new_i32 (cpu_env,AVR_REG_OFFS (sregS),"Sf" ); + cpu_Hf =tcg_global_mem_new_i32 (cpu_env,AVR_REG_OFFS (sregH),"Hf" ); + cpu_Tf =tcg_global_mem_new_i32 (cpu_env,AVR_REG_OFFS (sregT),"Tf" ); + cpu_If =tcg_global_mem_new_i32 (cpu_env,AVR_REG_OFFS (sregI),"If" ); + cpu_rampD =tcg_global_mem_new_i32 (cpu_env,AVR_REG_OFFS (rampD),"rampD" ); + cpu_rampX =tcg_global_mem_new_i32 (cpu_env,AVR_REG_OFFS (rampX),"rampX" ); + cpu_rampY =tcg_global_mem_new_i32 (cpu_env,AVR_REG_OFFS (rampY),"rampY" ); + cpu_rampZ =tcg_global_mem_new_i32 (cpu_env,AVR_REG_OFFS (rampZ),"rampZ" ); + cpu_eind =tcg_global_mem_new_i32 (cpu_env,AVR_REG_OFFS (eind),"eind" ); + cpu_sp =tcg_global_mem_new_i32 (cpu_env,AVR_REG_OFFS (sp),"sp" ); + cpu_skip =tcg_global_mem_new_i32 (cpu_env,AVR_REG_OFFS (skip),"skip" ); + +for (i =0 ; i <NO_CPU_REGISTERS ; i++) { + cpu_r[i] =tcg_global_mem_new_i32 (cpu_env,AVR_REG_OFFS (r[i]), + reg_names[i]); + } +#undef AVR_REG_OFFS +} + +static void translate (DisasContext *ctx) +{ +uint32_t opcode =next_word (ctx); + +if (!decode_insn (ctx, opcode)) { +gen_helper_unsupported (cpu_env); + ctx->bstate =DISAS_NORETURN ; + } +} + +/* Standardize the cpu_skip condition to NE. */ +static bool canonicalize_skip (DisasContext *ctx) +{ +switch (ctx->skip_cond) { +case TCG_COND_NEVER : +/* Normal case: cpu_skip is known to be false. */ +return false; + +case TCG_COND_ALWAYS : +/* +* Breakpoint case: cpu_skip is known to be true, via TB_FLAGS_SKIP. +* The breakpoint is on the instruction being skipped, at the start +* of the TranslationBlock. No need to update. +*/ +return false; + +case TCG_COND_NE : +if (ctx->skip_var1 ==NULL ) { +tcg_gen_mov_tl (cpu_skip, ctx->skip_var0); + }else { +tcg_gen_xor_tl (cpu_skip, ctx->skip_var0, ctx->skip_var1); + ctx->skip_var1 =NULL ; + } +break ; + +default : +/* Convert to a NE condition vs 0. */ +if (ctx->skip_var1 ==NULL ) { +tcg_gen_setcondi_tl (ctx->skip_cond, cpu_skip, ctx->skip_var0,0 ); + }else { +tcg_gen_setcond_tl (ctx->skip_cond, cpu_skip, + ctx->skip_var0, ctx->skip_var1); + ctx->skip_var1 =NULL ; + } + ctx->skip_cond =TCG_COND_NE ; +break ; + } +if (ctx->free_skip_var0) { +tcg_temp_free (ctx->skip_var0); + ctx->free_skip_var0 = false; + } + ctx->skip_var0 = cpu_skip; +return true; +} + +void gen_intermediate_code (CPUState *cs,TranslationBlock *tb,int max_insns) +{ +CPUAVRState *env = cs->env_ptr; +DisasContext ctx = { + .tb = tb, + .cs = cs, + .env = env, + .memidx =0 , + .bstate =DISAS_NEXT , + .skip_cond =TCG_COND_NEVER , + .singlestep = cs->singlestep_enabled, + }; +target_ulong pc_start = tb->pc /2 ; +int num_insns =0 ; + +if (tb->flags &TB_FLAGS_FULL_ACCESS ) { +/* +* This flag is set by ST/LD instruction we will regenerate it ONLY +* with mem/cpu memory access instead of mem access +*/ + max_insns =1 ; + } +if (ctx.singlestep) { + max_insns =1 ; + } + +gen_tb_start (tb); + + ctx.npc = pc_start; +if (tb->flags &TB_FLAGS_SKIP ) { + ctx.skip_cond =TCG_COND_ALWAYS ; + ctx.skip_var0 = cpu_skip; + } + +do { +TCGLabel *skip_label =NULL ; + +/* translate current instruction */ +tcg_gen_insn_start (ctx.npc); + num_insns++; + +/* +* this is due to some strange GDB behavior +* let's assume main has address 0x100 +* b main - sets breakpoint at address 0x00000100 (code) +* b *0x100 - sets breakpoint at address 0x00800100 (data) +*/ +if (unlikely (!ctx.singlestep && + (cpu_breakpoint_test (cs,OFFSET_CODE + ctx.npc *2 ,BP_ANY ) || +cpu_breakpoint_test (cs,OFFSET_DATA + ctx.npc *2 ,BP_ANY )))) { +canonicalize_skip (&ctx); +tcg_gen_movi_tl (cpu_pc, ctx.npc); +gen_helper_debug (cpu_env); + goto done_generating; + } + +/* Conditionally skip the next instruction, if indicated. */ +if (ctx.skip_cond !=TCG_COND_NEVER ) { + skip_label =gen_new_label (); +if (ctx.skip_var0 == cpu_skip) { +/* +* Copy cpu_skip so that we may zero it before the branch. +* This ensures that cpu_skip is non-zero after the label +* if and only if the skipped insn itself sets a skip. +*/ + ctx.free_skip_var0 = true; + ctx.skip_var0 =tcg_temp_new (); +tcg_gen_mov_tl (ctx.skip_var0, cpu_skip); +tcg_gen_movi_tl (cpu_skip,0 ); + } +if (ctx.skip_var1 ==NULL ) { +tcg_gen_brcondi_tl (ctx.skip_cond, ctx.skip_var0,0 , skip_label); + }else { +tcg_gen_brcond_tl (ctx.skip_cond, ctx.skip_var0, + ctx.skip_var1, skip_label); + ctx.skip_var1 =NULL ; + } +if (ctx.free_skip_var0) { +tcg_temp_free (ctx.skip_var0); + ctx.free_skip_var0 = false; + } + ctx.skip_cond =TCG_COND_NEVER ; + ctx.skip_var0 =NULL ; + } + +translate (&ctx); + +if (skip_label) { +canonicalize_skip (&ctx); +gen_set_label (skip_label); +if (ctx.bstate ==DISAS_NORETURN ) { + ctx.bstate =DISAS_CHAIN ; + } + } + }while (ctx.bstate ==DISAS_NEXT + && num_insns < max_insns + && (ctx.npc - pc_start) *2 <TARGET_PAGE_SIZE -4 + && !tcg_op_buf_full ()); + +if (tb->cflags &CF_LAST_IO ) { +gen_io_end (); + } + +bool nonconst_skip =canonicalize_skip (&ctx); + +switch (ctx.bstate) { +case DISAS_NORETURN : +assert (!nonconst_skip); +break ; +case DISAS_NEXT : +case DISAS_TOO_MANY : +case DISAS_CHAIN : +if (!nonconst_skip) { +/* Note gen_goto_tb checks singlestep. */ +gen_goto_tb (&ctx,1 , ctx.npc); +break ; + } +tcg_gen_movi_tl (cpu_pc, ctx.npc); +/* fall through */ +case DISAS_LOOKUP : +if (!ctx.singlestep) { +tcg_gen_lookup_and_goto_ptr (); +break ; + } +/* fall through */ +case DISAS_EXIT : +if (ctx.singlestep) { +gen_helper_debug (cpu_env); + }else { +tcg_gen_exit_tb (NULL ,0 ); + } +break ; +default : +g_assert_not_reached (); + } + +done_generating: +gen_tb_end (tb, num_insns); + + tb->size = (ctx.npc - pc_start) *2 ; + tb->icount = num_insns; +} + +void restore_state_to_opc (CPUAVRState *env,TranslationBlock *tb, +target_ulong *data) +{ + env->pc_w = data[0 ]; +}
Signature · 1 line
2.17.2 (Apple Git-113)
PATCH v36 10/17 target/avr: Add instruction disassembly function
In reply to Michael RolnikProvide function disassembles executed instruction when -d in_asm is provided
--- target/avr/cpu.h | 1 + target/avr/cpu.c | 2 +- target/avr/disas.c | 214 +++++++++++++++++++++++++++++++++++++++++ target/avr/translate.c | 11 +++ 4 files changed, 227 insertions(+), 1 deletion(-) create mode 100644 target/avr/disas.c
target/avr/cpu.h +1 -0
@@ -157,6 +157,7 @@ bool avr_cpu_exec_interrupt(CPUState *cpu, int int_req);hwaddr avr_cpu_get_phys_page_debug (CPUState *cpu,vaddr addr);int avr_cpu_gdb_read_register (CPUState *cpu,uint8_t *buf,int reg);int avr_cpu_gdb_write_register (CPUState *cpu,uint8_t *buf,int reg); +int avr_print_insn (bfd_vma addr,disassemble_info *info);static inline int avr_feature (CPUAVRState *env,int feature) {
target/avr/cpu.c +1 -1
@@ -83,7 +83,7 @@ static void avr_cpu_reset(CPUState *cs)static void avr_cpu_disas_set_info (CPUState *cpu,disassemble_info *info) { info->mach = bfd_arch_avr; - info->print_insn =NULL ; + info->print_insn = avr_print_insn; }static void avr_cpu_realizefn (DeviceState *dev,Error **errp)
target/avr/disas.c new file +214 -0
214 lines not on this page · raw message
target/avr/translate.c +11 -0
@@ -3019,6 +3019,17 @@ done_generating: tb->size = (ctx.npc - pc_start) *2 ; tb->icount = num_insns; + +#ifdef DEBUG_DISAS +if (qemu_loglevel_mask (CPU_LOG_TB_IN_ASM ) + &&qemu_log_in_addr_range (tb->pc)) { +qemu_log_lock (); +qemu_log ("IN: %s\n" ,lookup_symbol (tb->pc)); +log_target_disas (cs, tb->pc, tb->size); +qemu_log ("\n" ); +qemu_log_unlock (); + } +#endif } void restore_state_to_opc(CPUAVRState *env, TranslationBlock *tb,
Signature · 1 line
2.17.2 (Apple Git-113)
Re: [PATCH v36 10/17] target/avr: Add instruction disassembly function
Quoted 44 lines · Michael Rolnik
Provide function disassembles executed instruction when
-d in_asmis providedSigned-off-by Michael Rolnik <[email protected]>--- target/avr/cpu.h | 1 + target/avr/cpu.c | 2 +- target/avr/disas.c | 214 +++++++++++++++++++++++++++++++++++++++++ target/avr/translate.c | 11 +++ 4 files changed, 227 insertions(+), 1 deletion(-) create mode 100644 target/avr/disas.ctarget/avr/cpu.h +1
-0@@ -157,6 +157,7 @@ bool avr_cpu_exec_interrupt(CPUState *cpu, int int_req);hwaddr avr_cpu_get_phys_page_debug (CPUState *cpu,vaddr addr);int avr_cpu_gdb_read_register (CPUState *cpu,uint8_t *buf,int reg);int avr_cpu_gdb_write_register (CPUState *cpu,uint8_t *buf,int reg); +int avr_print_insn (bfd_vma addr,disassemble_info *info);static inline int avr_feature (CPUAVRState *env,int feature){
target/avr/cpu.c +1
-1@@ -83,7 +83,7 @@ static void avr_cpu_reset(CPUState *cs)static void avr_cpu_disas_set_info (CPUState *cpu,disassemble_info *info) { info->mach = bfd_arch_avr; - info->print_insn =NULL ; + info->print_insn = avr_print_insn; }static void avr_cpu_realizefn (DeviceState *dev,Error **errp)target/avr/disas.c new file +0
-0
target/avr/disas.c line 5
Quoted 5 lines
target/avr/disas.c new file +5
-0@@ -0,0 +1,214 @@ +/* +* OpenRISC disassembler +* +* Copyright (c) 2018 Richard Henderson <[email protected]> +*
s/OpenRISC/AVR
s/2018/2019
You can as well a add copyright line with your name and email after Richards.
Aleksandar
Quoted 236 lines
target/avr/disas.c new file +28
-0+* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include "qemu/osdep.h" +#include "disas/dis-asm.h" +#include "qemu/bitops.h" +#include "cpu.h" + +typedef struct { +disassemble_info *info; +uint16_t next_word; +bool next_word_used; +}DisasContext ; + +static int to_A (DisasContext *ctx,int indx) {return 16 + (indx %16 ); } +static int to_B (DisasContext *ctx,int indx) {return 16 + (indx %8 ); } +static int to_C(DisasContext *ctx, int indx) { return 24 + (indx % 4) *2; }
target/avr/disas.c new file +181
-0+static int to_D (DisasContext *ctx,int indx) {return (indx %16 ) *2 ; } + +static uint16_t next_word (DisasContext *ctx) +{ + ctx->next_word_used = true; +return ctx->next_word; +} + +static int append_16 (DisasContext *ctx,int x) +{ +return x <<16 |next_word (ctx); +} + + +/* Include the auto-generated decoder. */ +static bool decode_insn (DisasContext *ctx,uint16_t insn); +#include "decode_insn.inc.c" + +#define output (mnemonic, format, ...) \ + (pctx->info->fprintf_func(pctx->info->stream, "%-9s " format, \ + mnemonic, ##__VA_ARGS__)) + +int avr_print_insn (bfd_vma addr,disassemble_info *info) +{ +DisasContext ctx; +DisasContext *pctx = &ctx; +bfd_byte buffer[4 ]; +uint16_t insn; +int status; + + ctx.info = info; + + status = info->read_memory_func (addr, buffer,4 , info); +if (status !=0 ) { + info->memory_error_func (status, addr, info); +return -1 ; + } + insn =bfd_getl16 (buffer); + ctx.next_word =bfd_getl16 (buffer +2 ); + ctx.next_word_used = false; + +if (!decode_insn (&ctx, insn)) { +output (".db" ,"0x%02x, 0x%02x" , buffer[0 ], buffer[1 ]); + } + +return ctx.next_word_used ?4 :2 ; +} + + +#define INSN (opcode, format, ...) \ +static bool trans_##opcode(DisasContext *pctx, arg_##opcode * a) \ +{ \ + output(#opcode, format, ##__VA_ARGS__); \ + return true; \ +} + +#define INSN_MNEMONIC (opcode, mnemonic, format, ...) \ +static bool trans_##opcode(DisasContext *pctx, arg_##opcode * a) \ +{ \ + output(mnemonic, format, ##__VA_ARGS__); \ + return true; \ +} + +/* +* C Z N V S H T I +* 0 1 2 3 4 5 6 7 +*/ +static const char *brbc[] = { +"BRCC" ,"BRNE" ,"BRPL" ,"BRVC" ,"BRGE" ,"BRHC" ,"BRTC" ,"BRID" +}; + +static const char *brbs[] = { +"BRCS" ,"BREQ" ,"BRMI" ,"BRVS" ,"BRLT" ,"BRHS" ,"BRTS" ,"BRIE" +}; + +static const char *bset[] = { +"SEC" ,"SEZ" ,"SEN" ,"SEZ" ,"SES" ,"SEH" ,"SET" ,"SEI" +}; + +static const char *bclr[] = { +"CLC" ,"CLZ" ,"CLN" ,"CLZ" ,"CLS" ,"CLH" ,"CLT" ,"CLI" +}; + +INSN(ADC, "r%d, r%d", a->rd, a->rr) +INSN(ADD, "r%d, r%d", a->rd, a->rr) +INSN(ADIW, "r%d:r%r, %d", a->rd + 1, a->rd, a->imm) +INSN(AND, "r%d, r%d", a->rd, a->rr) +INSN(ANDI, "r%d, %d", a->rd, a->imm) +INSN(ASR, "r%d", a->rd) +INSN_MNEMONIC(BCLR, bclr[a->bit], "") +INSN(BLD, "r%d, %d", a->rd, a->bit) +INSN_MNEMONIC(BRBC, brbc[a->bit], ".%+d", a->imm * 2) +INSN_MNEMONIC(BRBS, brbs[a->bit], ".%+d", a->imm * 2) +INSN(BREAK, "") +INSN_MNEMONIC(BSET, bset[a->bit], "") +INSN(BST, "r%d, %d", a->rd, a->bit) +INSN(CALL, "0x%x", a->imm * 2) +INSN(CBI, "%d, %d", a->reg, a->bit) +INSN(COM, "r%d", a->rd) +INSN(CP, "r%d, r%d", a->rd, a->rr) +INSN(CPC, "r%d, r%d", a->rd, a->rr) +INSN(CPI, "r%d, %d", a->rd, a->imm) +INSN(CPSE, "r%d, r%d", a->rd, a->rr) +INSN(DEC, "r%d", a->rd) +INSN(DES, "%d", a->imm) +INSN(EICALL, "") +INSN(EIJMP, "") +INSN(ELPM1, "") +INSN(ELPM2, "r%d, Z", a->rd) +INSN(ELPMX, "r%d, Z+", a->rd) +INSN(EOR, "r%d, r%d", a->rd, a->rr) +INSN(FMUL, "r%d, r%d", a->rd, a->rr) +INSN(FMULS, "r%d, r%d", a->rd, a->rr) +INSN(FMULSU, "r%d, r%d", a->rd, a->rr) +INSN(ICALL, "") +INSN(IJMP, "") +INSN(IN, "r%d, $%d", a->rd, a->imm) +INSN(INC, "r%d", a->rd) +INSN(JMP, "0x%x", a->imm * 2) +INSN(LAC, "Z, r%d", a->rd) +INSN(LAS, "Z, r%d", a->rd) +INSN(LAT, "Z, r%d", a->rd) +INSN(LDDY, "r%d, Y+%d", a->rd, a->imm) +INSN(LDDZ, "r%d, Z+%d", a->rd, a->imm) +INSN(LDI, "r%d, %d", a->rd, a->imm) +INSN(LDS, "r%d, %d", a->rd, a->imm) +INSN(LDX1, "r%d, X", a->rd) +INSN(LDX2, "r%d, X+", a->rd) +INSN(LDX3, "r%d, -X", a->rd) +INSN(LDY2, "r%d, Y+", a->rd) +INSN(LDY3, "r%d, -Y", a->rd) +INSN(LDZ2, "r%d, Z+", a->rd) +INSN(LDZ3, "r%d, -Z", a->rd) +INSN(LPM1, "") +INSN(LPM2, "r%d, Z", a->rd) +INSN(LPMX, "r%d, Z+", a->rd) +INSN(LSR, "r%d", a->rd) +INSN(MOV, "r%d, r%d", a->rd, a->rr) +INSN(MOVW, "r%d:r%d, r%d,r:r%d", a->rd + 1, a->rd, a->rr + 1, a->rr) +INSN(MUL, "r%d, r%d", a->rd, a->rr) +INSN(MULS, "r%d, r%d", a->rd, a->rr) +INSN(MULSU, "r%d, r%d", a->rd, a->rr) +INSN(NEG, "r%d", a->rd) +INSN(NOP, "") +INSN(OR, "r%d, r%d", a->rd, a->rr) +INSN(ORI, "r%d, %d", a->rd, a->imm) +INSN(OUT, "$%d, r%d", a->imm, a->rd) +INSN(POP, "r%d", a->rd) +INSN(PUSH, "r%d", a->rd) +INSN(RCALL, ".%+d", a->imm * 2) +INSN(RET, "") +INSN(RETI, "") +INSN(RJMP, ".%+d", a->imm * 2) +INSN(ROR, "r%d", a->rd) +INSN(SBC, "r%d, r%d", a->rd, a->rr) +INSN(SBCI, "r%d, %d", a->rd, a->imm) +INSN(SBI, "$%d, %d", a->reg, a->bit) +INSN(SBIC, "$%d, %d", a->reg, a->bit) +INSN(SBIS, "$%d, %d", a->reg, a->bit) +INSN(SBIW, "r%d:r%d, %d", a->rd + 1, a->rd, a->imm) +INSN(SBRC, "r%d, %d", a->rr, a->bit) +INSN(SBRS, "r%d, %d", a->rr, a->bit) +INSN(SLEEP, "") +INSN(SPM, "") +INSN(SPMX, "Z+") +INSN(STDY, "r%d, Y+%d", a->rd, a->imm) +INSN(STDZ, "r%d, Z+%d", a->rd, a->imm) +INSN(STS, "r%d, %d", a->rd, a->imm) +INSN(STX1, "r%d, X", a->rr) +INSN(STX2, "r%d, X+", a->rr) +INSN(STX3, "r%d, -X", a->rr) +INSN(STY2, "r%d, Y+", a->rd) +INSN(STY3, "r%d, -Y", a->rd) +INSN(STZ2, "r%d, Z+", a->rd) +INSN(STZ3, "r%d, -Z", a->rd) +INSN(SUB, "r%d, r%d", a->rd, a->rr) +INSN(SUBI, "r%d, %d", a->rd, a->imm) +INSN(SWAP, "r%d", a->rd) +INSN(WDR, "") +INSN (XCH ,"Z, r%d" , a->rd) +target/avr/translate.c +11
-1@@ -3019,6 +3019,17 @@ done_generating: tb->size = (ctx.npc - pc_start) *2 ; tb->icount = num_insns; + +#ifdef DEBUG_DISAS +if (qemu_loglevel_mask (CPU_LOG_TB_IN_ASM ) + &&qemu_log_in_addr_range (tb->pc)) { +qemu_log_lock (); +qemu_log ("IN: %s\n" ,lookup_symbol (tb->pc)); +log_target_disas (cs, tb->pc, tb->size); +qemu_log ("\n" ); +qemu_log_unlock (); + } +#endif } void restore_state_to_opc(CPUAVRState *env, TranslationBlock *tb, --2.17.2 (Apple Git-113)
Re: [PATCH v36 10/17] target/avr: Add instruction disassembly function
In reply to Michael RolnikQuoted 5 lines · Michael Rolnik
Provide function disassembles executed instruction when
-d in_asmis providedSigned-off-by Michael Rolnik <[email protected]>---
You should add "Suggested-by:"s for Philippe, Richard, and myself in tge commit message.
Aleksandar
target/avr/cpu.h | 1 +
Quoted 279 lines
target/avr/cpu.c | 2 +- target/avr/disas.c | 214 +++++++++++++++++++++++++++++++++++++++++ target/avr/translate.c | 11 +++ 4 files changed, 227 insertions(+), 1 deletion(-) create mode 100644 target/avr/disas.ctarget/avr/cpu.h +1
-0@@ -157,6 +157,7 @@ bool avr_cpu_exec_interrupt(CPUState *cpu, int int_req);hwaddr avr_cpu_get_phys_page_debug (CPUState *cpu,vaddr addr);int avr_cpu_gdb_read_register (CPUState *cpu,uint8_t *buf,int reg);int avr_cpu_gdb_write_register (CPUState *cpu,uint8_t *buf,int reg); +int avr_print_insn (bfd_vma addr,disassemble_info *info);static inline int avr_feature (CPUAVRState *env,int feature){
target/avr/cpu.c +1
-1@@ -83,7 +83,7 @@ static void avr_cpu_reset(CPUState *cs)static void avr_cpu_disas_set_info (CPUState *cpu,disassemble_info *info) { info->mach = bfd_arch_avr; - info->print_insn =NULL ; + info->print_insn = avr_print_insn; }static void avr_cpu_realizefn (DeviceState *dev,Error **errp)target/avr/disas.c new file +33
-0@@ -0,0 +1,214 @@ +/* +* OpenRISC disassembler +* +* Copyright (c) 2018 Richard Henderson <[email protected]> +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include "qemu/osdep.h" +#include "disas/dis-asm.h" +#include "qemu/bitops.h" +#include "cpu.h" + +typedef struct { +disassemble_info *info; +uint16_t next_word; +bool next_word_used; +}DisasContext ; + +static int to_A (DisasContext *ctx,int indx) {return 16 + (indx %16 ); } +static int to_B (DisasContext *ctx,int indx) {return 16 + (indx %8 ); } +static int to_C(DisasContext *ctx, int indx) { return 24 + (indx % 4) *2; }
target/avr/disas.c new file +181
-0+static int to_D (DisasContext *ctx,int indx) {return (indx %16 ) *2 ; } + +static uint16_t next_word (DisasContext *ctx) +{ + ctx->next_word_used = true; +return ctx->next_word; +} + +static int append_16 (DisasContext *ctx,int x) +{ +return x <<16 |next_word (ctx); +} + + +/* Include the auto-generated decoder. */ +static bool decode_insn (DisasContext *ctx,uint16_t insn); +#include "decode_insn.inc.c" + +#define output (mnemonic, format, ...) \ + (pctx->info->fprintf_func(pctx->info->stream, "%-9s " format, \ + mnemonic, ##__VA_ARGS__)) + +int avr_print_insn (bfd_vma addr,disassemble_info *info) +{ +DisasContext ctx; +DisasContext *pctx = &ctx; +bfd_byte buffer[4 ]; +uint16_t insn; +int status; + + ctx.info = info; + + status = info->read_memory_func (addr, buffer,4 , info); +if (status !=0 ) { + info->memory_error_func (status, addr, info); +return -1 ; + } + insn =bfd_getl16 (buffer); + ctx.next_word =bfd_getl16 (buffer +2 ); + ctx.next_word_used = false; + +if (!decode_insn (&ctx, insn)) { +output (".db" ,"0x%02x, 0x%02x" , buffer[0 ], buffer[1 ]); + } + +return ctx.next_word_used ?4 :2 ; +} + + +#define INSN (opcode, format, ...) \ +static bool trans_##opcode(DisasContext *pctx, arg_##opcode * a) \ +{ \ + output(#opcode, format, ##__VA_ARGS__); \ + return true; \ +} + +#define INSN_MNEMONIC (opcode, mnemonic, format, ...) \ +static bool trans_##opcode(DisasContext *pctx, arg_##opcode * a) \ +{ \ + output(mnemonic, format, ##__VA_ARGS__); \ + return true; \ +} + +/* +* C Z N V S H T I +* 0 1 2 3 4 5 6 7 +*/ +static const char *brbc[] = { +"BRCC" ,"BRNE" ,"BRPL" ,"BRVC" ,"BRGE" ,"BRHC" ,"BRTC" ,"BRID" +}; + +static const char *brbs[] = { +"BRCS" ,"BREQ" ,"BRMI" ,"BRVS" ,"BRLT" ,"BRHS" ,"BRTS" ,"BRIE" +}; + +static const char *bset[] = { +"SEC" ,"SEZ" ,"SEN" ,"SEZ" ,"SES" ,"SEH" ,"SET" ,"SEI" +}; + +static const char *bclr[] = { +"CLC" ,"CLZ" ,"CLN" ,"CLZ" ,"CLS" ,"CLH" ,"CLT" ,"CLI" +}; + +INSN(ADC, "r%d, r%d", a->rd, a->rr) +INSN(ADD, "r%d, r%d", a->rd, a->rr) +INSN(ADIW, "r%d:r%r, %d", a->rd + 1, a->rd, a->imm) +INSN(AND, "r%d, r%d", a->rd, a->rr) +INSN(ANDI, "r%d, %d", a->rd, a->imm) +INSN(ASR, "r%d", a->rd) +INSN_MNEMONIC(BCLR, bclr[a->bit], "") +INSN(BLD, "r%d, %d", a->rd, a->bit) +INSN_MNEMONIC(BRBC, brbc[a->bit], ".%+d", a->imm * 2) +INSN_MNEMONIC(BRBS, brbs[a->bit], ".%+d", a->imm * 2) +INSN(BREAK, "") +INSN_MNEMONIC(BSET, bset[a->bit], "") +INSN(BST, "r%d, %d", a->rd, a->bit) +INSN(CALL, "0x%x", a->imm * 2) +INSN(CBI, "%d, %d", a->reg, a->bit) +INSN(COM, "r%d", a->rd) +INSN(CP, "r%d, r%d", a->rd, a->rr) +INSN(CPC, "r%d, r%d", a->rd, a->rr) +INSN(CPI, "r%d, %d", a->rd, a->imm) +INSN(CPSE, "r%d, r%d", a->rd, a->rr) +INSN(DEC, "r%d", a->rd) +INSN(DES, "%d", a->imm) +INSN(EICALL, "") +INSN(EIJMP, "") +INSN(ELPM1, "") +INSN(ELPM2, "r%d, Z", a->rd) +INSN(ELPMX, "r%d, Z+", a->rd) +INSN(EOR, "r%d, r%d", a->rd, a->rr) +INSN(FMUL, "r%d, r%d", a->rd, a->rr) +INSN(FMULS, "r%d, r%d", a->rd, a->rr) +INSN(FMULSU, "r%d, r%d", a->rd, a->rr) +INSN(ICALL, "") +INSN(IJMP, "") +INSN(IN, "r%d, $%d", a->rd, a->imm) +INSN(INC, "r%d", a->rd) +INSN(JMP, "0x%x", a->imm * 2) +INSN(LAC, "Z, r%d", a->rd) +INSN(LAS, "Z, r%d", a->rd) +INSN(LAT, "Z, r%d", a->rd) +INSN(LDDY, "r%d, Y+%d", a->rd, a->imm) +INSN(LDDZ, "r%d, Z+%d", a->rd, a->imm) +INSN(LDI, "r%d, %d", a->rd, a->imm) +INSN(LDS, "r%d, %d", a->rd, a->imm) +INSN(LDX1, "r%d, X", a->rd) +INSN(LDX2, "r%d, X+", a->rd) +INSN(LDX3, "r%d, -X", a->rd) +INSN(LDY2, "r%d, Y+", a->rd) +INSN(LDY3, "r%d, -Y", a->rd) +INSN(LDZ2, "r%d, Z+", a->rd) +INSN(LDZ3, "r%d, -Z", a->rd) +INSN(LPM1, "") +INSN(LPM2, "r%d, Z", a->rd) +INSN(LPMX, "r%d, Z+", a->rd) +INSN(LSR, "r%d", a->rd) +INSN(MOV, "r%d, r%d", a->rd, a->rr) +INSN(MOVW, "r%d:r%d, r%d,r:r%d", a->rd + 1, a->rd, a->rr + 1, a->rr) +INSN(MUL, "r%d, r%d", a->rd, a->rr) +INSN(MULS, "r%d, r%d", a->rd, a->rr) +INSN(MULSU, "r%d, r%d", a->rd, a->rr) +INSN(NEG, "r%d", a->rd) +INSN(NOP, "") +INSN(OR, "r%d, r%d", a->rd, a->rr) +INSN(ORI, "r%d, %d", a->rd, a->imm) +INSN(OUT, "$%d, r%d", a->imm, a->rd) +INSN(POP, "r%d", a->rd) +INSN(PUSH, "r%d", a->rd) +INSN(RCALL, ".%+d", a->imm * 2) +INSN(RET, "") +INSN(RETI, "") +INSN(RJMP, ".%+d", a->imm * 2) +INSN(ROR, "r%d", a->rd) +INSN(SBC, "r%d, r%d", a->rd, a->rr) +INSN(SBCI, "r%d, %d", a->rd, a->imm) +INSN(SBI, "$%d, %d", a->reg, a->bit) +INSN(SBIC, "$%d, %d", a->reg, a->bit) +INSN(SBIS, "$%d, %d", a->reg, a->bit) +INSN(SBIW, "r%d:r%d, %d", a->rd + 1, a->rd, a->imm) +INSN(SBRC, "r%d, %d", a->rr, a->bit) +INSN(SBRS, "r%d, %d", a->rr, a->bit) +INSN(SLEEP, "") +INSN(SPM, "") +INSN(SPMX, "Z+") +INSN(STDY, "r%d, Y+%d", a->rd, a->imm) +INSN(STDZ, "r%d, Z+%d", a->rd, a->imm) +INSN(STS, "r%d, %d", a->rd, a->imm) +INSN(STX1, "r%d, X", a->rr) +INSN(STX2, "r%d, X+", a->rr) +INSN(STX3, "r%d, -X", a->rr) +INSN(STY2, "r%d, Y+", a->rd) +INSN(STY3, "r%d, -Y", a->rd) +INSN(STZ2, "r%d, Z+", a->rd) +INSN(STZ3, "r%d, -Z", a->rd) +INSN(SUB, "r%d, r%d", a->rd, a->rr) +INSN(SUBI, "r%d, %d", a->rd, a->imm) +INSN(SWAP, "r%d", a->rd) +INSN(WDR, "") +INSN (XCH ,"Z, r%d" , a->rd) +target/avr/translate.c +11
-1@@ -3019,6 +3019,17 @@ done_generating: tb->size = (ctx.npc - pc_start) *2 ; tb->icount = num_insns; + +#ifdef DEBUG_DISAS +if (qemu_loglevel_mask (CPU_LOG_TB_IN_ASM ) + &&qemu_log_in_addr_range (tb->pc)) { +qemu_log_lock (); +qemu_log ("IN: %s\n" ,lookup_symbol (tb->pc)); +log_target_disas (cs, tb->pc, tb->size); +qemu_log ("\n" ); +qemu_log_unlock (); + } +#endif } void restore_state_to_opc(CPUAVRState *env, TranslationBlock *tb, --2.17.2 (Apple Git-113)
Re: [PATCH v36 10/17] target/avr: Add instruction disassembly function
In reply to Michael RolnikQuoted 5 lines · Michael Rolnik
Provide function disassembles executed instruction when
-d in_asmis providedSigned-off-by Michael Rolnik <[email protected]>---
Richard, is this what you expected from Michael, or there are still some caveats?
Thanks for the suggestion!
Aleksandar
target/avr/cpu.h | 1 +
Quoted 279 lines
target/avr/cpu.c | 2 +- target/avr/disas.c | 214 +++++++++++++++++++++++++++++++++++++++++ target/avr/translate.c | 11 +++ 4 files changed, 227 insertions(+), 1 deletion(-) create mode 100644 target/avr/disas.ctarget/avr/cpu.h +1
-0@@ -157,6 +157,7 @@ bool avr_cpu_exec_interrupt(CPUState *cpu, int int_req);hwaddr avr_cpu_get_phys_page_debug (CPUState *cpu,vaddr addr);int avr_cpu_gdb_read_register (CPUState *cpu,uint8_t *buf,int reg);int avr_cpu_gdb_write_register (CPUState *cpu,uint8_t *buf,int reg); +int avr_print_insn (bfd_vma addr,disassemble_info *info);static inline int avr_feature (CPUAVRState *env,int feature){
target/avr/cpu.c +1
-1@@ -83,7 +83,7 @@ static void avr_cpu_reset(CPUState *cs)static void avr_cpu_disas_set_info (CPUState *cpu,disassemble_info *info) { info->mach = bfd_arch_avr; - info->print_insn =NULL ; + info->print_insn = avr_print_insn; }static void avr_cpu_realizefn (DeviceState *dev,Error **errp)target/avr/disas.c new file +33
-0@@ -0,0 +1,214 @@ +/* +* OpenRISC disassembler +* +* Copyright (c) 2018 Richard Henderson <[email protected]> +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include "qemu/osdep.h" +#include "disas/dis-asm.h" +#include "qemu/bitops.h" +#include "cpu.h" + +typedef struct { +disassemble_info *info; +uint16_t next_word; +bool next_word_used; +}DisasContext ; + +static int to_A (DisasContext *ctx,int indx) {return 16 + (indx %16 ); } +static int to_B (DisasContext *ctx,int indx) {return 16 + (indx %8 ); } +static int to_C(DisasContext *ctx, int indx) { return 24 + (indx % 4) *2; }
target/avr/disas.c new file +181
-0+static int to_D (DisasContext *ctx,int indx) {return (indx %16 ) *2 ; } + +static uint16_t next_word (DisasContext *ctx) +{ + ctx->next_word_used = true; +return ctx->next_word; +} + +static int append_16 (DisasContext *ctx,int x) +{ +return x <<16 |next_word (ctx); +} + + +/* Include the auto-generated decoder. */ +static bool decode_insn (DisasContext *ctx,uint16_t insn); +#include "decode_insn.inc.c" + +#define output (mnemonic, format, ...) \ + (pctx->info->fprintf_func(pctx->info->stream, "%-9s " format, \ + mnemonic, ##__VA_ARGS__)) + +int avr_print_insn (bfd_vma addr,disassemble_info *info) +{ +DisasContext ctx; +DisasContext *pctx = &ctx; +bfd_byte buffer[4 ]; +uint16_t insn; +int status; + + ctx.info = info; + + status = info->read_memory_func (addr, buffer,4 , info); +if (status !=0 ) { + info->memory_error_func (status, addr, info); +return -1 ; + } + insn =bfd_getl16 (buffer); + ctx.next_word =bfd_getl16 (buffer +2 ); + ctx.next_word_used = false; + +if (!decode_insn (&ctx, insn)) { +output (".db" ,"0x%02x, 0x%02x" , buffer[0 ], buffer[1 ]); + } + +return ctx.next_word_used ?4 :2 ; +} + + +#define INSN (opcode, format, ...) \ +static bool trans_##opcode(DisasContext *pctx, arg_##opcode * a) \ +{ \ + output(#opcode, format, ##__VA_ARGS__); \ + return true; \ +} + +#define INSN_MNEMONIC (opcode, mnemonic, format, ...) \ +static bool trans_##opcode(DisasContext *pctx, arg_##opcode * a) \ +{ \ + output(mnemonic, format, ##__VA_ARGS__); \ + return true; \ +} + +/* +* C Z N V S H T I +* 0 1 2 3 4 5 6 7 +*/ +static const char *brbc[] = { +"BRCC" ,"BRNE" ,"BRPL" ,"BRVC" ,"BRGE" ,"BRHC" ,"BRTC" ,"BRID" +}; + +static const char *brbs[] = { +"BRCS" ,"BREQ" ,"BRMI" ,"BRVS" ,"BRLT" ,"BRHS" ,"BRTS" ,"BRIE" +}; + +static const char *bset[] = { +"SEC" ,"SEZ" ,"SEN" ,"SEZ" ,"SES" ,"SEH" ,"SET" ,"SEI" +}; + +static const char *bclr[] = { +"CLC" ,"CLZ" ,"CLN" ,"CLZ" ,"CLS" ,"CLH" ,"CLT" ,"CLI" +}; + +INSN(ADC, "r%d, r%d", a->rd, a->rr) +INSN(ADD, "r%d, r%d", a->rd, a->rr) +INSN(ADIW, "r%d:r%r, %d", a->rd + 1, a->rd, a->imm) +INSN(AND, "r%d, r%d", a->rd, a->rr) +INSN(ANDI, "r%d, %d", a->rd, a->imm) +INSN(ASR, "r%d", a->rd) +INSN_MNEMONIC(BCLR, bclr[a->bit], "") +INSN(BLD, "r%d, %d", a->rd, a->bit) +INSN_MNEMONIC(BRBC, brbc[a->bit], ".%+d", a->imm * 2) +INSN_MNEMONIC(BRBS, brbs[a->bit], ".%+d", a->imm * 2) +INSN(BREAK, "") +INSN_MNEMONIC(BSET, bset[a->bit], "") +INSN(BST, "r%d, %d", a->rd, a->bit) +INSN(CALL, "0x%x", a->imm * 2) +INSN(CBI, "%d, %d", a->reg, a->bit) +INSN(COM, "r%d", a->rd) +INSN(CP, "r%d, r%d", a->rd, a->rr) +INSN(CPC, "r%d, r%d", a->rd, a->rr) +INSN(CPI, "r%d, %d", a->rd, a->imm) +INSN(CPSE, "r%d, r%d", a->rd, a->rr) +INSN(DEC, "r%d", a->rd) +INSN(DES, "%d", a->imm) +INSN(EICALL, "") +INSN(EIJMP, "") +INSN(ELPM1, "") +INSN(ELPM2, "r%d, Z", a->rd) +INSN(ELPMX, "r%d, Z+", a->rd) +INSN(EOR, "r%d, r%d", a->rd, a->rr) +INSN(FMUL, "r%d, r%d", a->rd, a->rr) +INSN(FMULS, "r%d, r%d", a->rd, a->rr) +INSN(FMULSU, "r%d, r%d", a->rd, a->rr) +INSN(ICALL, "") +INSN(IJMP, "") +INSN(IN, "r%d, $%d", a->rd, a->imm) +INSN(INC, "r%d", a->rd) +INSN(JMP, "0x%x", a->imm * 2) +INSN(LAC, "Z, r%d", a->rd) +INSN(LAS, "Z, r%d", a->rd) +INSN(LAT, "Z, r%d", a->rd) +INSN(LDDY, "r%d, Y+%d", a->rd, a->imm) +INSN(LDDZ, "r%d, Z+%d", a->rd, a->imm) +INSN(LDI, "r%d, %d", a->rd, a->imm) +INSN(LDS, "r%d, %d", a->rd, a->imm) +INSN(LDX1, "r%d, X", a->rd) +INSN(LDX2, "r%d, X+", a->rd) +INSN(LDX3, "r%d, -X", a->rd) +INSN(LDY2, "r%d, Y+", a->rd) +INSN(LDY3, "r%d, -Y", a->rd) +INSN(LDZ2, "r%d, Z+", a->rd) +INSN(LDZ3, "r%d, -Z", a->rd) +INSN(LPM1, "") +INSN(LPM2, "r%d, Z", a->rd) +INSN(LPMX, "r%d, Z+", a->rd) +INSN(LSR, "r%d", a->rd) +INSN(MOV, "r%d, r%d", a->rd, a->rr) +INSN(MOVW, "r%d:r%d, r%d,r:r%d", a->rd + 1, a->rd, a->rr + 1, a->rr) +INSN(MUL, "r%d, r%d", a->rd, a->rr) +INSN(MULS, "r%d, r%d", a->rd, a->rr) +INSN(MULSU, "r%d, r%d", a->rd, a->rr) +INSN(NEG, "r%d", a->rd) +INSN(NOP, "") +INSN(OR, "r%d, r%d", a->rd, a->rr) +INSN(ORI, "r%d, %d", a->rd, a->imm) +INSN(OUT, "$%d, r%d", a->imm, a->rd) +INSN(POP, "r%d", a->rd) +INSN(PUSH, "r%d", a->rd) +INSN(RCALL, ".%+d", a->imm * 2) +INSN(RET, "") +INSN(RETI, "") +INSN(RJMP, ".%+d", a->imm * 2) +INSN(ROR, "r%d", a->rd) +INSN(SBC, "r%d, r%d", a->rd, a->rr) +INSN(SBCI, "r%d, %d", a->rd, a->imm) +INSN(SBI, "$%d, %d", a->reg, a->bit) +INSN(SBIC, "$%d, %d", a->reg, a->bit) +INSN(SBIS, "$%d, %d", a->reg, a->bit) +INSN(SBIW, "r%d:r%d, %d", a->rd + 1, a->rd, a->imm) +INSN(SBRC, "r%d, %d", a->rr, a->bit) +INSN(SBRS, "r%d, %d", a->rr, a->bit) +INSN(SLEEP, "") +INSN(SPM, "") +INSN(SPMX, "Z+") +INSN(STDY, "r%d, Y+%d", a->rd, a->imm) +INSN(STDZ, "r%d, Z+%d", a->rd, a->imm) +INSN(STS, "r%d, %d", a->rd, a->imm) +INSN(STX1, "r%d, X", a->rr) +INSN(STX2, "r%d, X+", a->rr) +INSN(STX3, "r%d, -X", a->rr) +INSN(STY2, "r%d, Y+", a->rd) +INSN(STY3, "r%d, -Y", a->rd) +INSN(STZ2, "r%d, Z+", a->rd) +INSN(STZ3, "r%d, -Z", a->rd) +INSN(SUB, "r%d, r%d", a->rd, a->rr) +INSN(SUBI, "r%d, %d", a->rd, a->imm) +INSN(SWAP, "r%d", a->rd) +INSN(WDR, "") +INSN (XCH ,"Z, r%d" , a->rd) +target/avr/translate.c +11
-1@@ -3019,6 +3019,17 @@ done_generating: tb->size = (ctx.npc - pc_start) *2 ; tb->icount = num_insns; + +#ifdef DEBUG_DISAS +if (qemu_loglevel_mask (CPU_LOG_TB_IN_ASM ) + &&qemu_log_in_addr_range (tb->pc)) { +qemu_log_lock (); +qemu_log ("IN: %s\n" ,lookup_symbol (tb->pc)); +log_target_disas (cs, tb->pc, tb->size); +qemu_log ("\n" ); +qemu_log_unlock (); + } +#endif } void restore_state_to_opc(CPUAVRState *env, TranslationBlock *tb, --2.17.2 (Apple Git-113)
Re: [PATCH v36 10/17] target/avr: Add instruction disassembly function
In reply to Michael RolnikQuoted 69 lines · Michael Rolnik
Provide function disassembles executed instruction when
-d in_asmis providedSigned-off-by Michael Rolnik <[email protected]>--- target/avr/cpu.h | 1 + target/avr/cpu.c | 2 +- target/avr/disas.c | 214 +++++++++++++++++++++++++++++++++++++++++ target/avr/translate.c | 11 +++ 4 files changed, 227 insertions(+), 1 deletion(-) create mode 100644 target/avr/disas.ctarget/avr/cpu.h +1
-0@@ -157,6 +157,7 @@ bool avr_cpu_exec_interrupt(CPUState *cpu, int int_req);hwaddr avr_cpu_get_phys_page_debug (CPUState *cpu,vaddr addr);int avr_cpu_gdb_read_register (CPUState *cpu,uint8_t *buf,int reg);int avr_cpu_gdb_write_register (CPUState *cpu,uint8_t *buf,int reg); +int avr_print_insn (bfd_vma addr,disassemble_info *info);static inline int avr_feature (CPUAVRState *env,int feature) {target/avr/cpu.c +1
-1@@ -83,7 +83,7 @@ static void avr_cpu_reset(CPUState *cs)static void avr_cpu_disas_set_info (CPUState *cpu,disassemble_info *info) { info->mach = bfd_arch_avr; - info->print_insn =NULL ; + info->print_insn = avr_print_insn; }static void avr_cpu_realizefn (DeviceState *dev,Error **errp)target/avr/disas.c new file +25
-0@@ -0,0 +1,214 @@ +/* +* OpenRISC disassembler +* +* Copyright (c) 2018 Richard Henderson <[email protected]> +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include "qemu/osdep.h" +#include "disas/dis-asm.h" +#include "qemu/bitops.h" +#include "cpu.h" + +typedef struct {
target/avr/disas.c line 35
Quoted 10 lines
target/avr/disas.c new file +10
-0+disassemble_info *info; +uint16_t next_word; +bool next_word_used; +} DisasContext; + +static int to_A (DisasContext *ctx,int indx) {return 16 + (indx %16 ); } +static int to_B (DisasContext *ctx,int indx) {return 16 + (indx %8 ); } +static int to_C (DisasContext *ctx,int indx) {return 24 + (indx %4 ) *2 ; } +static int to_D (DisasContext *ctx,int indx) {return (indx %16 ) *2 ; } +
Is there any better way for naming these four function than meaningless to_A, to_B, to_C, to_D?
Aleksandar
Quoted 204 lines
target/avr/disas.c new file +179
-0+static uint16_t next_word (DisasContext *ctx) +{ + ctx->next_word_used = true; +return ctx->next_word; +} + +static int append_16 (DisasContext *ctx,int x) +{ +return x <<16 |next_word (ctx); +} + + +/* Include the auto-generated decoder. */ +static bool decode_insn (DisasContext *ctx,uint16_t insn); +#include "decode_insn.inc.c" + +#define output (mnemonic, format, ...) \ + (pctx->info->fprintf_func(pctx->info->stream, "%-9s " format, \ + mnemonic, ##__VA_ARGS__)) + +int avr_print_insn (bfd_vma addr,disassemble_info *info) +{ +DisasContext ctx; +DisasContext *pctx = &ctx; +bfd_byte buffer[4 ]; +uint16_t insn; +int status; + + ctx.info = info; + + status = info->read_memory_func (addr, buffer,4 , info); +if (status !=0 ) { + info->memory_error_func (status, addr, info); +return -1 ; + } + insn =bfd_getl16 (buffer); + ctx.next_word =bfd_getl16 (buffer +2 ); + ctx.next_word_used = false; + +if (!decode_insn (&ctx, insn)) { +output (".db" ,"0x%02x, 0x%02x" , buffer[0 ], buffer[1 ]); + } + +return ctx.next_word_used ?4 :2 ; +} + + +#define INSN (opcode, format, ...) \ +static bool trans_##opcode(DisasContext *pctx, arg_##opcode * a) \ +{ \ + output(#opcode, format, ##__VA_ARGS__); \ + return true; \ +} + +#define INSN_MNEMONIC (opcode, mnemonic, format, ...) \ +static bool trans_##opcode(DisasContext *pctx, arg_##opcode * a) \ +{ \ + output(mnemonic, format, ##__VA_ARGS__); \ + return true; \ +} + +/* +* C Z N V S H T I +* 0 1 2 3 4 5 6 7 +*/ +static const char *brbc[] = { +"BRCC" ,"BRNE" ,"BRPL" ,"BRVC" ,"BRGE" ,"BRHC" ,"BRTC" ,"BRID" +}; + +static const char *brbs[] = { +"BRCS" ,"BREQ" ,"BRMI" ,"BRVS" ,"BRLT" ,"BRHS" ,"BRTS" ,"BRIE" +}; + +static const char *bset[] = { +"SEC" ,"SEZ" ,"SEN" ,"SEZ" ,"SES" ,"SEH" ,"SET" ,"SEI" +}; + +static const char *bclr[] = { +"CLC" ,"CLZ" ,"CLN" ,"CLZ" ,"CLS" ,"CLH" ,"CLT" ,"CLI" +}; + +INSN(ADC, "r%d, r%d", a->rd, a->rr) +INSN(ADD, "r%d, r%d", a->rd, a->rr) +INSN(ADIW, "r%d:r%r, %d", a->rd + 1, a->rd, a->imm) +INSN(AND, "r%d, r%d", a->rd, a->rr) +INSN(ANDI, "r%d, %d", a->rd, a->imm) +INSN(ASR, "r%d", a->rd) +INSN_MNEMONIC(BCLR, bclr[a->bit], "") +INSN(BLD, "r%d, %d", a->rd, a->bit) +INSN_MNEMONIC(BRBC, brbc[a->bit], ".%+d", a->imm * 2) +INSN_MNEMONIC(BRBS, brbs[a->bit], ".%+d", a->imm * 2) +INSN(BREAK, "") +INSN_MNEMONIC(BSET, bset[a->bit], "") +INSN(BST, "r%d, %d", a->rd, a->bit) +INSN(CALL, "0x%x", a->imm * 2) +INSN(CBI, "%d, %d", a->reg, a->bit) +INSN(COM, "r%d", a->rd) +INSN(CP, "r%d, r%d", a->rd, a->rr) +INSN(CPC, "r%d, r%d", a->rd, a->rr) +INSN(CPI, "r%d, %d", a->rd, a->imm) +INSN(CPSE, "r%d, r%d", a->rd, a->rr) +INSN(DEC, "r%d", a->rd) +INSN(DES, "%d", a->imm) +INSN(EICALL, "") +INSN(EIJMP, "") +INSN(ELPM1, "") +INSN(ELPM2, "r%d, Z", a->rd) +INSN(ELPMX, "r%d, Z+", a->rd) +INSN(EOR, "r%d, r%d", a->rd, a->rr) +INSN(FMUL, "r%d, r%d", a->rd, a->rr) +INSN(FMULS, "r%d, r%d", a->rd, a->rr) +INSN(FMULSU, "r%d, r%d", a->rd, a->rr) +INSN(ICALL, "") +INSN(IJMP, "") +INSN(IN, "r%d, $%d", a->rd, a->imm) +INSN(INC, "r%d", a->rd) +INSN(JMP, "0x%x", a->imm * 2) +INSN(LAC, "Z, r%d", a->rd) +INSN(LAS, "Z, r%d", a->rd) +INSN(LAT, "Z, r%d", a->rd) +INSN(LDDY, "r%d, Y+%d", a->rd, a->imm) +INSN(LDDZ, "r%d, Z+%d", a->rd, a->imm) +INSN(LDI, "r%d, %d", a->rd, a->imm) +INSN(LDS, "r%d, %d", a->rd, a->imm) +INSN(LDX1, "r%d, X", a->rd) +INSN(LDX2, "r%d, X+", a->rd) +INSN(LDX3, "r%d, -X", a->rd) +INSN(LDY2, "r%d, Y+", a->rd) +INSN(LDY3, "r%d, -Y", a->rd) +INSN(LDZ2, "r%d, Z+", a->rd) +INSN(LDZ3, "r%d, -Z", a->rd) +INSN(LPM1, "") +INSN(LPM2, "r%d, Z", a->rd) +INSN(LPMX, "r%d, Z+", a->rd) +INSN(LSR, "r%d", a->rd) +INSN(MOV, "r%d, r%d", a->rd, a->rr) +INSN(MOVW, "r%d:r%d, r%d,r:r%d", a->rd + 1, a->rd, a->rr + 1, a->rr) +INSN(MUL, "r%d, r%d", a->rd, a->rr) +INSN(MULS, "r%d, r%d", a->rd, a->rr) +INSN(MULSU, "r%d, r%d", a->rd, a->rr) +INSN(NEG, "r%d", a->rd) +INSN(NOP, "") +INSN(OR, "r%d, r%d", a->rd, a->rr) +INSN(ORI, "r%d, %d", a->rd, a->imm) +INSN(OUT, "$%d, r%d", a->imm, a->rd) +INSN(POP, "r%d", a->rd) +INSN(PUSH, "r%d", a->rd) +INSN(RCALL, ".%+d", a->imm * 2) +INSN(RET, "") +INSN(RETI, "") +INSN(RJMP, ".%+d", a->imm * 2) +INSN(ROR, "r%d", a->rd) +INSN(SBC, "r%d, r%d", a->rd, a->rr) +INSN(SBCI, "r%d, %d", a->rd, a->imm) +INSN(SBI, "$%d, %d", a->reg, a->bit) +INSN(SBIC, "$%d, %d", a->reg, a->bit) +INSN(SBIS, "$%d, %d", a->reg, a->bit) +INSN(SBIW, "r%d:r%d, %d", a->rd + 1, a->rd, a->imm) +INSN(SBRC, "r%d, %d", a->rr, a->bit) +INSN(SBRS, "r%d, %d", a->rr, a->bit) +INSN(SLEEP, "") +INSN(SPM, "") +INSN(SPMX, "Z+") +INSN(STDY, "r%d, Y+%d", a->rd, a->imm) +INSN(STDZ, "r%d, Z+%d", a->rd, a->imm) +INSN(STS, "r%d, %d", a->rd, a->imm) +INSN(STX1, "r%d, X", a->rr) +INSN(STX2, "r%d, X+", a->rr) +INSN(STX3, "r%d, -X", a->rr) +INSN(STY2, "r%d, Y+", a->rd) +INSN(STY3, "r%d, -Y", a->rd) +INSN(STZ2, "r%d, Z+", a->rd) +INSN(STZ3, "r%d, -Z", a->rd) +INSN(SUB, "r%d, r%d", a->rd, a->rr) +INSN(SUBI, "r%d, %d", a->rd, a->imm) +INSN(SWAP, "r%d", a->rd) +INSN(WDR, "") +INSN (XCH ,"Z, r%d" , a->rd) +target/avr/translate.c +11
-1@@ -3019,6 +3019,17 @@ done_generating: tb->size = (ctx.npc - pc_start) *2 ; tb->icount = num_insns; + +#ifdef DEBUG_DISAS +if (qemu_loglevel_mask (CPU_LOG_TB_IN_ASM ) + &&qemu_log_in_addr_range (tb->pc)) { +qemu_log_lock (); +qemu_log ("IN: %s\n" ,lookup_symbol (tb->pc)); +log_target_disas (cs, tb->pc, tb->size); +qemu_log ("\n" ); +qemu_log_unlock (); + } +#endif } void restore_state_to_opc(CPUAVRState *env, TranslationBlock *tb, --2.17.2 (Apple Git-113)
Re: [PATCH v36 10/17] target/avr: Add instruction disassembly function
Quoted 83 lines · Aleksandar Markovic
target/avr/cpu.h bool avr_cpu_exec_interrupt(CPUState *cpu, int
Quoted 18 lines · Michael Rolnik
Provide function disassembles executed instruction when
-d in_asmis providedSigned-off-by Michael Rolnik <[email protected]>--- target/avr/cpu.h | 1 + target/avr/cpu.c | 2 +- target/avr/disas.c | 214 +++++++++++++++++++++++++++++++++++++++++ target/avr/translate.c | 11 +++ 4 files changed, 227 insertions(+), 1 deletion(-) create mode 100644 target/avr/disas.ctarget/avr/cpu.h +0
-0@@ -157,6 +157,7 @@ bool avr_cpu_exec_interrupt(CPUState *cpu, int
int_req);target/avr/cpu.c static void avr_cpu_reset(CPUState *cs) · line 83
Quoted 13 lines
target/avr/cpu.h +1
-0hwaddr avr_cpu_get_phys_page_debug (CPUState *cpu,vaddr addr);int avr_cpu_gdb_read_register (CPUState *cpu,uint8_t *buf,int reg);int avr_cpu_gdb_write_register (CPUState *cpu,uint8_t *buf,int reg); +int avr_print_insn (bfd_vma addr,disassemble_info *info);static inline int avr_feature (CPUAVRState *env,int feature) {target/avr/cpu.c +0
-0@@ -83,7 +83,7 @@ static void avr_cpu_reset(CPUState *cs) static void avr_cpu_disas_set_info(CPUState *cpu, disassemble_info*info)
Quoted 35 lines
target/avr/cpu.c +1
-1{ info->mach = bfd_arch_avr; - info->print_insn =NULL ; + info->print_insn = avr_print_insn; }static void avr_cpu_realizefn (DeviceState *dev,Error **errp)target/avr/disas.c new file +17
-0@@ -0,0 +1,214 @@ +/* +* OpenRISC disassembler +* +* Copyright (c) 2018 Richard Henderson <[email protected]> +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see <http://www.gnu.org/licenses/ .
+ */target/avr/disas.c new file +3
-0+ +#include "qemu/osdep.h" +#include "disas/dis-asm.h" target/avr/disas.c
Quoted 10 lines
target/avr/disas.c new file +10
-0+#include "qemu/bitops.h" +#include "cpu.h" + +typedef struct { +disassemble_info *info; +uint16_t next_word; +bool next_word_used; +}DisasContext ; + +static int to_A (DisasContext *ctx,int indx) {return 16 + (indx %16 );}
target/avr/disas.c
Quoted 2 lines
target/avr/disas.c new file +2
-0+static int to_B (DisasContext *ctx,int indx) {return 16 + (indx %8 ); } +static int to_C(DisasContext *ctx, int indx) { return 24 + (indx % 4) *2; }
Quoted 9 lines
target/avr/disas.c
Quoted 2 lines
target/avr/disas.c new file +2
-0+static int to_D (DisasContext *ctx,int indx) {return (indx %16 ) *2 ; } +Is there any better way for naming these four function than meaningless
to_A,to_B,to_C,to_D?Aleksandar
if you look into insn.decode file you will see the following comment.
# A = [16 .. 31] # B = [16 .. 23] # C = [24, 26, 28, 30] # D = [0, 2, 4, 6, 8, .. 30]
I can call them if you prefer
A is regs_16_to_31_by_one
B is regs_16_to_23_by_one
C is regs_24_to_30_by_two
D is regs_00_to_30_by_two
Quoted 216 lines
Quoted 39 lines
target/avr/disas.c new file +38
-0+static uint16_t next_word (DisasContext *ctx) +{ + ctx->next_word_used = true; +return ctx->next_word; +} + +static int append_16 (DisasContext *ctx,int x) +{ +return x <<16 |next_word (ctx); +} + + +/* Include the auto-generated decoder. */ +static bool decode_insn (DisasContext *ctx,uint16_t insn); +#include "decode_insn.inc.c" + +#define output (mnemonic, format, ...) \ + (pctx->info->fprintf_func(pctx->info->stream, "%-9s " format, \ + mnemonic, ##__VA_ARGS__)) + +int avr_print_insn (bfd_vma addr,disassemble_info *info) +{ +DisasContext ctx; +DisasContext *pctx = &ctx; +bfd_byte buffer[4 ]; +uint16_t insn; +int status; + + ctx.info = info; + + status = info->read_memory_func (addr, buffer,4 , info); +if (status !=0 ) { + info->memory_error_func (status, addr, info); +return -1 ; + } + insn =bfd_getl16 (buffer); + ctx.next_word =bfd_getl16 (buffer +2 ); + ctx.next_word_used = false;target/avr/disas.c
Quoted 10 lines
target/avr/disas.c new file +10
-0+ +if (!decode_insn (&ctx, insn)) { +output (".db" ,"0x%02x, 0x%02x" , buffer[0 ], buffer[1 ]); + } + +return ctx.next_word_used ?4 :2 ; +} + + +#define INSN (opcode, format, ...)\
Quoted 1 line
+static bool trans_##opcode(DisasContext *pctx, arg_##opcode * a)
\
Quoted 1 line
+{
\
Quoted 1 line
+
output(#opcode, format, ##__VA_ARGS__);\
Quoted 1 line
+ return true;
\
target/avr/disas.c
Quoted 3 lines
target/avr/disas.c new file +3
-0+} + +#define INSN_MNEMONIC (opcode, mnemonic, format, ...)\
Quoted 1 line
+static bool trans_##opcode(DisasContext *pctx, arg_##opcode * a)
\
Quoted 1 line
+{
\
Quoted 1 line
+
output(mnemonic, format, ##__VA_ARGS__);\
Quoted 1 line
+ return true;
\
Quoted 145 lines
target/avr/disas.c new file +120
-0+} + +/* +* C Z N V S H T I +* 0 1 2 3 4 5 6 7 +*/ +static const char *brbc[] = { +"BRCC" ,"BRNE" ,"BRPL" ,"BRVC" ,"BRGE" ,"BRHC" ,"BRTC" ,"BRID" +}; + +static const char *brbs[] = { +"BRCS" ,"BREQ" ,"BRMI" ,"BRVS" ,"BRLT" ,"BRHS" ,"BRTS" ,"BRIE" +}; + +static const char *bset[] = { +"SEC" ,"SEZ" ,"SEN" ,"SEZ" ,"SES" ,"SEH" ,"SET" ,"SEI" +}; + +static const char *bclr[] = { +"CLC" ,"CLZ" ,"CLN" ,"CLZ" ,"CLS" ,"CLH" ,"CLT" ,"CLI" +}; + +INSN(ADC, "r%d, r%d", a->rd, a->rr) +INSN(ADD, "r%d, r%d", a->rd, a->rr) +INSN(ADIW, "r%d:r%r, %d", a->rd + 1, a->rd, a->imm) +INSN(AND, "r%d, r%d", a->rd, a->rr) +INSN(ANDI, "r%d, %d", a->rd, a->imm) +INSN(ASR, "r%d", a->rd) +INSN_MNEMONIC(BCLR, bclr[a->bit], "") +INSN(BLD, "r%d, %d", a->rd, a->bit) +INSN_MNEMONIC(BRBC, brbc[a->bit], ".%+d", a->imm * 2) +INSN_MNEMONIC(BRBS, brbs[a->bit], ".%+d", a->imm * 2) +INSN(BREAK, "") +INSN_MNEMONIC(BSET, bset[a->bit], "") +INSN(BST, "r%d, %d", a->rd, a->bit) +INSN(CALL, "0x%x", a->imm * 2) +INSN(CBI, "%d, %d", a->reg, a->bit) +INSN(COM, "r%d", a->rd) +INSN(CP, "r%d, r%d", a->rd, a->rr) +INSN(CPC, "r%d, r%d", a->rd, a->rr) +INSN(CPI, "r%d, %d", a->rd, a->imm) +INSN(CPSE, "r%d, r%d", a->rd, a->rr) +INSN(DEC, "r%d", a->rd) +INSN(DES, "%d", a->imm) +INSN(EICALL, "") +INSN(EIJMP, "") +INSN(ELPM1, "") +INSN(ELPM2, "r%d, Z", a->rd) +INSN(ELPMX, "r%d, Z+", a->rd) +INSN(EOR, "r%d, r%d", a->rd, a->rr) +INSN(FMUL, "r%d, r%d", a->rd, a->rr) +INSN(FMULS, "r%d, r%d", a->rd, a->rr) +INSN(FMULSU, "r%d, r%d", a->rd, a->rr) +INSN(ICALL, "") +INSN(IJMP, "") +INSN(IN, "r%d, $%d", a->rd, a->imm) +INSN(INC, "r%d", a->rd) +INSN(JMP, "0x%x", a->imm * 2) +INSN(LAC, "Z, r%d", a->rd) +INSN(LAS, "Z, r%d", a->rd) +INSN(LAT, "Z, r%d", a->rd) +INSN(LDDY, "r%d, Y+%d", a->rd, a->imm) +INSN(LDDZ, "r%d, Z+%d", a->rd, a->imm) +INSN(LDI, "r%d, %d", a->rd, a->imm) +INSN(LDS, "r%d, %d", a->rd, a->imm) +INSN(LDX1, "r%d, X", a->rd) +INSN(LDX2, "r%d, X+", a->rd) +INSN(LDX3, "r%d, -X", a->rd) +INSN(LDY2, "r%d, Y+", a->rd) +INSN(LDY3, "r%d, -Y", a->rd) +INSN(LDZ2, "r%d, Z+", a->rd) +INSN(LDZ3, "r%d, -Z", a->rd) +INSN(LPM1, "") +INSN(LPM2, "r%d, Z", a->rd) +INSN(LPMX, "r%d, Z+", a->rd) +INSN(LSR, "r%d", a->rd) +INSN(MOV, "r%d, r%d", a->rd, a->rr) +INSN(MOVW, "r%d:r%d, r%d,r:r%d", a->rd + 1, a->rd, a->rr + 1, a->rr) +INSN(MUL, "r%d, r%d", a->rd, a->rr) +INSN(MULS, "r%d, r%d", a->rd, a->rr) +INSN(MULSU, "r%d, r%d", a->rd, a->rr) +INSN(NEG, "r%d", a->rd) +INSN(NOP, "") +INSN(OR, "r%d, r%d", a->rd, a->rr) +INSN(ORI, "r%d, %d", a->rd, a->imm) +INSN(OUT, "$%d, r%d", a->imm, a->rd) +INSN(POP, "r%d", a->rd) +INSN(PUSH, "r%d", a->rd) +INSN(RCALL, ".%+d", a->imm * 2) +INSN(RET, "") +INSN(RETI, "") +INSN(RJMP, ".%+d", a->imm * 2) +INSN(ROR, "r%d", a->rd) +INSN(SBC, "r%d, r%d", a->rd, a->rr) +INSN(SBCI, "r%d, %d", a->rd, a->imm) +INSN(SBI, "$%d, %d", a->reg, a->bit) +INSN(SBIC, "$%d, %d", a->reg, a->bit) +INSN(SBIS, "$%d, %d", a->reg, a->bit) +INSN(SBIW, "r%d:r%d, %d", a->rd + 1, a->rd, a->imm) +INSN(SBRC, "r%d, %d", a->rr, a->bit) +INSN(SBRS, "r%d, %d", a->rr, a->bit) +INSN(SLEEP, "") +INSN(SPM, "") +INSN(SPMX, "Z+") +INSN(STDY, "r%d, Y+%d", a->rd, a->imm) +INSN(STDZ, "r%d, Z+%d", a->rd, a->imm) +INSN(STS, "r%d, %d", a->rd, a->imm) +INSN(STX1, "r%d, X", a->rr) +INSN(STX2, "r%d, X+", a->rr) +INSN(STX3, "r%d, -X", a->rr) +INSN(STY2, "r%d, Y+", a->rd) +INSN(STY3, "r%d, -Y", a->rd) +INSN(STZ2, "r%d, Z+", a->rd) +INSN(STZ3, "r%d, -Z", a->rd) +INSN(SUB, "r%d, r%d", a->rd, a->rr) +INSN(SUBI, "r%d, %d", a->rd, a->imm) +INSN(SWAP, "r%d", a->rd) +INSN(WDR, "") +INSN (XCH ,"Z, r%d" , a->rd) +target/avr/translate.c +11
-1@@ -3019,6 +3019,17 @@ done_generating: tb->size = (ctx.npc - pc_start) *2 ; tb->icount = num_insns; + +#ifdef DEBUG_DISAS +if (qemu_loglevel_mask (CPU_LOG_TB_IN_ASM ) + &&qemu_log_in_addr_range (tb->pc)) { +qemu_log_lock (); +qemu_log ("IN: %s\n" ,lookup_symbol (tb->pc)); +log_target_disas (cs, tb->pc, tb->size); +qemu_log ("\n" ); +qemu_log_unlock (); + } +#endif } void restore_state_to_opc(CPUAVRState *env, TranslationBlock *tb, --2.17.2 (Apple Git-113)
Signature · 2 lines
Best Regards, Michael Rolnik
Re: [PATCH v36 10/17] target/avr: Add instruction disassembly function
Quoted 106 lines · Michael Rolnik
Quoted 85 lines · Aleksandar Markovic
target/avr/cpu.h bool avr_cpu_exec_interrupt(CPUState *cpu, int
Quoted 18 lines · Michael Rolnik
Provide function disassembles executed instruction when
-d in_asmis providedSigned-off-by Michael Rolnik <[email protected]>--- target/avr/cpu.h | 1 + target/avr/cpu.c | 2 +- target/avr/disas.c | 214 +++++++++++++++++++++++++++++++++++++++++ target/avr/translate.c | 11 +++ 4 files changed, 227 insertions(+), 1 deletion(-) create mode 100644 target/avr/disas.ctarget/avr/cpu.h +0
-0@@ -157,6 +157,7 @@ bool avr_cpu_exec_interrupt(CPUState *cpu, int
int_req);target/avr/cpu.c static void avr_cpu_reset(CPUState *cs) · line 83
Quoted 13 lines
target/avr/cpu.h +1
-0hwaddr avr_cpu_get_phys_page_debug (CPUState *cpu,vaddr addr);int avr_cpu_gdb_read_register (CPUState *cpu,uint8_t *buf,int reg);int avr_cpu_gdb_write_register (CPUState *cpu,uint8_t *buf,int reg); +int avr_print_insn (bfd_vma addr,disassemble_info *info);static inline int avr_feature (CPUAVRState *env,int feature) {target/avr/cpu.c +0
-0@@ -83,7 +83,7 @@ static void avr_cpu_reset(CPUState *cs) static void avr_cpu_disas_set_info(CPUState *cpu, disassemble_info*info)
Quoted 35 lines
target/avr/cpu.c +1
-1{ info->mach = bfd_arch_avr; - info->print_insn =NULL ; + info->print_insn = avr_print_insn; }static void avr_cpu_realizefn (DeviceState *dev,Error **errp)target/avr/disas.c new file +17
-0@@ -0,0 +1,214 @@ +/* +* OpenRISC disassembler +* +* Copyright (c) 2018 Richard Henderson <[email protected]> +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see <http://www.gnu.org/licenses/ .
+ */target/avr/disas.c new file +3
-0+ +#include "qemu/osdep.h" +#include "disas/dis-asm.h" target/avr/disas.c
Quoted 10 lines
target/avr/disas.c new file +10
-0+#include "qemu/bitops.h" +#include "cpu.h" + +typedef struct { +disassemble_info *info; +uint16_t next_word; +bool next_word_used; +}DisasContext ; + +static int to_A(DisasContext *ctx, int indx) { return 16 + (indx %16); }
Quoted 1 line
+static int
to_B(DisasContext *ctx, int indx){ return 16 + (indx % 8);}
Quoted 1 line
+static int
to_C(DisasContext *ctx, int indx){ return 24 + (indx % 4)* 2; }
Quoted 1 line
+static int
to_D(DisasContext *ctx, int indx){ return (indx % 16) * 2;Quoted 9 lines
}
Quoted 1 line
+
Is there any better way for naming these four function than meaningless
to_A,to_B,to_C,to_D?Aleksandar
if you look into insn.decode file you will see the following comment.
# A = [16 .. 31] # B = [16 .. 23] # C = [24, 26, 28, 30] # D = [0, 2, 4, 6, 8, .. 30]
Quoted 7 lines
I can call them if you prefer
A isregs_16_to_31_by_one
B isregs_16_to_23_by_one
C isregs_24_to_30_by_two
D isregs_00_to_30_by_two
I really like these new names.
Quoted 223 lines
Quoted 212 lines
Quoted 40 lines
target/avr/disas.c new file +38
-0+static uint16_t next_word (DisasContext *ctx) +{ + ctx->next_word_used = true; +return ctx->next_word; +} + +static int append_16 (DisasContext *ctx,int x) +{ +return x <<16 |next_word (ctx); +} + + +/* Include the auto-generated decoder. */ +static bool decode_insn (DisasContext *ctx,uint16_t insn); +#include "decode_insn.inc.c" + +#define output (mnemonic, format, ...) \ + (pctx->info->fprintf_func(pctx->info->stream, "%-9s " format, \ + mnemonic, ##__VA_ARGS__)) + +int avr_print_insn (bfd_vma addr,disassemble_info *info) +{ +DisasContext ctx; +DisasContext *pctx = &ctx; +bfd_byte buffer[4 ]; +uint16_t insn; +int status; + + ctx.info = info; + + status = info->read_memory_func (addr, buffer,4 , info); +if (status !=0 ) { + info->memory_error_func (status, addr, info); +return -1 ; + } + insn =bfd_getl16 (buffer); + ctx.next_word =bfd_getl16 (buffer +2 ); + ctx.next_word_used = false;target/avr/disas.c
Quoted 10 lines
target/avr/disas.c new file +10
-0+ +if (!decode_insn (&ctx, insn)) { +output (".db" ,"0x%02x, 0x%02x" , buffer[0 ], buffer[1 ]); + } + +return ctx.next_word_used ?4 :2 ; +} + + +#define INSN (opcode, format, ...)\
Quoted 1 line
+static bool trans_##opcode(DisasContext *pctx, arg_##opcode * a)
\
Quoted 1 line
+{
\
Quoted 1 line
+
output(#opcode, format, ##__VA_ARGS__);\
Quoted 1 line
+ return true;
\
target/avr/disas.c
Quoted 3 lines
target/avr/disas.c new file +3
-0+} + +#define INSN_MNEMONIC (opcode, mnemonic, format, ...)\
Quoted 1 line
+static bool trans_##opcode(DisasContext *pctx, arg_##opcode * a)
\
Quoted 1 line
+{
\
Quoted 1 line
+
output(mnemonic, format, ##__VA_ARGS__);\
Quoted 1 line
+ return true;
\
Quoted 141 lines
target/avr/disas.c new file +120
-0+} + +/* +* C Z N V S H T I +* 0 1 2 3 4 5 6 7 +*/ +static const char *brbc[] = { +"BRCC" ,"BRNE" ,"BRPL" ,"BRVC" ,"BRGE" ,"BRHC" ,"BRTC" ,"BRID" +}; + +static const char *brbs[] = { +"BRCS" ,"BREQ" ,"BRMI" ,"BRVS" ,"BRLT" ,"BRHS" ,"BRTS" ,"BRIE" +}; + +static const char *bset[] = { +"SEC" ,"SEZ" ,"SEN" ,"SEZ" ,"SES" ,"SEH" ,"SET" ,"SEI" +}; + +static const char *bclr[] = { +"CLC" ,"CLZ" ,"CLN" ,"CLZ" ,"CLS" ,"CLH" ,"CLT" ,"CLI" +}; + +INSN(ADC, "r%d, r%d", a->rd, a->rr) +INSN(ADD, "r%d, r%d", a->rd, a->rr) +INSN(ADIW, "r%d:r%r, %d", a->rd + 1, a->rd, a->imm) +INSN(AND, "r%d, r%d", a->rd, a->rr) +INSN(ANDI, "r%d, %d", a->rd, a->imm) +INSN(ASR, "r%d", a->rd) +INSN_MNEMONIC(BCLR, bclr[a->bit], "") +INSN(BLD, "r%d, %d", a->rd, a->bit) +INSN_MNEMONIC(BRBC, brbc[a->bit], ".%+d", a->imm * 2) +INSN_MNEMONIC(BRBS, brbs[a->bit], ".%+d", a->imm * 2) +INSN(BREAK, "") +INSN_MNEMONIC(BSET, bset[a->bit], "") +INSN(BST, "r%d, %d", a->rd, a->bit) +INSN(CALL, "0x%x", a->imm * 2) +INSN(CBI, "%d, %d", a->reg, a->bit) +INSN(COM, "r%d", a->rd) +INSN(CP, "r%d, r%d", a->rd, a->rr) +INSN(CPC, "r%d, r%d", a->rd, a->rr) +INSN(CPI, "r%d, %d", a->rd, a->imm) +INSN(CPSE, "r%d, r%d", a->rd, a->rr) +INSN(DEC, "r%d", a->rd) +INSN(DES, "%d", a->imm) +INSN(EICALL, "") +INSN(EIJMP, "") +INSN(ELPM1, "") +INSN(ELPM2, "r%d, Z", a->rd) +INSN(ELPMX, "r%d, Z+", a->rd) +INSN(EOR, "r%d, r%d", a->rd, a->rr) +INSN(FMUL, "r%d, r%d", a->rd, a->rr) +INSN(FMULS, "r%d, r%d", a->rd, a->rr) +INSN(FMULSU, "r%d, r%d", a->rd, a->rr) +INSN(ICALL, "") +INSN(IJMP, "") +INSN(IN, "r%d, $%d", a->rd, a->imm) +INSN(INC, "r%d", a->rd) +INSN(JMP, "0x%x", a->imm * 2) +INSN(LAC, "Z, r%d", a->rd) +INSN(LAS, "Z, r%d", a->rd) +INSN(LAT, "Z, r%d", a->rd) +INSN(LDDY, "r%d, Y+%d", a->rd, a->imm) +INSN(LDDZ, "r%d, Z+%d", a->rd, a->imm) +INSN(LDI, "r%d, %d", a->rd, a->imm) +INSN(LDS, "r%d, %d", a->rd, a->imm) +INSN(LDX1, "r%d, X", a->rd) +INSN(LDX2, "r%d, X+", a->rd) +INSN(LDX3, "r%d, -X", a->rd) +INSN(LDY2, "r%d, Y+", a->rd) +INSN(LDY3, "r%d, -Y", a->rd) +INSN(LDZ2, "r%d, Z+", a->rd) +INSN(LDZ3, "r%d, -Z", a->rd) +INSN(LPM1, "") +INSN(LPM2, "r%d, Z", a->rd) +INSN(LPMX, "r%d, Z+", a->rd) +INSN(LSR, "r%d", a->rd) +INSN(MOV, "r%d, r%d", a->rd, a->rr) +INSN(MOVW, "r%d:r%d, r%d,r:r%d", a->rd + 1, a->rd, a->rr + 1, a->rr) +INSN(MUL, "r%d, r%d", a->rd, a->rr) +INSN(MULS, "r%d, r%d", a->rd, a->rr) +INSN(MULSU, "r%d, r%d", a->rd, a->rr) +INSN(NEG, "r%d", a->rd) +INSN(NOP, "") +INSN(OR, "r%d, r%d", a->rd, a->rr) +INSN(ORI, "r%d, %d", a->rd, a->imm) +INSN(OUT, "$%d, r%d", a->imm, a->rd) +INSN(POP, "r%d", a->rd) +INSN(PUSH, "r%d", a->rd) +INSN(RCALL, ".%+d", a->imm * 2) +INSN(RET, "") +INSN(RETI, "") +INSN(RJMP, ".%+d", a->imm * 2) +INSN(ROR, "r%d", a->rd) +INSN(SBC, "r%d, r%d", a->rd, a->rr) +INSN(SBCI, "r%d, %d", a->rd, a->imm) +INSN(SBI, "$%d, %d", a->reg, a->bit) +INSN(SBIC, "$%d, %d", a->reg, a->bit) +INSN(SBIS, "$%d, %d", a->reg, a->bit) +INSN(SBIW, "r%d:r%d, %d", a->rd + 1, a->rd, a->imm) +INSN(SBRC, "r%d, %d", a->rr, a->bit) +INSN(SBRS, "r%d, %d", a->rr, a->bit) +INSN(SLEEP, "") +INSN(SPM, "") +INSN(SPMX, "Z+") +INSN(STDY, "r%d, Y+%d", a->rd, a->imm) +INSN(STDZ, "r%d, Z+%d", a->rd, a->imm) +INSN(STS, "r%d, %d", a->rd, a->imm) +INSN(STX1, "r%d, X", a->rr) +INSN(STX2, "r%d, X+", a->rr) +INSN(STX3, "r%d, -X", a->rr) +INSN(STY2, "r%d, Y+", a->rd) +INSN(STY3, "r%d, -Y", a->rd) +INSN(STZ2, "r%d, Z+", a->rd) +INSN(STZ3, "r%d, -Z", a->rd) +INSN(SUB, "r%d, r%d", a->rd, a->rr) +INSN(SUBI, "r%d, %d", a->rd, a->imm) +INSN(SWAP, "r%d", a->rd) +INSN(WDR, "") +INSN (XCH ,"Z, r%d" , a->rd) +target/avr/translate.c +11
-0@@ -3019,6 +3019,17 @@ done_generating: tb->size = (ctx.npc - pc_start) *2 ; tb->icount = num_insns; + +#ifdef DEBUG_DISAS +if (qemu_loglevel_mask (CPU_LOG_TB_IN_ASM ) + &&qemu_log_in_addr_range (tb->pc)) { +qemu_log_lock (); +qemu_log ("IN: %s\n" ,lookup_symbol (tb->pc)); +log_target_disas (cs, tb->pc, tb->size); +qemu_log ("\n" ); +qemu_log_unlock (); + } +#endif }Quoted 5 lines
Quoted 4 lines
target/avr/translate.c +0
-1void restore_state_to_opc(CPUAVRState *env, TranslationBlock *tb, --2.17.2 (Apple Git-113)
--
Best Regards,
Michael Rolnik
Re: [PATCH v36 10/17] target/avr: Add instruction disassembly function
In reply to Michael RolnikQuoted 5 lines · Michael Rolnik
Provide function disassembles executed instruction when
-d in_asmis providedSigned-off-by Michael Rolnik <[email protected]>---
Michael, hi.
It would be very helpful if you include an example in the commit message:
- how to start qemu for AVR with -d in_asm (preferably in the form of instructions that will enable any reader to repeat the procedure)
- the first 20-30 outputed disassembler lines
As I said before, sorry if this might look like nitpicking,, it is not, I am just trying to help the series look and be better. Those are just missing bits and pieces that are shame to be omitted.
Sincerely yours,
Aleksandar
target/avr/cpu.h | 1 +
Quoted 279 lines
target/avr/cpu.c | 2 +- target/avr/disas.c | 214 +++++++++++++++++++++++++++++++++++++++++ target/avr/translate.c | 11 +++ 4 files changed, 227 insertions(+), 1 deletion(-) create mode 100644 target/avr/disas.ctarget/avr/cpu.h +1
-0@@ -157,6 +157,7 @@ bool avr_cpu_exec_interrupt(CPUState *cpu, int int_req);hwaddr avr_cpu_get_phys_page_debug (CPUState *cpu,vaddr addr);int avr_cpu_gdb_read_register (CPUState *cpu,uint8_t *buf,int reg);int avr_cpu_gdb_write_register (CPUState *cpu,uint8_t *buf,int reg); +int avr_print_insn (bfd_vma addr,disassemble_info *info);static inline int avr_feature (CPUAVRState *env,int feature){
target/avr/cpu.c +1
-1@@ -83,7 +83,7 @@ static void avr_cpu_reset(CPUState *cs)static void avr_cpu_disas_set_info (CPUState *cpu,disassemble_info *info) { info->mach = bfd_arch_avr; - info->print_insn =NULL ; + info->print_insn = avr_print_insn; }static void avr_cpu_realizefn (DeviceState *dev,Error **errp)target/avr/disas.c new file +33
-0@@ -0,0 +1,214 @@ +/* +* OpenRISC disassembler +* +* Copyright (c) 2018 Richard Henderson <[email protected]> +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include "qemu/osdep.h" +#include "disas/dis-asm.h" +#include "qemu/bitops.h" +#include "cpu.h" + +typedef struct { +disassemble_info *info; +uint16_t next_word; +bool next_word_used; +}DisasContext ; + +static int to_A (DisasContext *ctx,int indx) {return 16 + (indx %16 ); } +static int to_B (DisasContext *ctx,int indx) {return 16 + (indx %8 ); } +static int to_C(DisasContext *ctx, int indx) { return 24 + (indx % 4) *2; }
target/avr/disas.c new file +181
-0+static int to_D (DisasContext *ctx,int indx) {return (indx %16 ) *2 ; } + +static uint16_t next_word (DisasContext *ctx) +{ + ctx->next_word_used = true; +return ctx->next_word; +} + +static int append_16 (DisasContext *ctx,int x) +{ +return x <<16 |next_word (ctx); +} + + +/* Include the auto-generated decoder. */ +static bool decode_insn (DisasContext *ctx,uint16_t insn); +#include "decode_insn.inc.c" + +#define output (mnemonic, format, ...) \ + (pctx->info->fprintf_func(pctx->info->stream, "%-9s " format, \ + mnemonic, ##__VA_ARGS__)) + +int avr_print_insn (bfd_vma addr,disassemble_info *info) +{ +DisasContext ctx; +DisasContext *pctx = &ctx; +bfd_byte buffer[4 ]; +uint16_t insn; +int status; + + ctx.info = info; + + status = info->read_memory_func (addr, buffer,4 , info); +if (status !=0 ) { + info->memory_error_func (status, addr, info); +return -1 ; + } + insn =bfd_getl16 (buffer); + ctx.next_word =bfd_getl16 (buffer +2 ); + ctx.next_word_used = false; + +if (!decode_insn (&ctx, insn)) { +output (".db" ,"0x%02x, 0x%02x" , buffer[0 ], buffer[1 ]); + } + +return ctx.next_word_used ?4 :2 ; +} + + +#define INSN (opcode, format, ...) \ +static bool trans_##opcode(DisasContext *pctx, arg_##opcode * a) \ +{ \ + output(#opcode, format, ##__VA_ARGS__); \ + return true; \ +} + +#define INSN_MNEMONIC (opcode, mnemonic, format, ...) \ +static bool trans_##opcode(DisasContext *pctx, arg_##opcode * a) \ +{ \ + output(mnemonic, format, ##__VA_ARGS__); \ + return true; \ +} + +/* +* C Z N V S H T I +* 0 1 2 3 4 5 6 7 +*/ +static const char *brbc[] = { +"BRCC" ,"BRNE" ,"BRPL" ,"BRVC" ,"BRGE" ,"BRHC" ,"BRTC" ,"BRID" +}; + +static const char *brbs[] = { +"BRCS" ,"BREQ" ,"BRMI" ,"BRVS" ,"BRLT" ,"BRHS" ,"BRTS" ,"BRIE" +}; + +static const char *bset[] = { +"SEC" ,"SEZ" ,"SEN" ,"SEZ" ,"SES" ,"SEH" ,"SET" ,"SEI" +}; + +static const char *bclr[] = { +"CLC" ,"CLZ" ,"CLN" ,"CLZ" ,"CLS" ,"CLH" ,"CLT" ,"CLI" +}; + +INSN(ADC, "r%d, r%d", a->rd, a->rr) +INSN(ADD, "r%d, r%d", a->rd, a->rr) +INSN(ADIW, "r%d:r%r, %d", a->rd + 1, a->rd, a->imm) +INSN(AND, "r%d, r%d", a->rd, a->rr) +INSN(ANDI, "r%d, %d", a->rd, a->imm) +INSN(ASR, "r%d", a->rd) +INSN_MNEMONIC(BCLR, bclr[a->bit], "") +INSN(BLD, "r%d, %d", a->rd, a->bit) +INSN_MNEMONIC(BRBC, brbc[a->bit], ".%+d", a->imm * 2) +INSN_MNEMONIC(BRBS, brbs[a->bit], ".%+d", a->imm * 2) +INSN(BREAK, "") +INSN_MNEMONIC(BSET, bset[a->bit], "") +INSN(BST, "r%d, %d", a->rd, a->bit) +INSN(CALL, "0x%x", a->imm * 2) +INSN(CBI, "%d, %d", a->reg, a->bit) +INSN(COM, "r%d", a->rd) +INSN(CP, "r%d, r%d", a->rd, a->rr) +INSN(CPC, "r%d, r%d", a->rd, a->rr) +INSN(CPI, "r%d, %d", a->rd, a->imm) +INSN(CPSE, "r%d, r%d", a->rd, a->rr) +INSN(DEC, "r%d", a->rd) +INSN(DES, "%d", a->imm) +INSN(EICALL, "") +INSN(EIJMP, "") +INSN(ELPM1, "") +INSN(ELPM2, "r%d, Z", a->rd) +INSN(ELPMX, "r%d, Z+", a->rd) +INSN(EOR, "r%d, r%d", a->rd, a->rr) +INSN(FMUL, "r%d, r%d", a->rd, a->rr) +INSN(FMULS, "r%d, r%d", a->rd, a->rr) +INSN(FMULSU, "r%d, r%d", a->rd, a->rr) +INSN(ICALL, "") +INSN(IJMP, "") +INSN(IN, "r%d, $%d", a->rd, a->imm) +INSN(INC, "r%d", a->rd) +INSN(JMP, "0x%x", a->imm * 2) +INSN(LAC, "Z, r%d", a->rd) +INSN(LAS, "Z, r%d", a->rd) +INSN(LAT, "Z, r%d", a->rd) +INSN(LDDY, "r%d, Y+%d", a->rd, a->imm) +INSN(LDDZ, "r%d, Z+%d", a->rd, a->imm) +INSN(LDI, "r%d, %d", a->rd, a->imm) +INSN(LDS, "r%d, %d", a->rd, a->imm) +INSN(LDX1, "r%d, X", a->rd) +INSN(LDX2, "r%d, X+", a->rd) +INSN(LDX3, "r%d, -X", a->rd) +INSN(LDY2, "r%d, Y+", a->rd) +INSN(LDY3, "r%d, -Y", a->rd) +INSN(LDZ2, "r%d, Z+", a->rd) +INSN(LDZ3, "r%d, -Z", a->rd) +INSN(LPM1, "") +INSN(LPM2, "r%d, Z", a->rd) +INSN(LPMX, "r%d, Z+", a->rd) +INSN(LSR, "r%d", a->rd) +INSN(MOV, "r%d, r%d", a->rd, a->rr) +INSN(MOVW, "r%d:r%d, r%d,r:r%d", a->rd + 1, a->rd, a->rr + 1, a->rr) +INSN(MUL, "r%d, r%d", a->rd, a->rr) +INSN(MULS, "r%d, r%d", a->rd, a->rr) +INSN(MULSU, "r%d, r%d", a->rd, a->rr) +INSN(NEG, "r%d", a->rd) +INSN(NOP, "") +INSN(OR, "r%d, r%d", a->rd, a->rr) +INSN(ORI, "r%d, %d", a->rd, a->imm) +INSN(OUT, "$%d, r%d", a->imm, a->rd) +INSN(POP, "r%d", a->rd) +INSN(PUSH, "r%d", a->rd) +INSN(RCALL, ".%+d", a->imm * 2) +INSN(RET, "") +INSN(RETI, "") +INSN(RJMP, ".%+d", a->imm * 2) +INSN(ROR, "r%d", a->rd) +INSN(SBC, "r%d, r%d", a->rd, a->rr) +INSN(SBCI, "r%d, %d", a->rd, a->imm) +INSN(SBI, "$%d, %d", a->reg, a->bit) +INSN(SBIC, "$%d, %d", a->reg, a->bit) +INSN(SBIS, "$%d, %d", a->reg, a->bit) +INSN(SBIW, "r%d:r%d, %d", a->rd + 1, a->rd, a->imm) +INSN(SBRC, "r%d, %d", a->rr, a->bit) +INSN(SBRS, "r%d, %d", a->rr, a->bit) +INSN(SLEEP, "") +INSN(SPM, "") +INSN(SPMX, "Z+") +INSN(STDY, "r%d, Y+%d", a->rd, a->imm) +INSN(STDZ, "r%d, Z+%d", a->rd, a->imm) +INSN(STS, "r%d, %d", a->rd, a->imm) +INSN(STX1, "r%d, X", a->rr) +INSN(STX2, "r%d, X+", a->rr) +INSN(STX3, "r%d, -X", a->rr) +INSN(STY2, "r%d, Y+", a->rd) +INSN(STY3, "r%d, -Y", a->rd) +INSN(STZ2, "r%d, Z+", a->rd) +INSN(STZ3, "r%d, -Z", a->rd) +INSN(SUB, "r%d, r%d", a->rd, a->rr) +INSN(SUBI, "r%d, %d", a->rd, a->imm) +INSN(SWAP, "r%d", a->rd) +INSN(WDR, "") +INSN (XCH ,"Z, r%d" , a->rd) +target/avr/translate.c +11
-1@@ -3019,6 +3019,17 @@ done_generating: tb->size = (ctx.npc - pc_start) *2 ; tb->icount = num_insns; + +#ifdef DEBUG_DISAS +if (qemu_loglevel_mask (CPU_LOG_TB_IN_ASM ) + &&qemu_log_in_addr_range (tb->pc)) { +qemu_log_lock (); +qemu_log ("IN: %s\n" ,lookup_symbol (tb->pc)); +log_target_disas (cs, tb->pc, tb->size); +qemu_log ("\n" ); +qemu_log_unlock (); + } +#endif } void restore_state_to_opc(CPUAVRState *env, TranslationBlock *tb, --2.17.2 (Apple Git-113)
Re: [PATCH v36 10/17] target/avr: Add instruction disassembly function
In reply to Michael RolnikQuoted 2 lines · Michael Rolnik
Provide function disassembles executed instruction when
-d in_asmis provided
Maybe "Implement the disassemble_info::print_insn() callback which print a disassembled instruction."
Quoted 40 lines
Signed-off-by Michael Rolnik <[email protected]>--- target/avr/cpu.h | 1 + target/avr/cpu.c | 2 +- target/avr/disas.c | 214 +++++++++++++++++++++++++++++++++++++++++ target/avr/translate.c | 11 +++ 4 files changed, 227 insertions(+), 1 deletion(-)create mode 100644
target/avr/disas.ctarget/avr/cpu.h +1
-0@@ -157,6 +157,7 @@ bool avr_cpu_exec_interrupt(CPUState *cpu, int int_req);hwaddr avr_cpu_get_phys_page_debug (CPUState *cpu,vaddr addr);int avr_cpu_gdb_read_register (CPUState *cpu,uint8_t *buf,int reg);int avr_cpu_gdb_write_register (CPUState *cpu,uint8_t *buf,int reg); +int avr_print_insn (bfd_vma addr,disassemble_info *info);static inline int avr_feature (CPUAVRState *env,int feature) {target/avr/cpu.c +1
-1@@ -83,7 +83,7 @@ static void avr_cpu_reset(CPUState *cs)static void avr_cpu_disas_set_info (CPUState *cpu,disassemble_info *info) { info->mach = bfd_arch_avr; - info->print_insn =NULL ; + info->print_insn = avr_print_insn; }static void avr_cpu_realizefn (DeviceState *dev,Error **errp)target/avr/disas.c new file +0
-0
target/avr/disas.c line 2
Quoted 2 lines
target/avr/disas.c new file +2
-0@@ -0,0 +1,214 @@ +/* +* OpenRISC disassembler
AVR?
target/avr/disas.c line 4
Quoted 2 lines
target/avr/disas.c new file +2
-0+* +* Copyright (c) 2018 Richard Henderson <[email protected]>
Copyright (c) 2019 Michael Rolnik <[email protected]>?
Quoted 105 lines
target/avr/disas.c new file +105
-0+* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include "qemu/osdep.h" +#include "disas/dis-asm.h" +#include "qemu/bitops.h" +#include "cpu.h" + +typedef struct { +disassemble_info *info; +uint16_t next_word; +bool next_word_used; +}DisasContext ; + +static int to_A (DisasContext *ctx,int indx) {return 16 + (indx %16 ); } +static int to_B (DisasContext *ctx,int indx) {return 16 + (indx %8 ); } +static int to_C (DisasContext *ctx,int indx) {return 24 + (indx %4 ) *2 ; } +static int to_D (DisasContext *ctx,int indx) {return (indx %16 ) *2 ; } + +static uint16_t next_word (DisasContext *ctx) +{ + ctx->next_word_used = true; +return ctx->next_word; +} + +static int append_16 (DisasContext *ctx,int x) +{ +return x <<16 |next_word (ctx); +} + + +/* Include the auto-generated decoder. */ +static bool decode_insn (DisasContext *ctx,uint16_t insn); +#include "decode_insn.inc.c" + +#define output (mnemonic, format, ...) \ + (pctx->info->fprintf_func(pctx->info->stream, "%-9s " format, \ + mnemonic, ##__VA_ARGS__)) + +int avr_print_insn (bfd_vma addr,disassemble_info *info) +{ +DisasContext ctx; +DisasContext *pctx = &ctx; +bfd_byte buffer[4 ]; +uint16_t insn; +int status; + + ctx.info = info; + + status = info->read_memory_func (addr, buffer,4 , info); +if (status !=0 ) { + info->memory_error_func (status, addr, info); +return -1 ; + } + insn =bfd_getl16 (buffer); + ctx.next_word =bfd_getl16 (buffer +2 ); + ctx.next_word_used = false; + +if (!decode_insn (&ctx, insn)) { +output (".db" ,"0x%02x, 0x%02x" , buffer[0 ], buffer[1 ]); + } + +return ctx.next_word_used ?4 :2 ; +} + + +#define INSN (opcode, format, ...) \ +static bool trans_##opcode(DisasContext *pctx, arg_##opcode * a) \ +{ \ + output(#opcode, format, ##__VA_ARGS__); \ + return true; \ +} + +#define INSN_MNEMONIC (opcode, mnemonic, format, ...) \ +static bool trans_##opcode(DisasContext *pctx, arg_##opcode * a) \ +{ \ + output(mnemonic, format, ##__VA_ARGS__); \ + return true; \ +} + +/* +* C Z N V S H T I +* 0 1 2 3 4 5 6 7 +*/ +static const char *brbc[] = { +"BRCC" ,"BRNE" ,"BRPL" ,"BRVC" ,"BRGE" ,"BRHC" ,"BRTC" ,"BRID" +}; + +static const char *brbs[] = { +"BRCS" ,"BREQ" ,"BRMI" ,"BRVS" ,"BRLT" ,"BRHS" ,"BRTS" ,"BRIE" +}; + +static const char *bset[] = {
target/avr/disas.c line 119
Quoted 10 lines
target/avr/disas.c new file +10
-0+"SEC" ,"SEZ" ,"SEN" ,"SEZ" ,"SES" ,"SEH" ,"SET" ,"SEI" +}; + +static const char *bclr[] = { +"CLC" ,"CLZ" ,"CLN" ,"CLZ" ,"CLS" ,"CLH" ,"CLT" ,"CLI" +}; + +INSN(ADC, "r%d, r%d", a->rd, a->rr) +INSN(ADD, "r%d, r%d", a->rd, a->rr) +INSN (ADIW ,"r%d:r%r, %d" , a->rd +1 , a->rd, a->imm)
I suppose this is a typo and you want:
-- >8 --
-INSN(ADIW, "r%d:r%r, %d", a->rd + 1, a->rd, a->imm)
+INSN(ADIW, "r%d:r%d, %d", a->rd + 1, a->rd, a->imm)
---
Because I'm getting:
target/avr/disas.c: In function ‘trans_ADIW’:target/avr/disas.c:53:51: error: unknown conversion type character ‘r’ in format [-Werror=format=]
53 | (pctx->info->fprintf_func(pctx->info->stream, "%-9s " format, \
| ^~~~~~~target/avr/disas.c:86:5: note: in expansion of macro ‘output’
86 | output(#opcode, format, ##__VA_ARGS__);
\
| ^~~~~~
target/avr/disas.c:119:1: note: in expansion of macro ‘INSN’
119 | INSN(ADIW, "r%d:r%r, %d", a->rd + 1, a->rd, a->imm)
| ^~~~target/avr/disas.c:119:21: note: format string is defined here
119 | INSN(ADIW, "r%d:r%r, %d", a->rd + 1, a->rd, a->imm)
| ^target/avr/disas.c:53:51: error: too many arguments for format [-Werror=format-extra-args]
53 | (pctx->info->fprintf_func(pctx->info->stream, "%-9s " format, \
| ^~~~~~~target/avr/disas.c:86:5: note: in expansion of macro ‘output’
86 | output(#opcode, format, ##__VA_ARGS__);
\
| ^~~~~~
target/avr/disas.c:119:1: note: in expansion of macro ‘INSN’
119 | INSN(ADIW, "r%d:r%r, %d", a->rd + 1, a->rd, a->imm)
| ^~~~cc1: all warnings being treated as errors make[1]: *** [rules.mak:69: target/avr/disas.o] Error 1
Quoted 108 lines
target/avr/disas.c new file +95
-0+INSN(AND, "r%d, r%d", a->rd, a->rr) +INSN(ANDI, "r%d, %d", a->rd, a->imm) +INSN(ASR, "r%d", a->rd) +INSN_MNEMONIC(BCLR, bclr[a->bit], "") +INSN(BLD, "r%d, %d", a->rd, a->bit) +INSN_MNEMONIC(BRBC, brbc[a->bit], ".%+d", a->imm * 2) +INSN_MNEMONIC(BRBS, brbs[a->bit], ".%+d", a->imm * 2) +INSN(BREAK, "") +INSN_MNEMONIC(BSET, bset[a->bit], "") +INSN(BST, "r%d, %d", a->rd, a->bit) +INSN(CALL, "0x%x", a->imm * 2) +INSN(CBI, "%d, %d", a->reg, a->bit) +INSN(COM, "r%d", a->rd) +INSN(CP, "r%d, r%d", a->rd, a->rr) +INSN(CPC, "r%d, r%d", a->rd, a->rr) +INSN(CPI, "r%d, %d", a->rd, a->imm) +INSN(CPSE, "r%d, r%d", a->rd, a->rr) +INSN(DEC, "r%d", a->rd) +INSN(DES, "%d", a->imm) +INSN(EICALL, "") +INSN(EIJMP, "") +INSN(ELPM1, "") +INSN(ELPM2, "r%d, Z", a->rd) +INSN(ELPMX, "r%d, Z+", a->rd) +INSN(EOR, "r%d, r%d", a->rd, a->rr) +INSN(FMUL, "r%d, r%d", a->rd, a->rr) +INSN(FMULS, "r%d, r%d", a->rd, a->rr) +INSN(FMULSU, "r%d, r%d", a->rd, a->rr) +INSN(ICALL, "") +INSN(IJMP, "") +INSN(IN, "r%d, $%d", a->rd, a->imm) +INSN(INC, "r%d", a->rd) +INSN(JMP, "0x%x", a->imm * 2) +INSN(LAC, "Z, r%d", a->rd) +INSN(LAS, "Z, r%d", a->rd) +INSN(LAT, "Z, r%d", a->rd) +INSN(LDDY, "r%d, Y+%d", a->rd, a->imm) +INSN(LDDZ, "r%d, Z+%d", a->rd, a->imm) +INSN(LDI, "r%d, %d", a->rd, a->imm) +INSN(LDS, "r%d, %d", a->rd, a->imm) +INSN(LDX1, "r%d, X", a->rd) +INSN(LDX2, "r%d, X+", a->rd) +INSN(LDX3, "r%d, -X", a->rd) +INSN(LDY2, "r%d, Y+", a->rd) +INSN(LDY3, "r%d, -Y", a->rd) +INSN(LDZ2, "r%d, Z+", a->rd) +INSN(LDZ3, "r%d, -Z", a->rd) +INSN(LPM1, "") +INSN(LPM2, "r%d, Z", a->rd) +INSN(LPMX, "r%d, Z+", a->rd) +INSN(LSR, "r%d", a->rd) +INSN(MOV, "r%d, r%d", a->rd, a->rr) +INSN(MOVW, "r%d:r%d, r%d,r:r%d", a->rd + 1, a->rd, a->rr + 1, a->rr) +INSN(MUL, "r%d, r%d", a->rd, a->rr) +INSN(MULS, "r%d, r%d", a->rd, a->rr) +INSN(MULSU, "r%d, r%d", a->rd, a->rr) +INSN(NEG, "r%d", a->rd) +INSN(NOP, "") +INSN(OR, "r%d, r%d", a->rd, a->rr) +INSN(ORI, "r%d, %d", a->rd, a->imm) +INSN(OUT, "$%d, r%d", a->imm, a->rd) +INSN(POP, "r%d", a->rd) +INSN(PUSH, "r%d", a->rd) +INSN(RCALL, ".%+d", a->imm * 2) +INSN(RET, "") +INSN(RETI, "") +INSN(RJMP, ".%+d", a->imm * 2) +INSN(ROR, "r%d", a->rd) +INSN(SBC, "r%d, r%d", a->rd, a->rr) +INSN(SBCI, "r%d, %d", a->rd, a->imm) +INSN(SBI, "$%d, %d", a->reg, a->bit) +INSN(SBIC, "$%d, %d", a->reg, a->bit) +INSN(SBIS, "$%d, %d", a->reg, a->bit) +INSN(SBIW, "r%d:r%d, %d", a->rd + 1, a->rd, a->imm) +INSN(SBRC, "r%d, %d", a->rr, a->bit) +INSN(SBRS, "r%d, %d", a->rr, a->bit) +INSN(SLEEP, "") +INSN(SPM, "") +INSN(SPMX, "Z+") +INSN(STDY, "r%d, Y+%d", a->rd, a->imm) +INSN(STDZ, "r%d, Z+%d", a->rd, a->imm) +INSN(STS, "r%d, %d", a->rd, a->imm) +INSN(STX1, "r%d, X", a->rr) +INSN(STX2, "r%d, X+", a->rr) +INSN(STX3, "r%d, -X", a->rr) +INSN(STY2, "r%d, Y+", a->rd) +INSN(STY3, "r%d, -Y", a->rd) +INSN(STZ2, "r%d, Z+", a->rd) +INSN(STZ3, "r%d, -Z", a->rd) +INSN(SUB, "r%d, r%d", a->rd, a->rr) +INSN(SUBI, "r%d, %d", a->rd, a->imm) +INSN(SWAP, "r%d", a->rd) +INSN(WDR, "") +INSN (XCH ,"Z, r%d" , a->rd) +target/avr/translate.c +4
-0@@ -3019,6 +3019,17 @@ done_generating: tb->size = (ctx.npc - pc_start) *2 ; tb->icount = num_insns; + +#ifdef DEBUG_DISAS +if (qemu_loglevel_mask (CPU_LOG_TB_IN_ASM ) + &&qemu_log_in_addr_range (tb->pc)) {
target/avr/translate.c done_generating: · line 3035
Quoted 10 lines
target/avr/translate.c +7
-0+qemu_log_lock (); +qemu_log ("IN: %s\n" ,lookup_symbol (tb->pc)); +log_target_disas (cs, tb->pc, tb->size); +qemu_log ("\n" ); +qemu_log_unlock (); + } +#endif } void restore_state_to_opc(CPUAVRState *env, TranslationBlock *tb,
Testing time...
$ avr-softmmu/qemu-system-avr -M sample -bios demo.elf -d in_asm,unimp,int IN: 0x00000000: JMP 0x110
IN:
0x00000110: EOR r1, r1 0x00000112: OUT $63, r1 0x00000114: LDI r28, 255 0x00000116: LDI r29, 33 0x00000118: OUT $62, r29 0x0000011a: OUT $61, r28 0x0000011c: LDI r16, 0 0x0000011e: OUT $60, r16 0x00000120: LDI r17, 2 0x00000122: LDI r26, 0 0x00000124: LDI r27, 2 0x00000126: LDI r30, 80 0x00000128: LDI r31, 87 0x0000012a: LDI r16, 0 0x0000012c: OUT $59, r16 0x0000012e: RJMP .+4
IN:
0x00000134: CPI r26, 96 0x00000136: CPC r27, r17 0x00000138: BRNE .-10 IN: 0x00000130: ELPMX r0, Z+ 0x00000132: STX2 r0, X+ 0x00000134: CPI r26, 96 0x00000136: CPC r27, r17 0x00000138: BRNE .-10
IN:
0x0000013a: LDI r18, 18 0x0000013c: LDI r26, 96 0x0000013e: LDI r27, 2 0x00000140: RJMP .+2
IN:
0x00000144: CPI r26, 208 0x00000146: CPC r27, r18 0x00000148: BRNE .-8
IN:
0x00000142: STX2 r1, X+ 0x00000144: CPI r26, 208 0x00000146: CPC r27, r18 0x00000148: BRNE .-8
IN:0x0000014a: CALL 0x156
IN: main
IN: main
0x00000156: PUSH r14 0x00000158: PUSH r15 0x0000015a: PUSH r16 0x0000015c: PUSH r28 0x0000015e: PUSH r29 0x00000160: IN r28, $61 0x00000162: IN r29, $62 0x00000164: CALL 0x26c
IN: prvIncrementResetCount
0x0000026c: PUSH r28 0x0000026e: PUSH r29 0x00000270: IN r28, $61 0x00000272: IN r29, $62 0x00000274: NOP 0x00000276: POP r29 0x00000278: POP r28 0x0000027a: RET
IN: main0x00000168: CALL 0x5c6
IN: vParTestInitialise
0x000005c6: PUSH r28 0x000005c8: PUSH r29 0x000005ca: IN r28, $61 0x000005cc: IN r29, $62 0x000005ce: LDI r24, 255 0x000005d0: STS r24, 0 0x000005d2: MULS r16, r20 0x000005d4: LDI r24, 33 0x000005d6: LDI r25, 0 0x000005d8: LDI r18, 255 0x000005da: MOVW r31:r30, r25,r:r24 0x000005dc: STDZ r18, Z+0 0x000005de: LDI r24, 34 0x000005e0: LDI r25, 0 0x000005e2: LDS r18, 0 0x000005e4: MULS r16, r20 0x000005e6: MOVW r31:r30, r25,r:r24 0x000005e8: STDZ r18, Z+0 0x000005ea: NOP 0x000005ec: POP r29 0x000005ee: POP r28 0x000005f0: RET
IN: vParTestInitialise0x000005dc: STDZ r18, Z+0
gpio A: unimplemented device write (size 1, value 0xff, offset 0x1) [...]
IN: vParTestToggleLED
0x000006c0: LDI r24, 34 0x000006c2: LDI r25, 0 0x000006c4: LDS r18, 0 0x000006c6: MULS r16, r20 0x000006c8: MOVW r31:r30, r25,r:r24 0x000006ca: STDZ r18, Z+0 0x000006cc: CALL 0x30d6
IN: vParTestToggleLED0x000006ca: STDZ r18, Z+0
gpio A: unimplemented device write (size 1, value 0xef, offset 0x2)
IN: vParTestToggleLED0x000006cc: CALL 0x30d6
IN: vParTestToggleLED
0x000006d0: NOP 0x000006d2: POP r0 0x000006d4: POP r0 0x000006d6: POP r29 0x000006d8: POP r28 0x000006da: RET
[...]
IN: vParTestToggleLED
0x000006b4: LDS r25, 0 0x000006b6: MULS r16, r20 0x000006b8: LDDY r24, Y+1 0x000006ba: OR r24, r25 0x000006bc: STS r24, 0 0x000006be: MULS r16, r20 0x000006c0: LDI r24, 34 0x000006c2: LDI r25, 0 0x000006c4: LDS r18, 0 0x000006c6: MULS r16, r20 0x000006c8: MOVW r31:r30, r25,r:r24 0x000006ca: STDZ r18, Z+0 0x000006cc: CALL 0x30d6
gpio A: unimplemented device write (size 1, value 0xff, offset 0x2) gpio A: unimplemented device write (size 1, value 0xef, offset 0x2) gpio A: unimplemented device write (size 1, value 0xff, offset 0x2) gpio A: unimplemented device write (size 1, value 0xef, offset 0x2) gpio A: unimplemented device write (size 1, value 0xff, offset 0x2) gpio A: unimplemented device write (size 1, value 0xef, offset 0x2) gpio A: unimplemented device write (size 1, value 0xff, offset 0x2) gpio A: unimplemented device write (size 1, value 0xef, offset 0x2) gpio A: unimplemented device write (size 1, value 0xff, offset 0x2) gpio A: unimplemented device write (size 1, value 0xef, offset 0x2) gpio A: unimplemented device write (size 1, value 0xff, offset 0x2) gpio A: unimplemented device write (size 1, value 0xef, offset 0x2) gpio A: unimplemented device write (size 1, value 0xff, offset 0x2) gpio A: unimplemented device write (size 1, value 0xef, offset 0x2) gpio A: unimplemented device write (size 1, value 0xff, offset 0x2) gpio A: unimplemented device write (size 1, value 0xef, offset 0x2) gpio A: unimplemented device write (size 1, value 0xff, offset 0x2) gpio A: unimplemented device write (size 1, value 0xef, offset 0x2) gpio A: unimplemented device write (size 1, value 0xff, offset 0x2) gpio A: unimplemented device write (size 1, value 0xef, offset 0x2) gpio A: unimplemented device write (size 1, value 0xff, offset 0x2) gpio A: unimplemented device write (size 1, value 0xef, offset 0x2)
We have a blinking LED!
$ avr-softmmu/qemu-system-avr -M sample -bios ATmegaBOOT_168_atmega328.elf -d in_asm,unimp,int [...] 0x00007800: JMP 0x7868
IN:
0x00007868: EOR r1, r1 0x0000786a: OUT $63, r1 0x0000786c: LDI r28, 255 0x0000786e: LDI r29, 8 0x00007870: OUT $62, r29 0x00007872: OUT $61, r28 0x00007874: LDI r17, 1 0x00007876: LDI r26, 0 0x00007878: LDI r27, 1 0x0000787a: LDI r30, 226 0x0000787c: LDI r31, 133 0x0000787e: RJMP .+4
IN:
0x00007884: CPI r26, 2 0x00007886: CPC r27, r17 0x00007888: BRNE .-10
IN:
0x00007880: LPMX r0, Z+ 0x00007882: STX2 r0, X+ 0x00007884: CPI r26, 2 0x00007886: CPC r27, r17 0x00007888: BRNE .-10
gpio H: unimplemented device write (size 1, value 0x80, offset 0x0) gpio H: unimplemented device write (size 1, value 0x0, offset 0x1) IN:
0x0000788a: LDI r18, 2 0x0000788c: LDI r26, 2 0x0000788e: LDI r27, 1 0x00007890: RJMP .+2
IN:
0x00007894: CPI r26, 13 0x00007896: CPC r27, r18 0x00007898: BRNE .-8
IN:
0x00007892: STX2 r1, X+ 0x00007894: CPI r26, 13 0x00007896: CPC r27, r18 0x00007898: BRNE .-8
gpio H: unimplemented device write (size 1, value 0x0, offset 0x2) gpio J: unimplemented device write (size 1, value 0x0, offset 0x0) gpio J: unimplemented device write (size 1, value 0x0, offset 0x1) gpio J: unimplemented device write (size 1, value 0x0, offset 0x2) gpio K: unimplemented device write (size 1, value 0x0, offset 0x0) gpio K: unimplemented device write (size 1, value 0x0, offset 0x1) gpio K: unimplemented device write (size 1, value 0x0, offset 0x2) gpio L: unimplemented device write (size 1, value 0x0, offset 0x0) gpio L: unimplemented device write (size 1, value 0x0, offset 0x1) gpio L: unimplemented device write (size 1, value 0x0, offset 0x2) timer-counter-16bit 5: unimplemented device write (size 1, value 0x0, offset 0x0) timer-counter-16bit 5: unimplemented device write (size 1, value 0x0, offset 0x1) timer-counter-16bit 5: unimplemented device write (size 1, value 0x0, offset 0x2) timer-counter-16bit 5: unimplemented device write (size 1, value 0x0, offset 0x3) timer-counter-16bit 5: unimplemented device write (size 1, value 0x0, offset 0x4) timer-counter-16bit 5: unimplemented device write (size 1, value 0x0, offset 0x5) timer-counter-16bit 5: unimplemented device write (size 1, value 0x0, offset 0x6) timer-counter-16bit 5: unimplemented device write (size 1, value 0x0, offset 0x7) timer-counter-16bit 5: unimplemented device write (size 1, value 0x0, offset 0x8) timer-counter-16bit 5: unimplemented device write (size 1, value 0x0, offset 0x9) timer-counter-16bit 5: unimplemented device write (size 1, value 0x0, offset 0xa) timer-counter-16bit 5: unimplemented device write (size 1, value 0x0, offset 0xb) timer-counter-16bit 5: unimplemented device write (size 1, value 0x0, offset 0xc) timer-counter-16bit 5: unimplemented device write (size 1, value 0x0, offset 0xd) usart 3: unimplemented device write (size 1, value 0x0, offset 0x0) usart 3: unimplemented device write (size 1, value 0x0, offset 0x1) usart 3: unimplemented device write (size 1, value 0x0, offset 0x2) usart 3: unimplemented device write (size 1, value 0x0, offset 0x3) usart 3: unimplemented device write (size 1, value 0x0, offset 0x4) usart 3: unimplemented device write (size 1, value 0x0, offset 0x5) usart 3: unimplemented device write (size 1, value 0x0, offset 0x6) IN:0x0000789a: CALL 0x7b8c
IN: main
[...]
Wow, congratulation, I'm impressed how fast you implemented that!
:) :)
Re: [PATCH v36 10/17] target/avr: Add instruction disassembly function
Quoted 621 lines · Philippe Mathieu-Daudé
Quoted 2 lines · Michael Rolnik
Provide function disassembles executed instruction when
-d in_asmis providedMaybe "Implement the
disassemble_info::print_insn()callback which print a disassembled instruction."target/avr/cpu.h bool avr_cpu_exec_interrupt(CPUState *cpu, int
Quoted 14 lines
Signed-off-by Michael Rolnik <[email protected]>--- target/avr/cpu.h | 1 + target/avr/cpu.c | 2 +- target/avr/disas.c | 214 +++++++++++++++++++++++++++++++++++++++++ target/avr/translate.c | 11 +++ 4 files changed, 227 insertions(+), 1 deletion(-)create mode 100644
target/avr/disas.ctarget/avr/cpu.h +0
-0@@ -157,6 +157,7 @@ bool avr_cpu_exec_interrupt(CPUState *cpu, int
int_req);target/avr/cpu.c static void avr_cpu_reset(CPUState *cs) · line 83
Quoted 13 lines
target/avr/cpu.h +1
-0hwaddr avr_cpu_get_phys_page_debug (CPUState *cpu,vaddr addr);int avr_cpu_gdb_read_register (CPUState *cpu,uint8_t *buf,int reg);int avr_cpu_gdb_write_register (CPUState *cpu,uint8_t *buf,int reg); +int avr_print_insn (bfd_vma addr,disassemble_info *info);static inline int avr_feature (CPUAVRState *env,int feature) {target/avr/cpu.c +0
-0@@ -83,7 +83,7 @@ static void avr_cpu_reset(CPUState *cs) static void avr_cpu_disas_set_info(CPUState *cpu, disassemble_info*info)
Quoted 13 lines
target/avr/cpu.c +1
-1{ info->mach = bfd_arch_avr; - info->print_insn =NULL ; + info->print_insn = avr_print_insn; }static void avr_cpu_realizefn (DeviceState *dev,Error **errp)target/avr/disas.c new file +0
-0target/avr/disas.c line 2
Quoted 2 lines
target/avr/disas.c new file +2
-0@@ -0,0 +1,214 @@ +/* +* OpenRISC disassembler AVR?
target/avr/disas.c line 4
Quoted 2 lines
target/avr/disas.c new file +2
-0+* +* Copyright (c) 2018 Richard Henderson <[email protected]> Copyright (c) 2019 Michael Rolnik <[email protected]>?
Quoted 18 lines
target/avr/disas.c new file +13
-0+* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see <http://www.gnu.org/licenses/ .
+ */target/avr/disas.c new file +3
-0+ +#include "qemu/osdep.h" +#include "disas/dis-asm.h" target/avr/disas.c
Quoted 10 lines
target/avr/disas.c new file +10
-0+#include "qemu/bitops.h" +#include "cpu.h" + +typedef struct { +disassemble_info *info; +uint16_t next_word; +bool next_word_used; +}DisasContext ; + +static int to_A (DisasContext *ctx,int indx) {return 16 + (indx %16 );}
target/avr/disas.c
Quoted 2 lines
target/avr/disas.c new file +2
-0+static int to_B (DisasContext *ctx,int indx) {return 16 + (indx %8 ); } +static int to_C(DisasContext *ctx, int indx) { return 24 + (indx % 4) *2; }
Quoted 40 lines
target/avr/disas.c new file +40
-0+static int to_D (DisasContext *ctx,int indx) {return (indx %16 ) *2 ; } + +static uint16_t next_word (DisasContext *ctx) +{ + ctx->next_word_used = true; +return ctx->next_word; +} + +static int append_16 (DisasContext *ctx,int x) +{ +return x <<16 |next_word (ctx); +} + + +/* Include the auto-generated decoder. */ +static bool decode_insn (DisasContext *ctx,uint16_t insn); +#include "decode_insn.inc.c" + +#define output (mnemonic, format, ...) \ + (pctx->info->fprintf_func(pctx->info->stream, "%-9s " format, \ + mnemonic, ##__VA_ARGS__)) + +int avr_print_insn (bfd_vma addr,disassemble_info *info) +{ +DisasContext ctx; +DisasContext *pctx = &ctx; +bfd_byte buffer[4 ]; +uint16_t insn; +int status; + + ctx.info = info; + + status = info->read_memory_func (addr, buffer,4 , info); +if (status !=0 ) { + info->memory_error_func (status, addr, info); +return -1 ; + } + insn =bfd_getl16 (buffer); + ctx.next_word =bfd_getl16 (buffer +2 ); + ctx.next_word_used = false;target/avr/disas.c
Quoted 10 lines
target/avr/disas.c new file +10
-0+ +if (!decode_insn (&ctx, insn)) { +output (".db" ,"0x%02x, 0x%02x" , buffer[0 ], buffer[1 ]); + } + +return ctx.next_word_used ?4 :2 ; +} + + +#define INSN (opcode, format, ...)\
Quoted 1 line
+static bool trans_##opcode(DisasContext *pctx, arg_##opcode * a)
\
Quoted 1 line
+{
\
Quoted 1 line
+
output(#opcode, format, ##__VA_ARGS__);\
Quoted 1 line
+ return true;
\
target/avr/disas.c
Quoted 3 lines
target/avr/disas.c new file +3
-0+} + +#define INSN_MNEMONIC (opcode, mnemonic, format, ...)\
Quoted 1 line
+static bool trans_##opcode(DisasContext *pctx, arg_##opcode * a)
\
Quoted 1 line
+{
\
Quoted 1 line
+
output(mnemonic, format, ##__VA_ARGS__);\
Quoted 1 line
+ return true;
\
Quoted 15 lines
target/avr/disas.c new file +15
-0+} + +/* +* C Z N V S H T I +* 0 1 2 3 4 5 6 7 +*/ +static const char *brbc[] = { +"BRCC" ,"BRNE" ,"BRPL" ,"BRVC" ,"BRGE" ,"BRHC" ,"BRTC" ,"BRID" +}; + +static const char *brbs[] = { +"BRCS" ,"BREQ" ,"BRMI" ,"BRVS" ,"BRLT" ,"BRHS" ,"BRTS" ,"BRIE" +}; + +static const char *bset[] = {target/avr/disas.c line 119
Quoted 10 lines
target/avr/disas.c new file +10
-0+"SEC" ,"SEZ" ,"SEN" ,"SEZ" ,"SES" ,"SEH" ,"SET" ,"SEI" +}; + +static const char *bclr[] = { +"CLC" ,"CLZ" ,"CLN" ,"CLZ" ,"CLS" ,"CLH" ,"CLT" ,"CLI" +}; + +INSN(ADC, "r%d, r%d", a->rd, a->rr) +INSN(ADD, "r%d, r%d", a->rd, a->rr) +INSN (ADIW ,"r%d:r%r, %d" , a->rd +1 , a->rd, a->imm)I suppose this is a typo and you want:
-- >8 --
(quoted diff) +1
-2-INSN(ADIW, "r%d:r%r, %d", a->rd + 1, a->rd, a->imm) +INSN(ADIW, "r%d:r%d, %d", a->rd + 1, a->rd, a->imm) ---Because I'm getting:
target/avr/disas.c: In function ‘trans_ADIW’:target/avr/disas.c:53:51: error: unknown conversion type character ‘r’ in format [-Werror=format=]53 | (pctx->info->fprintf_func(pctx->info->stream, "%-9s " format, \ | ^~~~~~~ target/avr/disas.c:86:5: note: in expansion of macro ‘output’ 86 | output(#opcode, format, ##__VA_ARGS__); \ | ^~~~~~ target/avr/disas.c:119:1: note: in expansion of macro ‘INSN’ 119 | INSN(ADIW, "r%d:r%r, %d", a->rd + 1, a->rd, a->imm) | ^~~~
target/avr/disas.c:119:21: note: format string is defined here
119 |INSN(ADIW, "r%d:r%r, %d", a->rd + 1, a->rd, a->imm)
| ^target/avr/disas.c:53:51: error: too many arguments for format [-Werror=format-extra-args]53 | (pctx->info->fprintf_func(pctx->info->stream, "%-9s " format, \ | ^~~~~~~ target/avr/disas.c:86:5: note: in expansion of macro ‘output’ 86 | output(#opcode, format, ##__VA_ARGS__); \ | ^~~~~~ target/avr/disas.c:119:1: note: in expansion of macro ‘INSN’ 119 | INSN(ADIW, "r%d:r%r, %d", a->rd + 1, a->rd, a->imm) | ^~~~cc1: all warnings being treated as errors make[1]: *** [rules.mak:69:
target/avr/disas.o] Error 1Quoted 108 lines
target/avr/disas.c new file +95
-0+INSN(AND, "r%d, r%d", a->rd, a->rr) +INSN(ANDI, "r%d, %d", a->rd, a->imm) +INSN(ASR, "r%d", a->rd) +INSN_MNEMONIC(BCLR, bclr[a->bit], "") +INSN(BLD, "r%d, %d", a->rd, a->bit) +INSN_MNEMONIC(BRBC, brbc[a->bit], ".%+d", a->imm * 2) +INSN_MNEMONIC(BRBS, brbs[a->bit], ".%+d", a->imm * 2) +INSN(BREAK, "") +INSN_MNEMONIC(BSET, bset[a->bit], "") +INSN(BST, "r%d, %d", a->rd, a->bit) +INSN(CALL, "0x%x", a->imm * 2) +INSN(CBI, "%d, %d", a->reg, a->bit) +INSN(COM, "r%d", a->rd) +INSN(CP, "r%d, r%d", a->rd, a->rr) +INSN(CPC, "r%d, r%d", a->rd, a->rr) +INSN(CPI, "r%d, %d", a->rd, a->imm) +INSN(CPSE, "r%d, r%d", a->rd, a->rr) +INSN(DEC, "r%d", a->rd) +INSN(DES, "%d", a->imm) +INSN(EICALL, "") +INSN(EIJMP, "") +INSN(ELPM1, "") +INSN(ELPM2, "r%d, Z", a->rd) +INSN(ELPMX, "r%d, Z+", a->rd) +INSN(EOR, "r%d, r%d", a->rd, a->rr) +INSN(FMUL, "r%d, r%d", a->rd, a->rr) +INSN(FMULS, "r%d, r%d", a->rd, a->rr) +INSN(FMULSU, "r%d, r%d", a->rd, a->rr) +INSN(ICALL, "") +INSN(IJMP, "") +INSN(IN, "r%d, $%d", a->rd, a->imm) +INSN(INC, "r%d", a->rd) +INSN(JMP, "0x%x", a->imm * 2) +INSN(LAC, "Z, r%d", a->rd) +INSN(LAS, "Z, r%d", a->rd) +INSN(LAT, "Z, r%d", a->rd) +INSN(LDDY, "r%d, Y+%d", a->rd, a->imm) +INSN(LDDZ, "r%d, Z+%d", a->rd, a->imm) +INSN(LDI, "r%d, %d", a->rd, a->imm) +INSN(LDS, "r%d, %d", a->rd, a->imm) +INSN(LDX1, "r%d, X", a->rd) +INSN(LDX2, "r%d, X+", a->rd) +INSN(LDX3, "r%d, -X", a->rd) +INSN(LDY2, "r%d, Y+", a->rd) +INSN(LDY3, "r%d, -Y", a->rd) +INSN(LDZ2, "r%d, Z+", a->rd) +INSN(LDZ3, "r%d, -Z", a->rd) +INSN(LPM1, "") +INSN(LPM2, "r%d, Z", a->rd) +INSN(LPMX, "r%d, Z+", a->rd) +INSN(LSR, "r%d", a->rd) +INSN(MOV, "r%d, r%d", a->rd, a->rr) +INSN(MOVW, "r%d:r%d, r%d,r:r%d", a->rd + 1, a->rd, a->rr + 1, a->rr) +INSN(MUL, "r%d, r%d", a->rd, a->rr) +INSN(MULS, "r%d, r%d", a->rd, a->rr) +INSN(MULSU, "r%d, r%d", a->rd, a->rr) +INSN(NEG, "r%d", a->rd) +INSN(NOP, "") +INSN(OR, "r%d, r%d", a->rd, a->rr) +INSN(ORI, "r%d, %d", a->rd, a->imm) +INSN(OUT, "$%d, r%d", a->imm, a->rd) +INSN(POP, "r%d", a->rd) +INSN(PUSH, "r%d", a->rd) +INSN(RCALL, ".%+d", a->imm * 2) +INSN(RET, "") +INSN(RETI, "") +INSN(RJMP, ".%+d", a->imm * 2) +INSN(ROR, "r%d", a->rd) +INSN(SBC, "r%d, r%d", a->rd, a->rr) +INSN(SBCI, "r%d, %d", a->rd, a->imm) +INSN(SBI, "$%d, %d", a->reg, a->bit) +INSN(SBIC, "$%d, %d", a->reg, a->bit) +INSN(SBIS, "$%d, %d", a->reg, a->bit) +INSN(SBIW, "r%d:r%d, %d", a->rd + 1, a->rd, a->imm) +INSN(SBRC, "r%d, %d", a->rr, a->bit) +INSN(SBRS, "r%d, %d", a->rr, a->bit) +INSN(SLEEP, "") +INSN(SPM, "") +INSN(SPMX, "Z+") +INSN(STDY, "r%d, Y+%d", a->rd, a->imm) +INSN(STDZ, "r%d, Z+%d", a->rd, a->imm) +INSN(STS, "r%d, %d", a->rd, a->imm) +INSN(STX1, "r%d, X", a->rr) +INSN(STX2, "r%d, X+", a->rr) +INSN(STX3, "r%d, -X", a->rr) +INSN(STY2, "r%d, Y+", a->rd) +INSN(STY3, "r%d, -Y", a->rd) +INSN(STZ2, "r%d, Z+", a->rd) +INSN(STZ3, "r%d, -Z", a->rd) +INSN(SUB, "r%d, r%d", a->rd, a->rr) +INSN(SUBI, "r%d, %d", a->rd, a->imm) +INSN(SWAP, "r%d", a->rd) +INSN(WDR, "") +INSN (XCH ,"Z, r%d" , a->rd) +target/avr/translate.c +4
-0@@ -3019,6 +3019,17 @@ done_generating: tb->size = (ctx.npc - pc_start) *2 ; tb->icount = num_insns; + +#ifdef DEBUG_DISAS +if (qemu_loglevel_mask (CPU_LOG_TB_IN_ASM ) + &&qemu_log_in_addr_range (tb->pc)) {target/avr/translate.c done_generating: · line 3035
Quoted 10 lines
target/avr/translate.c +7
-0+qemu_log_lock (); +qemu_log ("IN: %s\n" ,lookup_symbol (tb->pc)); +log_target_disas (cs, tb->pc, tb->size); +qemu_log ("\n" ); +qemu_log_unlock (); + } +#endif } void restore_state_to_opc(CPUAVRState *env, TranslationBlock *tb,Testing time...
$ avr-softmmu/qemu-system-avr -M sample -bios demo.elf -d in_asm,unimp,int IN: 0x00000000: JMP 0x110IN:
0x00000110: EOR r1, r1 0x00000112: OUT $63, r1 0x00000114: LDI r28, 255 0x00000116: LDI r29, 33 0x00000118: OUT $62, r29 0x0000011a: OUT $61, r28 0x0000011c: LDI r16, 0 0x0000011e: OUT $60, r16 0x00000120: LDI r17, 2 0x00000122: LDI r26, 0 0x00000124: LDI r27, 2 0x00000126: LDI r30, 80 0x00000128: LDI r31, 87 0x0000012a: LDI r16, 0 0x0000012c: OUT $59, r16 0x0000012e: RJMP .+4IN:
0x00000134: CPI r26, 96 0x00000136: CPC r27, r17 0x00000138: BRNE .-10 IN: 0x00000130: ELPMX r0, Z+ 0x00000132: STX2 r0, X+ 0x00000134: CPI r26, 96 0x00000136: CPC r27, r17 0x00000138: BRNE .-10IN:
0x0000013a: LDI r18, 18 0x0000013c: LDI r26, 96 0x0000013e: LDI r27, 2 0x00000140: RJMP .+2IN:
0x00000144: CPI r26, 208 0x00000146: CPC r27, r18 0x00000148: BRNE .-8IN:
0x00000142: STX2 r1, X+ 0x00000144: CPI r26, 208 0x00000146: CPC r27, r18 0x00000148: BRNE .-8IN:
0x0000014a: CALL0x156IN: main
IN: main0x00000156: PUSH r14 0x00000158: PUSH r15 0x0000015a: PUSH r16 0x0000015c: PUSH r28 0x0000015e: PUSH r29 0x00000160: IN r28, $61 0x00000162: IN r29, $62 0x00000164: CALL 0x26cIN: prvIncrementResetCount
0x0000026c: PUSH r28 0x0000026e: PUSH r29 0x00000270: IN r28, $61 0x00000272: IN r29, $62 0x00000274: NOP 0x00000276: POP r29 0x00000278: POP r28 0x0000027a: RETIN: main
0x00000168: CALL0x5c6IN: vParTestInitialise
0x000005c6: PUSH r28 0x000005c8: PUSH r29 0x000005ca: IN r28, $61 0x000005cc: IN r29, $62 0x000005ce: LDI r24, 255 0x000005d0: STS r24, 0 0x000005d2: MULS r16, r20 0x000005d4: LDI r24, 33 0x000005d6: LDI r25, 0 0x000005d8: LDI r18, 255 0x000005da: MOVW r31:r30, r25,r:r24 0x000005dc: STDZ r18, Z+0 0x000005de: LDI r24, 34 0x000005e0: LDI r25, 0 0x000005e2: LDS r18, 0 0x000005e4: MULS r16, r20 0x000005e6: MOVW r31:r30, r25,r:r24 0x000005e8: STDZ r18, Z+0 0x000005ea: NOP 0x000005ec: POP r29 0x000005ee: POP r28 0x000005f0: RETIN: vParTestInitialise
0x000005dc: STDZ r18, Z+0gpio A: unimplemented device write (size 1, value
0xff, offset0x1) [...]IN: vParTestToggleLED
0x000006c0: LDI r24, 34 0x000006c2: LDI r25, 0 0x000006c4: LDS r18, 0 0x000006c6: MULS r16, r20 0x000006c8: MOVW r31:r30, r25,r:r24 0x000006ca: STDZ r18, Z+0 0x000006cc: CALL 0x30d6IN: vParTestToggleLED
0x000006ca: STDZ r18, Z+0gpio A: unimplemented device write (size 1, value
0xef, offset0x2)
IN: vParTestToggleLED0x000006cc: CALL0x30d6IN: vParTestToggleLED
0x000006d0: NOP 0x000006d2: POP r0 0x000006d4: POP r0 0x000006d6: POP r29 0x000006d8: POP r28 0x000006da: RET[...]
IN: vParTestToggleLED
0x000006b4: LDS r25, 0 0x000006b6: MULS r16, r20 0x000006b8: LDDY r24, Y+1 0x000006ba: OR r24, r25 0x000006bc: STS r24, 0 0x000006be: MULS r16, r20 0x000006c0: LDI r24, 34 0x000006c2: LDI r25, 0 0x000006c4: LDS r18, 0 0x000006c6: MULS r16, r20 0x000006c8: MOVW r31:r30, r25,r:r24 0x000006ca: STDZ r18, Z+0 0x000006cc: CALL 0x30d6gpio A: unimplemented device write (size 1, value
0xff, offset0x2) gpio A: unimplemented device write (size 1, value0xef, offset0x2) gpio A: unimplemented device write (size 1, value0xff, offset0x2) gpio A: unimplemented device write (size 1, value0xef, offset0x2) gpio A: unimplemented device write (size 1, value0xff, offset0x2) gpio A: unimplemented device write (size 1, value0xef, offset0x2) gpio A: unimplemented device write (size 1, value0xff, offset0x2) gpio A: unimplemented device write (size 1, value0xef, offset0x2) gpio A: unimplemented device write (size 1, value0xff, offset0x2) gpio A: unimplemented device write (size 1, value0xef, offset0x2) gpio A: unimplemented device write (size 1, value0xff, offset0x2) gpio A: unimplemented device write (size 1, value0xef, offset0x2) gpio A: unimplemented device write (size 1, value0xff, offset0x2) gpio A: unimplemented device write (size 1, value0xef, offset0x2) gpio A: unimplemented device write (size 1, value0xff, offset0x2) gpio A: unimplemented device write (size 1, value0xef, offset0x2) gpio A: unimplemented device write (size 1, value0xff, offset0x2) gpio A: unimplemented device write (size 1, value0xef, offset0x2) gpio A: unimplemented device write (size 1, value0xff, offset0x2) gpio A: unimplemented device write (size 1, value0xef, offset0x2) gpio A: unimplemented device write (size 1, value0xff, offset0x2) gpio A: unimplemented device write (size 1, value0xef, offset0x2)We have a blinking LED!
$ avr-softmmu/qemu-system-avr -M sample -bios ATmegaBOOT_168_atmega328.elf -d in_asm,unimp,int [...] 0x00007800: JMP 0x7868IN:
0x00007868: EOR r1, r1 0x0000786a: OUT $63, r1 0x0000786c: LDI r28, 255 0x0000786e: LDI r29, 8 0x00007870: OUT $62, r29 0x00007872: OUT $61, r28 0x00007874: LDI r17, 1 0x00007876: LDI r26, 0 0x00007878: LDI r27, 1 0x0000787a: LDI r30, 226 0x0000787c: LDI r31, 133 0x0000787e: RJMP .+4IN:
0x00007884: CPI r26, 2 0x00007886: CPC r27, r17 0x00007888: BRNE .-10IN:
0x00007880: LPMX r0, Z+ 0x00007882: STX2 r0, X+ 0x00007884: CPI r26, 2 0x00007886: CPC r27, r17 0x00007888: BRNE .-10gpio H: unimplemented device write (size 1, value
0x80, offset0x0) gpio H: unimplemented device write (size 1, value0x0, offset0x1) IN:0x0000788a: LDI r18, 2 0x0000788c: LDI r26, 2 0x0000788e: LDI r27, 1 0x00007890: RJMP .+2IN:
0x00007894: CPI r26, 13 0x00007896: CPC r27, r18 0x00007898: BRNE .-8IN:
0x00007892: STX2 r1, X+ 0x00007894: CPI r26, 13 0x00007896: CPC r27, r18 0x00007898: BRNE .-8gpio H: unimplemented device write (size 1, value
0x0, offset0x2) gpio J: unimplemented device write (size 1, value0x0, offset0x0) gpio J: unimplemented device write (size 1, value0x0, offset0x1) gpio J: unimplemented device write (size 1, value0x0, offset0x2) gpio K: unimplemented device write (size 1, value0x0, offset0x0) gpio K: unimplemented device write (size 1, value0x0, offset0x1) gpio K: unimplemented device write (size 1, value0x0, offset0x2) gpio L: unimplemented device write (size 1, value0x0, offset0x0) gpio L: unimplemented device write (size 1, value0x0, offset0x1) gpio L: unimplemented device write (size 1, value0x0, offset0x2) timer-counter-16bit 5: unimplemented device write (size 1, value0x0, offset0x0)
timer-counter-16bit 5: unimplemented device write (size 1, value0x0, offset0x1)
timer-counter-16bit 5: unimplemented device write (size 1, value0x0, offset0x2)
timer-counter-16bit 5: unimplemented device write (size 1, value0x0, offset0x3)
timer-counter-16bit 5: unimplemented device write (size 1, value0x0, offset0x4)
timer-counter-16bit 5: unimplemented device write (size 1, value0x0, offset0x5)
timer-counter-16bit 5: unimplemented device write (size 1, value0x0, offset0x6)
timer-counter-16bit 5: unimplemented device write (size 1, value0x0, offset0x7)
timer-counter-16bit 5: unimplemented device write (size 1, value0x0, offset0x8)
timer-counter-16bit 5: unimplemented device write (size 1, value0x0, offset0x9)
timer-counter-16bit 5: unimplemented device write (size 1, value0x0, offset0xa)
timer-counter-16bit 5: unimplemented device write (size 1, value0x0, offset0xb)
timer-counter-16bit 5: unimplemented device write (size 1, value0x0, offset0xc)
timer-counter-16bit 5: unimplemented device write (size 1, value0x0, offset0xd)
usart 3: unimplemented device write (size 1, value0x0, offset0x0) usart 3: unimplemented device write (size 1, value0x0, offset0x1) usart 3: unimplemented device write (size 1, value0x0, offset0x2) usart 3: unimplemented device write (size 1, value0x0, offset0x3) usart 3: unimplemented device write (size 1, value0x0, offset0x4) usart 3: unimplemented device write (size 1, value0x0, offset0x5) usart 3: unimplemented device write (size 1, value0x0, offset0x6) IN:0x0000789a: CALL0x7b8c
Quoted 5 lines
IN: main
[...]Wow, congratulation, I'm impressed how fast you implemented that!
Thanks Philippe.
Quoted 7 lines
:) :)
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Signature · 2 lines
Best Regards, Michael Rolnik
PATCH v36 11/17 target/avr: Add limited support for USART and 16 bit timer peripherals
In reply to Michael RolnikFrom: Sarah Harris <[email protected]>
These were designed to facilitate testing but should provide enough function to be useful in other contexts.
Only a subset of the functions of each peripheral is implemented, mainly due to the lack of a standard way to handle electrical connections (like GPIO pins).
--- include/hw/char/avr_usart.h | 97 ++++++ include/hw/misc/avr_mask.h | 47 +++ include/hw/timer/avr_timer16.h | 97 ++++++ hw/char/avr_usart.c | 324 ++++++++++++++++++ hw/misc/avr_mask.c | 112 ++++++ hw/timer/avr_timer16.c | 605 +++++++++++++++++++++++++++++++++ hw/char/Kconfig | 3 + hw/char/Makefile.objs | 1 + hw/misc/Kconfig | 3 + hw/misc/Makefile.objs | 2 + hw/timer/Kconfig | 3 + hw/timer/Makefile.objs | 2 + 12 files changed, 1296 insertions(+) create mode 100644 include/hw/char/avr_usart.h create mode 100644 include/hw/misc/avr_mask.h create mode 100644 include/hw/timer/avr_timer16.h create mode 100644 hw/char/avr_usart.c create mode 100644 hw/misc/avr_mask.c create mode 100644 hw/timer/avr_timer16.c
include/hw/char/avr_usart.h new file +97 -0
@@ -0,0 +1,97 @@ +/* +* AVR USART +* +* Copyright (c) 2018 University of Kent +* Author: Sarah Harris +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +*/ + +#ifndef HW_AVR_USART_H +#define HW_AVR_USART_H + +#include "hw/sysbus.h" +#include "chardev/char-fe.h" +#include "hw/hw.h" + +/* Offsets of registers. */ +#define USART_DR 0x06 +#define USART_CSRA 0x00 +#define USART_CSRB 0x01 +#define USART_CSRC 0x02 +#define USART_BRRH 0x05 +#define USART_BRRL 0x04 + +/* Relevant bits in regiters. */ +#define USART_CSRA_RXC (1 << 7) +#define USART_CSRA_TXC (1 << 6) +#define USART_CSRA_DRE (1 << 5) +#define USART_CSRA_MPCM (1 << 0) + +#define USART_CSRB_RXCIE (1 << 7) +#define USART_CSRB_TXCIE (1 << 6) +#define USART_CSRB_DREIE (1 << 5) +#define USART_CSRB_RXEN (1 << 4) +#define USART_CSRB_TXEN (1 << 3) +#define USART_CSRB_CSZ2 (1 << 2) +#define USART_CSRB_RXB8 (1 << 1) +#define USART_CSRB_TXB8 (1 << 0) + +#define USART_CSRC_MSEL1 (1 << 7) +#define USART_CSRC_MSEL0 (1 << 6) +#define USART_CSRC_PM1 (1 << 5) +#define USART_CSRC_PM0 (1 << 4) +#define USART_CSRC_CSZ1 (1 << 2) +#define USART_CSRC_CSZ0 (1 << 1) + +#define TYPE_AVR_USART "avr-usart" +#define AVR_USART (obj) \ + OBJECT_CHECK(AVRUsartState, (obj), TYPE_AVR_USART) + +typedef struct { +/* <private> */ +SysBusDevice parent_obj; + +/* <public> */ +MemoryRegion mmio; + +CharBackend chr; + +bool enabled; + +uint8_t data; +bool data_valid; +uint8_t char_mask; +/* Control and Status Registers */ +uint8_t csra; +uint8_t csrb; +uint8_t csrc; +/* Baud Rate Registers (low/high byte) */ +uint8_t brrh; +uint8_t brrl; + +/* Receive Complete */ +qemu_irq rxc_irq; +/* Transmit Complete */ +qemu_irq txc_irq; +/* Data Register Empty */ +qemu_irq dre_irq; +}AVRUsartState ; + +#endif /* HW_AVR_USART_H */
include/hw/misc/avr_mask.h new file +47 -0
47 lines not on this page · raw message
include/hw/timer/avr_timer16.h new file +97 -0
97 lines not on this page · raw message
hw/char/avr_usart.c new file +324 -0
324 lines not on this page · raw message
hw/misc/avr_mask.c new file +112 -0
112 lines not on this page · raw message
hw/timer/avr_timer16.c new file +605 -0
605 lines not on this page · raw message
hw/char/Kconfig +3 -0
@@ -46,3 +46,6 @@ config SCLPCONSOLE config TERMINAL3270 bool + +config AVR_USART + bool
hw/char/Makefile.objs +1 -0
@@ -21,6 +21,7 @@ obj-$(CONFIG_PSERIES) += spapr_vty.o obj-$(CONFIG_DIGIC) += digic-uart.o obj-$(CONFIG_STM32F2XX_USART) += stm32f2xx_usart.o obj-$(CONFIG_RASPI) += bcm2835_aux.o +common-obj-$(CONFIG_AVR_USART) += avr_usart.o common-obj-$(CONFIG_CMSDK_APB_UART) += cmsdk-apb-uart.o common-obj-$(CONFIG_ETRAXFS) += etraxfs_ser.o
hw/misc/Kconfig +3 -0
@@ -125,4 +125,7 @@ config MAC_VIA select MOS6522 select ADB +config AVR_MASK + bool + source macio/Kconfig
hw/misc/Makefile.objs +2 -0
@@ -82,3 +82,5 @@ common-obj-$(CONFIG_NRF51_SOC) += nrf51_rng.o obj-$(CONFIG_MAC_VIA) += mac_via.o common-obj-$(CONFIG_GRLIB) += grlib_ahb_apb_pnp.o + +obj-$(CONFIG_AVR_MASK) += avr_mask.o
hw/timer/Kconfig +3 -0
@@ -34,3 +34,6 @@ config CMSDK_APB_TIMER config CMSDK_APB_DUALTIMER bool select PTIMER + +config AVR_TIMER16 + bool
hw/timer/Makefile.objs +2 -0
@@ -35,3 +35,5 @@ common-obj-$(CONFIG_CMSDK_APB_TIMER) += cmsdk-apb-timer.o common-obj-$(CONFIG_CMSDK_APB_DUALTIMER) += cmsdk-apb-dualtimer.o common-obj-$(CONFIG_MSF2) += mss-timer.o common-obj-$(CONFIG_RASPI) += bcm2835_systmr.o + +obj-$(CONFIG_AVR_TIMER16) += avr_timer16.o
Signature · 1 line
2.17.2 (Apple Git-113)