Skip to content

Commit

Permalink
Merge pull request #957 from qilingframework/dev
Browse files Browse the repository at this point in the history 
Getting ready for 1.4.0
  • Loading branch information
@xwings
xwings authored Oct 20, 2021
2 parents 9fc3b66 + c100ef4 commit 94bf7a3
Show file tree
Hide file tree
Showing 102 changed files with 12,251 additions and 1,567 deletions.
24 changes: 6 additions & 18 deletions .github/workflows/build-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,13 @@ jobs:
matrix:
#os: [windows-2019, macos-10.15, ubuntu-18.04, ubuntu-20.04]
os: [windows-2019, ubuntu-18.04, ubuntu-20.04]
python-version: [3.7, 3.8, 3.9]
python-version: [3.8, 3.9]
exclude:
- os: ubuntu-20.04
python-version: 3.7
- os: ubuntu-18.04
python-version: 3.7
- os: ubuntu-18.04
python-version: 3.9
- os: windows-2019
python-version: 3.7
# - os: macos-10.15
# python-version: 3.8
python-version: 3.9
include:
- os: ubuntu-20.04
python-version: 3.8
- os: ubuntu-18.04
python-version: 3.9
container: Docker

steps:
Expand Down Expand Up @@ -93,12 +85,8 @@ jobs:
cd ../../../../
pip3 install -e .[evm]
if [ ${{ matrix.python-version }} == '3.9' ]; then
rm -rf tests/test_evm.py
fi
if [ ${{ matrix.os }} == 'ubuntu-20.04' ]; then
docker run -it --rm -v ${GITHUB_WORKSPACE}:/qiling qilingframework/qiling:dev bash -c "rm -rf tests/test_evm.py && cd tests && ./test_onlinux.sh"
if [ ${{ matrix.os }} == 'ubuntu-18.04' ] and [ ${{ matrix.python-version }} == '3.9' ]; then
docker run -it --rm -v ${GITHUB_WORKSPACE}:/qiling qilingframework/qiling:dev bash -c "cd tests && ./test_onlinux.sh"
else
pip3 install setuptools wheel
cd tests && ./test_onlinux.sh
Expand Down
19 changes: 10 additions & 9 deletions CREDITS.TXT
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,22 @@ Advisor
NGUYEN Anh Quynh <[email protected]>


Travis, Website and Documentations
==================================
FOO Kevin (chfl4gs) <[email protected]>


Core Developers
===============
Core Developers Crew
====================
Earl MARCUS (klks84) [email protected]
DING tianze (D1iv3) <[email protected]>
SUN bowen (w1tcher) <[email protected]>
CHEN huitao (null) <[email protected]>
YU tong (sp1ke) <[email protected]>
Earl MARCUS (klks84) [email protected]
WU chenxu (kabeor) <[email protected]>
KONG ziqiao (lazymio) <[email protected]>
YU zheng (dataisland) <[email protected]>
Eli Cohen Nehemia (elicn) <[email protected]>


Travis, Website and Documentations
==================================
FOO Kevin (chfl4gs) <[email protected]>


Key Contributors (in no particular order)
Expand All @@ -36,7 +38,6 @@ ucgJhe
jhumble
Mark Jansen (learn-more)
cq674350529
elicn
bkerler (viperbjk)


Expand Down
11 changes: 10 additions & 1 deletion ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
This file details the changelog of Qiling Framework.

------------------------------------
[Version 1.3]: Sept 25th, 2021
[Version 1.4.0]: Oct 20th, 2021
- Added MCU Engine
- Bug fix for qdb
- Bug fix for debugger
- Bug fix for ql.mem
- Bump to Unicorn 2


------------------------------------
[Version 1.3.0]: Sept 25th, 2021

