Skip to content

Conversation

@Xenithya
Copy link

@Xenithya Xenithya commented Nov 7, 2025

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

[

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

修复了 libcpu/arm/cortex-a/common/stack.c 中 FPU 上下文初始化顺序与汇编恢复顺序不一致的问题。
原始实现的压栈顺序和栈对齐未与 context_gcc.S 保持一致,导致在 -O2 优化、硬浮点 ABI (-mfloat-abi=hard) 环境下,
执行包含浮点/NEON 指令的线程时出现 Data Abort 异常。

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

  • 调整 FPU 上下文压栈顺序以符合 context_gcc.S 的恢复顺序:
    D0–D15 → D16–D31 → FPSCR → FPEXC。
  • 初始化 FPEXC 寄存器 (0x40000000) 以确保 FPU 处于启用状态。
  • 确保最终栈指针 8 字节对齐,符合 NEON/VFP 对齐要求。
  • 已在 Cortex-A15 平台上验证,未影响通用寄存器栈初始化逻辑。

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

  • BSP:
    • 自研板卡:bsp/ft-m6678e(Cortex-A15 平台,基于 RT-Thread 5.1.0)
  • .config:
    • 启用项(示例):
      CONFIG_RT_USING_FPU=y
      CONFIG_ARCH_MM_MMU=y
      CONFIG_ARCH_ARM=y
      CONFIG_ARCH_ARM_MMU=y
      CONFIG_ARCH_ARM_CORTEX_A=y
      
  • action:
    • 本地验证(尚未合入官方 BSP CI)
    • 后续将补充 BSP 并提交至官方仓库验证

测试验证 (testing and verification)

  • 编译选项:-O2 -Wall -mfloat-abi=hard -mfpu=neon-vfpv4
  • 运行示例:函数中包含浮点加减、乘法、sqrtf() 调用。
  • 在 Cortex-A15 (ft-m6678e) 板卡上验证通过:
    • Debug 模式 (-O0) 与 Release 模式 (-O2) 均运行稳定;
    • 无需 -fno-schedule-insns2 workaround;
    • 线程切换过程中 FPU 上下文恢复正常。

影响范围 (impact scope)

  • 仅影响使用 VFP/NEON 且启用 RT_USING_FPU 的 Cortex-A 系列处理器。
  • 对 Cortex-M 和 AArch64 架构无影响。

后续计划 (follow-up)

  • 将在 BSP/ft-m6678e(Cortex-A15)正式提交时,补充 Action CI 测试与回归验证。

]

当前拉取/合并请求的状态 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/ALL_BSP_COMPILE.json 详细请参考链接BSP自查

@CLAassistant
Copy link

CLAassistant commented Nov 7, 2025

CLA assistant check
All committers have signed the CLA.

@github-actions
Copy link

github-actions bot commented Nov 7, 2025

👋 感谢您对 RT-Thread 的贡献!Thank you for your contribution to RT-Thread!

为确保代码符合 RT-Thread 的编码规范,请在你的仓库中执行以下步骤运行代码格式化工作流(如果格式化CI运行失败)。
To ensure your code complies with RT-Thread's coding style, please run the code formatting workflow by following the steps below (If the formatting of CI fails to run).


🛠 操作步骤 | Steps

  1. 前往 Actions 页面 | Go to the Actions page
    点击进入工作流 → | Click to open workflow →

  2. 点击 Run workflow | Click Run workflow

  • 设置需排除的文件/目录(目录请以"/"结尾)
    Set files/directories to exclude (directories should end with "/")
  • 将目标分支设置为 \ Set the target branch to:dev
  • 设置PR number为 \ Set the PR number to:10906
  1. 等待工作流完成 | Wait for the workflow to complete
    格式化后的代码将自动推送至你的分支。
    The formatted code will be automatically pushed to your branch.

完成后,提交将自动更新至 dev 分支,关联的 Pull Request 也会同步更新。
Once completed, commits will be pushed to the dev branch automatically, and the related Pull Request will be updated.

如有问题欢迎联系我们,再次感谢您的贡献!💐
If you have any questions, feel free to reach out. Thanks again for your contribution!

rt_uint8_t *stack_addr, void *texit)
{
rt_uint32_t *stk;
rt_uint32_t i = 0;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

变量定义在这块会有ci报错

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

已重新提交

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants