Skip to content

Commit 94bf7a3

Browse files
xwingsxwings
authored
Merge pull request #957 from qilingframework/dev
Getting ready for 1.4.0
2 parents 9fc3b66 + c100ef4 commit 94bf7a3

File tree

102 files changed

+12251
-1567
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+12251
-1567
lines changed

‎.github/workflows/build-ci.yml‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,13 @@ jobs:
1111
matrix:
1212
#os: [windows-2019, macos-10.15, ubuntu-18.04, ubuntu-20.04]
1313
os: [windows-2019, ubuntu-18.04, ubuntu-20.04]
14-
python-version: [3.7, 3.8, 3.9]
14+
python-version: [3.8, 3.9]
1515
exclude:
16-
- os: ubuntu-20.04
17-
python-version: 3.7
1816
- os: ubuntu-18.04
19-
python-version: 3.7
20-
- os: ubuntu-18.04
21-
python-version: 3.9
22-
- os: windows-2019
23-
python-version: 3.7
24-
# - os: macos-10.15
25-
# python-version: 3.8
17+
python-version: 3.9
2618
include:
27-
- os: ubuntu-20.04
28-
python-version: 3.8
19+
- os: ubuntu-18.04
20+
python-version: 3.9
2921
container: Docker
3022

3123
steps:
@@ -93,12 +85,8 @@ jobs:
9385
cd ../../../../
9486
pip3 install -e .[evm]
9587
96-
if [ ${{ matrix.python-version }} == '3.9' ]; then
97-
rm -rf tests/test_evm.py
98-
fi
99-
100-
if [ ${{ matrix.os }} == 'ubuntu-20.04' ]; then
101-
docker run -it --rm -v ${GITHUB_WORKSPACE}:/qiling qilingframework/qiling:dev bash -c "rm -rf tests/test_evm.py && cd tests && ./test_onlinux.sh"
88+
if [ ${{ matrix.os }} == 'ubuntu-18.04' ] and [ ${{ matrix.python-version }} == '3.9' ]; then
89+
docker run -it --rm -v ${GITHUB_WORKSPACE}:/qiling qilingframework/qiling:dev bash -c "cd tests && ./test_onlinux.sh"
10290
else
10391
pip3 install setuptools wheel
10492
cd tests && ./test_onlinux.sh

‎CREDITS.TXT‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,22 @@ Advisor
1111
NGUYEN Anh Quynh <[email protected]>
1212

1313

14-
Travis, Website and Documentations
15-
==================================
16-
FOO Kevin (chfl4gs) <[email protected]>
17-
18-
19-
Core Developers
20-
===============
14+
Core Developers Crew
15+
====================
16+
Earl MARCUS (klks84) [email protected]
2117
DING tianze (D1iv3) <[email protected]>
2218
SUN bowen (w1tcher) <[email protected]>
2319
CHEN huitao (null) <[email protected]>
2420
YU tong (sp1ke) <[email protected]>
25-
Earl MARCUS (klks84) [email protected]
2621
WU chenxu (kabeor) <[email protected]>
2722
KONG ziqiao (lazymio) <[email protected]>
23+
YU zheng (dataisland) <[email protected]>
24+
Eli Cohen Nehemia (elicn) <[email protected]>
25+
26+
27+
Travis, Website and Documentations
28+
==================================
29+
FOO Kevin (chfl4gs) <[email protected]>
2830

2931

3032
Key Contributors (in no particular order)
@@ -36,7 +38,6 @@ ucgJhe
3638
jhumble
3739
Mark Jansen (learn-more)
3840
cq674350529
39-
elicn
4041
bkerler (viperbjk)
4142

4243

‎ChangeLog‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
11
This file details the changelog of Qiling Framework.
22

33
------------------------------------
4-
[Version 1.3]: Sept 25th, 2021
4+
[Version 1.4.0]: Oct 20th, 2021
5+
- Added MCU Engine
6+
- Bug fix for qdb
7+
- Bug fix for debugger
8+
- Bug fix for ql.mem
9+
- Bump to Unicorn 2
10+
11+
12+
------------------------------------
13+
[Version 1.3.0]: Sept 25th, 2021
514