- Added QNX
- Aded Dynamically executed QNX
Expand Down
32 changes: 3 additions & 29 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,35 +218,9 @@ Contact us at email [email protected], or via Twitter [@qiling_io](https://twitter.

---

#### Core developers

- LAU kaijern (xwings) <[email protected]>
- NGUYEN Anh Quynh <[email protected]>
- DING tianZe (D1iv3) <[email protected]>
- SUN bowen (w1tcher) <[email protected]>
- CHEN huitao (null) <[email protected]>
- YU tong (sp1ke) <[email protected]>
- Earl Marcus (klks84) [email protected]
- WU chenxu (kabeor) <[email protected]>
- KONG ziqiao (lazymio) <[email protected]>

#### Travis-CI, Docker, Website and Documentation

- FOO Kevin (chfl4gs) <[email protected]>

#### Key Contributors (in no particular order)

- 0ssigeno
- liba2k
- assafcarlsbad
- ucgJhe
- jhumble
- Mark Jansen (learn-more)
- cq674350529
- elicn
- bkerler (viperbjk)
- madprogrammer
- danielmoos
#### Core developers, Key Contributors and etc

Please refer to [CREDITS.TXT](https://github.com/qilingframework/qiling/blob/master/CREDITS.TXT)

---

Expand Down
2 changes: 1 addition & 1 deletion TODO
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ Release
14. Update version and add in dev
__version__ = "X.X.X" + "-dev"
15. Update changelog and add section for next Update
16. commit and push
16. commit and push
145 changes: 145 additions & 0 deletions examples/mcu/LCD1602A.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
-------------------------------------------------------------------------------------------------
| | | | ### | ### |#### | # | | | | | | | | | |
| | | |# #|# #|# #| # | | | | | | ####| ### | # #|# ## |
| | | |# ##| #|# #| # |#### | | | | | # #| |# # #|## #|
| | | |# # #| ## #|#### | |# #| | | |#####|# # #| ### |# # |# #|
| | | |## #|# # #|# | |#### | | | | | ##| | ## #|#### |
| | | |# #|# # #|# | |# | | | | | # | ### | |# |
| | | | ### | ### |# | |# | | | | | ## | #| |# |
| | | | | | | | | | | | | | | | |
-------------------------------------------------------------------------------------------------
| | | # | # | ### | ### | | | | | |#####| # | | # # | |
| | | # | ## |# #|# #| | | | | | #|### | # | ### | ## #|
| | | # | # |# #|# #| ### | ## #| | | | # #| # | # | #|# ##|
| | | # | # |# #|# #| #|# ##| | | | ## |#####|# | ####|# #|
| | | | # |#####|# # #| ####| ####| | |### | # | # |# #|# #| ####|
| | | | # |# #|# # |# #| #| | |# # | # | # |#####| ####| #|
| | | # | ### |# #| ## #| ####| #| | |### | # | # | #| | #|
| | | | | | | | | | | | | | | | |
-------------------------------------------------------------------------------------------------
| | | # # | ### |#### |#### |# | | | | ###| #| | | ### | ### |
| | | # # |# #|# #|# #|# | | | | # | # |# # #| #|# #|# #|
| | | # # | #|# #|# #|#### |# ## | | | # | # |# # #| #|#### |#####|
| | | | # |#### |#### |# #|## #| | | # | ## |# # #| # # |# #|# #|
| | | | # |# #|# # |# #|# | | | |# # | #| # |#### |# #|
| | | | # |# #|# # |# #|# | | | | # | # | # # |# | ### |
| | | |#####|#### |# #|#### |# | | | | # | # |# |# | |
| | | | | | | | | | | | | | |# | |
-------------------------------------------------------------------------------------------------
| | | # # |#####| ### | ####| | | | | | # | ### | | | |
| | | # # | # |# #|# | | | | | |#####| |#####| ### | |
| | |#####| # |# |# | ### | ### | | | |# #|#####| # |# | # ##|
| | | # # | # |# | ### |# |# | | | # |# #| # |#####| ## |# # #|
| | |#####| #|# | #|# | ### | | | # | #| # | # |# #|## # |
| | | # # |# #|# #| #|# #| #| | | # | # | # | # | ### | |
| | | # # | ### | ### |#### | ### |#### | | |### | # | # | ###| | |
| | | | | | | | | | | | | | | | |
-------------------------------------------------------------------------------------------------
| | | # | # |### |#####| #| # | | | | | # | # | | |
| | | ####| ## |# # | # | #| # | | | |#####| # | # |# #| ### |
| | |# # | # # |# #| # | ## #|### | | | | # | # |#####|# #|# #|
| | | ### |# # |# #| # |# ##| # | | | | # | ## | # #|# #|# #|
| | | # #|#####|# #| # |# #| # | | |# | # | # # | # # |### #| # # |
| | |#### | # |# # | # |# #| # #| | | # | # | # | # |# |## ##|
| | | # | # |### | # | ####| ## | | | # |#####| # | # |# | |
| | | | | | | | | | | | | | | | |
-------------------------------------------------------------------------------------------------
| | |## |#####|#####|# #| | | | | | # | # | | | # # |
| | |## #|# |# |# #| | | | | |#####| # | ### | ####|# #|
| | | # |#### |# |# #| ### |# #| | | | # |#####| # |# # |# #|
| | | # | #|#### |# #|# #|# #| | | ## | ## | # | # |# # |# ##|
| | | # | #|# |# #|#####|# #| | | ## | # # | # | # | ### | ## #|
| | |# ##|# #|# |# #|# |# ##| | | |# # | # | # | | |
| | | ##| ### |#####| ### | ### | ## #| | | | # |# |#####| | |
| | | | | | | | | | | | | | | | |
-------------------------------------------------------------------------------------------------
| | | ## | ## |#####|# #| ## | | | | | # | | | |#####|
| | |# # | # |# |# #| # #| | | |#####|#####| ### |#####| ## | # |
| | |# # |# |# |# #| # |# #| | | #| # #| | #| # #| # |
| | | # |#### |#### |# #|### |# #| | |#####| # #| |#####|# #| # |
| | |# # |# #|# |# #| # |# #| | | #| # #| | #|#### |#####|
| | |# # |# #|# | # # | # | # # | | | # | # #| | #|# | |
| | | ## #| ### |# | # | # | # | | | # |# # |#####|#####|# | |
| | | | | | | | | | | | | | | | |
-------------------------------------------------------------------------------------------------
| | | ## |#####| ### |# #| | | | | | # | | ### | | |
| | | # | #|# #|# #| ####| | | | |#####|#####| | ### |#####|
| | | # | # |# |# #|# #|# #| | |#####| # | #|#####|# #| # # |
| | | | # |# ###|# #|# #|# #| | | #|#####| # # | #|# #| # # |
| | | | # |# #|# # #| ####|# #| | | # | # | # | #| ####|# ##|
| | | | # |# #|# # #| #|# # #| | | # | # | # # | # | #| |
| | | | # | ### | ### | ### | # # | | | # | # |# | # | #| |
| | | | | | | | | | | | | | | ### | |
-------------------------------------------------------------------------------------------------
| | | # | ### |# #|# #|# | | | | | | # |# # | |#####|
| | | # |# #|# #|# #|# | | | | | ####|#####|# # | ###|# #|
| | | # |# #|# #| # # |# ## |# #| | | # | # #| # |# # | # | # # |
| | | # | ### |#####| # |## #| # # | | | # |# #| # |# # | # | # |
| | | # |# #|# #| # # |# #| # | | | ## | #| ### | # | # |# #|
| | | # |# #|# #|# #|# #| # # | | |# # | # |# # #| # | | |
| | | # | ### |# #|# #|# #|# #| | | # | ## | # | # | | |
| | | | | | | | | | | | | | | | |
-------------------------------------------------------------------------------------------------
| | | # | ### | ### |# #| # | | | | | # | # | | | |
| | | # |# #| # |# #| | | | | | ####| # | # |## # |# #|
| | | # |# #| # |# #| ## |# #| | | # |# # | # |# # | # |# #|
| | | # | ####| # | # # | # |# #| | |#####| # | # |# # | |# #|
| | | # | #| # | # | # | ####| | |# #| # | # |# # #| | ####|
| | | # | # | # | # | # | #| | | #| # | # |# # #| | #|
| | | # | ## | ### | # | ### | ### | | | ## | # | # |# ## | | ### |
| | | | | | | | | | | | | | | | |
-------------------------------------------------------------------------------------------------
| | | | | ###|#####| # | | | | | | | | # | #|
| | | # | ## | # | #| | | | | |#####| # |# | |#### |
| | |# # #| ## | # | # | ## |#####| | | | #| # |# | ## | # |
| | | ### | | # | # | # | # | | |#####| #|# #|# #| # |#####|
| | |# # #| ## | # | # | # | # | | | # | #|# #|# # | # | # |
| | | # | ## |# # |# |# # | # | | | # | #|# #|# # | # | |
| | | | | ## |#####| ## |#####| | |#####|#####|# #|## |# # | |
| | | | | | | | | | | | | | | ## | |
-------------------------------------------------------------------------------------------------
| | | | |# #| ### |# | # | | | | # # |# | |# # | |
| | | # | ## |# # | # |# | # | | | |#####|# |#####| # |#####|
| | | # | ## |# # | # |# # | # | | | # | # # |#####|# #|# # | # |
| | |#####| |## | # |# # | # | | |#####| # # |# |# #| | ####|
| | | # | ## |# # | # |## | # | | | ## | # |# |# #| | # #|
| | | # | # |# # | # |# # | # | | | # # | # |# |# #| |# #|
| | | | # |# #| ### |# # | # | | |# # | # | ####|#####| | |
| | | | | | | | | | | | | | | | |
-------------------------------------------------------------------------------------------------
| | | | # |# |# #| ## | # | | | | | | | # | |
| | | | # |# | # # | # | # | | | |## |#####|#####| ### |#####|
| | | | # |# |#####| # | # | | | # | #| #|# #|# # |# # #|
| | | |# |# | # | # | # | | |#####|## #| #|# #|# # #|#####|
| | | ## | # |# |#####| # | # | | | # #| #| #| #| ### |# #|
| | | # | # |# | # | # | # | | | # # | # | # | # | # |# #|
| | | # | # |#####| # | ### | # | | | # |### | ## | # | | |
| | | | | | | | | | | | | | | | |
-------------------------------------------------------------------------------------------------
| | | | |# #| ### | | # | | | | | | | # | |
| | | | |## ##| # | | # | | | |#####| # |## |### | # |
| | | |#####|# # #| # |## # | # | | | | #|# # | | # |#####|
| | |#####| |# # #| # |# # #| # | | | ### | # | # | #|### | # |
| | | |#####|# #| # |# # #| # | | | # | # | #| #| # | |
| | | | |# #| # |# #| # | | | # | # # | #| # | ####| |
| | | | |# #| ### |# #| # | | |#####|# #| |### | | |
| | | | | | | | | | | | | | | | |
-------------------------------------------------------------------------------------------------
| | | | # |# #| # | | | | | | # | # | # | ### | |
| | | | # |# #| # # | | # | | | |#####|#####|# # |# ## | |
| | | | # |## #|# #|# ## | # | | |#### | # #| # | # |## #| |
| | | | #|# # #| |## #|#####| | | # | # # | # | |# #| |
| | | | # |# ##| |# #| # | | |#### | # |# # #| |# #| |
| | | ## | # |# #| |# #| # | | | # | # |# # #| | | |
| | | ## | # |# #| |# #| | | |#### | ###| # | | | |
| | | | | | | | | | | | | | | | |
-------------------------------------------------------------------------------------------------
| | | | ### | ### | | | | | | | | |### | # # |#####|
| | | #|# #|# #| | | # | | | |# #|#####|# # | ### |#####|
| | | # | #|# #| | ### | # | | | |# #| #|### |# #|#####|
| | | # | # |# #| |# #|#####| | |# # #| # #| #| |# #|#####|
| | | # | # |# #| |# #| # | | |# # #| #| # # | | ### |#####|
| | |# | |# #| |# #| # | | | #| # | # | | |#####|
| | | | # | ### |#####| ### | | | | ## | ## | # | | |#####|
| | | | | | | | | | | | | | | |#####|
-------------------------------------------------------------------------------------------------
25 changes: 25 additions & 0 deletions examples/mcu/stm32f4_dma.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import sys
sys.path.append("../..")

from qiling.core import Qiling
from qiling.const import QL_VERBOSE


def stm32f411_dma():
ql = Qiling(["../rootfs/mcu/stm32f411/dma-clock.hex"],
archtype="cortex_m", profile="stm32f411", verbose=QL_VERBOSE.DEBUG)

ql.hw.create('usart2')
ql.hw.create('dma1')
ql.hw.create('rcc')

ql.run(count=200000)
buf = ql.hw.usart2.recv()

## check timestamp
tick = [int(x) for x in buf.split()]
for i in range(1, len(tick)):
assert(4 <= tick[i] - tick[i - 1] <= 6)

if __name__ == "__main__":
stm32f411_dma()
29 changes: 29 additions & 0 deletions examples/mcu/stm32f4_freertos.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import sys
sys.path.append("../..")

from qiling.core import Qiling
from qiling.const import QL_VERBOSE


def stm32f411_freertos():
ql = Qiling(["../rootfs/mcu/stm32f411/os-demo.hex"],
archtype="cortex_m", profile="stm32f411", verbose=QL_VERBOSE.DEBUG)

ql.hw.create('usart2')
ql.hw.create('rcc')
ql.hw.create('gpioa')

count = 0
def counter():
nonlocal count
count += 1

ql.hw.gpioa.hook_set(5, counter)

ql.run(count=200000)

print(count >= 5)
print(ql.hw.usart2.recv())

if __name__ == "__main__":
stm32f411_freertos()
Loading

0 comments on commit 94bf7a3

Please sign in to comment.