From 9c6a39fa7f85c4c77e519b95d562521e6eb6cae9 Mon Sep 17 00:00:00 2001 From: lyon Date: Sun, 20 Feb 2022 12:57:45 +0800 Subject: [PATCH] fix project --- bsp/pico/MDK/mdk/AC6-flash.BAT | 75 ++++++- bsp/pico/MDK/mdk/template.uvprojx | 312 +++++++++++++++++----------- bsp/pico/main.c | 48 ----- bsp/pico/pikascript/requestment.txt | 2 +- 4 files changed, 261 insertions(+), 176 deletions(-) diff --git a/bsp/pico/MDK/mdk/AC6-flash.BAT b/bsp/pico/MDK/mdk/AC6-flash.BAT index a969b2705..25b1ef11f 100644 --- a/bsp/pico/MDK/mdk/AC6-flash.BAT +++ b/bsp/pico/MDK/mdk/AC6-flash.BAT @@ -1,5 +1,78 @@ -SET PATH=C:\Keil_v5\ARM\ARMCLANG\Bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files\Git\cmd;C:\Program Files\dotnet\;C:\Program Files\PuTTY\;C:\Program Files (x86)\GNU Arm Embedded Toolchain\10 2021.10\bin;C:\Users\liang\AppData\Local\Programs\Python\Python310\Scripts\;C:\Users\liang\AppData\Local\Programs\Python\Python310\;C:\Users\liang\AppData\Local\Microsoft\WindowsApps;C:\Users\liang\AppData\Local\Programs\Microsoft VS Code\bin;C:\texlive\2021\bin\win32;C:\Users\liang\.dotnet\tools +SET PATH=C:\Keil_v5\ARM\ARMCLANG\Bin;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files\Git\cmd;C:\Program Files\CMake\bin;C:\MinGW\bin;C:\Users\lyon\AppData\Local\Packages\PythonSoftwareFoundation.Python.3.9_qbz5n2kfra8p0\LocalCache\local-packages\Python39\Scripts;C:\Program Files\PuTTY\;C:\mipsel-none-elf-win\bin;C:\Program Files\dotnet\;C:\Program Files\MATLAB\R2021b\runtime\win64;C:\Program Files\MATLAB\R2021b\bin;C:\Program Files\nodejs\;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\OpenSSH\;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Program Files\NVIDIA Corporation\NVIDIA NvDLISR;C:\Program Files\Docker\Docker\resources\bin;C:\ProgramData\DockerDesktop\version-bin;C:\Program Files\Go\bin;C:\Users\lyon\.cargo\bin;C:\Program Files (x86)\GNU Arm Embedded Toolchain\10 2021.10\bin;C:\Users\lyon\AppData\Local\Microsoft\WindowsApps;C:\texlive\2021\bin\win32;C:\Loongson_IDE32\msys\bin;C:\Loongson_IDE32\Toolchains\mips-mti-elf\2018.11-01\bin;C:\Users\lyon\.dotnet\tools;C:\Users\lyon\AppData\Roaming\npm;C:\Users\lyon\AppData\Local\Programs\Microsoft VS Code\bin;C:\Users\lyon\go\bin SET CPU_TYPE=ARMCM0P_MPU SET CPU_VENDOR=ARM SET UV2_TARGET=AC6-flash SET CPU_CLOCK=0x00B71B00 +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\startup_rp2040.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\system_rp2040.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\clocks.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\watchdog.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\pll.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\platform.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\xosc.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\irq.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\irq_handler_chain._ac" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\gpio.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\multicore.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\sync.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\critical_section.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\lock_core.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\mutex.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\sem.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\time.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\timeout_helper.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\timer.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\claim.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\queue.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\pheap.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\datetime.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\stdlib.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\uart.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\compile_time_choice._ac" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\runtime.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\i2c.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\spi.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\adc.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\bootrom.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\stdio_uart.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\env_wrapper.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\stdio.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\main.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\baseobj.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\dataarg.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\dataargs.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\datalink.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\datalinknode.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\datamemory.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\dataqueue.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\dataqueueobj.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\datastack.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\datastring.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\datastrs.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\pikaobj.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\pikaparser.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\pikaplatform.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\pikavm.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\tinyobj.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\pikadebuger_debuger.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\pikastddata_dict.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\pikastddata_list.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\pikastddata_string.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\pikastdlib_memchecker.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\pikastdlib_rangeobj.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\pikastdlib_stringobj.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\pikastdlib_sysobj.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\pikastdtask_task.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\pikamain-api.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\pikascript.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\pikastdlib_memchecker-api.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\pikastdlib_rangeobj-api.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\pikastdlib_sysobj-api.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\pikastdlib-api.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\pikastddata_dict-api.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\pikastddata_list-api.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\pikastddata-api.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\pikastdlib_stringobj-api.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\eventrecorder.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmClang.exe" @".\objects\retarget_io.__i" +"C:\Keil_v5\ARM\ARMCLANG\Bin\ArmLink" --Via ".\Objects\template.lnp" diff --git a/bsp/pico/MDK/mdk/template.uvprojx b/bsp/pico/MDK/mdk/template.uvprojx index 3557836c7..1ef520c7e 100644 --- a/bsp/pico/MDK/mdk/template.uvprojx +++ b/bsp/pico/MDK/mdk/template.uvprojx @@ -129,7 +129,7 @@ - 0 + 1 1 0 1 @@ -339,7 +339,7 @@ -include env_wrapper.h PICO - ..\..\pico-sdk\src\rp2040\hardware_structs\include;..\..\pico-sdk\src\rp2_common\cmsis\include\cmsis;..\..\pico-sdk\src\rp2_common\cmsis\stub\CMSIS\Device\RaspberryPi\RP2040\Include;..\..\pico-sdk\src\boards\include\boards;..\..\pico-sdk\src\rp2040\hardware_regs\include;.\wrapper;..\..\pico-sdk\src\rp2_common\hardware_base\include;..\..\pico-sdk\src\rp2_common\hardware_watchdog\include;..\..\pico-sdk\src\rp2_common\hardware_pll\include;..\..\pico-sdk\src\rp2_common\hardware_xosc\include;..\..\pico-sdk\src\rp2_common\hardware_irq\include;..\..\pico-sdk\src\rp2_common\hardware_gpio\include;..\..\pico-sdk\src\rp2_common\hardware_resets\include;..\..\pico-sdk\src\rp2_common\hardware_clocks\include;..\..\pico-sdk\src\rp2_common\hardware_timer\include;..\..\pico-sdk\src\rp2_common\hardware_sync\include;..\..\pico-sdk\src\rp2_common\hardware_claim\include;..\..\pico-sdk\src\rp2_common\hardware_spi\include;..\..\pico-sdk\src\rp2_common\hardware_pwm\include;..\..\pico-sdk\src\rp2_common\hardware_i2c\include;..\..\pico-sdk\src\rp2_common\hardware_uart\include;..\..\pico-sdk\src\rp2_common\hardware_adc\include;..\..\pico-sdk\src\common\pico_base\include;..\..\pico-sdk\src\rp2_common\pico_multicore\include;..\..\pico-sdk\src\common\pico_sync\include;..\..\pico-sdk\src\common\pico_time\include;..\..\pico-sdk\src\common\pico_util\include;..\..\pico-sdk\src\common\pico_stdlib\include;..\..\pico-sdk\src\rp2_common\pico_stdio\include;..\..\pico-sdk\src;..\..\pico-sdk\src\rp2_common\pico_runtime\include;..\..\pico-sdk\src\rp2_common\pico_printf\include;..\..\pico-sdk\src\rp2_common\pico_bootrom\include;..\..\pico-sdk\src\rp2_common\pico_stdio\include;..\..\pico-sdk\src\rp2_common\pico_stdio_uart\include;..\..\pico-sdk\src\rp2_common\pico_stdio_usb\include;..\..\pico-sdk\src\common\pico_binary_info\include;..\..\pico-sdk\src\rp2_common\pico_stdio_semihosting\include + ..\..\pico-sdk\src\rp2040\hardware_structs\include;..\..\pico-sdk\src\rp2_common\cmsis\include\cmsis;..\..\pico-sdk\src\rp2_common\cmsis\stub\CMSIS\Device\RaspberryPi\RP2040\Include;..\..\pico-sdk\src\boards\include\boards;..\..\pico-sdk\src\rp2040\hardware_regs\include;.\wrapper;..\..\pico-sdk\src\rp2_common\hardware_base\include;..\..\pico-sdk\src\rp2_common\hardware_watchdog\include;..\..\pico-sdk\src\rp2_common\hardware_pll\include;..\..\pico-sdk\src\rp2_common\hardware_xosc\include;..\..\pico-sdk\src\rp2_common\hardware_irq\include;..\..\pico-sdk\src\rp2_common\hardware_gpio\include;..\..\pico-sdk\src\rp2_common\hardware_resets\include;..\..\pico-sdk\src\rp2_common\hardware_clocks\include;..\..\pico-sdk\src\rp2_common\hardware_timer\include;..\..\pico-sdk\src\rp2_common\hardware_sync\include;..\..\pico-sdk\src\rp2_common\hardware_claim\include;..\..\pico-sdk\src\rp2_common\hardware_spi\include;..\..\pico-sdk\src\rp2_common\hardware_pwm\include;..\..\pico-sdk\src\rp2_common\hardware_i2c\include;..\..\pico-sdk\src\rp2_common\hardware_uart\include;..\..\pico-sdk\src\rp2_common\hardware_adc\include;..\..\pico-sdk\src\common\pico_base\include;..\..\pico-sdk\src\rp2_common\pico_multicore\include;..\..\pico-sdk\src\common\pico_sync\include;..\..\pico-sdk\src\common\pico_time\include;..\..\pico-sdk\src\common\pico_util\include;..\..\pico-sdk\src\common\pico_stdlib\include;..\..\pico-sdk\src\rp2_common\pico_stdio\include;..\..\pico-sdk\src;..\..\pico-sdk\src\rp2_common\pico_runtime\include;..\..\pico-sdk\src\rp2_common\pico_printf\include;..\..\pico-sdk\src\rp2_common\pico_bootrom\include;..\..\pico-sdk\src\rp2_common\pico_stdio\include;..\..\pico-sdk\src\rp2_common\pico_stdio_uart\include;..\..\pico-sdk\src\rp2_common\pico_stdio_usb\include;..\..\pico-sdk\src\common\pico_binary_info\include;..\..\pico-sdk\src\rp2_common\pico_stdio_semihosting\include;..\..\pikascript\pikascript-core;..\..\pikascript\pikascript-api @@ -823,82 +823,82 @@ BaseObj.c 1 - ..\..\..\..\src\BaseObj.c + ..\..\pikascript\pikascript-core\BaseObj.c dataArg.c 1 - ..\..\..\..\src\dataArg.c + ..\..\pikascript\pikascript-core\dataArg.c dataArgs.c 1 - ..\..\..\..\src\dataArgs.c + ..\..\pikascript\pikascript-core\dataArgs.c dataLink.c 1 - ..\..\..\..\src\dataLink.c + ..\..\pikascript\pikascript-core\dataLink.c dataLinkNode.c 1 - ..\..\..\..\src\dataLinkNode.c + ..\..\pikascript\pikascript-core\dataLinkNode.c dataMemory.c 1 - ..\..\..\..\src\dataMemory.c + ..\..\pikascript\pikascript-core\dataMemory.c dataQueue.c 1 - ..\..\..\..\src\dataQueue.c + ..\..\pikascript\pikascript-core\dataQueue.c dataQueueObj.c 1 - ..\..\..\..\src\dataQueueObj.c + ..\..\pikascript\pikascript-core\dataQueueObj.c dataStack.c 1 - ..\..\..\..\src\dataStack.c + ..\..\pikascript\pikascript-core\dataStack.c dataString.c 1 - ..\..\..\..\src\dataString.c + ..\..\pikascript\pikascript-core\dataString.c dataStrs.c 1 - ..\..\..\..\src\dataStrs.c + ..\..\pikascript\pikascript-core\dataStrs.c PikaObj.c 1 - ..\..\..\..\src\PikaObj.c + ..\..\pikascript\pikascript-core\PikaObj.c PikaParser.c 1 - ..\..\..\..\src\PikaParser.c + ..\..\pikascript\pikascript-core\PikaParser.c PikaPlatform.c 1 - ..\..\..\..\src\PikaPlatform.c + ..\..\pikascript\pikascript-core\PikaPlatform.c PikaVM.c 1 - ..\..\..\..\src\PikaVM.c + ..\..\pikascript\pikascript-core\PikaVM.c TinyObj.c 1 - ..\..\..\..\src\TinyObj.c + ..\..\pikascript\pikascript-core\TinyObj.c @@ -906,34 +906,49 @@ pikascript-lib - PikaStdLib_MemChecker.c + PikaDebuger_Debuger.c 1 - ..\..\..\..\package\PikaStdLib\PikaStdLib_MemChecker.c - - - PikaStdLib_RangeObj.c - 1 - ..\..\..\..\package\PikaStdLib\PikaStdLib_RangeObj.c - - - PikaStdLib_SysObj.c - 1 - ..\..\..\..\package\PikaStdLib\PikaStdLib_SysObj.c + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaDebuger_Debuger.c PikaStdData_Dict.c 1 - ..\..\..\..\package\PikaStdData\PikaStdData_Dict.c + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaStdData_Dict.c PikaStdData_List.c 1 - ..\..\..\..\package\PikaStdData\PikaStdData_List.c + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaStdData_List.c + + + PikaStdData_String.c + 1 + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaStdData_String.c + + + PikaStdLib_MemChecker.c + 1 + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaStdLib_MemChecker.c + + + PikaStdLib_RangeObj.c + 1 + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaStdLib_RangeObj.c PikaStdLib_StringObj.c 1 - ..\..\..\..\package\PikaStdLib\PikaStdLib_StringObj.c + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaStdLib_StringObj.c + + + PikaStdLib_SysObj.c + 1 + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaStdLib_SysObj.c + + + PikaStdTask_Task.c + 1 + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaStdTask_Task.c @@ -1830,82 +1845,82 @@ BaseObj.c 1 - ..\..\..\..\src\BaseObj.c + ..\..\pikascript\pikascript-core\BaseObj.c dataArg.c 1 - ..\..\..\..\src\dataArg.c + ..\..\pikascript\pikascript-core\dataArg.c dataArgs.c 1 - ..\..\..\..\src\dataArgs.c + ..\..\pikascript\pikascript-core\dataArgs.c dataLink.c 1 - ..\..\..\..\src\dataLink.c + ..\..\pikascript\pikascript-core\dataLink.c dataLinkNode.c 1 - ..\..\..\..\src\dataLinkNode.c + ..\..\pikascript\pikascript-core\dataLinkNode.c dataMemory.c 1 - ..\..\..\..\src\dataMemory.c + ..\..\pikascript\pikascript-core\dataMemory.c dataQueue.c 1 - ..\..\..\..\src\dataQueue.c + ..\..\pikascript\pikascript-core\dataQueue.c dataQueueObj.c 1 - ..\..\..\..\src\dataQueueObj.c + ..\..\pikascript\pikascript-core\dataQueueObj.c dataStack.c 1 - ..\..\..\..\src\dataStack.c + ..\..\pikascript\pikascript-core\dataStack.c dataString.c 1 - ..\..\..\..\src\dataString.c + ..\..\pikascript\pikascript-core\dataString.c dataStrs.c 1 - ..\..\..\..\src\dataStrs.c + ..\..\pikascript\pikascript-core\dataStrs.c PikaObj.c 1 - ..\..\..\..\src\PikaObj.c + ..\..\pikascript\pikascript-core\PikaObj.c PikaParser.c 1 - ..\..\..\..\src\PikaParser.c + ..\..\pikascript\pikascript-core\PikaParser.c PikaPlatform.c 1 - ..\..\..\..\src\PikaPlatform.c + ..\..\pikascript\pikascript-core\PikaPlatform.c PikaVM.c 1 - ..\..\..\..\src\PikaVM.c + ..\..\pikascript\pikascript-core\PikaVM.c TinyObj.c 1 - ..\..\..\..\src\TinyObj.c + ..\..\pikascript\pikascript-core\TinyObj.c @@ -1913,34 +1928,49 @@ pikascript-lib - PikaStdLib_MemChecker.c + PikaDebuger_Debuger.c 1 - ..\..\..\..\package\PikaStdLib\PikaStdLib_MemChecker.c - - - PikaStdLib_RangeObj.c - 1 - ..\..\..\..\package\PikaStdLib\PikaStdLib_RangeObj.c - - - PikaStdLib_SysObj.c - 1 - ..\..\..\..\package\PikaStdLib\PikaStdLib_SysObj.c + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaDebuger_Debuger.c PikaStdData_Dict.c 1 - ..\..\..\..\package\PikaStdData\PikaStdData_Dict.c + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaStdData_Dict.c PikaStdData_List.c 1 - ..\..\..\..\package\PikaStdData\PikaStdData_List.c + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaStdData_List.c + + + PikaStdData_String.c + 1 + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaStdData_String.c + + + PikaStdLib_MemChecker.c + 1 + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaStdLib_MemChecker.c + + + PikaStdLib_RangeObj.c + 1 + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaStdLib_RangeObj.c PikaStdLib_StringObj.c 1 - ..\..\..\..\package\PikaStdLib\PikaStdLib_StringObj.c + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaStdLib_StringObj.c + + + PikaStdLib_SysObj.c + 1 + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaStdLib_SysObj.c + + + PikaStdTask_Task.c + 1 + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaStdTask_Task.c @@ -2836,82 +2866,82 @@ BaseObj.c 1 - ..\..\..\..\src\BaseObj.c + ..\..\pikascript\pikascript-core\BaseObj.c dataArg.c 1 - ..\..\..\..\src\dataArg.c + ..\..\pikascript\pikascript-core\dataArg.c dataArgs.c 1 - ..\..\..\..\src\dataArgs.c + ..\..\pikascript\pikascript-core\dataArgs.c dataLink.c 1 - ..\..\..\..\src\dataLink.c + ..\..\pikascript\pikascript-core\dataLink.c dataLinkNode.c 1 - ..\..\..\..\src\dataLinkNode.c + ..\..\pikascript\pikascript-core\dataLinkNode.c dataMemory.c 1 - ..\..\..\..\src\dataMemory.c + ..\..\pikascript\pikascript-core\dataMemory.c dataQueue.c 1 - ..\..\..\..\src\dataQueue.c + ..\..\pikascript\pikascript-core\dataQueue.c dataQueueObj.c 1 - ..\..\..\..\src\dataQueueObj.c + ..\..\pikascript\pikascript-core\dataQueueObj.c dataStack.c 1 - ..\..\..\..\src\dataStack.c + ..\..\pikascript\pikascript-core\dataStack.c dataString.c 1 - ..\..\..\..\src\dataString.c + ..\..\pikascript\pikascript-core\dataString.c dataStrs.c 1 - ..\..\..\..\src\dataStrs.c + ..\..\pikascript\pikascript-core\dataStrs.c PikaObj.c 1 - ..\..\..\..\src\PikaObj.c + ..\..\pikascript\pikascript-core\PikaObj.c PikaParser.c 1 - ..\..\..\..\src\PikaParser.c + ..\..\pikascript\pikascript-core\PikaParser.c PikaPlatform.c 1 - ..\..\..\..\src\PikaPlatform.c + ..\..\pikascript\pikascript-core\PikaPlatform.c PikaVM.c 1 - ..\..\..\..\src\PikaVM.c + ..\..\pikascript\pikascript-core\PikaVM.c TinyObj.c 1 - ..\..\..\..\src\TinyObj.c + ..\..\pikascript\pikascript-core\TinyObj.c @@ -2919,34 +2949,49 @@ pikascript-lib - PikaStdLib_MemChecker.c + PikaDebuger_Debuger.c 1 - ..\..\..\..\package\PikaStdLib\PikaStdLib_MemChecker.c - - - PikaStdLib_RangeObj.c - 1 - ..\..\..\..\package\PikaStdLib\PikaStdLib_RangeObj.c - - - PikaStdLib_SysObj.c - 1 - ..\..\..\..\package\PikaStdLib\PikaStdLib_SysObj.c + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaDebuger_Debuger.c PikaStdData_Dict.c 1 - ..\..\..\..\package\PikaStdData\PikaStdData_Dict.c + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaStdData_Dict.c PikaStdData_List.c 1 - ..\..\..\..\package\PikaStdData\PikaStdData_List.c + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaStdData_List.c + + + PikaStdData_String.c + 1 + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaStdData_String.c + + + PikaStdLib_MemChecker.c + 1 + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaStdLib_MemChecker.c + + + PikaStdLib_RangeObj.c + 1 + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaStdLib_RangeObj.c PikaStdLib_StringObj.c 1 - ..\..\..\..\package\PikaStdLib\PikaStdLib_StringObj.c + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaStdLib_StringObj.c + + + PikaStdLib_SysObj.c + 1 + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaStdLib_SysObj.c + + + PikaStdTask_Task.c + 1 + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaStdTask_Task.c @@ -3842,82 +3887,82 @@ BaseObj.c 1 - ..\..\..\..\src\BaseObj.c + ..\..\pikascript\pikascript-core\BaseObj.c dataArg.c 1 - ..\..\..\..\src\dataArg.c + ..\..\pikascript\pikascript-core\dataArg.c dataArgs.c 1 - ..\..\..\..\src\dataArgs.c + ..\..\pikascript\pikascript-core\dataArgs.c dataLink.c 1 - ..\..\..\..\src\dataLink.c + ..\..\pikascript\pikascript-core\dataLink.c dataLinkNode.c 1 - ..\..\..\..\src\dataLinkNode.c + ..\..\pikascript\pikascript-core\dataLinkNode.c dataMemory.c 1 - ..\..\..\..\src\dataMemory.c + ..\..\pikascript\pikascript-core\dataMemory.c dataQueue.c 1 - ..\..\..\..\src\dataQueue.c + ..\..\pikascript\pikascript-core\dataQueue.c dataQueueObj.c 1 - ..\..\..\..\src\dataQueueObj.c + ..\..\pikascript\pikascript-core\dataQueueObj.c dataStack.c 1 - ..\..\..\..\src\dataStack.c + ..\..\pikascript\pikascript-core\dataStack.c dataString.c 1 - ..\..\..\..\src\dataString.c + ..\..\pikascript\pikascript-core\dataString.c dataStrs.c 1 - ..\..\..\..\src\dataStrs.c + ..\..\pikascript\pikascript-core\dataStrs.c PikaObj.c 1 - ..\..\..\..\src\PikaObj.c + ..\..\pikascript\pikascript-core\PikaObj.c PikaParser.c 1 - ..\..\..\..\src\PikaParser.c + ..\..\pikascript\pikascript-core\PikaParser.c PikaPlatform.c 1 - ..\..\..\..\src\PikaPlatform.c + ..\..\pikascript\pikascript-core\PikaPlatform.c PikaVM.c 1 - ..\..\..\..\src\PikaVM.c + ..\..\pikascript\pikascript-core\PikaVM.c TinyObj.c 1 - ..\..\..\..\src\TinyObj.c + ..\..\pikascript\pikascript-core\TinyObj.c @@ -3925,34 +3970,49 @@ pikascript-lib - PikaStdLib_MemChecker.c + PikaDebuger_Debuger.c 1 - ..\..\..\..\package\PikaStdLib\PikaStdLib_MemChecker.c - - - PikaStdLib_RangeObj.c - 1 - ..\..\..\..\package\PikaStdLib\PikaStdLib_RangeObj.c - - - PikaStdLib_SysObj.c - 1 - ..\..\..\..\package\PikaStdLib\PikaStdLib_SysObj.c + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaDebuger_Debuger.c PikaStdData_Dict.c 1 - ..\..\..\..\package\PikaStdData\PikaStdData_Dict.c + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaStdData_Dict.c PikaStdData_List.c 1 - ..\..\..\..\package\PikaStdData\PikaStdData_List.c + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaStdData_List.c + + + PikaStdData_String.c + 1 + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaStdData_String.c + + + PikaStdLib_MemChecker.c + 1 + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaStdLib_MemChecker.c + + + PikaStdLib_RangeObj.c + 1 + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaStdLib_RangeObj.c PikaStdLib_StringObj.c 1 - ..\..\..\..\package\PikaStdLib\PikaStdLib_StringObj.c + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaStdLib_StringObj.c + + + PikaStdLib_SysObj.c + 1 + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaStdLib_SysObj.c + + + PikaStdTask_Task.c + 1 + ..\..\pikascript\pikascript-lib\PikaStdLib\PikaStdTask_Task.c diff --git a/bsp/pico/main.c b/bsp/pico/main.c index ac3819b10..dd76da54e 100644 --- a/bsp/pico/main.c +++ b/bsp/pico/main.c @@ -132,54 +132,6 @@ int main(void) /* run unit test */ obj_deinit(pikaScriptInit()); - /* benchmark */ - uint64_t nCycleUsed_c,nCycleUsed_pika = 0; - printf("[----------benchmark----------]\r\n"); - __cycleof__("", { - nCycleUsed_c = _; - printf("[prime_number_100_c] Cycle Used %lld\r\n", _); - - }) { - prime_number_100_c(); - } - - /* create pikaMain root obj */ - PikaObj* pikaMain = newRootObj((char*)"pikaMain", New_PikaMain); - /* parse python to pikaAsm */ - Args* buffs = New_strBuff(); - - char *pikaAsm = Parser_multiLineToAsm(buffs, (char *) - "num = 0\n" - "i = 2\n" - "for i in range(2,100):\n" - " j=2\n" - " is_prime = 1\n" - " for j in range(2,i):\n" - " if i%j==0 :\n" - " is_prime = 0\n" - " break\n" - " if is_prime:\n" - " num = num + i\n" - "\n"); - __cycleof__("", { - nCycleUsed_pika = _; - printf("[prime_number_100_pika] Cycle Used %lld\r\n", _); - }) { - /* run pika Asm */ - pikaVM_runAsm(pikaMain, pikaAsm); - } - int num = obj_getInt(pikaMain, "num"); - if ( num != 1060){ - printf("[error] in benchmark prime_number_100_pika \r\n"); - } - /* free the pikaMain obj */ - obj_deinit(pikaMain); - - uint64_t benchmark_result = ((double) nCycleUsed_c / (double)nCycleUsed_pika) * 100 * 100000; - - printf("\r\n[------benchmark finished ---------]\r\n"); - printf("benchmakr result :%lld\r\n", benchmark_result); - while (true) { breath_led(); //gpio_put(PICO_DEFAULT_LED_PIN, 1); diff --git a/bsp/pico/pikascript/requestment.txt b/bsp/pico/pikascript/requestment.txt index 2342b84f3..a35777ff8 100644 --- a/bsp/pico/pikascript/requestment.txt +++ b/bsp/pico/pikascript/requestment.txt @@ -1,2 +1,2 @@ pikascript-core==lts2021 -PikaStdLib==lts2021 \ No newline at end of file +PikaStdLib==lts2021