615
- Added QNX
716
- Aded Dynamically executed QNX

‎README.md‎

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -218,35 +218,9 @@ Contact us at email [email protected], or via Twitter [@qiling_io](https://twitter.
218218

219219
---
220220

221-
#### Core developers
222-
223-
- LAU kaijern (xwings) <[email protected]>
224-
- NGUYEN Anh Quynh <[email protected]>
225-
- DING tianZe (D1iv3) <[email protected]>
226-
- SUN bowen (w1tcher) <[email protected]>
227-
- CHEN huitao (null) <[email protected]>
228-
- YU tong (sp1ke) <[email protected]>
229-
- Earl Marcus (klks84) [email protected]
230-
- WU chenxu (kabeor) <[email protected]>
231-
- KONG ziqiao (lazymio) <[email protected]>
232-
233-
#### Travis-CI, Docker, Website and Documentation
234-
235-
- FOO Kevin (chfl4gs) <[email protected]>
236-
237-
#### Key Contributors (in no particular order)
238-
239-
- 0ssigeno
240-
- liba2k
241-
- assafcarlsbad
242-
- ucgJhe
243-
- jhumble
244-
- Mark Jansen (learn-more)
245-
- cq674350529
246-
- elicn
247-
- bkerler (viperbjk)
248-
- madprogrammer
249-
- danielmoos
221+
#### Core developers, Key Contributors and etc
222+
223+
Please refer to [CREDITS.TXT](https://github.com/qilingframework/qiling/blob/master/CREDITS.TXT)
250224

251225
---
252226

‎TODO‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ Release
2222
14. Update version and add in dev
2323
__version__ = "X.X.X" + "-dev"
2424
15. Update changelog and add section for next Update
25-
16. commit and push
25+
16. commit and push

‎examples/mcu/LCD1602A.txt‎

Lines changed: 145 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,145 @@
1+
-------------------------------------------------------------------------------------------------
2+
| | | | ### | ### |#### | # | | | | | | | | | |
3+
| | | |# #|# #|# #| # | | | | | | ####| ### | # #|# ## |
4+
| | | |# ##| #|# #| # |#### | | | | | # #| |# # #|## #|
5+
| | | |# # #| ## #|#### | |# #| | | |#####|# # #| ### |# # |# #|
6+
| | | |## #|# # #|# | |#### | | | | | ##| | ## #|#### |
7+
| | | |# #|# # #|# | |# | | | | | # | ### | |# |
8+
| | | | ### | ### |# | |# | | | | | ## | #| |# |
9+
| | | | | | | | | | | | | | | | |
10+
-------------------------------------------------------------------------------------------------
11+
| | | # | # | ### | ### | | | | | |#####| # | | # # | |
12+
| | | # | ## |# #|# #| | | | | | #|### | # | ### | ## #|
13+
| | | # | # |# #|# #| ### | ## #| | | | # #| # | # | #|# ##|
14+
| | | # | # |# #|# #| #|# ##| | | | ## |#####|# | ####|# #|
15+
| | | | # |#####|# # #| ####| ####| | |### | # | # |# #|# #| ####|
16+
| | | | # |# #|# # |# #| #| | |# # | # | # |#####| ####| #|
17+
| | | # | ### |# #| ## #| ####| #| | |### | # | # | #| | #|
18+
| | | | | | | | | | | | | | | | |
19+
-------------------------------------------------------------------------------------------------
20+
| | | # # | ### |#### |#### |# | | | | ###| #| | | ### | ### |
21+
| | | # # |# #|# #|# #|# | | | | # | # |# # #| #|# #|# #|
22+
| | | # # | #|# #|# #|#### |# ## | | | # | # |# # #| #|#### |#####|
23+
| | | | # |#### |#### |# #|## #| | | # | ## |# # #| # # |# #|# #|
24+
| | | | # |# #|# # |# #|# | | | |# # | #| # |#### |# #|
25+
| | | | # |# #|# # |# #|# | | | | # | # | # # |# | ### |
26+
| | | |#####|#### |# #|#### |# | | | | # | # |# |# | |
27+
| | | | | | | | | | | | | | |# | |
28+
-------------------------------------------------------------------------------------------------
29+
| | | # # |#####| ### | ####| | | | | | # | ### | | | |
30+
| | | # # | # |# #|# | | | | | |#####| |#####| ### | |
31+
| | |#####| # |# |# | ### | ### | | | |# #|#####| # |# | # ##|
32+
| | | # # | # |# | ### |# |# | | | # |# #| # |#####| ## |# # #|
33+
| | |#####| #|# | #|# | ### | | | # | #| # | # |# #|## # |
34+
| | | # # |# #|# #| #|# #| #| | | # | # | # | # | ### | |
35+
| | | # # | ### | ### |#### | ### |#### | | |### | # | # | ###| | |
36+
| | | | | | | | | | | | | | | | |
37+
-------------------------------------------------------------------------------------------------
38+
| | | # | # |### |#####| #| # | | | | | # | # | | |
39+
| | | ####| ## |# # | # | #| # | | | |#####| # | # |# #| ### |
40+
| | |# # | # # |# #| # | ## #|### | | | | # | # |#####|# #|# #|
41+
| | | ### |# # |# #| # |# ##| # | | | | # | ## | # #|# #|# #|
42+
| | | # #|#####|# #| # |# #| # | | |# | # | # # | # # |### #| # # |
43+
| | |#### | # |# # | # |# #| # #| | | # | # | # | # |# |## ##|
44+
| | | # | # |### | # | ####| ## | | | # |#####| # | # |# | |
45+
| | | | | | | | | | | | | | | | |
46+
-------------------------------------------------------------------------------------------------
47+
| | |## |#####|#####|# #| | | | | | # | # | | | # # |
48+
| | |## #|# |# |# #| | | | | |#####| # | ### | ####|# #|
49+
| | | # |#### |# |# #| ### |# #| | | | # |#####| # |# # |# #|
50+
| | | # | #|#### |# #|# #|# #| | | ## | ## | # | # |# # |# ##|
51+
| | | # | #|# |# #|#####|# #| | | ## | # # | # | # | ### | ## #|
52+
| | |# ##|# #|# |# #|# |# ##| | | |# # | # | # | | |
53+
| | | ##| ### |#####| ### | ### | ## #| | | | # |# |#####| | |
54+
| | | | | | | | | | | | | | | | |
55+
-------------------------------------------------------------------------------------------------
56+
| | | ## | ## |#####|# #| ## | | | | | # | | | |#####|
57+
| | |# # | # |# |# #| # #| | | |#####|#####| ### |#####| ## | # |
58+
| | |# # |# |# |# #| # |# #| | | #| # #| | #| # #| # |
59+
| | | # |#### |#### |# #|### |# #| | |#####| # #| |#####|# #| # |
60+
| | |# # |# #|# |# #| # |# #| | | #| # #| | #|#### |#####|
61+
| | |# # |# #|# | # # | # | # # | | | # | # #| | #|# | |
62+
| | | ## #| ### |# | # | # | # | | | # |# # |#####|#####|# | |
63+
| | | | | | | | | | | | | | | | |
64+
-------------------------------------------------------------------------------------------------
65+
| | | ## |#####| ### |# #| | | | | | # | | ### | | |
66+
| | | # | #|# #|# #| ####| | | | |#####|#####| | ### |#####|
67+
| | | # | # |# |# #|# #|# #| | |#####| # | #|#####|# #| # # |
68+
| | | | # |# ###|# #|# #|# #| | | #|#####| # # | #|# #| # # |
69+
| | | | # |# #|# # #| ####|# #| | | # | # | # | #| ####|# ##|
70+
| | | | # |# #|# # #| #|# # #| | | # | # | # # | # | #| |
71+
| | | | # | ### | ### | ### | # # | | | # | # |# | # | #| |
72+
| | | | | | | | | | | | | | | ### | |
73+
-------------------------------------------------------------------------------------------------
74+
| | | # | ### |# #|# #|# | | | | | | # |# # | |#####|
75+
| | | # |# #|# #|# #|# | | | | | ####|#####|# # | ###|# #|
76+
| | | # |# #|# #| # # |# ## |# #| | | # | # #| # |# # | # | # # |
77+
| | | # | ### |#####| # |## #| # # | | | # |# #| # |# # | # | # |
78+
| | | # |# #|# #| # # |# #| # | | | ## | #| ### | # | # |# #|
79+
| | | # |# #|# #|# #|# #| # # | | |# # | # |# # #| # | | |
80+
| | | # | ### |# #|# #|# #|# #| | | # | ## | # | # | | |
81+
| | | | | | | | | | | | | | | | |
82+
-------------------------------------------------------------------------------------------------
83+
| | | # | ### | ### |# #| # | | | | | # | # | | | |
84+
| | | # |# #| # |# #| | | | | | ####| # | # |## # |# #|
85+
| | | # |# #| # |# #| ## |# #| | | # |# # | # |# # | # |# #|
86+
| | | # | ####| # | # # | # |# #| | |#####| # | # |# # | |# #|
87+
| | | # | #| # | # | # | ####| | |# #| # | # |# # #| | ####|
88+
| | | # | # | # | # | # | #| | | #| # | # |# # #| | #|
89+
| | | # | ## | ### | # | ### | ### | | | ## | # | # |# ## | | ### |
90+
| | | | | | | | | | | | | | | | |
91+
-------------------------------------------------------------------------------------------------
92+
| | | | | ###|#####| # | | | | | | | | # | #|
93+
| | | # | ## | # | #| | | | | |#####| # |# | |#### |
94+
| | |# # #| ## | # | # | ## |#####| | | | #| # |# | ## | # |
95+
| | | ### | | # | # | # | # | | |#####| #|# #|# #| # |#####|
96+
| | |# # #| ## | # | # | # | # | | | # | #|# #|# # | # | # |
97+
| | | # | ## |# # |# |# # | # | | | # | #|# #|# # | # | |
98+
| | | | | ## |#####| ## |#####| | |#####|#####|# #|## |# # | |
99+
| | | | | | | | | | | | | | | ## | |
100+
-------------------------------------------------------------------------------------------------
101+
| | | | |# #| ### |# | # | | | | # # |# | |# # | |
102+
| | | # | ## |# # | # |# | # | | | |#####|# |#####| # |#####|
103+
| | | # | ## |# # | # |# # | # | | | # | # # |#####|# #|# # | # |
104+
| | |#####| |## | # |# # | # | | |#####| # # |# |# #| | ####|
105+
| | | # | ## |# # | # |## | # | | | ## | # |# |# #| | # #|
106+
| | | # | # |# # | # |# # | # | | | # # | # |# |# #| |# #|
107+
| | | | # |# #| ### |# # | # | | |# # | # | ####|#####| | |
108+
| | | | | | | | | | | | | | | | |
109+
-------------------------------------------------------------------------------------------------
110+
| | | | # |# |# #| ## | # | | | | | | | # | |
111+
| | | | # |# | # # | # | # | | | |## |#####|#####| ### |#####|
112+
| | | | # |# |#####| # | # | | | # | #| #|# #|# # |# # #|
113+
| | | |# |# | # | # | # | | |#####|## #| #|# #|# # #|#####|
114+
| | | ## | # |# |#####| # | # | | | # #| #| #| #| ### |# #|
115+
| | | # | # |# | # | # | # | | | # # | # | # | # | # |# #|
116+
| | | # | # |#####| # | ### | # | | | # |### | ## | # | | |
117+
| | | | | | | | | | | | | | | | |
118+
-------------------------------------------------------------------------------------------------
119+
| | | | |# #| ### | | # | | | | | | | # | |
120+
| | | | |## ##| # | | # | | | |#####| # |## |### | # |
121+
| | | |#####|# # #| # |## # | # | | | | #|# # | | # |#####|
122+
| | |#####| |# # #| # |# # #| # | | | ### | # | # | #|### | # |
123+
| | | |#####|# #| # |# # #| # | | | # | # | #| #| # | |
124+
| | | | |# #| # |# #| # | | | # | # # | #| # | ####| |
125+
| | | | |# #| ### |# #| # | | |#####|# #| |### | | |
126+
| | | | | | | | | | | | | | | | |
127+
-------------------------------------------------------------------------------------------------
128+
| | | | # |# #| # | | | | | | # | # | # | ### | |
129+
| | | | # |# #| # # | | # | | | |#####|#####|# # |# ## | |
130+
| | | | # |## #|# #|# ## | # | | |#### | # #| # | # |## #| |
131+
| | | | #|# # #| |## #|#####| | | # | # # | # | |# #| |
132+
| | | | # |# ##| |# #| # | | |#### | # |# # #| |# #| |
133+
| | | ## | # |# #| |# #| # | | | # | # |# # #| | | |
134+
| | | ## | # |# #| |# #| | | |#### | ###| # | | | |
135+
| | | | | | | | | | | | | | | | |
136+
-------------------------------------------------------------------------------------------------
137+
| | | | ### | ### | | | | | | | | |### | # # |#####|
138+
| | | #|# #|# #| | | # | | | |# #|#####|# # | ### |#####|
139+
| | | # | #|# #| | ### | # | | | |# #| #|### |# #|#####|
140+
| | | # | # |# #| |# #|#####| | |# # #| # #| #| |# #|#####|
141+
| | | # | # |# #| |# #| # | | |# # #| #| # # | | ### |#####|
142+
| | |# | |# #| |# #| # | | | #| # | # | | |#####|
143+
| | | | # | ### |#####| ### | | | | ## | ## | # | | |#####|
144+
| | | | | | | | | | | | | | | |#####|
145+
-------------------------------------------------------------------------------------------------

‎examples/mcu/stm32f4_dma.py‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import sys
2+
sys.path.append("../..")
3+
4+
from qiling.core import Qiling
5+
from qiling.const import QL_VERBOSE
6+
7+
8+
def stm32f411_dma():
9+
ql = Qiling(["../rootfs/mcu/stm32f411/dma-clock.hex"],
10+
archtype="cortex_m", profile="stm32f411", verbose=QL_VERBOSE.DEBUG)
11+
12+
ql.hw.create('usart2')
13+
ql.hw.create('dma1')
14+
ql.hw.create('rcc')
15+
16+
ql.run(count=200000)
17+
buf = ql.hw.usart2.recv()
18+
19+
## check timestamp
20+
tick = [int(x) for x in buf.split()]
21+
for i in range(1, len(tick)):
22+
assert(4 <= tick[i] - tick[i - 1] <= 6)
23+
24+
if __name__ == "__main__":
25+
stm32f411_dma()

‎examples/mcu/stm32f4_freertos.py‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
import sys
2+
sys.path.append("../..")
3+
4+
from qiling.core import Qiling
5+
from qiling.const import QL_VERBOSE
6+
7+
8+
def stm32f411_freertos():
9+
ql = Qiling(["../rootfs/mcu/stm32f411/os-demo.hex"],
10+
archtype="cortex_m", profile="stm32f411", verbose=QL_VERBOSE.DEBUG)
11+
12+
ql.hw.create('usart2')
13+
ql.hw.create('rcc')
14+
ql.hw.create('gpioa')
15+
16+
count = 0
17+
def counter():
18+
nonlocal count
19+
count += 1
20+
21+
ql.hw.gpioa.hook_set(5, counter)
22+
23+
ql.run(count=200000)
24+
25+
print(count >= 5)
26+
print(ql.hw.usart2.recv())
27+
28+
if __name__ == "__main__":
29+
stm32f411_freertos()

0 commit comments

Comments
 (0)