QEMU AVR 8 bit cores
Quoted 8 lines · Aleksandar Markovic
Quoted 6 lines · Michael Rolnik
I don't see why you say that the peripherals are inside the chip, there is CPU within target/avr directory and then there are some peripherals in hw directory, CPU does not depend on them. what am I missing?
Quoted 2 lines
Quoted 5 lines
I meant these peripherals are physically inside the chip together with the core.
And USART in a micricontroler from 2010 is different than USART from one from 2018.
Won't these be different chip parts? Or at least revs of the part?
I think broadly the difference between SoC devices is handled by handling versioning in the board models - the board being in this case a CPU core + a bunch of SoC components + the actual board itself.
All the target/cpu stuff needs to deal with is actual architectural revs (c.f. target/arm/cpu[64].c).
Quoted 509 lines
Quoted 509 lines
Quoted 79 lines · Aleksandar Markovic
Quoted 41 lines · Michael Rolnik
Quoted 12 lines · Aleksandar Markovic
Quoted 3 lines · Michael Rolnik
This series of patches adds 8bit AVR cores to QEMU. All instruction, except BREAK/DES/SPM/SPMX, are implemented. Not
fully tested yet.
Quoted 1 line
However I was able to execute simple code with functions. e.g
fibonacci calculation.
Quoted 3 lines
This series of patches include a non real, sample board. No fuses support yet. PC is set to 0 at reset.
Quoted 5 lines
I have a couple of general remarks, so I am responding to the cover letter, not individual patches.
1) The licenses for Sarah devices differ than the rest - shouldn't all licenses be harmonized?
Sarah,
do you mind if use the same license I use for my code?Quoted 14 lines
2) There is an architectural problem with peripherals. It is possible that they evolve over time, so, for example, USART could not be the same for older and newer CPUs (in principle, newer peripheral is expected to be o sort of "superset" of the older). How do you solve that problem? Right now, it may not looks serious to you, but if you don;t think about that right now, from the outset, soon the code will become so entangled, ti woudl be almost very difficult to fix it. Please think about that, how would you solve it, is there a way to pass the information on the currently emulated CPU to the code covering a peripheral, and provide a different behaviour?
Quoted 5 lines
Hi Aleksandar,
Please explain.
My concern is about peripherals inside the chip, together with the core.
If one models, let's say an external (in the sense, it is a separate chip) ADC (analog-to-digital converter), one looks at specs, implement what is resonable possible in QEMU, plug it in in one of machines thst contains it, and that's it. That ADC remains the same, of course, whatever the surrounding system is.
In AVR case, I think we have a phenomenon likes of which we didn't see before (at least I don't know about). Number of AVR microcontrollers is very large, and both cores and peripherals evolved.
For cores, you handle differences with all these
AVR_FEATUREmacros, and this seems to be working, no significant objection from my side, and btw that was not an easy task to execute, all admiration from me.But what about peripherals inside the chip? A peripheral with the same name and the same general area of functionality may be differently specified for microcontrollers from 2010 and 2018. By the difference I don't mean starting address, but the difference in behavior. I don't have time right now to spell many examples, but I read three different specs, and there are differences in USART specifications.
I am not clear what is your envisioned solution for these cases. Would you such close, but not the same, flabors of a peripheral treat as if they are two completely separate cases of a peripheral? Or would you have a single peripheral that would somehow configure itself depending on the core it is attached to?
Quoted 420 lines
I hope I was clearer this time.
Aleksandar
Quoted 413 lines
I don't see any problem from CPU's perspective.
as for the sample board is just a sample, I hope other people will create real models or real hw.
there was no way I could provide a CPU alone, that's why there is sample.Quoted 349 lines
Quoted 2 lines
Following are examples of possible usages, assuming program.elf is
compiled for AVR cpu
Quoted 3 lines
1. Continious non interrupted execution
runqemu-system-avr -kernel program.elf
2. Continious non interrupted execution with serial output intotelnet window
Quoted 1 line
run `qemu-system-avr -kernel program.elf -serial
tcp::5678,server,nowait -nographic `
Quoted 2 lines
run
telent localhost 5678
3. Continious non interrupted execution with serial output intostdout
Quoted 4 lines
run
qemu-system-avr -kernel program.elf -serial stdio
4. Debugging wit GDB debugger
runqemu-system-avr -kernel program.elf -s -Srunavr-gdb program.elfand then within GDB shell `targetremote :1234`
Quoted 3 lines
5. Print out executed instructions
runqemu-system-avr -kernel program.elf -d in_asmThank you so much for these examples!
Aleksandar
Quoted 3 lines
the patches include the following
1. just a basic 8bit AVR CPU, without instruction decoding ortranslation
Quoted 9 lines
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
Quoted 9 lines
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 togetherchanges since v3
1. rampD/X/Y/Z registers are encoded as0x00ff0000(instead of
0x000000ff) for faster address manipulatonQuoted 13 lines
2. ffs changed to ctz32
3. duplicate code removed atavr_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 of0xff- 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 XCHQuoted 2 lines
changes since v4
1. target is now defined as big endian in order to optimizepush_ret/pop_ret
Quoted 14 lines
2. all style warnings are fixed
3. adding cpu_set/get_sreg functions
4. simplifyinggen_goto_tbas 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. removingavr_set_feature
10. SPL/SPH set bug fix
11. switchingstb_phystocpu_stb_data
12. cleaning upavr_decode
13. saving sreg, rampD/X/Y/Z, eind in HW format (savevm)
14. saving CPU features (savevm)Quoted 6 lines
changes since v5
1. BLD bug fix
2. decoder generator is addedchages since v6
1. using cpu_get_sreg/cpu_set_sreg in avr_cpu_gdb_read_register/avr_
cpu_gdb_write_registerQuoted 1 line
2. configure the target as little endian because otherwise GDB does
not work
Quoted 5 lines
3. fixing and testing gen_push_ret/gen_pop_ret
changes since v7
1. folding back v6
2. logging athelper_outbandhelper_inbare done for non supportedyet registers only
Quoted 4 lines
3.
MAINTAINERSupdatedchanges since v8
1. removing hw/avr from hw/Makefile.obj as it should not be built forall
Quoted 9 lines
2. making linux compilable
3. testing ona. 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 memoryQuoted 5 lines
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 toany device
Quoted 4 lines
5. commenst about sample board and sample IO device added
6. sample board description is more descriptive now
7.memory_region_allocate_system_memoryis used to create RAM
8. now there arehelper_fullrd&helper_fullwrwhen LD/ST try toaccess registers
Quoted 3 lines
changes since v10
1. movig back fullwr & fullrd into the commit where outb and inb wereintroduced
Quoted 12 lines
2. changing
tlb_fillfunction signature
3. adding empty line between functions
4. adding newline on the last line of the file
5. usingtb->flagsto 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.objschanges since v11
1. updating to v2.7.0-rc
2. removing assignment toenv->fullaccfromgen_intermediate_codeQuoted 12 lines
changes since v12
1. fixing spacing
2. fixing get/put_segment functions
3. removingtarget-avr/machine.hfile
4.VMSTATE_SINGLE_TEST->VMSTATE_SINGLE
5. comment spelling
6. removinghw/avr/sample_io.c
7. char const* -> const char*
8. proper ram allocation
9. fixing breakpoint functionality.
10.env1 -> env
11.fixingavr_cpu_gdb_write_register&avr_cpu_gdb_read_registerfunctions
Quoted 8 lines
12.any cpu is removed
12.feature bits are not saved into vm statechanges since v13
1. rebasing to v2.7.0-rc1changes since v14
1. I made self review with git gui tool. (I did not know such a thingexists)
Quoted 8 lines
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 chrischanges since v15
1. removing IO registers cache from CPU
2. implementing CBI/SBI asread(helper_inb), modify,
write(helper_outb)Quoted 5 lines
3. implementing CBIC/SBIC as
read(helper_inb), check, branch
4. adding missingtcg_temp_free_i32fortcg_const_i32changes since v16
1. removing EXT IO registers knoledge from CPU. These registers areaccessible
Quoted 30 lines
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 oftranslate.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<<18changes 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_fillchanges since v20
Quoted 8 lines
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 nowchanges since v21
1. Reorganize bstate.
This will make transition to <exec/translator.h> easier, andfixes a couple of bugs wrt single stepping
Quoted 40 lines
by [email protected]
2. Drop cpc and fix page cross condition.
by [email protected]
3. Refactor checking supported/unsupported instructions
4. Addgdb-xml/avr-cpu.xmlchanges since v22
1. Rebase
2. Split long commentchanges 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 functionchanges since v24
1. removeAVR_CPU_TYPE_NAMEmacrochanges 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/prr1changes since v26
1. add avocado acceptence test
2. add boot serial testchanges since v27
1. list atmel2560 devices as unimplemented
2. fix sram base/sizechanges since v28
1. rebase
2. fix includes & buildchanges since v29
1. fixing ownership
2. using 'since' instread of 'added in'Quoted 8 lines
changes since v30
1. rebasechanges 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 instructiontranslation - CPU main translation funcions' commit
Quoted 8 lines
changes since v32
1. modifycpu_get_sregto treat sreg C as other flags, except sreg Zchanges since v33
1. ensure flag C is always calculated as one bit
2. calculate flag Z as one bit, without using inverse logicQuoted 7 lines
changes since v34
1. rebasechanges 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
Quoted 12 lines
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"changes since v36
1. rebase
2. tenameQuoted 9 lines
1. NO_CPU_REGISTERS -> NUMBER_OF_CPU_REGISTERS 2. NO_IO_REGISTERS -> NUMBER_OF_IO_REGISTERS 3. to_A -> to_regs_16_31_by_one 4. to_B -> to_regs_16_23_by_one 5. to_C -> to_regs_24_30_by_two 6. to_D -> to_regs_00_30_by_two 3. add missing licences 4. add usage example (see above) 5. ass Sarah Harris <[email protected]> as a reviewer to
MAINTAINERSQuoted 23 lines
7. use git commit sha1 instead of `master`` in avocado test
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: UpdateMAINTAINERSfileQuoted 2 lines
Sarah Harris (1):
target/avr: Add limited support for USART and 16 bit timerperipherals
Quoted 16 lines
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 ++++Quoted 8 lines
hw/misc/avr_mask.c | 112 ++ hw/timer/avr_timer16.c | 605 ++++++ target/avr/cpu.c | 576 ++++++ target/avr/disas.c | 228 +++ target/avr/gdbstub.c | 85 + target/avr/helper.c | 354 ++++ target/avr/machine.c | 121 ++ target/avr/translate.c | 3052Quoted 48 lines
++++++++++++++++++++++++++++++
Quoted 46 lines
tests/boot-serial-test.c | 10 + tests/machine-none-test.c | 1 + MAINTAINERS | 11 + 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 | 194 ++ tests/Makefile.include | 2 + tests/acceptance/machine_avr6.py | 56 + 40 files changed, 6756 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--
2.17.2 (Apple Git-113)--
Best Regards,
Michael Rolnik--
Best Regards,
Michael Rolnik
Signature · 1 line
Alex Bennée
Quoted 21 lines · Alex Bennée
Quoted 1 line · Aleksandar Markovic
On Thursday, November 28, 2019, Michael Rolnik <[email protected]>
Quoted 2 lines · wrote:
Quoted 2 lines
I don't see why you say that the peripherals are inside the chip, there
is
Quoted 1 line
Quoted 1 line
CPU within target/avr directory and then there are some peripherals in
hw
Quoted 5 lines
Quoted 4 lines
directory, CPU does not depend on them. what am I missing?
Quoted 2 lines
I meant these peripherals are physically inside the chip together with
the
Quoted 4 lines
core.
And USART in a micricontroler from 2010 is different than USART from one from 2018.
Quoted 10 lines
Won't these be different chip parts? Or at least revs of the part?
I think broadly the difference between SoC devices is handled by handling versioning in the board models - the board being in this case a CPU core + a bunch of SoC components + the actual board itself.
All the target/cpu stuff needs to deal with is actual architectural revs (c.f. target/arm/cpu[64].c).
This sounds like a very good way of dealing with this.
I don't want to force Michael to implement some of such cases before integration, but just to think about such cases - for future improvements and developments.
Alex, I appreciate your advice, very nice of you!
Aleksandar
Quoted 536 lines
Quoted 8 lines
Quoted 8 lines
Quoted 3 lines · Aleksandar Markovic
On Thursday, November 28, 2019, Michael Rolnik <[email protected]>
Quoted 14 lines · wrote:
Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
Quoted 8 lines · Aleksandar Markovic
Quoted 3 lines · Michael Rolnik
This series of patches adds 8bit AVR cores to QEMU. All instruction, except BREAK/DES/SPM/SPMX, are implemented. Not
fully tested yet.
Quoted 1 line
However I was able to execute simple code with functions. e.g
fibonacci calculation.
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 3 lines
This series of patches include a non real, sample board. No fuses support yet. PC is set to 0 at reset.
I have a couple of general remarks, so I am responding to the cover letter, not individual patches.
1) The licenses for Sarah devices differ than the rest - shouldn't
all
Quoted 20 lines
Quoted 20 lines
Quoted 20 lines
Quoted 20 lines
Quoted 1 line
licenses be harmonized?
Sarah,
do you mind if use the same license I use for my code?Quoted 14 lines
2) There is an architectural problem with peripherals. It is possible that they evolve over time, so, for example, USART could not be the same for older and newer CPUs (in principle, newer peripheral is expected to be o sort of "superset" of the older). How do you solve that problem? Right now, it may not looks serious to you, but if you don;t think about that right now, from the outset, soon the code will become so entangled, ti woudl be almost very difficult to fix it. Please think about that, how would you solve it, is there a way to pass the information on the currently emulated CPU to the code covering a peripheral, and provide a different behaviour?
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
Hi Aleksandar,
Please explain.
My concern is about peripherals inside the chip, together with the
core.
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
If one models, let's say an external (in the sense, it is a separate chip) ADC (analog-to-digital converter), one looks at specs, implement
what
Quoted 1 line
Quoted 1 line
Quoted 1 line
is resonable possible in QEMU, plug it in in one of machines thst
contains
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
it, and that's it. That ADC remains the same, of course, whatever the surrounding system is.
In AVR case, I think we have a phenomenon likes of which we didn't see before (at least I don't know about). Number of AVR microcontrollers is very large, and both cores and peripherals evolved.
For cores, you handle differences with all these
AVR_FEATUREmacros,and
Quoted 1 line
Quoted 1 line
Quoted 1 line
this seems to be working, no significant objection from my side, and
btw
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
that was not an easy task to execute, all admiration from me.
But what about peripherals inside the chip? A peripheral with the same name and the same general area of functionality may be differently specified for microcontrollers from 2010 and 2018. By the difference I don't mean starting address, but the difference in behavior. I don't
have
Quoted 1 line
Quoted 1 line
Quoted 1 line
time right now to spell many examples, but I read three different
specs,
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
and there are differences in USART specifications.
I am not clear what is your envisioned solution for these cases. Would you such close, but not the same, flabors of a peripheral treat as if
they
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
are two completely separate cases of a peripheral? Or would you have a single peripheral that would somehow configure itself depending on the
core
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
it is attached to?
I hope I was clearer this time.
Aleksandar
Quoted 3 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
I don't see any problem from CPU's perspective.
as for the sample board is just a sample, I hope other people will create real models or real hw.
there was no way I could provide a CPU alone, that's why there issample.
Quoted 83 lines
Quoted 83 lines
Quoted 83 lines
Quoted 83 lines
Quoted 83 lines
Quoted 5 lines
Following are examples of possible usages, assuming program.elf is
compiled for AVR cpu
Quoted 3 lines
1. Continious non interrupted execution
runqemu-system-avr -kernel program.elf
2. Continious non interrupted execution with serial output intotelnet window
Quoted 1 line
run `qemu-system-avr -kernel program.elf -serial
tcp::5678,server,nowait -nographic `
Quoted 2 lines
run
telent localhost 5678
3. Continious non interrupted execution with serial output intostdout
Quoted 4 lines
run
qemu-system-avr -kernel program.elf -serial stdio
4. Debugging wit GDB debugger
runqemu-system-avr -kernel program.elf -s -Srunavr-gdb program.elfand then within GDB shell `targetremote :1234`
Quoted 3 lines
5. Print out executed instructions
runqemu-system-avr -kernel program.elf -d in_asmThank you so much for these examples!
Aleksandar
Quoted 3 lines
the patches include the following
1. just a basic 8bit AVR CPU, without instruction decoding ortranslation
Quoted 9 lines
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
Quoted 9 lines
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 togetherchanges since v3
1. rampD/X/Y/Z registers are encoded as0x00ff0000(instead of
0x000000ff) for faster address manipulatonQuoted 13 lines
2. ffs changed to ctz32
3. duplicate code removed atavr_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 of0xff- 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 XCHQuoted 2 lines
changes since v4
1. target is now defined as big endian in order to optimizepush_ret/pop_ret
Quoted 14 lines
2. all style warnings are fixed
3. adding cpu_set/get_sreg functions
4. simplifyinggen_goto_tbas 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. removingavr_set_feature
10. SPL/SPH set bug fix
11. switchingstb_phystocpu_stb_data
12. cleaning upavr_decode
13. saving sreg, rampD/X/Y/Z, eind in HW format (savevm)
14. saving CPU features (savevm)Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
changes since v5
1. BLD bug fix
2. decoder generator is addedchages since v6
1. using cpu_get_sreg/cpu_set_sreg inavr_cpu_gdb_read_register/avr_
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
cpu_gdb_write_registerQuoted 1 line
2. configure the target as little endian because otherwise GDB does
not work
Quoted 2 lines
3. fixing and testing gen_push_ret/gen_pop_ret
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 3 lines
changes since v7
1. folding back v6
2. logging athelper_outbandhelper_inbare done for non supportedyet registers only
Quoted 4 lines
3.
MAINTAINERSupdatedchanges since v8
1. removing hw/avr from hw/Makefile.obj as it should not be builtfor
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
all
Quoted 9 lines
2. making linux compilable
3. testing ona. 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 memoryQuoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
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 routedto
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
any device
Quoted 4 lines
5. commenst about sample board and sample IO device added
6. sample board description is more descriptive now
7.memory_region_allocate_system_memoryis used to create RAM
8. now there arehelper_fullrd&helper_fullwrwhen LD/ST try toaccess registers
Quoted 3 lines
changes since v10
1. movig back fullwr & fullrd into the commit where outb and inbwere
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
introduced
Quoted 12 lines
2. changing
tlb_fillfunction signature
3. adding empty line between functions
4. adding newline on the last line of the file
5. usingtb->flagsto 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.objschanges since v11
1. updating to v2.7.0-rc
2. removing assignment toenv->fullaccfromgen_intermediate_codeQuoted 12 lines
changes since v12
1. fixing spacing
2. fixing get/put_segment functions
3. removingtarget-avr/machine.hfile
4.VMSTATE_SINGLE_TEST->VMSTATE_SINGLE
5. comment spelling
6. removinghw/avr/sample_io.c
7. char const* -> const char*
8. proper ram allocation
9. fixing breakpoint functionality.
10.env1 -> env
11.fixingavr_cpu_gdb_write_register&avr_cpu_gdb_read_registerfunctions
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
12.any cpu is removed
12.feature bits are not saved into vm statechanges since v13
1. rebasing to v2.7.0-rc1changes since v14
1. I made self review with git gui tool. (I did not know such athing
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
exists)
Quoted 3 lines
2. removing all double/tripple spaces
3. removing comment reference to SampleIO
4. folding back some changes, so there is not deleted lines in mycode
Quoted 99 lines
Quoted 99 lines
Quoted 99 lines
Quoted 99 lines
Quoted 99 lines
Quoted 5 lines
5. moving avr configuration, within configure file, before chris
changes since v15
1. removing IO registers cache from CPU
2. implementing CBI/SBI asread(helper_inb), modify,
write(helper_outb)Quoted 5 lines
3. implementing CBIC/SBIC as
read(helper_inb), check, branch
4. adding missingtcg_temp_free_i32fortcg_const_i32changes since v16
1. removing EXT IO registers knoledge from CPU. These registers areaccessible
Quoted 30 lines
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 oftranslate.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<<18changes 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_fillchanges since v20
Quoted 8 lines
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 nowchanges since v21
1. Reorganize bstate.
This will make transition to <exec/translator.h> easier, andfixes a couple of bugs wrt single stepping
Quoted 48 lines
by [email protected]
2. Drop cpc and fix page cross condition.
by [email protected]
3. Refactor checking supported/unsupported instructions
4. Addgdb-xml/avr-cpu.xmlchanges since v22
1. Rebase
2. Split long commentchanges 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 functionchanges since v24
1. removeAVR_CPU_TYPE_NAMEmacrochanges 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/prr1changes since v26
1. add avocado acceptence test
2. add boot serial testchanges since v27
1. list atmel2560 devices as unimplemented
2. fix sram base/sizechanges since v28
1. rebase
2. fix includes & buildchanges since v29
1. fixing ownership
2. using 'since' instread of 'added in'changes since v30
1. rebasechanges 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 instructionQuoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
translation - CPU main translation funcions' commit
Quoted 3 lines
changes since v32
1. modifycpu_get_sregto treat sreg C as other flags, exceptsreg Z
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
changes since v33
1. ensure flag C is always calculated as one bit
2. calculate flag Z as one bit, without using inverse logicchanges since v34
1. rebasechanges since v35
1. rebase
2. useNANOSECONDS_PER_SECONDinstead of 1000000000 in
avr_timer16.cQuoted 26 lines
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
Quoted 1 line
3. split "target/avr: Register AVR support with the rest of QEMU"
into three patches
Quoted 12 lines
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"changes since v36
1. rebase
2. tenameQuoted 9 lines
1. NO_CPU_REGISTERS -> NUMBER_OF_CPU_REGISTERS 2. NO_IO_REGISTERS -> NUMBER_OF_IO_REGISTERS 3. to_A -> to_regs_16_31_by_one 4. to_B -> to_regs_16_23_by_one 5. to_C -> to_regs_24_30_by_two 6. to_D -> to_regs_00_30_by_two 3. add missing licences 4. add usage example (see above) 5. ass Sarah Harris <[email protected]> as a reviewer to
MAINTAINERSQuoted 2 lines
7. use git commit sha1 instead of `master`` in avocado test
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
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 ControlInstructions
Quoted 93 lines
Quoted 93 lines
Quoted 92 lines
Quoted 91 lines
Quoted 37 lines
Quoted 10 lines
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: UpdateMAINTAINERSfileQuoted 2 lines
Sarah Harris (1):
target/avr: Add limited support for USART and 16 bit timerperipherals
Quoted 16 lines
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 ++++Quoted 8 lines
hw/misc/avr_mask.c | 112 ++ hw/timer/avr_timer16.c | 605 ++++++ target/avr/cpu.c | 576 ++++++ target/avr/disas.c | 228 +++ target/avr/gdbstub.c | 85 + target/avr/helper.c | 354 ++++ target/avr/machine.c | 121 ++ target/avr/translate.c | 3052Quoted 48 lines
++++++++++++++++++++++++++++++
Quoted 46 lines
tests/boot-serial-test.c | 10 + tests/machine-none-test.c | 1 + MAINTAINERS | 11 + 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 | 194 ++ tests/Makefile.include | 2 + tests/acceptance/machine_avr6.py | 56 + 40 files changed, 6756 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--
2.17.2 (Apple Git-113)--
Best Regards,
Michael RolnikQuoted 4 lines
Quoted 4 lines
--
Best Regards,
Michael Rolnik--
Alex Bennée
Quoted 21 lines · Alex Bennée
Quoted 1 line · Aleksandar Markovic
On Thursday, November 28, 2019, Michael Rolnik <[email protected]>
Quoted 2 lines · wrote:
Quoted 2 lines
I don't see why you say that the peripherals are inside the chip, there
is
Quoted 1 line
Quoted 1 line
CPU within target/avr directory and then there are some peripherals in
hw
Quoted 5 lines
Quoted 4 lines
directory, CPU does not depend on them. what am I missing?
Quoted 2 lines
I meant these peripherals are physically inside the chip together with
the
Quoted 4 lines
core.
And USART in a micricontroler from 2010 is different than USART from one from 2018.
Quoted 10 lines
Won't these be different chip parts? Or at least revs of the part?
I think broadly the difference between SoC devices is handled by handling versioning in the board models - the board being in this case a CPU core + a bunch of SoC components + the actual board itself.
All the target/cpu stuff needs to deal with is actual architectural revs (c.f. target/arm/cpu[64].c).
Michael, please take a look at this link:
https://web-engineering.info/node/28
"Part number" seems to be the thing you'll need to incorporate in the overall AVR support in QEMU in order to get the correct emulation of in-chip peripherals - as Alex actually hinted. (In my opinion, you don't need it now, in the initial version, but by no means in near future.)
Have a great weekend!
Quoted 536 lines
Quoted 8 lines
Quoted 8 lines
Quoted 3 lines · Aleksandar Markovic
On Thursday, November 28, 2019, Michael Rolnik <[email protected]>
Quoted 14 lines · wrote:
Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
Quoted 8 lines · Aleksandar Markovic
Quoted 3 lines · Michael Rolnik
This series of patches adds 8bit AVR cores to QEMU. All instruction, except BREAK/DES/SPM/SPMX, are implemented. Not
fully tested yet.
Quoted 1 line
However I was able to execute simple code with functions. e.g
fibonacci calculation.
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 3 lines
This series of patches include a non real, sample board. No fuses support yet. PC is set to 0 at reset.
I have a couple of general remarks, so I am responding to the cover letter, not individual patches.
1) The licenses for Sarah devices differ than the rest - shouldn't
all
Quoted 20 lines
Quoted 20 lines
Quoted 20 lines
Quoted 20 lines
Quoted 1 line
licenses be harmonized?
Sarah,
do you mind if use the same license I use for my code?Quoted 14 lines
2) There is an architectural problem with peripherals. It is possible that they evolve over time, so, for example, USART could not be the same for older and newer CPUs (in principle, newer peripheral is expected to be o sort of "superset" of the older). How do you solve that problem? Right now, it may not looks serious to you, but if you don;t think about that right now, from the outset, soon the code will become so entangled, ti woudl be almost very difficult to fix it. Please think about that, how would you solve it, is there a way to pass the information on the currently emulated CPU to the code covering a peripheral, and provide a different behaviour?
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
Hi Aleksandar,
Please explain.
My concern is about peripherals inside the chip, together with the
core.
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
If one models, let's say an external (in the sense, it is a separate chip) ADC (analog-to-digital converter), one looks at specs, implement
what
Quoted 1 line
Quoted 1 line
Quoted 1 line
is resonable possible in QEMU, plug it in in one of machines thst
contains
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
it, and that's it. That ADC remains the same, of course, whatever the surrounding system is.
In AVR case, I think we have a phenomenon likes of which we didn't see before (at least I don't know about). Number of AVR microcontrollers is very large, and both cores and peripherals evolved.
For cores, you handle differences with all these
AVR_FEATUREmacros,and
Quoted 1 line
Quoted 1 line
Quoted 1 line
this seems to be working, no significant objection from my side, and
btw
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
that was not an easy task to execute, all admiration from me.
But what about peripherals inside the chip? A peripheral with the same name and the same general area of functionality may be differently specified for microcontrollers from 2010 and 2018. By the difference I don't mean starting address, but the difference in behavior. I don't
have
Quoted 1 line
Quoted 1 line
Quoted 1 line
time right now to spell many examples, but I read three different
specs,
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
and there are differences in USART specifications.
I am not clear what is your envisioned solution for these cases. Would you such close, but not the same, flabors of a peripheral treat as if
they
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
are two completely separate cases of a peripheral? Or would you have a single peripheral that would somehow configure itself depending on the
core
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
it is attached to?
I hope I was clearer this time.
Aleksandar
Quoted 3 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
I don't see any problem from CPU's perspective.
as for the sample board is just a sample, I hope other people will create real models or real hw.
there was no way I could provide a CPU alone, that's why there issample.
Quoted 83 lines
Quoted 83 lines
Quoted 83 lines
Quoted 83 lines
Quoted 83 lines
Quoted 5 lines
Following are examples of possible usages, assuming program.elf is
compiled for AVR cpu
Quoted 3 lines
1. Continious non interrupted execution
runqemu-system-avr -kernel program.elf
2. Continious non interrupted execution with serial output intotelnet window
Quoted 1 line
run `qemu-system-avr -kernel program.elf -serial
tcp::5678,server,nowait -nographic `
Quoted 2 lines
run
telent localhost 5678
3. Continious non interrupted execution with serial output intostdout
Quoted 4 lines
run
qemu-system-avr -kernel program.elf -serial stdio
4. Debugging wit GDB debugger
runqemu-system-avr -kernel program.elf -s -Srunavr-gdb program.elfand then within GDB shell `targetremote :1234`
Quoted 3 lines
5. Print out executed instructions
runqemu-system-avr -kernel program.elf -d in_asmThank you so much for these examples!
Aleksandar
Quoted 3 lines
the patches include the following
1. just a basic 8bit AVR CPU, without instruction decoding ortranslation
Quoted 9 lines
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
Quoted 9 lines
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 togetherchanges since v3
1. rampD/X/Y/Z registers are encoded as0x00ff0000(instead of
0x000000ff) for faster address manipulatonQuoted 13 lines
2. ffs changed to ctz32
3. duplicate code removed atavr_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 of0xff- 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 XCHQuoted 2 lines
changes since v4
1. target is now defined as big endian in order to optimizepush_ret/pop_ret
Quoted 14 lines
2. all style warnings are fixed
3. adding cpu_set/get_sreg functions
4. simplifyinggen_goto_tbas 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. removingavr_set_feature
10. SPL/SPH set bug fix
11. switchingstb_phystocpu_stb_data
12. cleaning upavr_decode
13. saving sreg, rampD/X/Y/Z, eind in HW format (savevm)
14. saving CPU features (savevm)Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
changes since v5
1. BLD bug fix
2. decoder generator is addedchages since v6
1. using cpu_get_sreg/cpu_set_sreg inavr_cpu_gdb_read_register/avr_
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
cpu_gdb_write_registerQuoted 1 line
2. configure the target as little endian because otherwise GDB does
not work
Quoted 2 lines
3. fixing and testing gen_push_ret/gen_pop_ret
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 3 lines
changes since v7
1. folding back v6
2. logging athelper_outbandhelper_inbare done for non supportedyet registers only
Quoted 4 lines
3.
MAINTAINERSupdatedchanges since v8
1. removing hw/avr from hw/Makefile.obj as it should not be builtfor
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
all
Quoted 9 lines
2. making linux compilable
3. testing ona. 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 memoryQuoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
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 routedto
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
any device
Quoted 4 lines
5. commenst about sample board and sample IO device added
6. sample board description is more descriptive now
7.memory_region_allocate_system_memoryis used to create RAM
8. now there arehelper_fullrd&helper_fullwrwhen LD/ST try toaccess registers
Quoted 3 lines
changes since v10
1. movig back fullwr & fullrd into the commit where outb and inbwere
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
introduced
Quoted 12 lines
2. changing
tlb_fillfunction signature
3. adding empty line between functions
4. adding newline on the last line of the file
5. usingtb->flagsto 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.objschanges since v11
1. updating to v2.7.0-rc
2. removing assignment toenv->fullaccfromgen_intermediate_codeQuoted 12 lines
changes since v12
1. fixing spacing
2. fixing get/put_segment functions
3. removingtarget-avr/machine.hfile
4.VMSTATE_SINGLE_TEST->VMSTATE_SINGLE
5. comment spelling
6. removinghw/avr/sample_io.c
7. char const* -> const char*
8. proper ram allocation
9. fixing breakpoint functionality.
10.env1 -> env
11.fixingavr_cpu_gdb_write_register&avr_cpu_gdb_read_registerfunctions
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
12.any cpu is removed
12.feature bits are not saved into vm statechanges since v13
1. rebasing to v2.7.0-rc1changes since v14
1. I made self review with git gui tool. (I did not know such athing
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
exists)
Quoted 3 lines
2. removing all double/tripple spaces
3. removing comment reference to SampleIO
4. folding back some changes, so there is not deleted lines in mycode
Quoted 99 lines
Quoted 99 lines
Quoted 99 lines
Quoted 99 lines
Quoted 99 lines
Quoted 5 lines
5. moving avr configuration, within configure file, before chris
changes since v15
1. removing IO registers cache from CPU
2. implementing CBI/SBI asread(helper_inb), modify,
write(helper_outb)Quoted 5 lines
3. implementing CBIC/SBIC as
read(helper_inb), check, branch
4. adding missingtcg_temp_free_i32fortcg_const_i32changes since v16
1. removing EXT IO registers knoledge from CPU. These registers areaccessible
Quoted 30 lines
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 oftranslate.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<<18changes 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_fillchanges since v20
Quoted 8 lines
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 nowchanges since v21
1. Reorganize bstate.
This will make transition to <exec/translator.h> easier, andfixes a couple of bugs wrt single stepping
Quoted 48 lines
by [email protected]
2. Drop cpc and fix page cross condition.
by [email protected]
3. Refactor checking supported/unsupported instructions
4. Addgdb-xml/avr-cpu.xmlchanges since v22
1. Rebase
2. Split long commentchanges 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 functionchanges since v24
1. removeAVR_CPU_TYPE_NAMEmacrochanges 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/prr1changes since v26
1. add avocado acceptence test
2. add boot serial testchanges since v27
1. list atmel2560 devices as unimplemented
2. fix sram base/sizechanges since v28
1. rebase
2. fix includes & buildchanges since v29
1. fixing ownership
2. using 'since' instread of 'added in'changes since v30
1. rebasechanges 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 instructionQuoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
translation - CPU main translation funcions' commit
Quoted 3 lines
changes since v32
1. modifycpu_get_sregto treat sreg C as other flags, exceptsreg Z
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
changes since v33
1. ensure flag C is always calculated as one bit
2. calculate flag Z as one bit, without using inverse logicchanges since v34
1. rebasechanges since v35
1. rebase
2. useNANOSECONDS_PER_SECONDinstead of 1000000000 in
avr_timer16.cQuoted 26 lines
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
Quoted 1 line
3. split "target/avr: Register AVR support with the rest of QEMU"
into three patches
Quoted 12 lines
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"changes since v36
1. rebase
2. tenameQuoted 9 lines
1. NO_CPU_REGISTERS -> NUMBER_OF_CPU_REGISTERS 2. NO_IO_REGISTERS -> NUMBER_OF_IO_REGISTERS 3. to_A -> to_regs_16_31_by_one 4. to_B -> to_regs_16_23_by_one 5. to_C -> to_regs_24_30_by_two 6. to_D -> to_regs_00_30_by_two 3. add missing licences 4. add usage example (see above) 5. ass Sarah Harris <[email protected]> as a reviewer to
MAINTAINERSQuoted 2 lines
7. use git commit sha1 instead of `master`` in avocado test
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
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 ControlInstructions
Quoted 93 lines
Quoted 93 lines
Quoted 92 lines
Quoted 91 lines
Quoted 37 lines
Quoted 10 lines
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: UpdateMAINTAINERSfileQuoted 2 lines
Sarah Harris (1):
target/avr: Add limited support for USART and 16 bit timerperipherals
Quoted 16 lines
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 ++++Quoted 8 lines
hw/misc/avr_mask.c | 112 ++ hw/timer/avr_timer16.c | 605 ++++++ target/avr/cpu.c | 576 ++++++ target/avr/disas.c | 228 +++ target/avr/gdbstub.c | 85 + target/avr/helper.c | 354 ++++ target/avr/machine.c | 121 ++ target/avr/translate.c | 3052Quoted 48 lines
++++++++++++++++++++++++++++++
Quoted 46 lines
tests/boot-serial-test.c | 10 + tests/machine-none-test.c | 1 + MAINTAINERS | 11 + 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 | 194 ++ tests/Makefile.include | 2 + tests/acceptance/machine_avr6.py | 56 + 40 files changed, 6756 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--
2.17.2 (Apple Git-113)--
Best Regards,
Michael RolnikQuoted 4 lines
Quoted 4 lines
--
Best Regards,
Michael Rolnik--
Alex Bennée
Quoted 36 lines · Aleksandar Markovic
Quoted 21 lines · Alex Bennée
Quoted 1 line · Aleksandar Markovic
On Thursday, November 28, 2019, Michael Rolnik <[email protected]>
Quoted 2 lines · wrote:
Quoted 2 lines
I don't see why you say that the peripherals are inside the chip,
there is
Quoted 1 line
Quoted 1 line
CPU within target/avr directory and then there are some peripherals in
hw
Quoted 5 lines
Quoted 4 lines
directory, CPU does not depend on them. what am I missing?
Quoted 2 lines
I meant these peripherals are physically inside the chip together with
the
Quoted 4 lines
core.
And USART in a micricontroler from 2010 is different than USART from one from 2018.
Quoted 10 lines
Won't these be different chip parts? Or at least revs of the part?
I think broadly the difference between SoC devices is handled by handling versioning in the board models - the board being in this case a CPU core + a bunch of SoC components + the actual board itself.
All the target/cpu stuff needs to deal with is actual architectural revs (c.f. target/arm/cpu[64].c).
Quoted 10 lines
Michael, please take a look at this link:
https://web-engineering.info/node/28
"Part number" seems to be the thing you'll need to incorporate in the overall AVR support in QEMU in order to get the correct emulation of in-chip peripherals - as Alex actually hinted. (In my opinion, you don't need it now, in the initial version, but by no means in near future.)
Here is the list of "part numbers" for 212 (!! a mind-blowing number) of AVR microcontrollers:
https://github.com/felias-fogg/RescueAVR/blob/master/all.list
Quoted 545 lines
Have a great weekend!
Quoted 542 lines
Quoted 8 lines
Quoted 8 lines
Quoted 3 lines · Aleksandar Markovic
On Thursday, November 28, 2019, Michael Rolnik <[email protected]>
Quoted 14 lines · wrote:
Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
Quoted 8 lines · Aleksandar Markovic
Quoted 3 lines · Michael Rolnik
This series of patches adds 8bit AVR cores to QEMU. All instruction, except BREAK/DES/SPM/SPMX, are implemented. Not
fully tested yet.
Quoted 1 line
However I was able to execute simple code with functions. e.g
fibonacci calculation.
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 3 lines
This series of patches include a non real, sample board. No fuses support yet. PC is set to 0 at reset.
I have a couple of general remarks, so I am responding to the cover letter, not individual patches.
1) The licenses for Sarah devices differ than the rest - shouldn't
all
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 1 line
licenses be harmonized?
Sarah,
do you mind if use the same license I use for my code?Quoted 4 lines
2) There is an architectural problem with peripherals. It is
possible
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
that they evolve over time, so, for example, USART could not be the same for older and newer CPUs (in principle, newer peripheral is expected to be o sort of "superset" of the older). How do you solve that problem? Right now, it may not looks serious to you, but if you don;t think about that right now, from the outset, soon the code
will
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 10 lines
Quoted 5 lines
become so entangled, ti woudl be almost very difficult to fix it. Please think about that, how would you solve it, is there a way to pass the information on the currently emulated CPU to the code covering a peripheral, and provide a different behaviour?
Hi Aleksandar,
Please explain.
My concern is about peripherals inside the chip, together with the
core.
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
If one models, let's say an external (in the sense, it is a separate chip) ADC (analog-to-digital converter), one looks at specs,
implement what
Quoted 1 line
Quoted 1 line
Quoted 1 line
is resonable possible in QEMU, plug it in in one of machines thst
contains
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
it, and that's it. That ADC remains the same, of course, whatever the surrounding system is.
In AVR case, I think we have a phenomenon likes of which we didn't see before (at least I don't know about). Number of AVR microcontrollers
is
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
very large, and both cores and peripherals evolved.
For cores, you handle differences with all these
AVR_FEATUREmacros,and
Quoted 1 line
Quoted 1 line
Quoted 1 line
this seems to be working, no significant objection from my side, and
btw
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
that was not an easy task to execute, all admiration from me.
But what about peripherals inside the chip? A peripheral with the same name and the same general area of functionality may be differently specified for microcontrollers from 2010 and 2018. By the difference I don't mean starting address, but the difference in behavior. I don't
have
Quoted 1 line
Quoted 1 line
Quoted 1 line
time right now to spell many examples, but I read three different
specs,
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
and there are differences in USART specifications.
I am not clear what is your envisioned solution for these cases. Would you such close, but not the same, flabors of a peripheral treat as if
they
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
are two completely separate cases of a peripheral? Or would you have a single peripheral that would somehow configure itself depending on
the core
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
it is attached to?
I hope I was clearer this time.
Aleksandar
Quoted 3 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
I don't see any problem from CPU's perspective.
as for the sample board is just a sample, I hope other people will create real models or real hw.
there was no way I could provide a CPU alone, that's why there issample.
Quoted 83 lines
Quoted 83 lines
Quoted 83 lines
Quoted 83 lines
Quoted 83 lines
Quoted 5 lines
Following are examples of possible usages, assuming program.elf is
compiled for AVR cpu
Quoted 3 lines
1. Continious non interrupted execution
runqemu-system-avr -kernel program.elf
2. Continious non interrupted execution with serial output intotelnet window
Quoted 1 line
run `qemu-system-avr -kernel program.elf -serial
tcp::5678,server,nowait -nographic `
Quoted 2 lines
run
telent localhost 5678
3. Continious non interrupted execution with serial output intostdout
Quoted 4 lines
run
qemu-system-avr -kernel program.elf -serial stdio
4. Debugging wit GDB debugger
runqemu-system-avr -kernel program.elf -s -Srunavr-gdb program.elfand then within GDB shell `targetremote :1234`
Quoted 3 lines
5. Print out executed instructions
runqemu-system-avr -kernel program.elf -d in_asmThank you so much for these examples!
Aleksandar
Quoted 3 lines
the patches include the following
1. just a basic 8bit AVR CPU, without instruction decoding ortranslation
Quoted 9 lines
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
Quoted 9 lines
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 togetherchanges since v3
1. rampD/X/Y/Z registers are encoded as0x00ff0000(instead of
0x000000ff) for faster address manipulatonQuoted 13 lines
2. ffs changed to ctz32
3. duplicate code removed atavr_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 of0xff- 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 XCHQuoted 2 lines
changes since v4
1. target is now defined as big endian in order to optimizepush_ret/pop_ret
Quoted 14 lines
2. all style warnings are fixed
3. adding cpu_set/get_sreg functions
4. simplifyinggen_goto_tbas 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. removingavr_set_feature
10. SPL/SPH set bug fix
11. switchingstb_phystocpu_stb_data
12. cleaning upavr_decode
13. saving sreg, rampD/X/Y/Z, eind in HW format (savevm)
14. saving CPU features (savevm)Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
changes since v5
1. BLD bug fix
2. decoder generator is addedchages since v6
1. using cpu_get_sreg/cpu_set_sreg inavr_cpu_gdb_read_register/avr_
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
cpu_gdb_write_registerQuoted 1 line
2. configure the target as little endian because otherwise GDB
does
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
not work
Quoted 5 lines
3. fixing and testing gen_push_ret/gen_pop_ret
changes since v7
1. folding back v6
2. logging athelper_outbandhelper_inbare done for nonsupported
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
yet registers only
Quoted 4 lines
3.
MAINTAINERSupdatedchanges since v8
1. removing hw/avr from hw/Makefile.obj as it should not be builtfor
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
all
Quoted 9 lines
2. making linux compilable
3. testing ona. 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 memoryQuoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
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 notrouted to
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
any device
Quoted 4 lines
5. commenst about sample board and sample IO device added
6. sample board description is more descriptive now
7.memory_region_allocate_system_memoryis used to create RAM
8. now there arehelper_fullrd&helper_fullwrwhen LD/ST try toaccess registers
Quoted 3 lines
changes since v10
1. movig back fullwr & fullrd into the commit where outb and inbwere
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
introduced
Quoted 12 lines
2. changing
tlb_fillfunction signature
3. adding empty line between functions
4. adding newline on the last line of the file
5. usingtb->flagsto 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.objschanges since v11
1. updating to v2.7.0-rc
2. removing assignment toenv->fullaccfromgen_intermediate_codeQuoted 12 lines
changes since v12
1. fixing spacing
2. fixing get/put_segment functions
3. removingtarget-avr/machine.hfile
4.VMSTATE_SINGLE_TEST->VMSTATE_SINGLE
5. comment spelling
6. removinghw/avr/sample_io.c
7. char const* -> const char*
8. proper ram allocation
9. fixing breakpoint functionality.
10.env1 -> env
11.fixingavr_cpu_gdb_write_register&avr_cpu_gdb_read_registerfunctions
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
12.any cpu is removed
12.feature bits are not saved into vm statechanges since v13
1. rebasing to v2.7.0-rc1changes since v14
1. I made self review with git gui tool. (I did not know such athing
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
exists)
Quoted 3 lines
2. removing all double/tripple spaces
3. removing comment reference to SampleIO
4. folding back some changes, so there is not deleted lines in mycode
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 5 lines
5. moving avr configuration, within configure file, before chris
changes since v15
1. removing IO registers cache from CPU
2. implementing CBI/SBI asread(helper_inb), modify,
write(helper_outb)Quoted 5 lines
3. implementing CBIC/SBIC as
read(helper_inb), check, branch
4. adding missingtcg_temp_free_i32fortcg_const_i32changes since v16
1. removing EXT IO registers knoledge from CPU. These registersare
Quoted 88 lines
Quoted 88 lines
Quoted 88 lines
Quoted 88 lines
Quoted 88 lines
accessible
Quoted 30 lines
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 oftranslate.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<<18changes 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_fillchanges since v20
Quoted 8 lines
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 nowchanges since v21
1. Reorganize bstate.
This will make transition to <exec/translator.h> easier, andfixes a couple of bugs wrt single stepping
Quoted 48 lines
by [email protected]
2. Drop cpc and fix page cross condition.
by [email protected]
3. Refactor checking supported/unsupported instructions
4. Addgdb-xml/avr-cpu.xmlchanges since v22
1. Rebase
2. Split long commentchanges 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 functionchanges since v24
1. removeAVR_CPU_TYPE_NAMEmacrochanges 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/prr1changes since v26
1. add avocado acceptence test
2. add boot serial testchanges since v27
1. list atmel2560 devices as unimplemented
2. fix sram base/sizechanges since v28
1. rebase
2. fix includes & buildchanges since v29
1. fixing ownership
2. using 'since' instread of 'added in'changes since v30
1. rebasechanges 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 instructionQuoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
translation - CPU main translation funcions' commit
Quoted 3 lines
changes since v32
1. modifycpu_get_sregto treat sreg C as other flags, exceptsreg Z
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
changes since v33
1. ensure flag C is always calculated as one bit
2. calculate flag Z as one bit, without using inverse logicchanges since v34
1. rebasechanges since v35
1. rebase
2. useNANOSECONDS_PER_SECONDinstead of 1000000000 in
avr_timer16.cQuoted 26 lines
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
Quoted 1 line
3. split "target/avr: Register AVR support with the rest of QEMU"
into three patches
Quoted 12 lines
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"changes since v36
1. rebase
2. tenameQuoted 9 lines
1. NO_CPU_REGISTERS -> NUMBER_OF_CPU_REGISTERS 2. NO_IO_REGISTERS -> NUMBER_OF_IO_REGISTERS 3. to_A -> to_regs_16_31_by_one 4. to_B -> to_regs_16_23_by_one 5. to_C -> to_regs_24_30_by_two 6. to_D -> to_regs_00_30_by_two 3. add missing licences 4. add usage example (see above) 5. ass Sarah Harris <[email protected]> as a reviewer to
MAINTAINERSQuoted 2 lines
7. use git commit sha1 instead of `master`` in avocado test
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
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 ControlInstructions
Quoted 93 lines
Quoted 93 lines
Quoted 92 lines
Quoted 91 lines
Quoted 37 lines
Quoted 10 lines
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: UpdateMAINTAINERSfileQuoted 2 lines
Sarah Harris (1):
target/avr: Add limited support for USART and 16 bit timerperipherals
Quoted 16 lines
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 ++++Quoted 8 lines
hw/misc/avr_mask.c | 112 ++ hw/timer/avr_timer16.c | 605 ++++++ target/avr/cpu.c | 576 ++++++ target/avr/disas.c | 228 +++ target/avr/gdbstub.c | 85 + target/avr/helper.c | 354 ++++ target/avr/machine.c | 121 ++ target/avr/translate.c | 3052Quoted 48 lines
++++++++++++++++++++++++++++++
Quoted 46 lines
tests/boot-serial-test.c | 10 + tests/machine-none-test.c | 1 + MAINTAINERS | 11 + 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 | 194 ++ tests/Makefile.include | 2 + tests/acceptance/machine_avr6.py | 56 + 40 files changed, 6756 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--
2.17.2 (Apple Git-113)--
Best Regards,
Michael RolnikQuoted 4 lines
Quoted 4 lines
--
Best Regards,
Michael Rolnik--
Alex Bennée
Quoted 2 lines
Sarah,
do you mind if use the same license I use for my code?
I'm happy to use the same license.
Kind regards,
Sarah Harris
Quoted 443 lines · On Thu, 28 Nov 2019 14:28:19 +0200 Michael Rolnik <[email protected]> wrote:
Quoted 11 lines · Aleksandar Markovic
Quoted 3 lines · Michael Rolnik
This series of patches adds 8bit AVR cores to QEMU.
All instruction, except BREAK/DES/SPM/SPMX, are implemented. Not fullytested yet.
Quoted 1 line
However I was able to execute simple code with functions. e.g fibonacci
calculation.
Quoted 3 lines
This series of patches include a non real, sample board. No fuses support yet. PC is set to 0 at reset.
Quoted 5 lines
I have a couple of general remarks, so I am responding to the cover letter, not individual patches.
1) The licenses for Sarah devices differ than the rest - shouldn't all licenses be harmonized?
Sarah,
do you mind if use the same license I use for my code?Quoted 14 lines
2) There is an architectural problem with peripherals. It is possible that they evolve over time, so, for example, USART could not be the same for older and newer CPUs (in principle, newer peripheral is expected to be o sort of "superset" of the older). How do you solve that problem? Right now, it may not looks serious to you, but if you don;t think about that right now, from the outset, soon the code will become so entangled, ti woudl be almost very difficult to fix it. Please think about that, how would you solve it, is there a way to pass the information on the currently emulated CPU to the code covering a peripheral, and provide a different behaviour?
Hi Aleksandar,
Please explain. I don't see any problem from CPU's perspective. as for the sample board is just a sample, I hope other people will create real models or real hw.
there was no way I could provide a CPU alone, that's why there is sample.Quoted 391 lines
Quoted 2 lines
Following are examples of possible usages, assuming program.elf is
compiled for AVR cpu
Quoted 3 lines
1. Continious non interrupted execution
runqemu-system-avr -kernel program.elf
2. Continious non interrupted execution with serial output into telnetwindow
Quoted 1 line
run `qemu-system-avr -kernel program.elf -serial
tcp::5678,server,nowait -nographic `
Quoted 6 lines
run
telent localhost 5678
3. Continious non interrupted execution with serial output into stdout runqemu-system-avr -kernel program.elf -serial stdio
4. Debugging wit GDB debugger
runqemu-system-avr -kernel program.elf -s -S
runavr-gdb program.elfand then within GDB shell `target remote:1234`
Quoted 3 lines
5. Print out executed instructions
runqemu-system-avr -kernel program.elf -d in_asmThank you so much for these examples!
Aleksandar
Quoted 4 lines
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 coresQuoted 8 lines
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
Quoted 9 lines
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 togetherchanges since v3
1. rampD/X/Y/Z registers are encoded as0x00ff0000(instead of
0x000000ff) for faster address manipulatonQuoted 13 lines
2. ffs changed to ctz32
3. duplicate code removed atavr_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 of0xff- 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 XCHQuoted 2 lines
changes since v4
1. target is now defined as big endian in order to optimizepush_ret/pop_ret
Quoted 14 lines
2. all style warnings are fixed
3. adding cpu_set/get_sreg functions
4. simplifyinggen_goto_tbas 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. removingavr_set_feature
10. SPL/SPH set bug fix
11. switchingstb_phystocpu_stb_data
12. cleaning upavr_decode
13. saving sreg, rampD/X/Y/Z, eind in HW format (savevm)
14. saving CPU features (savevm)Quoted 6 lines
changes since v5
1. BLD bug fix
2. decoder generator is addedchages since v6
1. using cpu_get_sreg/cpu_set_sreg inavr_cpu_gdb_read_register/avr_cpu_gdb_write_register
Quoted 1 line
2. configure the target as little endian because otherwise GDB does not
work
Quoted 5 lines
3. fixing and testing gen_push_ret/gen_pop_ret
changes since v7
1. folding back v6
2. logging athelper_outbandhelper_inbare done for non supported yetregisters only
Quoted 13 lines
3.
MAINTAINERSupdatedchanges since v8
1. removing hw/avr from hw/Makefile.obj as it should not be built for all
2. making linux compilable
3. testing ona. 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 memoryQuoted 5 lines
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 toany device
Quoted 4 lines
5. commenst about sample board and sample IO device added
6. sample board description is more descriptive now
7.memory_region_allocate_system_memoryis used to create RAM
8. now there arehelper_fullrd&helper_fullwrwhen LD/ST try to accessregisters
Quoted 3 lines
changes since v10
1. movig back fullwr & fullrd into the commit where outb and inb wereintroduced
Quoted 12 lines
2. changing
tlb_fillfunction signature
3. adding empty line between functions
4. adding newline on the last line of the file
5. usingtb->flagsto 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.objschanges since v11
1. updating to v2.7.0-rc
2. removing assignment toenv->fullaccfromgen_intermediate_codeQuoted 12 lines
changes since v12
1. fixing spacing
2. fixing get/put_segment functions
3. removingtarget-avr/machine.hfile
4.VMSTATE_SINGLE_TEST->VMSTATE_SINGLE
5. comment spelling
6. removinghw/avr/sample_io.c
7. char const* -> const char*
8. proper ram allocation
9. fixing breakpoint functionality.
10.env1 -> env
11.fixingavr_cpu_gdb_write_register&avr_cpu_gdb_read_registerfunctions
Quoted 8 lines
12.any cpu is removed
12.feature bits are not saved into vm statechanges since v13
1. rebasing to v2.7.0-rc1changes since v14
1. I made self review with git gui tool. (I did not know such a thingexists)
Quoted 5 lines
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 chrisQuoted 8 lines
changes since v15
1. removing IO registers cache from CPU
2. implementing CBI/SBI asread(helper_inb), modify,write(helper_outb)
3. implementing CBIC/SBIC asread(helper_inb), check, branch
4. adding missingtcg_temp_free_i32fortcg_const_i32changes since v16
1. removing EXT IO registers knoledge from CPU. These registers areaccessible
Quoted 30 lines
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 oftranslate.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<<18changes 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_fillchanges since v20
Quoted 8 lines
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 nowchanges since v21
1. Reorganize bstate.
This will make transition to <exec/translator.h> easier, and fixes acouple of bugs wrt single stepping
Quoted 40 lines
by [email protected]
2. Drop cpc and fix page cross condition.
by [email protected]
3. Refactor checking supported/unsupported instructions
4. Addgdb-xml/avr-cpu.xmlchanges since v22
1. Rebase
2. Split long commentchanges 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 functionchanges since v24
1. removeAVR_CPU_TYPE_NAMEmacrochanges 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/prr1changes since v26
1. add avocado acceptence test
2. add boot serial testchanges since v27
1. list atmel2560 devices as unimplemented
2. fix sram base/sizechanges since v28
1. rebase
2. fix includes & buildchanges since v29
1. fixing ownership
2. using 'since' instread of 'added in'Quoted 8 lines
changes since v30
1. rebasechanges 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 instructiontranslation - CPU main translation funcions' commit
Quoted 8 lines
changes since v32
1. modifycpu_get_sregto treat sreg C as other flags, except sreg Zchanges since v33
1. ensure flag C is always calculated as one bit
2. calculate flag Z as one bit, without using inverse logicQuoted 7 lines
changes since v34
1. rebasechanges 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" intothree patches
Quoted 12 lines
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"changes since v36
1. rebase
2. tenameQuoted 9 lines
1. NO_CPU_REGISTERS -> NUMBER_OF_CPU_REGISTERS 2. NO_IO_REGISTERS -> NUMBER_OF_IO_REGISTERS 3. to_A -> to_regs_16_31_by_one 4. to_B -> to_regs_16_23_by_one 5. to_C -> to_regs_24_30_by_two 6. to_D -> to_regs_00_30_by_two 3. add missing licences 4. add usage example (see above) 5. ass Sarah Harris <[email protected]> as a reviewer to
MAINTAINERSQuoted 95 lines
7. use git commit sha1 instead of `master`` in avocado test
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: UpdateMAINTAINERSfileSarah Harris (1):
target/avr: Add limited support for USART and 16 bit timer peripheralsconfigure | 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 | 228 +++ target/avr/gdbstub.c | 85 + target/avr/helper.c | 354 ++++ target/avr/machine.c | 121 ++ target/avr/translate.c | 3052 ++++++++++++++++++++++++++++++ tests/boot-serial-test.c | 10 + tests/machine-none-test.c | 1 + MAINTAINERS | 11 + 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 | 194 ++ tests/Makefile.include | 2 + tests/acceptance/machine_avr6.py | 56 + 40 files changed, 6756 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--
2.17.2 (Apple Git-113)Signature · 2 lines
Best Regards, Michael Rolnik
Quoted 17 lines · Michael Rolnik
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.Following are examples of possible usages, assuming program.elf is compiled for AVR cpu
1. Continious non interrupted execution
runqemu-system-avr -kernel program.elf
2. Continious non interrupted execution with serial output into telnet window
run `qemu-system-avr -kernel program.elf -serial
tcp::5678,server,nowait -nographic `
runtelent localhost 5678
Quoted 10 lines
3. Continious non interrupted execution with serial output into stdout run
qemu-system-avr -kernel program.elf -serial stdio
4. Debugging wit GDB debugger
runqemu-system-avr -kernel program.elf -s -S
runavr-gdb program.elfand then within GDB shell `target remote
:1234`
5. Print out executed instructions
runqemu-system-avr -kernel program.elf -d in_asm
What is still missing is a documentstion patch. You need to browse a bit QEMU online documentation https://qemu.weilnetz.de/doc/qemu-doc.html and find the right place and content for AVR. Source for documentation is within the tree, in one of .texi or .rst files.
Please also split Sarah's patch into three, not only for reviewing purpose, but for the sake of future readers.
Yours,
Aleksandar
Quoted 364 lines
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 coresavr1 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 togetherchanges since v3
1. rampD/X/Y/Z registers are encoded as0x00ff0000(instead of0x000000ff) for faster address manipulaton
2. ffs changed to ctz32
3. duplicate code removed atavr_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 of0xff- 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 XCHchanges 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. simplifyinggen_goto_tbas 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. removingavr_set_feature
10. SPL/SPH set bug fix
11. switchingstb_phystocpu_stb_data
12. cleaning upavr_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 addedchages 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_retchanges since v7
1. folding back v6
2. logging athelper_outbandhelper_inbare done for non supported yet registers only
3.MAINTAINERSupdatedchanges since v8
1. removing hw/avr from hw/Makefile.obj as it should not be built for all
2. making linux compilable
3. testing ona. 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 memorychanges 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_memoryis used to create RAM
8. now there arehelper_fullrd&helper_fullwrwhen LD/ST try to access registerschanges since v10
1. movig back fullwr & fullrd into the commit where outb and inb were introduced
2. changingtlb_fillfunction signature
3. adding empty line between functions
4. adding newline on the last line of the file
5. usingtb->flagsto 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.objschanges since v11
1. updating to v2.7.0-rc
2. removing assignment toenv->fullaccfromgen_intermediate_codechanges since v12
1. fixing spacing
2. fixing get/put_segment functions
3. removingtarget-avr/machine.hfile
4.VMSTATE_SINGLE_TEST->VMSTATE_SINGLE
5. comment spelling
6. removinghw/avr/sample_io.c
7. char const* -> const char*
8. proper ram allocation
9. fixing breakpoint functionality.
10.env1 -> env
11.fixingavr_cpu_gdb_write_register&avr_cpu_gdb_read_registerfunctions 12.any cpu is removed
12.feature bits are not saved into vm statechanges since v13
1. rebasing to v2.7.0-rc1changes 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 chrischanges since v15
1. removing IO registers cache from CPU
2. implementing CBI/SBI asread(helper_inb), modify,write(helper_outb)
3. implementing CBIC/SBIC asread(helper_inb), check, branch
4. adding missingtcg_temp_free_i32fortcg_const_i32changes since v16
1. removing EXT IO registers knoledge from CPU. These registers are accessible
by LD/ST only. CPU has no interest in themchanges 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 oftranslate.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<<18changes 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_fillchanges 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 nowchanges 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. Addgdb-xml/avr-cpu.xmlchanges since v22
1. Rebase
2. Split long commentchanges 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 functionchanges since v24
1. removeAVR_CPU_TYPE_NAMEmacrochanges 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/prr1changes since v26
1. add avocado acceptence test
2. add boot serial testchanges since v27
1. list atmel2560 devices as unimplemented
2. fix sram base/sizechanges since v28
1. rebase
2. fix includes & buildchanges since v29
1. fixing ownership
2. using 'since' instread of 'added in'changes since v30
1. rebasechanges 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 instructiontranslation - CPU main translation funcions' commit
changes since v32
1. modifycpu_get_sregto treat sreg C as other flags, except sreg Zchanges since v33
1. ensure flag C is always calculated as one bit
2. calculate flag Z as one bit, without using inverse logicchanges since v34
1. rebasechanges 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"changes since v36
1. rebase
2. tename1. NO_CPU_REGISTERS -> NUMBER_OF_CPU_REGISTERS 2. NO_IO_REGISTERS -> NUMBER_OF_IO_REGISTERS 3. to_A -> to_regs_16_31_by_one 4. to_B -> to_regs_16_23_by_one 5. to_C -> to_regs_24_30_by_two 6. to_D -> to_regs_00_30_by_two 3. add missing licences 4. add usage example (see above) 5. ass Sarah Harris <[email protected]> as a reviewer to MAINTAINERS 7. use git commit sha1 instead of `master`` in avocado testMichael 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: UpdateMAINTAINERSfileSarah Harris (1):
target/avr: Add limited support for USART and 16 bit timer peripheralsconfigure | 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 | 228 +++ target/avr/gdbstub.c | 85 + target/avr/helper.c | 354 ++++ target/avr/machine.c | 121 ++ target/avr/translate.c | 3052 ++++++++++++++++++++++++++++++ tests/boot-serial-test.c | 10 + tests/machine-none-test.c | 1 + MAINTAINERS | 11 + 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 | 194 ++ tests/Makefile.include | 2 + tests/acceptance/machine_avr6.py | 56 + 40 files changed, 6756 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--
2.17.2 (Apple Git-113)
Quoted 17 lines · Michael Rolnik
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.Following are examples of possible usages, assuming program.elf is compiled for AVR cpu
1. Continious non interrupted execution
runqemu-system-avr -kernel program.elf
2. Continious non interrupted execution with serial output into telnet window
run `qemu-system-avr -kernel program.elf -serial
tcp::5678,server,nowait -nographic `
runtelent localhost 5678
Quoted 10 lines
3. Continious non interrupted execution with serial output into stdout run
qemu-system-avr -kernel program.elf -serial stdio
4. Debugging wit GDB debugger
runqemu-system-avr -kernel program.elf -s -S
runavr-gdb program.elfand then within GDB shell `target remote
:1234`
5. Print out executed instructions
runqemu-system-avr -kernel program.elf -d in_asm
Hi, Michael.
Can you explain to me the mechanisms of recognition of what core/microcontroller QEMU is supposed to emulate in the examples above?
Yours, Aleksandar
Quoted 363 lines
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 coresavr1 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 togetherchanges since v3
1. rampD/X/Y/Z registers are encoded as0x00ff0000(instead of0x000000ff) for faster address manipulaton
2. ffs changed to ctz32
3. duplicate code removed atavr_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 of0xff- 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 XCHchanges 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. simplifyinggen_goto_tbas 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. removingavr_set_feature
10. SPL/SPH set bug fix
11. switchingstb_phystocpu_stb_data
12. cleaning upavr_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 addedchages 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_retchanges since v7
1. folding back v6
2. logging athelper_outbandhelper_inbare done for non supported yet registers only
3.MAINTAINERSupdatedchanges since v8
1. removing hw/avr from hw/Makefile.obj as it should not be built for all
2. making linux compilable
3. testing ona. 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 memorychanges 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_memoryis used to create RAM
8. now there arehelper_fullrd&helper_fullwrwhen LD/ST try to access registerschanges since v10
1. movig back fullwr & fullrd into the commit where outb and inb were introduced
2. changingtlb_fillfunction signature
3. adding empty line between functions
4. adding newline on the last line of the file
5. usingtb->flagsto 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.objschanges since v11
1. updating to v2.7.0-rc
2. removing assignment toenv->fullaccfromgen_intermediate_codechanges since v12
1. fixing spacing
2. fixing get/put_segment functions
3. removingtarget-avr/machine.hfile
4.VMSTATE_SINGLE_TEST->VMSTATE_SINGLE
5. comment spelling
6. removinghw/avr/sample_io.c
7. char const* -> const char*
8. proper ram allocation
9. fixing breakpoint functionality.
10.env1 -> env
11.fixingavr_cpu_gdb_write_register&avr_cpu_gdb_read_registerfunctions 12.any cpu is removed
12.feature bits are not saved into vm statechanges since v13
1. rebasing to v2.7.0-rc1changes 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 chrischanges since v15
1. removing IO registers cache from CPU
2. implementing CBI/SBI asread(helper_inb), modify,write(helper_outb)
3. implementing CBIC/SBIC asread(helper_inb), check, branch
4. adding missingtcg_temp_free_i32fortcg_const_i32changes since v16
1. removing EXT IO registers knoledge from CPU. These registers are accessible
by LD/ST only. CPU has no interest in themchanges 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 oftranslate.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<<18changes 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_fillchanges 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 nowchanges 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. Addgdb-xml/avr-cpu.xmlchanges since v22
1. Rebase
2. Split long commentchanges 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 functionchanges since v24
1. removeAVR_CPU_TYPE_NAMEmacrochanges 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/prr1changes since v26
1. add avocado acceptence test
2. add boot serial testchanges since v27
1. list atmel2560 devices as unimplemented
2. fix sram base/sizechanges since v28
1. rebase
2. fix includes & buildchanges since v29
1. fixing ownership
2. using 'since' instread of 'added in'changes since v30
1. rebasechanges 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 instructiontranslation - CPU main translation funcions' commit
changes since v32
1. modifycpu_get_sregto treat sreg C as other flags, except sreg Zchanges since v33
1. ensure flag C is always calculated as one bit
2. calculate flag Z as one bit, without using inverse logicchanges since v34
1. rebasechanges 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"changes since v36
1. rebase
2. tename1. NO_CPU_REGISTERS -> NUMBER_OF_CPU_REGISTERS 2. NO_IO_REGISTERS -> NUMBER_OF_IO_REGISTERS 3. to_A -> to_regs_16_31_by_one 4. to_B -> to_regs_16_23_by_one 5. to_C -> to_regs_24_30_by_two 6. to_D -> to_regs_00_30_by_two 3. add missing licences 4. add usage example (see above) 5. ass Sarah Harris <[email protected]> as a reviewer to MAINTAINERS 7. use git commit sha1 instead of `master`` in avocado testMichael 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: UpdateMAINTAINERSfileSarah Harris (1):
target/avr: Add limited support for USART and 16 bit timer peripheralsconfigure | 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 | 228 +++ target/avr/gdbstub.c | 85 + target/avr/helper.c | 354 ++++ target/avr/machine.c | 121 ++ target/avr/translate.c | 3052 ++++++++++++++++++++++++++++++ tests/boot-serial-test.c | 10 + tests/machine-none-test.c | 1 + MAINTAINERS | 11 + 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 | 194 ++ tests/Makefile.include | 2 + tests/acceptance/machine_avr6.py | 56 + 40 files changed, 6756 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--
2.17.2 (Apple Git-113)
There is *-cpu *option where you can specify what CPU you want, if this option is not specified avr6 (avr6-avr-cpu) is chosen.
*./avr-softmmu/qemu-system-avr -cpu help*
avr1-avr-cpu
avr2-avr-cpu
avr25-avr-cpu
avr3-avr-cpu
avr31-avr-cpu
avr35-avr-cpu
avr4-avr-cpu
avr5-avr-cpu
avr51-avr-cpu
avr6-avr-cpu
xmega2-avr-cpu
xmega4-avr-cpu
xmega5-avr-cpu
xmega6-avr-cpu
xmega7-avr-cpu
Regards,
Michael Rolnik
Quoted 403 lines · Aleksandar Markovic
Quoted 17 lines · Michael Rolnik
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.Following are examples of possible usages, assuming program.elf is compiled for AVR cpu
1. Continious non interrupted execution
runqemu-system-avr -kernel program.elf
2. Continious non interrupted execution with serial output into telnet window
run `qemu-system-avr -kernel program.elf -serial
tcp::5678,server,nowait -nographic `
runtelent localhost 5678Quoted 10 lines
3. Continious non interrupted execution with serial output into stdout run
qemu-system-avr -kernel program.elf -serial stdio
4. Debugging wit GDB debugger
runqemu-system-avr -kernel program.elf -s -S
runavr-gdb program.elfand then within GDB shell `target remote
:1234`
5. Print out executed instructions
runqemu-system-avr -kernel program.elf -d in_asmHi, Michael.
Can you explain to me the mechanisms of recognition of what core/microcontroller QEMU is supposed to emulate in the examples above?
Yours, Aleksandar
Quoted 363 lines
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 coresavr1 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 togetherchanges since v3
1. rampD/X/Y/Z registers are encoded as0x00ff0000(instead of0x000000ff) for faster address manipulaton
2. ffs changed to ctz32
3. duplicate code removed atavr_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 of0xff- 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 XCHchanges 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. simplifyinggen_goto_tbas 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. removingavr_set_feature
10. SPL/SPH set bug fix
11. switchingstb_phystocpu_stb_data
12. cleaning upavr_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 addedchages 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_retchanges since v7
1. folding back v6
2. logging athelper_outbandhelper_inbare done for non supported yet registers only
3.MAINTAINERSupdatedchanges since v8
1. removing hw/avr from hw/Makefile.obj as it should not be built for all
2. making linux compilable
3. testing ona. 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 memorychanges 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_memoryis used to create RAM
8. now there arehelper_fullrd&helper_fullwrwhen LD/ST try to access registerschanges since v10
1. movig back fullwr & fullrd into the commit where outb and inb were introduced
2. changingtlb_fillfunction signature
3. adding empty line between functions
4. adding newline on the last line of the file
5. usingtb->flagsto 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.objschanges since v11
1. updating to v2.7.0-rc
2. removing assignment toenv->fullaccfromgen_intermediate_codechanges since v12
1. fixing spacing
2. fixing get/put_segment functions
3. removingtarget-avr/machine.hfile
4.VMSTATE_SINGLE_TEST->VMSTATE_SINGLE
5. comment spelling
6. removinghw/avr/sample_io.c
7. char const* -> const char*
8. proper ram allocation
9. fixing breakpoint functionality.
10.env1 -> env
11.fixingavr_cpu_gdb_write_register&avr_cpu_gdb_read_registerfunctions 12.any cpu is removed
12.feature bits are not saved into vm statechanges since v13
1. rebasing to v2.7.0-rc1changes 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 chrischanges since v15
1. removing IO registers cache from CPU
2. implementing CBI/SBI asread(helper_inb), modify,write(helper_outb)
3. implementing CBIC/SBIC asread(helper_inb), check, branch
4. adding missingtcg_temp_free_i32fortcg_const_i32changes since v16
1. removing EXT IO registers knoledge from CPU. These registers are accessible
by LD/ST only. CPU has no interest in themchanges 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 oftranslate.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<<18changes 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_fillchanges 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 nowchanges 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. Addgdb-xml/avr-cpu.xmlchanges since v22
1. Rebase
2. Split long commentchanges 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 functionchanges since v24
1. removeAVR_CPU_TYPE_NAMEmacrochanges 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/prr1changes since v26
1. add avocado acceptence test
2. add boot serial testchanges since v27
1. list atmel2560 devices as unimplemented
2. fix sram base/sizechanges since v28
1. rebase
2. fix includes & buildchanges since v29
1. fixing ownership
2. using 'since' instread of 'added in'changes since v30
1. rebasechanges 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 instructiontranslation - CPU main translation funcions' commit
changes since v32
1. modifycpu_get_sregto treat sreg C as other flags, except sreg Zchanges since v33
1. ensure flag C is always calculated as one bit
2. calculate flag Z as one bit, without using inverse logicchanges since v34
1. rebasechanges 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"changes since v36
1. rebase
2. tename1. NO_CPU_REGISTERS -> NUMBER_OF_CPU_REGISTERS 2. NO_IO_REGISTERS -> NUMBER_OF_IO_REGISTERS 3. to_A -> to_regs_16_31_by_one 4. to_B -> to_regs_16_23_by_one 5. to_C -> to_regs_24_30_by_two 6. to_D -> to_regs_00_30_by_two 3. add missing licences 4. add usage example (see above) 5. ass Sarah Harris <[email protected]> as a reviewer to MAINTAINERS 7. use git commit sha1 instead of `master`` in avocado testMichael 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: UpdateMAINTAINERSfileSarah Harris (1):
target/avr: Add limited support for USART and 16 bit timer peripheralsconfigure | 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 | 228 +++ target/avr/gdbstub.c | 85 + target/avr/helper.c | 354 ++++ target/avr/machine.c | 121 ++ target/avr/translate.c | 3052 ++++++++++++++++++++++++++++++ tests/boot-serial-test.c | 10 + tests/machine-none-test.c | 1 + MAINTAINERS | 11 + 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 | 194 ++ tests/Makefile.include | 2 + tests/acceptance/machine_avr6.py | 56 + 40 files changed, 6756 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--
2.17.2 (Apple Git-113)
Signature · 2 lines
Best Regards, Michael Rolnik
Quoted 21 lines · Michael Rolnik
There is *-cpu *option where you can specify what CPU you want, if this option is not specified avr6 (avr6-avr-cpu) is chosen.
*./avr-softmmu/qemu-system-avr -cpu help*
avr1-avr-cpu
avr2-avr-cpu
avr25-avr-cpu
avr3-avr-cpu
avr31-avr-cpu
avr35-avr-cpu
avr4-avr-cpu
avr5-avr-cpu
avr51-avr-cpu
avr6-avr-cpu
xmega2-avr-cpu
xmega4-avr-cpu
xmega5-avr-cpu
xmega6-avr-cpu
xmega7-avr-cpu
What happens if you specify a core via -cpu, and supply elf file compiled for another core?
Best regards,
Akeksandar
Quoted 419 lines
Regards,
Michael RolnikQuoted 32 lines · Aleksandar Markovic
Quoted 17 lines · Michael Rolnik
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.Following are examples of possible usages, assuming program.elf is compiled for AVR cpu
1. Continious non interrupted execution
runqemu-system-avr -kernel program.elf
2. Continious non interrupted execution with serial output into telnet window
run `qemu-system-avr -kernel program.elf -serial
tcp::5678,server,nowait -nographic `
runtelent localhost 5678Quoted 10 lines
3. Continious non interrupted execution with serial output into stdout run
qemu-system-avr -kernel program.elf -serial stdio
4. Debugging wit GDB debugger
runqemu-system-avr -kernel program.elf -s -S
runavr-gdb program.elfand then within GDB shell `target remote
:1234`
5. Print out executed instructions
runqemu-system-avr -kernel program.elf -d in_asmQuoted 374 lines
Hi, Michael.
Can you explain to me the mechanisms of recognition of what core/microcontroller QEMU is supposed to emulate in the examples above?
Yours, Aleksandar
Quoted 365 lines
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 coresavr1 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 togetherchanges since v3
1. rampD/X/Y/Z registers are encoded as0x00ff0000(instead of0x000000ff) for faster address manipulaton
2. ffs changed to ctz32
3. duplicate code removed atavr_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 of0xff- 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 XCHchanges 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. simplifyinggen_goto_tbas 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. removingavr_set_feature
10. SPL/SPH set bug fix
11. switchingstb_phystocpu_stb_data
12. cleaning upavr_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 addedchages 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_retchanges since v7
1. folding back v6
2. logging athelper_outbandhelper_inbare done for non supported yet registers only
3.MAINTAINERSupdatedchanges since v8
1. removing hw/avr from hw/Makefile.obj as it should not be built for all
2. making linux compilable
3. testing ona. 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 memorychanges 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_memoryis used to create RAM
8. now there arehelper_fullrd&helper_fullwrwhen LD/ST try to access registerschanges since v10
1. movig back fullwr & fullrd into the commit where outb and inb were introduced
2. changingtlb_fillfunction signature
3. adding empty line between functions
4. adding newline on the last line of the file
5. usingtb->flagsto 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.objschanges since v11
1. updating to v2.7.0-rc
2. removing assignment toenv->fullaccfromgen_intermediate_codechanges since v12
1. fixing spacing
2. fixing get/put_segment functions
3. removingtarget-avr/machine.hfile
4.VMSTATE_SINGLE_TEST->VMSTATE_SINGLE
5. comment spelling
6. removinghw/avr/sample_io.c
7. char const* -> const char*
8. proper ram allocation
9. fixing breakpoint functionality.
10.env1 -> env
11.fixingavr_cpu_gdb_write_register&avr_cpu_gdb_read_registerfunctions
12.any cpu is removed
12.feature bits are not saved into vm statechanges since v13
1. rebasing to v2.7.0-rc1changes 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 chrischanges since v15
1. removing IO registers cache from CPU
2. implementing CBI/SBI asread(helper_inb), modify,write(helper_outb)
3. implementing CBIC/SBIC asread(helper_inb), check, branch
4. adding missingtcg_temp_free_i32fortcg_const_i32changes since v16
1. removing EXT IO registers knoledge from CPU. These registers are accessible
by LD/ST only. CPU has no interest in themchanges 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 oftranslate.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<<18changes 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_fillchanges 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 nowchanges 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. Addgdb-xml/avr-cpu.xmlchanges since v22
1. Rebase
2. Split long commentchanges 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 functionchanges since v24
1. removeAVR_CPU_TYPE_NAMEmacrochanges 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/prr1changes since v26
1. add avocado acceptence test
2. add boot serial testchanges since v27
1. list atmel2560 devices as unimplemented
2. fix sram base/sizechanges since v28
1. rebase
2. fix includes & buildchanges since v29
1. fixing ownership
2. using 'since' instread of 'added in'changes since v30
1. rebasechanges 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 instructiontranslation - CPU main translation funcions' commit
changes since v32
1. modifycpu_get_sregto treat sreg C as other flags, except sreg Zchanges since v33
1. ensure flag C is always calculated as one bit
2. calculate flag Z as one bit, without using inverse logicchanges since v34
1. rebasechanges 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"changes since v36
1. rebase
2. tename1. NO_CPU_REGISTERS -> NUMBER_OF_CPU_REGISTERS 2. NO_IO_REGISTERS -> NUMBER_OF_IO_REGISTERS 3. to_A -> to_regs_16_31_by_one 4. to_B -> to_regs_16_23_by_one 5. to_C -> to_regs_24_30_by_two 6. to_D -> to_regs_00_30_by_two 3. add missing licences 4. add usage example (see above) 5. ass Sarah Harris <[email protected]> as a reviewer to
MAINTAINERS
7. use git commit sha1 instead of `master`` in avocado testMichael 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: UpdateMAINTAINERSfileSarah Harris (1):
target/avr: Add limited support for USART and 16 bit timer peripheralsconfigure | 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 | 228 +++ target/avr/gdbstub.c | 85 + target/avr/helper.c | 354 ++++ target/avr/machine.c | 121 ++ target/avr/translate.c | 3052 ++++++++++++++++++++++++++++++ tests/boot-serial-test.c | 10 + tests/machine-none-test.c | 1 + MAINTAINERS | 11 + 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 | 194 ++ tests/Makefile.include | 2 + tests/acceptance/machine_avr6.py | 56 + 40 files changed, 6756 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--
2.17.2 (Apple Git-113)--
Best Regards,
Michael Rolnik
Quoted 25 lines · Aleksandar Markovic
Quoted 21 lines · Michael Rolnik
There is *-cpu *option where you can specify what CPU you want, if this option is not specified avr6 (avr6-avr-cpu) is chosen.
*./avr-softmmu/qemu-system-avr -cpu help*
avr1-avr-cpu
avr2-avr-cpu
avr25-avr-cpu
avr3-avr-cpu
avr31-avr-cpu
avr35-avr-cpu
avr4-avr-cpu
avr5-avr-cpu
avr51-avr-cpu
avr6-avr-cpu
xmega2-avr-cpu
xmega4-avr-cpu
xmega5-avr-cpu
xmega6-avr-cpu
xmega7-avr-cpu
Quoted 4 lines
What happens if you specify a core via -cpu, and supply elf file compiled for another core?
It looks there is some related info written in ELF header. This is from a binutils header:
(so it looks you could detect the core from elf file - do you do that detection right now?)
#define E_AVR_MACH_AVR1 1
#define E_AVR_MACH_AVR2 2
#define E_AVR_MACH_AVR25 25
#define E_AVR_MACH_AVR3 3
#define E_AVR_MACH_AVR31 31
#define E_AVR_MACH_AVR35 35
#define E_AVR_MACH_AVR4 4
#define E_AVR_MACH_AVR5 5
#define E_AVR_MACH_AVR51 51
#define E_AVR_MACH_AVR6 6
#define E_AVR_MACH_AVRTINY 100
#define E_AVR_MACH_XMEGA1 101 #define E_AVR_MACH_XMEGA2 102 #define E_AVR_MACH_XMEGA3 103 #define E_AVR_MACH_XMEGA4 104 #define E_AVR_MACH_XMEGA5 105 #define E_AVR_MACH_XMEGA6 106 #define E_AVR_MACH_XMEGA7 107
Best regards,
Quoted 427 lines
Akeksandar
Quoted 421 lines
Regards,
Michael RolnikQuoted 32 lines · Aleksandar Markovic
Quoted 17 lines · Michael Rolnik
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.Following are examples of possible usages, assuming program.elf is compiled for AVR cpu
1. Continious non interrupted execution
runqemu-system-avr -kernel program.elf
2. Continious non interrupted execution with serial output into telnet window
run `qemu-system-avr -kernel program.elf -serial
tcp::5678,server,nowait -nographic `
runtelent localhost 5678Quoted 10 lines
3. Continious non interrupted execution with serial output into stdout run
qemu-system-avr -kernel program.elf -serial stdio
4. Debugging wit GDB debugger
runqemu-system-avr -kernel program.elf -s -S
runavr-gdb program.elfand then within GDB shell `target remote
:1234`
5. Print out executed instructions
runqemu-system-avr -kernel program.elf -d in_asmQuoted 376 lines
Hi, Michael.
Can you explain to me the mechanisms of recognition of what core/microcontroller QEMU is supposed to emulate in the examples above?
Yours, Aleksandar
Quoted 367 lines
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 coresavr1 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 togetherchanges since v3
1. rampD/X/Y/Z registers are encoded as0x00ff0000(instead of0x000000ff) for faster address manipulaton
2. ffs changed to ctz32
3. duplicate code removed atavr_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 of0xff- 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 XCHchanges 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. simplifyinggen_goto_tbas 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. removingavr_set_feature
10. SPL/SPH set bug fix
11. switchingstb_phystocpu_stb_data
12. cleaning upavr_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 addedchages 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_retchanges since v7
1. folding back v6
2. logging athelper_outbandhelper_inbare done for non supported yet registers only
3.MAINTAINERSupdatedchanges since v8
1. removing hw/avr from hw/Makefile.obj as it should not be built for all
2. making linux compilable
3. testing ona. 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 memorychanges 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_memoryis used to create RAM
8. now there arehelper_fullrd&helper_fullwrwhen LD/ST try to access registerschanges since v10
1. movig back fullwr & fullrd into the commit where outb and inb were introduced
2. changingtlb_fillfunction signature
3. adding empty line between functions
4. adding newline on the last line of the file
5. usingtb->flagsto 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.objschanges since v11
1. updating to v2.7.0-rc
2. removing assignment toenv->fullaccfromgen_intermediate_codechanges since v12
1. fixing spacing
2. fixing get/put_segment functions
3. removingtarget-avr/machine.hfile
4.VMSTATE_SINGLE_TEST->VMSTATE_SINGLE
5. comment spelling
6. removinghw/avr/sample_io.c
7. char const* -> const char*
8. proper ram allocation
9. fixing breakpoint functionality.
10.env1 -> env
11.fixingavr_cpu_gdb_write_register&avr_cpu_gdb_read_registerfunctions
12.any cpu is removed
12.feature bits are not saved into vm statechanges since v13
1. rebasing to v2.7.0-rc1changes 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 chrischanges since v15
1. removing IO registers cache from CPU
2. implementing CBI/SBI asread(helper_inb), modify,write(helper_outb)
3. implementing CBIC/SBIC asread(helper_inb), check, branch
4. adding missingtcg_temp_free_i32fortcg_const_i32changes since v16
1. removing EXT IO registers knoledge from CPU. These registers are accessible
by LD/ST only. CPU has no interest in themchanges 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 oftranslate.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<<18changes 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_fillchanges 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 nowchanges 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. Addgdb-xml/avr-cpu.xmlchanges since v22
1. Rebase
2. Split long commentchanges 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 functionchanges since v24
1. removeAVR_CPU_TYPE_NAMEmacrochanges 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/prr1changes since v26
1. add avocado acceptence test
2. add boot serial testchanges since v27
1. list atmel2560 devices as unimplemented
2. fix sram base/sizechanges since v28
1. rebase
2. fix includes & buildchanges since v29
1. fixing ownership
2. using 'since' instread of 'added in'changes since v30
1. rebasechanges 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 instructiontranslation - CPU main translation funcions' commit
changes since v32
1. modifycpu_get_sregto treat sreg C as other flags, except sreg Zchanges since v33
1. ensure flag C is always calculated as one bit
2. calculate flag Z as one bit, without using inverse logicchanges since v34
1. rebasechanges 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"changes since v36
1. rebase
2. tename1. NO_CPU_REGISTERS -> NUMBER_OF_CPU_REGISTERS 2. NO_IO_REGISTERS -> NUMBER_OF_IO_REGISTERS 3. to_A -> to_regs_16_31_by_one 4. to_B -> to_regs_16_23_by_one 5. to_C -> to_regs_24_30_by_two 6. to_D -> to_regs_00_30_by_two 3. add missing licences 4. add usage example (see above) 5. ass Sarah Harris <[email protected]> as a reviewer to
MAINTAINERS
7. use git commit sha1 instead of `master`` in avocado testMichael 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: UpdateMAINTAINERSfileSarah Harris (1):
target/avr: Add limited support for USART and 16 bit timer peripheralsconfigure | 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 | 228 +++ target/avr/gdbstub.c | 85 + target/avr/helper.c | 354 ++++ target/avr/machine.c | 121 ++ target/avr/translate.c | 3052 ++++++++++++++++++++++++++++++ tests/boot-serial-test.c | 10 + tests/machine-none-test.c | 1 + MAINTAINERS | 11 + 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 | 194 ++ tests/Makefile.include | 2 + tests/acceptance/machine_avr6.py | 56 + 40 files changed, 6756 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--
2.17.2 (Apple Git-113)--
Best Regards,
Michael Rolnik
No, I don't.
but I also can load and execute a binary file which does not have this information.
Quoted 490 lines · Aleksandar Markovic
Quoted 25 lines · Aleksandar Markovic
Quoted 21 lines · Michael Rolnik
There is *-cpu *option where you can specify what CPU you want, if this option is not specified avr6 (avr6-avr-cpu) is chosen.
*./avr-softmmu/qemu-system-avr -cpu help*
avr1-avr-cpu
avr2-avr-cpu
avr25-avr-cpu
avr3-avr-cpu
avr31-avr-cpu
avr35-avr-cpu
avr4-avr-cpu
avr5-avr-cpu
avr51-avr-cpu
avr6-avr-cpu
xmega2-avr-cpu
xmega4-avr-cpu
xmega5-avr-cpu
xmega6-avr-cpu
xmega7-avr-cpuQuoted 4 lines
What happens if you specify a core via -cpu, and supply elf file compiled for another core?
It looks there is some related info written in ELF header. This is from a binutils header:
(so it looks you could detect the core from elf file - do you do that detection right now?)
#define
E_AVR_MACH_AVR11
#defineE_AVR_MACH_AVR22
#defineE_AVR_MACH_AVR2525
#defineE_AVR_MACH_AVR33
#defineE_AVR_MACH_AVR3131
#defineE_AVR_MACH_AVR3535
#defineE_AVR_MACH_AVR44
#defineE_AVR_MACH_AVR55
#defineE_AVR_MACH_AVR5151
#defineE_AVR_MACH_AVR66
#defineE_AVR_MACH_AVRTINY100#define E_AVR_MACH_XMEGA1 101 #define E_AVR_MACH_XMEGA2 102 #define E_AVR_MACH_XMEGA3 103 #define E_AVR_MACH_XMEGA4 104 #define E_AVR_MACH_XMEGA5 105 #define E_AVR_MACH_XMEGA6 106 #define E_AVR_MACH_XMEGA7 107Best regards,
Quoted 428 lines
Akeksandar
Quoted 422 lines
Regards,
Michael RolnikQuoted 32 lines · Aleksandar Markovic
Quoted 17 lines · Michael Rolnik
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.Following are examples of possible usages, assuming program.elf is compiled for AVR cpu
1. Continious non interrupted execution
runqemu-system-avr -kernel program.elf
2. Continious non interrupted execution with serial output into telnet window
run `qemu-system-avr -kernel program.elf -serial
tcp::5678,server,nowait -nographic `
runtelent localhost 5678Quoted 10 lines
3. Continious non interrupted execution with serial output into stdout run
qemu-system-avr -kernel program.elf -serial stdio
4. Debugging wit GDB debugger
runqemu-system-avr -kernel program.elf -s -S
runavr-gdb program.elfand then within GDB shell `target remote
:1234`
5. Print out executed instructions
runqemu-system-avr -kernel program.elf -d in_asmQuoted 377 lines
Hi, Michael.
Can you explain to me the mechanisms of recognition of what core/microcontroller QEMU is supposed to emulate in the examples above?
Yours, Aleksandar
Quoted 368 lines
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 coresavr1 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 togetherchanges since v3
1. rampD/X/Y/Z registers are encoded as0x00ff0000(instead of0x000000ff) for faster address manipulaton
2. ffs changed to ctz32
3. duplicate code removed atavr_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 of0xff- 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 XCHchanges 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. simplifyinggen_goto_tbas 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. removingavr_set_feature
10. SPL/SPH set bug fix
11. switchingstb_phystocpu_stb_data
12. cleaning upavr_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 addedchages 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_retchanges since v7
1. folding back v6
2. logging athelper_outbandhelper_inbare done for non supported yet registers only
3.MAINTAINERSupdatedchanges since v8
1. removing hw/avr from hw/Makefile.obj as it should not be built for all
2. making linux compilable
3. testing ona. 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 memorychanges 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_memoryis used to create RAM
8. now there arehelper_fullrd&helper_fullwrwhen LD/ST try to access registerschanges since v10
1. movig back fullwr & fullrd into the commit where outb and inb were introduced
2. changingtlb_fillfunction signature
3. adding empty line between functions
4. adding newline on the last line of the file
5. usingtb->flagsto 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.objschanges since v11
1. updating to v2.7.0-rc
2. removing assignment toenv->fullaccfromgen_intermediate_codechanges since v12
1. fixing spacing
2. fixing get/put_segment functions
3. removingtarget-avr/machine.hfile
4.VMSTATE_SINGLE_TEST->VMSTATE_SINGLE
5. comment spelling
6. removinghw/avr/sample_io.c
7. char const* -> const char*
8. proper ram allocation
9. fixing breakpoint functionality.
10.env1 -> env
11.fixingavr_cpu_gdb_write_register&avr_cpu_gdb_read_registerfunctions
12.any cpu is removed
12.feature bits are not saved into vm statechanges since v13
1. rebasing to v2.7.0-rc1changes 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 chrischanges since v15
1. removing IO registers cache from CPU
2. implementing CBI/SBI asread(helper_inb), modify,write(helper_outb)
3. implementing CBIC/SBIC asread(helper_inb), check, branch
4. adding missingtcg_temp_free_i32fortcg_const_i32changes since v16
1. removing EXT IO registers knoledge from CPU. These registers are accessible
by LD/ST only. CPU has no interest in themchanges 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 oftranslate.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<<18changes 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_fillchanges 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 nowchanges 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. Addgdb-xml/avr-cpu.xmlchanges since v22
1. Rebase
2. Split long commentchanges 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 functionchanges since v24
1. removeAVR_CPU_TYPE_NAMEmacrochanges 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/prr1changes since v26
1. add avocado acceptence test
2. add boot serial testchanges since v27
1. list atmel2560 devices as unimplemented
2. fix sram base/sizechanges since v28
1. rebase
2. fix includes & buildchanges since v29
1. fixing ownership
2. using 'since' instread of 'added in'changes since v30
1. rebasechanges 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 instructiontranslation - CPU main translation funcions' commit
changes since v32
1. modifycpu_get_sregto treat sreg C as other flags, except sreg Zchanges since v33
1. ensure flag C is always calculated as one bit
2. calculate flag Z as one bit, without using inverse logicchanges since v34
1. rebasechanges 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"changes since v36
1. rebase
2. tename1. NO_CPU_REGISTERS -> NUMBER_OF_CPU_REGISTERS 2. NO_IO_REGISTERS -> NUMBER_OF_IO_REGISTERS 3. to_A -> to_regs_16_31_by_one 4. to_B -> to_regs_16_23_by_one 5. to_C -> to_regs_24_30_by_two 6. to_D -> to_regs_00_30_by_two 3. add missing licences 4. add usage example (see above) 5. ass Sarah Harris <[email protected]> as a reviewer to
MAINTAINERS
7. use git commit sha1 instead of `master`` in avocado testMichael 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: UpdateMAINTAINERSfileSarah Harris (1):
target/avr: Add limited support for USART and 16 bit timer
peripheralsconfigure | 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 | 228 +++ target/avr/gdbstub.c | 85 + target/avr/helper.c | 354 ++++ target/avr/machine.c | 121 ++ target/avr/translate.c | 3052 ++++++++++++++++++++++++++++++ tests/boot-serial-test.c | 10 + tests/machine-none-test.c | 1 + MAINTAINERS | 11 + 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 | 194 ++ tests/Makefile.include | 2 + tests/acceptance/machine_avr6.py | 56 + 40 files changed, 6756 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--
2.17.2 (Apple Git-113)--
Best Regards,
Michael Rolnik
Signature · 2 lines
Best Regards, Michael Rolnik
Quoted 6 lines · Michael Rolnik
No, I don't.
but I also can load and execute a binary file which does not have this information.Quoted 2 lines
OK. Let's think about that for a while. I currently think you have here an opportunity to add a really clean interface from the outset of AVR support in QEMU (that even some established platforms don't have in full), which is, trust me, very important for future. And it not that difficult to implement at all. But let's both think for a while.
Best regards,
Aleksandar
Quoted 502 lines
Quoted 62 lines · Aleksandar Markovic
Quoted 26 lines · Aleksandar Markovic
Quoted 21 lines · Michael Rolnik
There is *-cpu *option where you can specify what CPU you want, if this option is not specified avr6 (avr6-avr-cpu) is chosen.
*./avr-softmmu/qemu-system-avr -cpu help*
avr1-avr-cpu
avr2-avr-cpu
avr25-avr-cpu
avr3-avr-cpu
avr31-avr-cpu
avr35-avr-cpu
avr4-avr-cpu
avr5-avr-cpu
avr51-avr-cpu
avr6-avr-cpu
xmega2-avr-cpu
xmega4-avr-cpu
xmega5-avr-cpu
xmega6-avr-cpu
xmega7-avr-cpuQuoted 4 lines
What happens if you specify a core via -cpu, and supply elf file compiled for another core?
It looks there is some related info written in ELF header. This is from a binutils header:
(so it looks you could detect the core from elf file - do you do that detection right now?)
#define
E_AVR_MACH_AVR11
#defineE_AVR_MACH_AVR22
#defineE_AVR_MACH_AVR2525
#defineE_AVR_MACH_AVR33
#defineE_AVR_MACH_AVR3131
#defineE_AVR_MACH_AVR3535
#defineE_AVR_MACH_AVR44
#defineE_AVR_MACH_AVR55
#defineE_AVR_MACH_AVR5151
#defineE_AVR_MACH_AVR66
#defineE_AVR_MACH_AVRTINY100#define E_AVR_MACH_XMEGA1 101 #define E_AVR_MACH_XMEGA2 102 #define E_AVR_MACH_XMEGA3 103 #define E_AVR_MACH_XMEGA4 104 #define E_AVR_MACH_XMEGA5 105 #define E_AVR_MACH_XMEGA6 106 #define E_AVR_MACH_XMEGA7 107Quoted 432 lines
Best regards,
Quoted 431 lines
Akeksandar
Quoted 425 lines
Regards,
Michael RolnikQuoted 33 lines · Aleksandar Markovic
Quoted 18 lines · Michael Rolnik
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.Following are examples of possible usages, assuming program.elf is compiled for AVR cpu
1. Continious non interrupted execution
runqemu-system-avr -kernel program.elf
2. Continious non interrupted execution with serial output into telnet window
run `qemu-system-avr -kernel program.elf -serial
tcp::5678,server,nowait -nographic `
runtelent localhost 5678
3. Continious non interrupted execution with serial output intoQuoted 10 lines
stdout
runqemu-system-avr -kernel program.elf -serial stdio
4. Debugging wit GDB debugger
runqemu-system-avr -kernel program.elf -s -Srunavr-gdb program.elfand then within GDB shell `target
remote :1234`
5. Print out executed instructions
runqemu-system-avr -kernel program.elf -d in_asmQuoted 379 lines
Hi, Michael.
Can you explain to me the mechanisms of recognition of what core/microcontroller QEMU is supposed to emulate in the examples above?
Yours, Aleksandar
Quoted 370 lines
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 coresavr1 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 togetherchanges since v3
1. rampD/X/Y/Z registers are encoded as0x00ff0000(instead of0x000000ff) for faster address manipulaton
2. ffs changed to ctz32
3. duplicate code removed atavr_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 of0xff- 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 XCHchanges 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. simplifyinggen_goto_tbas 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. removingavr_set_feature
10. SPL/SPH set bug fix
11. switchingstb_phystocpu_stb_data
12. cleaning upavr_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 addedchages 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_retchanges since v7
1. folding back v6
2. logging athelper_outbandhelper_inbare done for non supported yet registers only
3.MAINTAINERSupdatedchanges since v8
1. removing hw/avr from hw/Makefile.obj as it should not be built for all
2. making linux compilable
3. testing ona. 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 memorychanges 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_memoryis used to create RAM
8. now there arehelper_fullrd&helper_fullwrwhen LD/ST try to access registerschanges since v10
1. movig back fullwr & fullrd into the commit where outb and inb were introduced
2. changingtlb_fillfunction signature
3. adding empty line between functions
4. adding newline on the last line of the file
5. usingtb->flagsto 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.objschanges since v11
1. updating to v2.7.0-rc
2. removing assignment toenv->fullaccfromgen_intermediate_codechanges since v12
1. fixing spacing
2. fixing get/put_segment functions
3. removingtarget-avr/machine.hfile
4.VMSTATE_SINGLE_TEST->VMSTATE_SINGLE
5. comment spelling
6. removinghw/avr/sample_io.c
7. char const* -> const char*
8. proper ram allocation
9. fixing breakpoint functionality.
10.env1 -> env
11.fixingavr_cpu_gdb_write_register&avr_cpu_gdb_read_registerfunctions
12.any cpu is removed
12.feature bits are not saved into vm statechanges since v13
1. rebasing to v2.7.0-rc1changes 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 chrischanges since v15
1. removing IO registers cache from CPU
2. implementing CBI/SBI asread(helper_inb), modify,write(helper_outb)
3. implementing CBIC/SBIC asread(helper_inb), check, branch
4. adding missingtcg_temp_free_i32fortcg_const_i32changes since v16
1. removing EXT IO registers knoledge from CPU. These registers are accessible
by LD/ST only. CPU has no interest in themchanges 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 oftranslate.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<<18changes 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_fillchanges 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 nowchanges 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. Addgdb-xml/avr-cpu.xmlchanges since v22
1. Rebase
2. Split long commentchanges 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 functionchanges since v24
1. removeAVR_CPU_TYPE_NAMEmacrochanges 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/prr1changes since v26
1. add avocado acceptence test
2. add boot serial testchanges since v27
1. list atmel2560 devices as unimplemented
2. fix sram base/sizechanges since v28
1. rebase
2. fix includes & buildchanges since v29
1. fixing ownership
2. using 'since' instread of 'added in'changes since v30
1. rebasechanges 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 instructiontranslation - CPU main translation funcions' commit
changes since v32
1. modifycpu_get_sregto treat sreg C as other flags, except sreg Zchanges since v33
1. ensure flag C is always calculated as one bit
2. calculate flag Z as one bit, without using inverse logicchanges since v34
1. rebasechanges 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"changes since v36
1. rebase
2. tename1. NO_CPU_REGISTERS -> NUMBER_OF_CPU_REGISTERS 2. NO_IO_REGISTERS -> NUMBER_OF_IO_REGISTERS 3. to_A -> to_regs_16_31_by_one 4. to_B -> to_regs_16_23_by_one 5. to_C -> to_regs_24_30_by_two 6. to_D -> to_regs_00_30_by_two 3. add missing licences 4. add usage example (see above) 5. ass Sarah Harris <[email protected]> as a reviewer to
MAINTAINERS
7. use git commit sha1 instead of `master`` in avocado testMichael 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: UpdateMAINTAINERSfileSarah Harris (1):
target/avr: Add limited support for USART and 16 bit timer
peripheralsconfigure | 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 | 228 +++ target/avr/gdbstub.c | 85 + target/avr/helper.c | 354 ++++ target/avr/machine.c | 121 ++ target/avr/translate.c | 3052 ++++++++++++++++++++++++++++++ tests/boot-serial-test.c | 10 + tests/machine-none-test.c | 1 + MAINTAINERS | 11 + 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 | 194 ++ tests/Makefile.include | 2 + tests/acceptance/machine_avr6.py | 56 + 40 files changed, 6756 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--
2.17.2 (Apple Git-113)--
Best Regards,
Michael Rolnik--
Best Regards,
Michael Rolnik
how can I get this elf flags from within QEMU?
Quoted 525 lines · Aleksandar Markovic
Quoted 6 lines · Michael Rolnik
No, I don't.
but I also can load and execute a binary file which does not have this information.Quoted 2 lines
OK. Let's think about that for a while. I currently think you have here an opportunity to add a really clean interface from the outset of AVR support in QEMU (that even some established platforms don't have in full), which is, trust me, very important for future. And it not that difficult to implement at all. But let's both think for a while.
Best regards,
AleksandarQuoted 503 lines
Quoted 62 lines · Aleksandar Markovic
Quoted 26 lines · Aleksandar Markovic
Quoted 21 lines · Michael Rolnik
There is *-cpu *option where you can specify what CPU you want, if this option is not specified avr6 (avr6-avr-cpu) is chosen.
*./avr-softmmu/qemu-system-avr -cpu help*
avr1-avr-cpu
avr2-avr-cpu
avr25-avr-cpu
avr3-avr-cpu
avr31-avr-cpu
avr35-avr-cpu
avr4-avr-cpu
avr5-avr-cpu
avr51-avr-cpu
avr6-avr-cpu
xmega2-avr-cpu
xmega4-avr-cpu
xmega5-avr-cpu
xmega6-avr-cpu
xmega7-avr-cpuQuoted 4 lines
What happens if you specify a core via -cpu, and supply elf file compiled for another core?
It looks there is some related info written in ELF header. This is from a binutils header:
(so it looks you could detect the core from elf file - do you do that detection right now?)
#define
E_AVR_MACH_AVR11
#defineE_AVR_MACH_AVR22
#defineE_AVR_MACH_AVR2525
#defineE_AVR_MACH_AVR33
#defineE_AVR_MACH_AVR3131
#defineE_AVR_MACH_AVR3535
#defineE_AVR_MACH_AVR44
#defineE_AVR_MACH_AVR55
#defineE_AVR_MACH_AVR5151
#defineE_AVR_MACH_AVR66
#defineE_AVR_MACH_AVRTINY100#define E_AVR_MACH_XMEGA1 101 #define E_AVR_MACH_XMEGA2 102 #define E_AVR_MACH_XMEGA3 103 #define E_AVR_MACH_XMEGA4 104 #define E_AVR_MACH_XMEGA5 105 #define E_AVR_MACH_XMEGA6 106 #define E_AVR_MACH_XMEGA7 107Quoted 433 lines
Best regards,
Quoted 432 lines
Akeksandar
Quoted 426 lines
Regards,
Michael RolnikQuoted 33 lines · Aleksandar Markovic
Quoted 18 lines · Michael Rolnik
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.Following are examples of possible usages, assuming program.elf is compiled for AVR cpu
1. Continious non interrupted execution
runqemu-system-avr -kernel program.elf
2. Continious non interrupted execution with serial output into telnet window
run `qemu-system-avr -kernel program.elf -serial
tcp::5678,server,nowait -nographic `
runtelent localhost 5678
3. Continious non interrupted execution with serial output intoQuoted 10 lines
stdout
runqemu-system-avr -kernel program.elf -serial stdio
4. Debugging wit GDB debugger
runqemu-system-avr -kernel program.elf -s -Srunavr-gdb program.elfand then within GDB shell `target
remote :1234`
5. Print out executed instructions
runqemu-system-avr -kernel program.elf -d in_asmQuoted 380 lines
Hi, Michael.
Can you explain to me the mechanisms of recognition of what core/microcontroller QEMU is supposed to emulate in the examples above?
Yours, Aleksandar
Quoted 371 lines
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 coresavr1 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 togetherchanges since v3
1. rampD/X/Y/Z registers are encoded as0x00ff0000(instead of0x000000ff) for faster address manipulaton
2. ffs changed to ctz32
3. duplicate code removed atavr_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 of0xff- 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 XCHchanges 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. simplifyinggen_goto_tbas 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. removingavr_set_feature
10. SPL/SPH set bug fix
11. switchingstb_phystocpu_stb_data
12. cleaning upavr_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 addedchages 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_retchanges since v7
1. folding back v6
2. logging athelper_outbandhelper_inbare done for non supported yet registers only
3.MAINTAINERSupdatedchanges since v8
1. removing hw/avr from hw/Makefile.obj as it should not be built for all
2. making linux compilable
3. testing ona. 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 memorychanges 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_memoryis used to create RAM
8. now there arehelper_fullrd&helper_fullwrwhen LD/ST try to access registerschanges since v10
1. movig back fullwr & fullrd into the commit where outb and inb were introduced
2. changingtlb_fillfunction signature
3. adding empty line between functions
4. adding newline on the last line of the file
5. usingtb->flagsto 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.objschanges since v11
1. updating to v2.7.0-rc
2. removing assignment toenv->fullaccfromgen_intermediate_codechanges since v12
1. fixing spacing
2. fixing get/put_segment functions
3. removingtarget-avr/machine.hfile
4.VMSTATE_SINGLE_TEST->VMSTATE_SINGLE
5. comment spelling
6. removinghw/avr/sample_io.c
7. char const* -> const char*
8. proper ram allocation
9. fixing breakpoint functionality.
10.env1 -> env
11.fixingavr_cpu_gdb_write_register&avr_cpu_gdb_read_registerfunctions
12.any cpu is removed
12.feature bits are not saved into vm statechanges since v13
1. rebasing to v2.7.0-rc1changes 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 chrischanges since v15
1. removing IO registers cache from CPU
2. implementing CBI/SBI asread(helper_inb), modify,write(helper_outb)
3. implementing CBIC/SBIC asread(helper_inb), check, branch
4. adding missingtcg_temp_free_i32fortcg_const_i32changes since v16
1. removing EXT IO registers knoledge from CPU. These registers are accessible
by LD/ST only. CPU has no interest in themchanges 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 oftranslate.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<<18changes 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_fillchanges 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 nowchanges 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. Addgdb-xml/avr-cpu.xmlchanges since v22
1. Rebase
2. Split long commentchanges 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 functionchanges since v24
1. removeAVR_CPU_TYPE_NAMEmacrochanges 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/prr1changes since v26
1. add avocado acceptence test
2. add boot serial testchanges since v27
1. list atmel2560 devices as unimplemented
2. fix sram base/sizechanges since v28
1. rebase
2. fix includes & buildchanges since v29
1. fixing ownership
2. using 'since' instread of 'added in'changes since v30
1. rebasechanges 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 instructiontranslation - CPU main translation funcions' commit
changes since v32
1. modifycpu_get_sregto treat sreg C as other flags, except sreg Zchanges since v33
1. ensure flag C is always calculated as one bit
2. calculate flag Z as one bit, without using inverse logicchanges since v34
1. rebasechanges 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"changes since v36
1. rebase
2. tename1. NO_CPU_REGISTERS -> NUMBER_OF_CPU_REGISTERS 2. NO_IO_REGISTERS -> NUMBER_OF_IO_REGISTERS 3. to_A -> to_regs_16_31_by_one 4. to_B -> to_regs_16_23_by_one 5. to_C -> to_regs_24_30_by_two 6. to_D -> to_regs_00_30_by_two 3. add missing licences 4. add usage example (see above) 5. ass Sarah Harris <[email protected]> as a reviewer to
MAINTAINERS
7. use git commit sha1 instead of `master`` in avocado testMichael 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: UpdateMAINTAINERSfileSarah Harris (1):
target/avr: Add limited support for USART and 16 bit timer
peripheralsconfigure | 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 | 228 +++ target/avr/gdbstub.c | 85 + target/avr/helper.c | 354 ++++ target/avr/machine.c | 121 ++ target/avr/translate.c | 3052 ++++++++++++++++++++++++++++++ tests/boot-serial-test.c | 10 + tests/machine-none-test.c | 1 + MAINTAINERS | 11 + 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 | 194 ++ tests/Makefile.include | 2 + tests/acceptance/machine_avr6.py | 56 + 40 files changed, 6756 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--
2.17.2 (Apple Git-113)--
Best Regards,
Michael Rolnik--
Best Regards,
Michael Rolnik
Signature · 2 lines
Best Regards, Michael Rolnik
Quoted 4 lines · Michael Rolnik
how can I get this elf flags from within QEMU?
Quoted 2 lines
In one of files from your "machine" patch, you have this snippet:
+ bytes_loaded = load_elf(
+ filename, NULL, NULL, NULL, NULL, NULL, NULL, 0, EM_NONE, 0,
0);
With this line you a kind of "blindly" load whatever you find in the file "filename". I think you need to modify load_elf() to fetch the information on what core the elf in question is compiled for. Additionally, you most likely have to check if the elf file is compiled for AVR at all.
I don't know enough about AVR-specifics of ELF format, but I know that we in MIPS read successfuly some MIPS-specific things we need to know. Do some research for ELF format headrr content for AVR.
This is really missing in your series, seriously.
Please keep in mind that I don't have right now at hand any dev system, so all I said here is off of my head.
You have to do some code digging.
Best regards, Aleksandar
Quoted 535 lines
Quoted 10 lines · Aleksandar Markovic
Quoted 6 lines · Michael Rolnik
No, I don't.
but I also can load and execute a binary file which does not have this information.Quoted 2 lines
Quoted 517 lines
OK. Let's think about that for a while. I currently think you have here an opportunity to add a really clean interface from the outset of AVR support in QEMU (that even some established platforms don't have in full), which is, trust me, very important for future. And it not that difficult to implement at all. But let's both think for a while.
Best regards,
AleksandarQuoted 505 lines
Quoted 62 lines · Aleksandar Markovic
Quoted 26 lines · Aleksandar Markovic
Quoted 21 lines · Michael Rolnik
There is *-cpu *option where you can specify what CPU you want, if this option is not specified avr6 (avr6-avr-cpu) is chosen.
*./avr-softmmu/qemu-system-avr -cpu help*
avr1-avr-cpu
avr2-avr-cpu
avr25-avr-cpu
avr3-avr-cpu
avr31-avr-cpu
avr35-avr-cpu
avr4-avr-cpu
avr5-avr-cpu
avr51-avr-cpu
avr6-avr-cpu
xmega2-avr-cpu
xmega4-avr-cpu
xmega5-avr-cpu
xmega6-avr-cpu
xmega7-avr-cpuQuoted 4 lines
What happens if you specify a core via -cpu, and supply elf file compiled for another core?
It looks there is some related info written in ELF header. This is from a binutils header:
(so it looks you could detect the core from elf file - do you do that detection right now?)
#define
E_AVR_MACH_AVR11
#defineE_AVR_MACH_AVR22
#defineE_AVR_MACH_AVR2525
#defineE_AVR_MACH_AVR33
#defineE_AVR_MACH_AVR3131
#defineE_AVR_MACH_AVR3535
#defineE_AVR_MACH_AVR44
#defineE_AVR_MACH_AVR55
#defineE_AVR_MACH_AVR5151
#defineE_AVR_MACH_AVR66
#defineE_AVR_MACH_AVRTINY100#define E_AVR_MACH_XMEGA1 101 #define E_AVR_MACH_XMEGA2 102 #define E_AVR_MACH_XMEGA3 103 #define E_AVR_MACH_XMEGA4 104 #define E_AVR_MACH_XMEGA5 105 #define E_AVR_MACH_XMEGA6 106 #define E_AVR_MACH_XMEGA7 107Quoted 435 lines
Best regards,
Quoted 434 lines
Akeksandar
Quoted 428 lines
Regards,
Michael RolnikQuoted 33 lines · Aleksandar Markovic
Quoted 18 lines · Michael Rolnik
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.Following are examples of possible usages, assuming program.elf is compiled for AVR cpu
1. Continious non interrupted execution
runqemu-system-avr -kernel program.elf
2. Continious non interrupted execution with serial output into telnet window
run `qemu-system-avr -kernel program.elf -serial
tcp::5678,server,nowait -nographic `
runtelent localhost 5678
3. Continious non interrupted execution with serial output intoQuoted 10 lines
stdout
runqemu-system-avr -kernel program.elf -serial stdio
4. Debugging wit GDB debugger
runqemu-system-avr -kernel program.elf -s -Srunavr-gdb program.elfand then within GDB shell `target
remote :1234`
5. Print out executed instructions
runqemu-system-avr -kernel program.elf -d in_asmQuoted 382 lines
Hi, Michael.
Can you explain to me the mechanisms of recognition of what core/microcontroller QEMU is supposed to emulate in the examples above?
Yours, Aleksandar
Quoted 373 lines
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 coresavr1 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 togetherchanges since v3
1. rampD/X/Y/Z registers are encoded as0x00ff0000(instead of0x000000ff) for faster address manipulaton
2. ffs changed to ctz32
3. duplicate code removed atavr_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 of0xff- 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 XCHchanges 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. simplifyinggen_goto_tbas 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. removingavr_set_feature
10. SPL/SPH set bug fix
11. switchingstb_phystocpu_stb_data
12. cleaning upavr_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 addedchages 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_retchanges since v7
1. folding back v6
2. logging athelper_outbandhelper_inbare done for non supported yet registers only
3.MAINTAINERSupdatedchanges since v8
1. removing hw/avr from hw/Makefile.obj as it should not be built for all
2. making linux compilable
3. testing ona. 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 memorychanges 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_memoryis used to create RAM
8. now there arehelper_fullrd&helper_fullwrwhen LD/ST try to access registerschanges since v10
1. movig back fullwr & fullrd into the commit where outb and inb were introduced
2. changingtlb_fillfunction signature
3. adding empty line between functions
4. adding newline on the last line of the file
5. usingtb->flagsto 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.objschanges since v11
1. updating to v2.7.0-rc
2. removing assignment toenv->fullaccfromgen_intermediate_codechanges since v12
1. fixing spacing
2. fixing get/put_segment functions
3. removingtarget-avr/machine.hfile
4.VMSTATE_SINGLE_TEST->VMSTATE_SINGLE
5. comment spelling
6. removinghw/avr/sample_io.c
7. char const* -> const char*
8. proper ram allocation
9. fixing breakpoint functionality.
10.env1 -> env
11.fixingavr_cpu_gdb_write_register&avr_cpu_gdb_read_registerfunctions
12.any cpu is removed
12.feature bits are not saved into vm statechanges since v13
1. rebasing to v2.7.0-rc1changes 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 chrischanges since v15
1. removing IO registers cache from CPU
2. implementing CBI/SBI asread(helper_inb), modify,write(helper_outb)
3. implementing CBIC/SBIC asread(helper_inb), check, branch
4. adding missingtcg_temp_free_i32fortcg_const_i32changes since v16
1. removing EXT IO registers knoledge from CPU. These registers are accessible
by LD/ST only. CPU has no interest in themchanges 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 oftranslate.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<<18changes 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_fillchanges 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 nowchanges 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. Addgdb-xml/avr-cpu.xmlchanges since v22
1. Rebase
2. Split long commentchanges 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 functionchanges since v24
1. removeAVR_CPU_TYPE_NAMEmacrochanges 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/prr1changes since v26
1. add avocado acceptence test
2. add boot serial testchanges since v27
1. list atmel2560 devices as unimplemented
2. fix sram base/sizechanges since v28
1. rebase
2. fix includes & buildchanges since v29
1. fixing ownership
2. using 'since' instread of 'added in'changes since v30
1. rebasechanges 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 instructiontranslation - CPU main translation funcions' commit
changes since v32
1. modifycpu_get_sregto treat sreg C as other flags, except sreg Zchanges since v33
1. ensure flag C is always calculated as one bit
2. calculate flag Z as one bit, without using inverse logicchanges since v34
1. rebasechanges since v35
1. rebase
2. useNANOSECONDS_PER_SECONDinstead of 1000000000 inavr_timer16.c
3. split "target/avr: Register AVR support with the rest of QEMU" into three patches1. "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"changes since v36
1. rebase
2. tename1. NO_CPU_REGISTERS -> NUMBER_OF_CPU_REGISTERS 2. NO_IO_REGISTERS -> NUMBER_OF_IO_REGISTERS 3. to_A -> to_regs_16_31_by_one 4. to_B -> to_regs_16_23_by_one 5. to_C -> to_regs_24_30_by_two 6. to_D -> to_regs_00_30_by_two 3. add missing licences 4. add usage example (see above) 5. ass Sarah Harris <[email protected]> as a reviewer to
MAINTAINERS
7. use git commit sha1 instead of `master`` in avocado testMichael 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: UpdateMAINTAINERSfileSarah Harris (1):
target/avr: Add limited support for USART and 16 bit timer
peripheralsconfigure | 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 | 228 +++ target/avr/gdbstub.c | 85 + target/avr/helper.c | 354 ++++ target/avr/machine.c | 121 ++ target/avr/translate.c | 3052 ++++++++++++++++++++++++++++++ tests/boot-serial-test.c | 10 + tests/machine-none-test.c | 1 + MAINTAINERS | 11 + 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 | 194 ++ tests/Makefile.include | 2 + tests/acceptance/machine_avr6.py | 56 + 40 files changed, 6756 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--
2.17.2 (Apple Git-113)--
Best Regards,
Michael Rolnik--
Best Regards,
Michael Rolnik--
Best Regards,
Michael Rolnik
v37 cover QEMU AVR 8 bit cores
Quoted 23 lines · Aleksandar Markovic
Quoted 4 lines · Michael Rolnik
how can I get this elf flags from within QEMU?
Quoted 2 lines
In one of files from your "machine" patch, you have this snippet:
(quoted diff) +2
-0+ bytes_loaded = load_elf( + filename, NULL, NULL, NULL, NULL, NULL, NULL, 0, EM_NONE, 0,0);
With this line you a kind of "blindly" load whatever you find in the file "filename". I think you need to modify
load_elf()to fetch the information on what core the elf in question is compiled for. Additionally, you most likely have to check if the elf file is compiled for AVR at all.I don't know enough about AVR-specifics of ELF format, but I know that we in MIPS read successfuly some MIPS-specific things we need to know. Do some research for ELF format headrr content for AVR.
Quoted 8 lines
This is really missing in your series, seriously.
Please keep in mind that I don't have right now at hand any dev system, so all I said here is off of my head.
You have to do some code digging.
First, you need to update
https://github.com/qemu/qemu/blob/master/include/elf.h
with bits and pieces for AVR.
In binutils file:
https://github.com/bminor/binutils-gdb/blob/master/include/elf/common.h
you will spot the line:
#define EM_AVR 83 /* Atmel AVR 8-bit microcontroller */
that is the value of e_machine field for AVR, which you need to insert in qemu's include/elf.h about at line 162.
Then, in another binutils file:
https://github.com/bminor/binutils-gdb/blob/master/include/elf/avr.h
you find the lines:
#define E_AVR_MACH_AVR1 1
#define E_AVR_MACH_AVR2 2
#define E_AVR_MACH_AVR25 25
#define E_AVR_MACH_AVR3 3
#define E_AVR_MACH_AVR31 31
#define E_AVR_MACH_AVR35 35
#define E_AVR_MACH_AVR4 4
#define E_AVR_MACH_AVR5 5
#define E_AVR_MACH_AVR51 51
#define E_AVR_MACH_AVR6 6
#define E_AVR_MACH_AVRTINY 100
#define E_AVR_MACH_XMEGA1 101
#define E_AVR_MACH_XMEGA2 102
#define E_AVR_MACH_XMEGA3 103
#define E_AVR_MACH_XMEGA4 104
#define E_AVR_MACH_XMEGA5 105
#define E_AVR_MACH_XMEGA6 106
#define E_AVR_MACH_XMEGA7 107
That you also need to insert in qemu's include/elf.h, probably at the end of tge foke or elsewhere.
Perhaps something more you need to insert into that file, you'll see.
Than, you need to modify the file where load_elf() resides with AVR support, take a look at other architectures' support, and adjust to what you need.
I know it will be contrieved at times, but, personally, similar ELF support must be done for any upcoming platform. Only if there is some unsourmantable obstacle, that support can be omitted.
I am on vacation next 10 days.
Yours,
Aleksandar
.
Quoted 540 lines
Best regards, Aleksandar
Quoted 536 lines
Quoted 10 lines · Aleksandar Markovic
Quoted 6 lines · Michael Rolnik
No, I don't.
but I also can load and execute a binary file which does not have this information.Quoted 2 lines
Quoted 518 lines
OK. Let's think about that for a while. I currently think you have here an opportunity to add a really clean interface from the outset of AVR support in QEMU (that even some established platforms don't have in full), which is, trust me, very important for future. And it not that difficult to implement at all. But let's both think for a while.
Best regards,
AleksandarQuoted 506 lines
Quoted 62 lines · Aleksandar Markovic
Quoted 26 lines · Aleksandar Markovic
Quoted 21 lines · Michael Rolnik
There is *-cpu *option where you can specify what CPU you want, if this option is not specified avr6 (avr6-avr-cpu) is chosen.
*./avr-softmmu/qemu-system-avr -cpu help*
avr1-avr-cpu
avr2-avr-cpu
avr25-avr-cpu
avr3-avr-cpu
avr31-avr-cpu
avr35-avr-cpu
avr4-avr-cpu
avr5-avr-cpu
avr51-avr-cpu
avr6-avr-cpu
xmega2-avr-cpu
xmega4-avr-cpu
xmega5-avr-cpu
xmega6-avr-cpu
xmega7-avr-cpuQuoted 4 lines
What happens if you specify a core via -cpu, and supply elf file compiled for another core?
It looks there is some related info written in ELF header. This is from a binutils header:
(so it looks you could detect the core from elf file - do you do that detection right now?)
#define
E_AVR_MACH_AVR11
#defineE_AVR_MACH_AVR22
#defineE_AVR_MACH_AVR2525
#defineE_AVR_MACH_AVR33
#defineE_AVR_MACH_AVR3131
#defineE_AVR_MACH_AVR3535
#defineE_AVR_MACH_AVR44
#defineE_AVR_MACH_AVR55
#defineE_AVR_MACH_AVR5151
#defineE_AVR_MACH_AVR66
#defineE_AVR_MACH_AVRTINY100#define E_AVR_MACH_XMEGA1 101 #define E_AVR_MACH_XMEGA2 102 #define E_AVR_MACH_XMEGA3 103 #define E_AVR_MACH_XMEGA4 104 #define E_AVR_MACH_XMEGA5 105 #define E_AVR_MACH_XMEGA6 106 #define E_AVR_MACH_XMEGA7 107Quoted 436 lines
Best regards,
Quoted 435 lines
Akeksandar
Quoted 429 lines
Regards,
Michael RolnikQuoted 33 lines · Aleksandar Markovic
Quoted 18 lines · Michael Rolnik
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.Following are examples of possible usages, assuming program.elf is compiled for AVR cpu
1. Continious non interrupted execution
runqemu-system-avr -kernel program.elf
2. Continious non interrupted execution with serial output into telnet window
run `qemu-system-avr -kernel program.elf -serial
tcp::5678,server,nowait -nographic `
runtelent localhost 5678
3. Continious non interrupted execution with serial output intoQuoted 10 lines
stdout
runqemu-system-avr -kernel program.elf -serial stdio
4. Debugging wit GDB debugger
runqemu-system-avr -kernel program.elf -s -Srunavr-gdb program.elfand then within GDB shell `target
remote :1234`
5. Print out executed instructions
runqemu-system-avr -kernel program.elf -d in_asmQuoted 383 lines
Hi, Michael.
Can you explain to me the mechanisms of recognition of what core/microcontroller QEMU is supposed to emulate in the examples above?
Yours, Aleksandar
Quoted 374 lines
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 coresavr1 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 togetherchanges since v3
1. rampD/X/Y/Z registers are encoded as0x00ff0000(instead of0x000000ff) for faster address manipulaton
2. ffs changed to ctz32
3. duplicate code removed atavr_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 of0xff- 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 XCHchanges 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. simplifyinggen_goto_tbas 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. removingavr_set_feature
10. SPL/SPH set bug fix
11. switchingstb_phystocpu_stb_data
12. cleaning upavr_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 addedchages 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_retchanges since v7
1. folding back v6
2. logging athelper_outbandhelper_inbare done for non supported yet registers only
3.MAINTAINERSupdatedchanges since v8
1. removing hw/avr from hw/Makefile.obj as it should not be built for all
2. making linux compilable
3. testing ona. 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 memorychanges 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_memoryis used to create RAM
8. now there arehelper_fullrd&helper_fullwrwhen LD/ST try to access registerschanges since v10
1. movig back fullwr & fullrd into the commit where outb and inb were introduced
2. changingtlb_fillfunction signature
3. adding empty line between functions
4. adding newline on the last line of the file
5. usingtb->flagsto 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.objschanges since v11
1. updating to v2.7.0-rc
2. removing assignment toenv->fullaccfromgen_intermediate_codechanges since v12
1. fixing spacing
2. fixing get/put_segment functions
3. removingtarget-avr/machine.hfile
4.VMSTATE_SINGLE_TEST->VMSTATE_SINGLE
5. comment spelling
6. removinghw/avr/sample_io.c
7. char const* -> const char*
8. proper ram allocation
9. fixing breakpoint functionality.
10.env1 -> env
11.fixingavr_cpu_gdb_write_register&avr_cpu_gdb_read_registerfunctions
12.any cpu is removed
12.feature bits are not saved into vm statechanges since v13
1. rebasing to v2.7.0-rc1changes 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 chrischanges since v15
1. removing IO registers cache from CPU
2. implementing CBI/SBI asread(helper_inb), modify,write(helper_outb)
3. implementing CBIC/SBIC asread(helper_inb), check, branch
4. adding missingtcg_temp_free_i32fortcg_const_i32changes since v16
1. removing EXT IO registers knoledge from CPU. These registers are accessible
by LD/ST only. CPU has no interest in themchanges 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 oftranslate.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<<18changes 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_fillchanges 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 nowchanges 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. Addgdb-xml/avr-cpu.xmlchanges since v22
1. Rebase
2. Split long commentchanges 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 functionchanges since v24
1. removeAVR_CPU_TYPE_NAMEmacrochanges 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/prr1changes since v26
1. add avocado acceptence test
2. add boot serial testchanges since v27
1. list atmel2560 devices as unimplemented
2. fix sram base/sizechanges since v28
1. rebase
2. fix includes & buildchanges since v29
1. fixing ownership
2. using 'since' instread of 'added in'changes since v30
1. rebasechanges 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 instructiontranslation - CPU main translation funcions' commit
changes since v32
1. modifycpu_get_sregto treat sreg C as other flags, except sreg Zchanges since v33
1. ensure flag C is always calculated as one bit
2. calculate flag Z as one bit, without using inverse logicchanges since v34
1. rebasechanges since v35
1. rebase
2. useNANOSECONDS_PER_SECONDinstead of 1000000000 inavr_timer16.c
3. split "target/avr: Register AVR support with the rest of QEMU" into three patches1. "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"changes since v36
1. rebase
2. tename1. NO_CPU_REGISTERS -> NUMBER_OF_CPU_REGISTERS 2. NO_IO_REGISTERS -> NUMBER_OF_IO_REGISTERS 3. to_A -> to_regs_16_31_by_one 4. to_B -> to_regs_16_23_by_one 5. to_C -> to_regs_24_30_by_two 6. to_D -> to_regs_00_30_by_two 3. add missing licences 4. add usage example (see above) 5. ass Sarah Harris <[email protected]> as a reviewer to
MAINTAINERS
7. use git commit sha1 instead of `master`` in avocado testMichael 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: UpdateMAINTAINERSfileSarah Harris (1):
target/avr: Add limited support for USART and 16 bit timer
peripheralsconfigure | 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 | 228 +++ target/avr/gdbstub.c | 85 + target/avr/helper.c | 354 ++++ target/avr/machine.c | 121 ++ target/avr/translate.c | 3052 ++++++++++++++++++++++++++++++ tests/boot-serial-test.c | 10 + tests/machine-none-test.c | 1 + MAINTAINERS | 11 + 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 | 194 ++ tests/Makefile.include | 2 + tests/acceptance/machine_avr6.py | 56 + 40 files changed, 6756 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--
2.17.2 (Apple Git-113)--
Best Regards,
Michael Rolnik--
Best Regards,
Michael Rolnik--
Best Regards,
Michael Rolnik
Quoted 87 lines · Aleksandar Markovic
Quoted 23 lines · Aleksandar Markovic
Quoted 4 lines · Michael Rolnik
how can I get this elf flags from within QEMU?
Quoted 2 lines
In one of files from your "machine" patch, you have this snippet:
(quoted diff) +2
-0+ bytes_loaded = load_elf( + filename, NULL, NULL, NULL, NULL, NULL, NULL, 0, EM_NONE, 0,0);
With this line you a kind of "blindly" load whatever you find in the file "filename". I think you need to modify
load_elf()to fetch the information on what core the elf in question is compiled for. Additionally, you most likely have to check if the elf file is compiled for AVR at all.I don't know enough about AVR-specifics of ELF format, but I know that we in MIPS read successfuly some MIPS-specific things we need to know. Do some research for ELF format headrr content for AVR.
Quoted 8 lines
This is really missing in your series, seriously.
Please keep in mind that I don't have right now at hand any dev system, so all I said here is off of my head.
You have to do some code digging.
First, you need to update
https://github.com/qemu/qemu/blob/master/include/elf.h
with bits and pieces for AVR.
In binutils file:
https://github.com/bminor/binutils-gdb/blob/master/include/elf/common.h
you will spot the line:
#define
EM_AVR83 /* Atmel AVR 8-bit microcontroller */that is the value of
e_machinefield for AVR, which you need to insert in qemu'sinclude/elf.habout at line 162.Then, in another binutils file:
https://github.com/bminor/binutils-gdb/blob/master/include/elf/avr.h
you find the lines:
#define
E_AVR_MACH_AVR11
#defineE_AVR_MACH_AVR22
#defineE_AVR_MACH_AVR2525
#defineE_AVR_MACH_AVR33
#defineE_AVR_MACH_AVR3131
#defineE_AVR_MACH_AVR3535
#defineE_AVR_MACH_AVR44
#defineE_AVR_MACH_AVR55
#defineE_AVR_MACH_AVR5151
#defineE_AVR_MACH_AVR66
#defineE_AVR_MACH_AVRTINY100
#defineE_AVR_MACH_XMEGA1101
#defineE_AVR_MACH_XMEGA2102
#defineE_AVR_MACH_XMEGA3103
#defineE_AVR_MACH_XMEGA4104
#defineE_AVR_MACH_XMEGA5105
#defineE_AVR_MACH_XMEGA6106
#defineE_AVR_MACH_XMEGA7107That you also need to insert in qemu's
include/elf.h, probably at the end of tge foke or elsewhere.Perhaps something more you need to insert into that file, you'll see.
Than, you need to modify the file where
load_elf()resides with AVR support, take a look at other architectures' support, and adjust to what you need.
Quoted 7 lines
I know it will be contrieved at times, but, personally, similar ELF support must be done for any upcoming platform. Only if there is some unsourmantable obstacle, that support can be omitted.
I am on vacation next 10 days.
In the source of readelf utility:
static voiddecode_AVR_machine_flags (unsigned e_flags, char buf[], size_t size) {
--size; /* Leave space for null terminator. */
switch (e_flags & EF_AVR_MACH)
{
case E_AVR_MACH_AVR1:
strncat (buf, ", avr:1", size);
break;
case E_AVR_MACH_AVR2:
strncat (buf, ", avr:2", size);
break;
case E_AVR_MACH_AVR25:
strncat (buf, ", avr:25", size);
break;
case E_AVR_MACH_AVR3:
strncat (buf, ", avr:3", size);
break;
case E_AVR_MACH_AVR31:
strncat (buf, ", avr:31", size);
break;
case E_AVR_MACH_AVR35:
strncat (buf, ", avr:35", size);
break;
case E_AVR_MACH_AVR4:
strncat (buf, ", avr:4", size);
break;
case E_AVR_MACH_AVR5:
strncat (buf, ", avr:5", size);
break;
case E_AVR_MACH_AVR51:
strncat (buf, ", avr:51", size);
break;
case E_AVR_MACH_AVR6:
strncat (buf, ", avr:6", size);
break;
case E_AVR_MACH_AVRTINY:
strncat (buf, ", avr:100", size);
break;
case E_AVR_MACH_XMEGA1:
strncat (buf, ", avr:101", size);
break;
case E_AVR_MACH_XMEGA2:
strncat (buf, ", avr:102", size);
break;
case E_AVR_MACH_XMEGA3:
strncat (buf, ", avr:103", size);
break;
case E_AVR_MACH_XMEGA4:
strncat (buf, ", avr:104", size);
break;
case E_AVR_MACH_XMEGA5:
strncat (buf, ", avr:105", size);
break;
case E_AVR_MACH_XMEGA6:
strncat (buf, ", avr:106", size);
break;
case E_AVR_MACH_XMEGA7:
strncat (buf, ", avr:107", size);
break;
default:
strncat (buf, ", avr:<unknown>", size);
break;
}So, it looks, for 8-bit AVR, e_machine must be 83 (EM_AVR), while e_flags is one of E_AVR_MACH_XXX constants. You just need to store somewhere E_AVR_MACH_XXX that you read from given ELF file, and compare it with core specified by "-cpu" command line option.
Quoted 545 lines
Yours,
Aleksandar.
Quoted 540 lines
Best regards, Aleksandar
Quoted 536 lines
Quoted 10 lines · Aleksandar Markovic
Quoted 6 lines · Michael Rolnik
No, I don't.
but I also can load and execute a binary file which does not have this information.Quoted 2 lines
Quoted 518 lines
OK. Let's think about that for a while. I currently think you have here an opportunity to add a really clean interface from the outset of AVR support in QEMU (that even some established platforms don't have in full), which is, trust me, very important for future. And it not that difficult to implement at all. But let's both think for a while.
Best regards,
AleksandarQuoted 506 lines
Quoted 62 lines · Aleksandar Markovic
Quoted 26 lines · Aleksandar Markovic
Quoted 21 lines · Michael Rolnik
There is *-cpu *option where you can specify what CPU you want, if this option is not specified avr6 (avr6-avr-cpu) is chosen.
*./avr-softmmu/qemu-system-avr -cpu help*
avr1-avr-cpu
avr2-avr-cpu
avr25-avr-cpu
avr3-avr-cpu
avr31-avr-cpu
avr35-avr-cpu
avr4-avr-cpu
avr5-avr-cpu
avr51-avr-cpu
avr6-avr-cpu
xmega2-avr-cpu
xmega4-avr-cpu
xmega5-avr-cpu
xmega6-avr-cpu
xmega7-avr-cpuQuoted 4 lines
What happens if you specify a core via -cpu, and supply elf file compiled for another core?
It looks there is some related info written in ELF header. This is from a binutils header:
(so it looks you could detect the core from elf file - do you do that detection right now?)
#define
E_AVR_MACH_AVR11
#defineE_AVR_MACH_AVR22
#defineE_AVR_MACH_AVR2525
#defineE_AVR_MACH_AVR33
#defineE_AVR_MACH_AVR3131
#defineE_AVR_MACH_AVR3535
#defineE_AVR_MACH_AVR44
#defineE_AVR_MACH_AVR55
#defineE_AVR_MACH_AVR5151
#defineE_AVR_MACH_AVR66
#defineE_AVR_MACH_AVRTINY100#define E_AVR_MACH_XMEGA1 101 #define E_AVR_MACH_XMEGA2 102 #define E_AVR_MACH_XMEGA3 103 #define E_AVR_MACH_XMEGA4 104 #define E_AVR_MACH_XMEGA5 105 #define E_AVR_MACH_XMEGA6 106 #define E_AVR_MACH_XMEGA7 107Quoted 436 lines
Best regards,
Quoted 435 lines
Akeksandar
Quoted 429 lines
Regards,
Michael RolnikQuoted 33 lines · Aleksandar Markovic
Quoted 18 lines · Michael Rolnik
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.Following are examples of possible usages, assuming program.elf is compiled for AVR cpu
1. Continious non interrupted execution
runqemu-system-avr -kernel program.elf
2. Continious non interrupted execution with serial output into telnet window
run `qemu-system-avr -kernel program.elf -serial
tcp::5678,server,nowait -nographic `
runtelent localhost 5678
3. Continious non interrupted execution with serial output intoQuoted 10 lines
stdout
runqemu-system-avr -kernel program.elf -serial stdio
4. Debugging wit GDB debugger
runqemu-system-avr -kernel program.elf -s -Srunavr-gdb program.elfand then within GDB shell `target
remote :1234`
5. Print out executed instructions
runqemu-system-avr -kernel program.elf -d in_asmQuoted 383 lines
Hi, Michael.
Can you explain to me the mechanisms of recognition of what core/microcontroller QEMU is supposed to emulate in the examples above?
Yours, Aleksandar
Quoted 374 lines
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 coresavr1 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 togetherchanges since v3
1. rampD/X/Y/Z registers are encoded as0x00ff0000(instead of0x000000ff) for faster address manipulaton
2. ffs changed to ctz32
3. duplicate code removed atavr_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 of0xff- 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 XCHchanges 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. simplifyinggen_goto_tbas 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. removingavr_set_feature
10. SPL/SPH set bug fix
11. switchingstb_phystocpu_stb_data
12. cleaning upavr_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 addedchages 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_retchanges since v7
1. folding back v6
2. logging athelper_outbandhelper_inbare done for non supported yet registers only
3.MAINTAINERSupdatedchanges since v8
1. removing hw/avr from hw/Makefile.obj as it should not be built for all
2. making linux compilable
3. testing ona. 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 memorychanges 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_memoryis used to create RAM
8. now there arehelper_fullrd&helper_fullwrwhen LD/ST try to access registerschanges since v10
1. movig back fullwr & fullrd into the commit where outb and inb were introduced
2. changingtlb_fillfunction signature
3. adding empty line between functions
4. adding newline on the last line of the file
5. usingtb->flagsto 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.objschanges since v11
1. updating to v2.7.0-rc
2. removing assignment toenv->fullaccfromgen_intermediate_codechanges since v12
1. fixing spacing
2. fixing get/put_segment functions
3. removingtarget-avr/machine.hfile
4.VMSTATE_SINGLE_TEST->VMSTATE_SINGLE
5. comment spelling
6. removinghw/avr/sample_io.c
7. char const* -> const char*
8. proper ram allocation
9. fixing breakpoint functionality.
10.env1 -> env
11.fixingavr_cpu_gdb_write_register&avr_cpu_gdb_read_registerfunctions
12.any cpu is removed
12.feature bits are not saved into vm statechanges since v13
1. rebasing to v2.7.0-rc1changes 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 chrischanges since v15
1. removing IO registers cache from CPU
2. implementing CBI/SBI asread(helper_inb), modify,write(helper_outb)
3. implementing CBIC/SBIC asread(helper_inb), check, branch
4. adding missingtcg_temp_free_i32fortcg_const_i32changes since v16
1. removing EXT IO registers knoledge from CPU. These registers are accessible
by LD/ST only. CPU has no interest in themchanges 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 oftranslate.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<<18changes 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_fillchanges 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 nowchanges 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. Addgdb-xml/avr-cpu.xmlchanges since v22
1. Rebase
2. Split long commentchanges 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 functionchanges since v24
1. removeAVR_CPU_TYPE_NAMEmacrochanges 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/prr1changes since v26
1. add avocado acceptence test
2. add boot serial testchanges since v27
1. list atmel2560 devices as unimplemented
2. fix sram base/sizechanges since v28
1. rebase
2. fix includes & buildchanges since v29
1. fixing ownership
2. using 'since' instread of 'added in'changes since v30
1. rebasechanges 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 'Addinstruction translation - CPU main translation funcions' commit
changes since v32
1. modifycpu_get_sregto treat sreg C as other flags, except sreg Zchanges since v33
1. ensure flag C is always calculated as one bit
2. calculate flag Z as one bit, without using inverse logicchanges since v34
1. rebasechanges since v35
1. rebase
2. useNANOSECONDS_PER_SECONDinstead of 1000000000 inavr_timer16.c
3. split "target/avr: Register AVR support with the rest of QEMU" into three patches1. "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"changes since v36
1. rebase
2. tename1. NO_CPU_REGISTERS -> NUMBER_OF_CPU_REGISTERS 2. NO_IO_REGISTERS -> NUMBER_OF_IO_REGISTERS 3. to_A -> to_regs_16_31_by_one 4. to_B -> to_regs_16_23_by_one 5. to_C -> to_regs_24_30_by_two 6. to_D -> to_regs_00_30_by_two 3. add missing licences 4. add usage example (see above) 5. ass Sarah Harris <[email protected]> as a reviewer to
MAINTAINERS
7. use git commit sha1 instead of `master`` in avocado testMichael 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: UpdateMAINTAINERSfileSarah Harris (1):
target/avr: Add limited support for USART and 16 bit timer
peripheralsconfigure | 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 | 228 +++ target/avr/gdbstub.c | 85 + target/avr/helper.c | 354 ++++ target/avr/machine.c | 121 ++ target/avr/translate.c | 3052 ++++++++++++++++++++++++++++++ tests/boot-serial-test.c | 10 + tests/machine-none-test.c | 1 + MAINTAINERS | 11 + 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 | 194 ++ tests/Makefile.include | 2 + tests/acceptance/machine_avr6.py | 56 + 40 files changed, 6756 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--
2.17.2 (Apple Git-113)--
Best Regards,
Michael Rolnik--
Best Regards,
Michael Rolnik--
Best Regards,
Michael Rolnik
Quoted 169 lines · Aleksandar Markovic
Quoted 87 lines · Aleksandar Markovic
Quoted 23 lines · Aleksandar Markovic
Quoted 4 lines · Michael Rolnik
how can I get this elf flags from within QEMU?
Quoted 2 lines
In one of files from your "machine" patch, you have this snippet:
(quoted diff) +2
-0+ bytes_loaded = load_elf( + filename, NULL, NULL, NULL, NULL, NULL, NULL, 0, EM_NONE,0, 0);
With this line you a kind of "blindly" load whatever you find in the file "filename". I think you need to modify
load_elf()to fetch the information on what core the elf in question is compiled for. Additionally, you most likely have to check if the elf file is compiled for AVR at all.I don't know enough about AVR-specifics of ELF format, but I know that we in MIPS read successfuly some MIPS-specific things we need to know. Do some research for ELF format headrr content for AVR.
Quoted 8 lines
This is really missing in your series, seriously.
Please keep in mind that I don't have right now at hand any dev system, so all I said here is off of my head.
You have to do some code digging.
First, you need to update
https://github.com/qemu/qemu/blob/master/include/elf.h
with bits and pieces for AVR.
In binutils file:
https://github.com/bminor/binutils-gdb/blob/master/include/elf/common.h
you will spot the line:
#define
EM_AVR83 /* Atmel AVR 8-bit microcontroller */that is the value of
e_machinefield for AVR, which you need to insert in qemu'sinclude/elf.habout at line 162.Then, in another binutils file:
https://github.com/bminor/binutils-gdb/blob/master/include/elf/avr.h
you find the lines:
#define
E_AVR_MACH_AVR11
#defineE_AVR_MACH_AVR22
#defineE_AVR_MACH_AVR2525
#defineE_AVR_MACH_AVR33
#defineE_AVR_MACH_AVR3131
#defineE_AVR_MACH_AVR3535
#defineE_AVR_MACH_AVR44
#defineE_AVR_MACH_AVR55
#defineE_AVR_MACH_AVR5151
#defineE_AVR_MACH_AVR66
#defineE_AVR_MACH_AVRTINY100
#defineE_AVR_MACH_XMEGA1101
#defineE_AVR_MACH_XMEGA2102
#defineE_AVR_MACH_XMEGA3103
#defineE_AVR_MACH_XMEGA4104
#defineE_AVR_MACH_XMEGA5105
#defineE_AVR_MACH_XMEGA6106
#defineE_AVR_MACH_XMEGA7107That you also need to insert in qemu's
include/elf.h, probably at the end of tge foke or elsewhere.Perhaps something more you need to insert into that file, you'll see.
Than, you need to modify the file where
load_elf()resides with AVR support, take a look at other architectures' support, and adjust to what you need.Quoted 7 lines
I know it will be contrieved at times, but, personally, similar ELF support must be done for any upcoming platform. Only if there is some unsourmantable obstacle, that support can be omitted.
I am on vacation next 10 days.
In the source of readelf utility:
static void
decode_AVR_machine_flags(unsignede_flags, char buf[],size_tsize) {
--size; /* Leave space for null terminator. */switch (e_flags & EF_AVR_MACH) { case E_AVR_MACH_AVR1: strncat (buf, ", avr:1", size); break; case E_AVR_MACH_AVR2: strncat (buf, ", avr:2", size); break; case E_AVR_MACH_AVR25: strncat (buf, ", avr:25", size); break; case E_AVR_MACH_AVR3: strncat (buf, ", avr:3", size); break; case E_AVR_MACH_AVR31: strncat (buf, ", avr:31", size); break; case E_AVR_MACH_AVR35: strncat (buf, ", avr:35", size); break; case E_AVR_MACH_AVR4: strncat (buf, ", avr:4", size); break; case E_AVR_MACH_AVR5: strncat (buf, ", avr:5", size); break; case E_AVR_MACH_AVR51: strncat (buf, ", avr:51", size); break; case E_AVR_MACH_AVR6: strncat (buf, ", avr:6", size); break; case E_AVR_MACH_AVRTINY: strncat (buf, ", avr:100", size); break; case E_AVR_MACH_XMEGA1: strncat (buf, ", avr:101", size); break; case E_AVR_MACH_XMEGA2: strncat (buf, ", avr:102", size); break; case E_AVR_MACH_XMEGA3: strncat (buf, ", avr:103", size); break; case E_AVR_MACH_XMEGA4: strncat (buf, ", avr:104", size); break; case E_AVR_MACH_XMEGA5: strncat (buf, ", avr:105", size); break; case E_AVR_MACH_XMEGA6: strncat (buf, ", avr:106", size); break; case E_AVR_MACH_XMEGA7: strncat (buf, ", avr:107", size); break; default: strncat (buf, ", avr:<unknown>", size); break; }
Quoted 6 lines
So, it looks, for 8-bit AVR,
e_machinemust be 83 (EM_AVR), whilee_flagsis one ofE_AVR_MACH_XXXconstants. You just need to store somewhereE_AVR_MACH_XXXthat you read from given ELF file, and compare it with core specified by "-cpu" command line option.
Looking further into the code, it looks that load_elf() that you use to load given AVR elf file is simply not suitable for reading info you wanr. That is because that function is used for loading kernels for other platforms, and AVR case is quite different you load an executable.
You may want to write your own version of load_elf(), called let's say load_elf_avr() (but place it in AVR-specific location), that will load elf, but aso read e_machine and e_flags fields that you will later pass to appropriate logic, compare with "-cpu" given core, and decide further what to do.
Please take all my advices with reservation, I am writing without a computer dev system.
I am off on vacation!
Take care!
Aleksandar
Quoted 546 lines
Quoted 546 lines
Yours,
Aleksandar.
Quoted 540 lines
Best regards, Aleksandar
Quoted 536 lines
Quoted 10 lines · Aleksandar Markovic
Quoted 6 lines · Michael Rolnik
No, I don't.
but I also can load and execute a binary file which does not have this information.Quoted 2 lines
Quoted 518 lines
OK. Let's think about that for a while. I currently think you have here an opportunity to add a really clean interface from the outset of AVR support in QEMU (that even some established platforms don't have in full), which is, trust me, very important for future. And it not that difficult to implement at all. But let's both think for a while.
Best regards,
AleksandarQuoted 506 lines
Quoted 62 lines · Aleksandar Markovic
Quoted 26 lines · Aleksandar Markovic
Quoted 21 lines · Michael Rolnik
There is *-cpu *option where you can specify what CPU you want, if this option is not specified avr6 (avr6-avr-cpu) is chosen.
*./avr-softmmu/qemu-system-avr -cpu help*
avr1-avr-cpu
avr2-avr-cpu
avr25-avr-cpu
avr3-avr-cpu
avr31-avr-cpu
avr35-avr-cpu
avr4-avr-cpu
avr5-avr-cpu
avr51-avr-cpu
avr6-avr-cpu
xmega2-avr-cpu
xmega4-avr-cpu
xmega5-avr-cpu
xmega6-avr-cpu
xmega7-avr-cpuQuoted 4 lines
What happens if you specify a core via -cpu, and supply elf file compiled for another core?
It looks there is some related info written in ELF header. This is from a binutils header:
(so it looks you could detect the core from elf file - do you do that detection right now?)
#define
E_AVR_MACH_AVR11
#defineE_AVR_MACH_AVR22
#defineE_AVR_MACH_AVR2525
#defineE_AVR_MACH_AVR33
#defineE_AVR_MACH_AVR3131
#defineE_AVR_MACH_AVR3535
#defineE_AVR_MACH_AVR44
#defineE_AVR_MACH_AVR55
#defineE_AVR_MACH_AVR5151
#defineE_AVR_MACH_AVR66
#defineE_AVR_MACH_AVRTINY100#define E_AVR_MACH_XMEGA1 101 #define E_AVR_MACH_XMEGA2 102 #define E_AVR_MACH_XMEGA3 103 #define E_AVR_MACH_XMEGA4 104 #define E_AVR_MACH_XMEGA5 105 #define E_AVR_MACH_XMEGA6 106 #define E_AVR_MACH_XMEGA7 107Quoted 436 lines
Best regards,
Quoted 435 lines
Akeksandar
Quoted 429 lines
Regards,
Michael RolnikQuoted 33 lines · Aleksandar Markovic
Quoted 18 lines · Michael Rolnik
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.Following are examples of possible usages, assuming program.elf is compiled for AVR cpu
1. Continious non interrupted execution
runqemu-system-avr -kernel program.elf
2. Continious non interrupted execution with serial output into telnet window
run `qemu-system-avr -kernel program.elf -serial
tcp::5678,server,nowait -nographic `
runtelent localhost 5678
3. Continious non interrupted execution with serial output intoQuoted 10 lines
stdout
runqemu-system-avr -kernel program.elf -serial stdio
4. Debugging wit GDB debugger
runqemu-system-avr -kernel program.elf -s -Srunavr-gdb program.elfand then within GDB shell `target
remote :1234`
5. Print out executed instructions
runqemu-system-avr -kernel program.elf -d in_asmQuoted 383 lines
Hi, Michael.
Can you explain to me the mechanisms of recognition of what core/microcontroller QEMU is supposed to emulate in the examples above?
Yours, Aleksandar
Quoted 374 lines
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 coresavr1 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 togetherchanges since v3
1. rampD/X/Y/Z registers are encoded as0x00ff0000(instead of0x000000ff) for faster address manipulaton
2. ffs changed to ctz32
3. duplicate code removed atavr_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 of0xff- 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 XCHchanges 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. simplifyinggen_goto_tbas 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. removingavr_set_feature
10. SPL/SPH set bug fix
11. switchingstb_phystocpu_stb_data
12. cleaning upavr_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 addedchages 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_retchanges since v7
1. folding back v6
2. logging athelper_outbandhelper_inbare done for non supported yet registers only
3.MAINTAINERSupdatedchanges since v8
1. removing hw/avr from hw/Makefile.obj as it should not be built for all
2. making linux compilable
3. testing ona. 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 memorychanges 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_memoryis used to create RAM
8. now there arehelper_fullrd&helper_fullwrwhen LD/ST try to access registerschanges since v10
1. movig back fullwr & fullrd into the commit where outb and inb were introduced
2. changingtlb_fillfunction signature
3. adding empty line between functions
4. adding newline on the last line of the file
5. usingtb->flagsto 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.objschanges since v11
1. updating to v2.7.0-rc
2. removing assignment toenv->fullaccfromgen_intermediate_codechanges since v12
1. fixing spacing
2. fixing get/put_segment functions
3. removingtarget-avr/machine.hfile
4.VMSTATE_SINGLE_TEST->VMSTATE_SINGLE
5. comment spelling
6. removinghw/avr/sample_io.c
7. char const* -> const char*
8. proper ram allocation
9. fixing breakpoint functionality.
10.env1 -> env
11.fixingavr_cpu_gdb_write_register&avr_cpu_gdb_read_registerfunctions
12.any cpu is removed
12.feature bits are not saved into vm statechanges since v13
1. rebasing to v2.7.0-rc1changes 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 chrischanges since v15
1. removing IO registers cache from CPU
2. implementing CBI/SBI asread(helper_inb), modify,write(helper_outb)
3. implementing CBIC/SBIC asread(helper_inb), check, branch
4. adding missingtcg_temp_free_i32fortcg_const_i32changes since v16
1. removing EXT IO registers knoledge from CPU. These registers are accessible
by LD/ST only. CPU has no interest in themchanges 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 oftranslate.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<<18changes 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_fillchanges 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 nowchanges 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. Addgdb-xml/avr-cpu.xmlchanges since v22
1. Rebase
2. Split long commentchanges 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 functionchanges since v24
1. removeAVR_CPU_TYPE_NAMEmacrochanges 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/prr1changes since v26
1. add avocado acceptence test
2. add boot serial testchanges since v27
1. list atmel2560 devices as unimplemented
2. fix sram base/sizechanges since v28
1. rebase
2. fix includes & buildchanges since v29
1. fixing ownership
2. using 'since' instread of 'added in'changes since v30
1. rebasechanges 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 'Addinstruction translation - CPU main translation funcions' commit
changes since v32
1. modifycpu_get_sregto treat sreg C as other flags, except sreg Zchanges since v33
1. ensure flag C is always calculated as one bit
2. calculate flag Z as one bit, without using inverse logicchanges since v34
1. rebasechanges since v35
1. rebase
2. useNANOSECONDS_PER_SECONDinstead of 1000000000 inavr_timer16.c
3. split "target/avr: Register AVR support with the rest of QEMU" into three patches1. "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"changes since v36
1. rebase
2. tename1. NO_CPU_REGISTERS -> NUMBER_OF_CPU_REGISTERS 2. NO_IO_REGISTERS -> NUMBER_OF_IO_REGISTERS 3. to_A -> to_regs_16_31_by_one 4. to_B -> to_regs_16_23_by_one 5. to_C -> to_regs_24_30_by_two 6. to_D -> to_regs_00_30_by_two 3. add missing licences 4. add usage example (see above) 5. ass Sarah Harris <[email protected]> as a reviewer to
MAINTAINERS
7. use git commit sha1 instead of `master`` in avocado testMichael 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: UpdateMAINTAINERSfileSarah Harris (1):
target/avr: Add limited support for USART and 16 bit timer
peripheralsconfigure | 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 | 228 +++ target/avr/gdbstub.c | 85 + target/avr/helper.c | 354 ++++ target/avr/machine.c | 121 ++ target/avr/translate.c | 3052 ++++++++++++++++++++++++++++++ tests/boot-serial-test.c | 10 + tests/machine-none-test.c | 1 + MAINTAINERS | 11 + 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 | 194 ++ tests/Makefile.include | 2 + tests/acceptance/machine_avr6.py | 56 + 40 files changed, 6756 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--
2.17.2 (Apple Git-113)--
Best Regards,
Michael Rolnik--
Best Regards,
Michael Rolnik--
Best Regards,
Michael Rolnik
Aleksandar.
enjoy your vacation.
Regards,
Michael Rolnik
Quoted 751 lines · Aleksandar Markovic
Quoted 169 lines · Aleksandar Markovic
Quoted 87 lines · Aleksandar Markovic
Quoted 23 lines · Aleksandar Markovic
Quoted 4 lines · Michael Rolnik
how can I get this elf flags from within QEMU?
Quoted 2 lines
In one of files from your "machine" patch, you have this snippet:
(quoted diff) +2
-0+ bytes_loaded = load_elf( + filename, NULL, NULL, NULL, NULL, NULL, NULL, 0, EM_NONE,0, 0);
With this line you a kind of "blindly" load whatever you find in the file "filename". I think you need to modify
load_elf()to fetch the information on what core the elf in question is compiled for. Additionally, you most likely have to check if the elf file is compiled for AVR at all.I don't know enough about AVR-specifics of ELF format, but I know that we in MIPS read successfuly some MIPS-specific things we need to know. Do some research for ELF format headrr content for AVR.
Quoted 8 lines
This is really missing in your series, seriously.
Please keep in mind that I don't have right now at hand any dev system, so all I said here is off of my head.
You have to do some code digging.
First, you need to update
https://github.com/qemu/qemu/blob/master/include/elf.h
with bits and pieces for AVR.
In binutils file:
https://github.com/bminor/binutils-gdb/blob/master/include/elf/common.h
you will spot the line:
#define
EM_AVR83 /* Atmel AVR 8-bit microcontroller */that is the value of
e_machinefield for AVR, which you need to insert in qemu'sinclude/elf.habout at line 162.Then, in another binutils file:
https://github.com/bminor/binutils-gdb/blob/master/include/elf/avr.h
you find the lines:
#define
E_AVR_MACH_AVR11
#defineE_AVR_MACH_AVR22
#defineE_AVR_MACH_AVR2525
#defineE_AVR_MACH_AVR33
#defineE_AVR_MACH_AVR3131
#defineE_AVR_MACH_AVR3535
#defineE_AVR_MACH_AVR44
#defineE_AVR_MACH_AVR55
#defineE_AVR_MACH_AVR5151
#defineE_AVR_MACH_AVR66
#defineE_AVR_MACH_AVRTINY100
#defineE_AVR_MACH_XMEGA1101
#defineE_AVR_MACH_XMEGA2102
#defineE_AVR_MACH_XMEGA3103
#defineE_AVR_MACH_XMEGA4104
#defineE_AVR_MACH_XMEGA5105
#defineE_AVR_MACH_XMEGA6106
#defineE_AVR_MACH_XMEGA7107That you also need to insert in qemu's
include/elf.h, probably at the end of tge foke or elsewhere.Perhaps something more you need to insert into that file, you'll see.
Than, you need to modify the file where
load_elf()resides with AVR support, take a look at other architectures' support, and adjust to what you need.Quoted 7 lines
I know it will be contrieved at times, but, personally, similar ELF support must be done for any upcoming platform. Only if there is some unsourmantable obstacle, that support can be omitted.
I am on vacation next 10 days.
In the source of readelf utility:
static void
decode_AVR_machine_flags(unsignede_flags, char buf[],size_tsize) {
--size; /* Leave space for null terminator. */switch (e_flags & EF_AVR_MACH) { case E_AVR_MACH_AVR1: strncat (buf, ", avr:1", size); break; case E_AVR_MACH_AVR2: strncat (buf, ", avr:2", size); break; case E_AVR_MACH_AVR25: strncat (buf, ", avr:25", size); break; case E_AVR_MACH_AVR3: strncat (buf, ", avr:3", size); break; case E_AVR_MACH_AVR31: strncat (buf, ", avr:31", size); break; case E_AVR_MACH_AVR35: strncat (buf, ", avr:35", size); break; case E_AVR_MACH_AVR4: strncat (buf, ", avr:4", size); break; case E_AVR_MACH_AVR5: strncat (buf, ", avr:5", size); break; case E_AVR_MACH_AVR51: strncat (buf, ", avr:51", size); break; case E_AVR_MACH_AVR6: strncat (buf, ", avr:6", size); break; case E_AVR_MACH_AVRTINY: strncat (buf, ", avr:100", size); break; case E_AVR_MACH_XMEGA1: strncat (buf, ", avr:101", size); break; case E_AVR_MACH_XMEGA2: strncat (buf, ", avr:102", size); break; case E_AVR_MACH_XMEGA3: strncat (buf, ", avr:103", size); break; case E_AVR_MACH_XMEGA4: strncat (buf, ", avr:104", size); break; case E_AVR_MACH_XMEGA5: strncat (buf, ", avr:105", size); break; case E_AVR_MACH_XMEGA6: strncat (buf, ", avr:106", size); break; case E_AVR_MACH_XMEGA7: strncat (buf, ", avr:107", size); break; default: strncat (buf, ", avr:<unknown>", size); break; }Quoted 6 lines
So, it looks, for 8-bit AVR,
e_machinemust be 83 (EM_AVR), whilee_flagsis one ofE_AVR_MACH_XXXconstants. You just need to store somewhereE_AVR_MACH_XXXthat you read from given ELF file, and compare it with core specified by "-cpu" command line option.Looking further into the code, it looks that
load_elf()that you use to load given AVR elf file is simply not suitable for reading info you wanr. That is because that function is used for loading kernels for other platforms, and AVR case is quite different you load an executable.You may want to write your own version of
load_elf(), called let's sayload_elf_avr()(but place it in AVR-specific location), that will load elf, but aso reade_machineande_flagsfields that you will later pass to appropriate logic, compare with "-cpu" given core, and decide further what to do.Please take all my advices with reservation, I am writing without a computer dev system.
I am off on vacation!
Take care!
Aleksandar
Quoted 550 lines
Quoted 550 lines
Yours,
Aleksandar.
Quoted 544 lines
Best regards, Aleksandar
Quoted 540 lines
Quoted 11 lines · Aleksandar Markovic
Quoted 6 lines · Michael Rolnik
No, I don't.
but I also can load and execute a binary file which does not have this information.Quoted 2 lines
Quoted 521 lines
OK. Let's think about that for a while. I currently think you have here an opportunity to add a really clean interface from the outset of AVR support in QEMU (that even some established platforms don't have in full), which is, trust me, very important for future. And it not that difficult to implement at all. But let's both think for a while.
Best regards,
AleksandarQuoted 509 lines
Quoted 62 lines · Aleksandar Markovic
Quoted 26 lines · Aleksandar Markovic
Quoted 21 lines · Michael Rolnik
There is *-cpu *option where you can specify what CPU you want, if this option is not specified avr6 (avr6-avr-cpu) is chosen.
*./avr-softmmu/qemu-system-avr -cpu help*
avr1-avr-cpu
avr2-avr-cpu
avr25-avr-cpu
avr3-avr-cpu
avr31-avr-cpu
avr35-avr-cpu
avr4-avr-cpu
avr5-avr-cpu
avr51-avr-cpu
avr6-avr-cpu
xmega2-avr-cpu
xmega4-avr-cpu
xmega5-avr-cpu
xmega6-avr-cpu
xmega7-avr-cpuQuoted 4 lines
What happens if you specify a core via -cpu, and supply elf file compiled for another core?
It looks there is some related info written in ELF header. This is from a binutils header:
(so it looks you could detect the core from elf file - do you do that detection right now?)
#define
E_AVR_MACH_AVR11
#defineE_AVR_MACH_AVR22
#defineE_AVR_MACH_AVR2525
#defineE_AVR_MACH_AVR33
#defineE_AVR_MACH_AVR3131
#defineE_AVR_MACH_AVR3535
#defineE_AVR_MACH_AVR44
#defineE_AVR_MACH_AVR55
#defineE_AVR_MACH_AVR5151
#defineE_AVR_MACH_AVR66
#defineE_AVR_MACH_AVRTINY100#define E_AVR_MACH_XMEGA1 101 #define E_AVR_MACH_XMEGA2 102 #define E_AVR_MACH_XMEGA3 103 #define E_AVR_MACH_XMEGA4 104 #define E_AVR_MACH_XMEGA5 105 #define E_AVR_MACH_XMEGA6 106 #define E_AVR_MACH_XMEGA7 107Quoted 439 lines
Best regards,
Quoted 438 lines
Akeksandar
Quoted 432 lines
Regards,
Michael RolnikQuoted 33 lines · Aleksandar Markovic
Quoted 18 lines · Michael Rolnik
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.Following are examples of possible usages, assuming program.elf is compiled for AVR cpu
1. Continious non interrupted execution
runqemu-system-avr -kernel program.elf
2. Continious non interrupted execution with serial output into telnet window
run `qemu-system-avr -kernel program.elf -serial
tcp::5678,server,nowait -nographic `
runtelent localhost 5678
3. Continious non interrupted execution with serial outputQuoted 10 lines
into stdout
runqemu-system-avr -kernel program.elf -serial stdio
4. Debugging wit GDB debugger
runqemu-system-avr -kernel program.elf -s -Srunavr-gdb program.elfand then within GDB shell `target
remote :1234`
5. Print out executed instructions
runqemu-system-avr -kernel program.elf -d in_asmQuoted 386 lines
Hi, Michael.
Can you explain to me the mechanisms of recognition of what core/microcontroller QEMU is supposed to emulate in the examples above?
Yours, Aleksandar
Quoted 377 lines
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 coresavr1 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 togetherchanges since v3
1. rampD/X/Y/Z registers are encoded as0x00ff0000(instead of0x000000ff) for faster address manipulaton
2. ffs changed to ctz32
3. duplicate code removed atavr_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 of0xff- 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 XCHchanges 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. simplifyinggen_goto_tbas 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. removingavr_set_feature
10. SPL/SPH set bug fix
11. switchingstb_phystocpu_stb_data
12. cleaning upavr_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 addedchages 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_retchanges since v7
1. folding back v6
2. logging athelper_outbandhelper_inbare done for non supported yet registers only
3.MAINTAINERSupdatedchanges since v8
1. removing hw/avr from hw/Makefile.obj as it should not be built for all
2. making linux compilable
3. testing ona. 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 memorychanges 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_memoryis used to create RAM
8. now there arehelper_fullrd&helper_fullwrwhen LD/ST try to access registerschanges since v10
1. movig back fullwr & fullrd into the commit where outb and inb were introduced
2. changingtlb_fillfunction signature
3. adding empty line between functions
4. adding newline on the last line of the file
5. usingtb->flagsto 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.objschanges since v11
1. updating to v2.7.0-rc
2. removing assignment toenv->fullaccfromgen_intermediate_codechanges since v12
1. fixing spacing
2. fixing get/put_segment functions
3. removingtarget-avr/machine.hfile
4.VMSTATE_SINGLE_TEST->VMSTATE_SINGLE
5. comment spelling
6. removinghw/avr/sample_io.c
7. char const* -> const char*
8. proper ram allocation
9. fixing breakpoint functionality.
10.env1 -> env
11.fixingavr_cpu_gdb_write_register&avr_cpu_gdb_read_registerfunctions
12.any cpu is removed
12.feature bits are not saved into vm statechanges since v13
1. rebasing to v2.7.0-rc1changes 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 chrischanges since v15
1. removing IO registers cache from CPU
2. implementing CBI/SBI asread(helper_inb), modify,write(helper_outb)
3. implementing CBIC/SBIC asread(helper_inb), check, branch
4. adding missingtcg_temp_free_i32fortcg_const_i32changes since v16
1. removing EXT IO registers knoledge from CPU. These registers are accessible
by LD/ST only. CPU has no interest in themchanges 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 oftranslate.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 inmachine.c
7. changingQEMU_ARCH_AVRfrom 1<<17 to 1<<18changes 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_fillchanges 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 nowchanges 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. Addgdb-xml/avr-cpu.xmlchanges since v22
1. Rebase
2. Split long commentchanges 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 functionchanges since v24
1. removeAVR_CPU_TYPE_NAMEmacrochanges 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/prr1changes since v26
1. add avocado acceptence test
2. add boot serial testchanges since v27
1. list atmel2560 devices as unimplemented
2. fix sram base/sizechanges since v28
1. rebase
2. fix includes & buildchanges since v29
1. fixing ownership
2. using 'since' instread of 'added in'changes since v30
1. rebasechanges 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 'Addinstruction translation - CPU main translation funcions' commit
changes since v32
1. modifycpu_get_sregto treat sreg C as other flags, except sreg Zchanges since v33
1. ensure flag C is always calculated as one bit
2. calculate flag Z as one bit, without using inverse logicchanges since v34
1. rebasechanges since v35
1. rebase
2. useNANOSECONDS_PER_SECONDinstead of 1000000000 inavr_timer16.c
3. split "target/avr: Register AVR support with the rest of QEMU" into three patches1. "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"changes since v36
1. rebase
2. tename1. NO_CPU_REGISTERS -> NUMBER_OF_CPU_REGISTERS 2. NO_IO_REGISTERS -> NUMBER_OF_IO_REGISTERS 3. to_A -> to_regs_16_31_by_one 4. to_B -> to_regs_16_23_by_one 5. to_C -> to_regs_24_30_by_two 6. to_D -> to_regs_00_30_by_two 3. add missing licences 4. add usage example (see above) 5. ass Sarah Harris <[email protected]> as a reviewer to
MAINTAINERS
7. use git commit sha1 instead of `master`` in avocado testMichael 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: UpdateMAINTAINERSfileSarah Harris (1):
target/avr: Add limited support for USART and 16 bit timer
peripheralsconfigure | 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 | 228 +++ target/avr/gdbstub.c | 85 + target/avr/helper.c | 354 ++++ target/avr/machine.c | 121 ++ target/avr/translate.c | 3052 ++++++++++++++++++++++++++++++ tests/boot-serial-test.c | 10 + tests/machine-none-test.c | 1 + MAINTAINERS | 11 + 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 | 194 ++ tests/Makefile.include | 2 + tests/acceptance/machine_avr6.py | 56 + 40 files changed, 6756 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--
2.17.2 (Apple Git-113)--
Best Regards,
Michael Rolnik--
Best Regards,
Michael Rolnik--
Best Regards,
Michael Rolnik
Signature · 2 lines
Best Regards, Michael Rolnik