Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

解决bps/simulator无法在vs2019环境下编译 #10112

Merged
merged 7 commits into from
Mar 17, 2025

Conversation

ComerLater
Copy link
Contributor

@ComerLater ComerLater commented Mar 15, 2025

拉取/合并请求描述:(PR description)

[

为什么提交这份PR (why to submit this PR)

随着master的升级(主要是finsh中MSH_CMD_EXPORT宏变化影响较大),但是bsp/simulator没有得到同步维护,bsp/simulator无法使用visual studio 2012/2019/2022等进行正常编译。

本次pr主要是修复该问题,使得bsp/simulator可以在vs中进行编译,并运行。

你的解决方案是什么 (what is your solution)

1、finsh.h随着master做了较大更新,但是vs不支持“变维度数组”,因此对以下宏进行了修复

#ifdef _MSC_VER
#define CMD_OPTIONS_STATEMENT(command) static struct msh_cmd_opt command##_msh_options[16];
#else
#define CMD_OPTIONS_STATEMENT(command) static struct msh_cmd_opt command##_msh_options[];
#endif

#ifdef _MSC_VER
#define CMD_OPTIONS_NODE_START(command) static struct msh_cmd_opt command##_msh_options[16] = {
#else
#define CMD_OPTIONS_NODE_START(command) static struct msh_cmd_opt command##_msh_options[] = {
#endif

2、finsh中MSH_CMD_EXPORT宏机进行了较大变化,导致vs中老版本的c语言无法正确对MSH_CMD_EXPORT宏进行展开,因此需要将template_vs2012.vcxproj中添加默认是使用c11版本

      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
      <LanguageStandard_C>stdc11</LanguageStandard_C>
    </ClCompile>

3、scheduler_up.c文件中使用了rt_sched_insert_thread等函数,需要开启__RT_IPC_SOURCE__才能正常工作

#define __RT_IPC_SOURCE__
#include <rtthread.h>
#include <rthw.h>

4、最终在vs2019和2022运行效果如下
2025-03-16_01-05-37

请提供验证的bsp和config (provide the config and bsp)

  • BSP: bsp/simulator
  • .config:
  • action:

]

当前拉取/合并请求的状态 Intent for your PR

必须选择一项 Choose one (Mandatory):

  • 本拉取/合并请求是一个草稿版本 This PR is for a code-review and is intended to get feedback
  • 本拉取/合并请求是一个成熟版本 This PR is mature, and ready to be integrated into the repo

代码质量 Code Quality:

我在这个拉取/合并请求中已经考虑了 As part of this pull request, I've considered the following:

  • 已经仔细查看过代码改动的对比 Already check the difference between PR and old code
  • 代码风格正确,包括缩进空格,命名及其他风格 Style guide is adhered to, including spacing, naming and other styles
  • 没有垃圾代码,代码尽量精简,不包含#if 0代码,不包含已经被注释了的代码 All redundant code is removed and cleaned up
  • 所有变更均有原因及合理的,并且不会影响到其他软件组件代码或BSP All modifications are justified and not affect other components or BSP
  • 对难懂代码均提供对应的注释 I've commented appropriately where code is tricky
  • 代码是高质量的 Code in this PR is of high quality
  • 已经使用formatting 等源码格式化工具确保格式符合RT-Thread代码规范 This PR complies with RT-Thread code specification
  • 如果是新增bsp, 已经添加ci检查到.github/workflows/bsp_buildings.yml 详细请参考链接BSP自查

Signed-off-by: latercomer <latercomer@qq.com>
@Rbb666 Rbb666 added the 5.2.0 version 5.2.0 (planned to be released by the end of 2025) label Mar 16, 2025
@Rbb666 Rbb666 requested a review from mysterywolf March 16, 2025 04:41
Signed-off-by: latercomer <latercomer@qq.com>
Signed-off-by: latercomer <latercomer@qq.com>
Signed-off-by: latercomer <latercomer@qq.com>
Signed-off-by: latercomer <latercomer@qq.com>
@Rbb666 Rbb666 merged commit 4c061ce into RT-Thread:master Mar 17, 2025
56 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
5.2.0 version 5.2.0 (planned to be released by the end of 2025) BSP component: finsh Component Kernel PR has src relate code libcpu
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants