Merge pull request #1 from qilingframework/dev

Dev fix evm

Author: kabeor

.gitignore

@@ -36,4 +36,5 @@ test.file
 core
 *.perf
 tests/output.txt
+tests/testtest_*
 

AUTHORS.TXT

@@ -14,16 +14,20 @@ NGUYEN Anh Quynh <[email protected]>
 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]>
 WU chenxu (kabeor) <[email protected]>
 KONG ziqiao (lazymio) <[email protected]>
 YU zheng (dataisland) <[email protected]>
 Eli Cohen Nehemia (elicn) <[email protected]>
 
 
+Legacy Core Developers
+======================
+DING tianze (D1iv3) <[email protected]>
+SUN bowen (w1tcher) <[email protected]>
+CHEN huitao (null) <[email protected]>
+YU tong (sp1ke) <[email protected]>
+
+
 Travis, Website and Documentations
 ==================================
 FOO Kevin (chfl4gs) <[email protected]>

CREDITS.TXT

@@ -1,7 +1,22 @@
 This file details the changelog of Qiling Framework.
 
+------------------------------------
+[Version 1.4.1]: Nov Xth, 2021
+
+New features:
+- Introduced riscv, both 32 and 64 (#980)
+
+Improvements:
+- Refactored core hooks (#966)
+- update ql.os.posix.const_mapping with more os/arch match (#973)
+- Minor refactor on ql.interpreter and ql.baremetal (#975)
+- More update in MCU modules (#971)
+- Fix getpeername and getsockname syscalls (#986)
+
+
 ------------------------------------
 [Version 1.4.0]: Oct 20th, 2021
+
 - Added MCU Engine
 - Bug fix for qdb
 - Bug fix for debugger

ChangeLog

@@ -3,6 +3,7 @@ FROM python:3.8-slim AS builder
 LABEL maintainer="Kevin Foo <[email protected]>"
 
 ENV DEBIAN_FRONTEND=noninteractive
+ENV AM_I_IN_A_DOCKER_CONTAINER Yes
 
 RUN apt-get update \
   && apt-get -y upgrade \

Dockerfile

@@ -9,8 +9,8 @@ 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('usart2').watch()
+    ql.hw.create('dma1').watch()
     ql.hw.create('rcc')
 
     ql.run(count=200000)

examples/mcu/stm32f4_hack_lock.py examples/mcu/stm32f407_hack_lock.pyexamples/mcu/stm32f4_hack_lock.py renamed to examples/mcu/stm32f407_hack_lock.py

@@ -9,21 +9,12 @@ 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.hw.create('usart2').watch()
+    ql.hw.create('gpioa').watch()
+    ql.hw.create('rcc')    
 
+    ql.hw.systick.set_ratio(100)
     ql.run(count=200000)
 
-    print(count >= 5)
-    print(ql.hw.usart2.recv())
-
 if __name__ == "__main__":
     stm32f411_freertos()

examples/mcu/stm32f4_dma.py examples/mcu/stm32f411_dma_logger.pyexamples/mcu/stm32f4_dma.py renamed to examples/mcu/stm32f411_dma_logger.py

@@ -9,9 +9,9 @@ def test_mcu_gpio_stm32f411():
     ql = Qiling(["../../examples/rootfs/mcu/stm32f411/hello_gpioA.hex"],                    
                 archtype="cortex_m", profile="stm32f411", verbose=QL_VERBOSE.DEBUG)
 
-    ql.hw.create('usart2')
-    ql.hw.create('rcc')
-    ql.hw.create('gpioa')
+    ql.hw.create('usart2').watch()
+    ql.hw.create('rcc').watch()
+    ql.hw.create('gpioa').watch()
 
 
     ql.hw.gpioa.hook_set(5, lambda: print('LED light up'))

examples/mcu/stm32f4_freertos.py examples/mcu/stm32f411_freertos.pyexamples/mcu/stm32f4_freertos.py renamed to examples/mcu/stm32f411_freertos.py

@@ -0,0 +1,31 @@
+import sys
+
+sys.path.append("../..")
+
+from qiling.core import Qiling
+from qiling.const import QL_VERBOSE
+from qiling.hw.external_device.lcd.lcd1602 import PyGameLCD1602
+
+
+def create(path, lcd):
+    ql = Qiling([path], archtype="cortex_m", profile="stm32f411", verbose=QL_VERBOSE.DEBUG)
+
+    ql.hw.create('i2c1')
+    ql.hw.create('rcc')
+    ql.hw.create('gpioa')
+    ql.hw.create('gpiob')   
+
+    ql.hw.i2c1.watch()
+    ql.hw.i2c1.connect(lcd)    
+    
+    ql.hw.systick.set_ratio(100)
+
+    return ql
+
+if __name__ == "__main__":
+    lcd = PyGameLCD1602()    
+    
+    create("../rootfs/mcu/stm32f411/i2c-lcd.hex", lcd).run(count=50000)
+    create("../rootfs/mcu/stm32f411/lcd-plus.hex", lcd).run(count=100000)
+
+    lcd.quit()