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

arch/intel64: various cosmetic improvements after code review #11758

Merged
merged 4 commits into from
Feb 24, 2024

Conversation

szafonimateusz-mi
Copy link
Contributor

Summary

  • arch/intel64: format asm files, remove unused debug macros
    use tab at the beginning of lines, remove C++ comments, fix some tabs to spaces
  • arch/intel64: convert __nxstart to C function and move appropriate functions there
    to follow the approach in other architectures
  • arch/intel64: clear BSS in __nxstart
    BSS nulling can now be optimized by the compiler, so it is necessary
    to enable SSE instructions early in __nxstart
  • arch/intel64: add g_ prefix to global data
    to follow NuttX coding standard

Impact

no functional changes, improve code quality

Testing

qemu and intel hw

use tab at the beginning of lines, remove C++ comments, fix some tabs to spaces

Signed-off-by: p-szafonimateusz <p-szafonimateusz@xiaomi.com>
…nctions there

to follow the approach in other architectures

Signed-off-by: p-szafonimateusz <p-szafonimateusz@xiaomi.com>
BSS nulling can now be optimized by the compiler, so it is necessary
to enable SSE instructions early in __nxstart

Signed-off-by: p-szafonimateusz <p-szafonimateusz@xiaomi.com>
to follow NuttX coding standard

Signed-off-by: p-szafonimateusz <p-szafonimateusz@xiaomi.com>
@xiaoxiang781216 xiaoxiang781216 merged commit 8c4612b into apache:master Feb 24, 2024
27 checks passed
@masayuki2009
Copy link
Contributor

masayuki2009 commented Feb 24, 2024

@szafonimateusz-mi

I noticed that qemu-intel64:nsh can not boot with this PR on ubuntu 20.04 x86_64 (Core-i7 11700) + QEMU-8.2.0.

@szafonimateusz-mi
Copy link
Contributor Author

@masayuki2009 I'll fix it right away.

@szafonimateusz-mi
Copy link
Contributor Author

@masayuki2009 fixed here #11764 I messed up something in my patches

@masayuki2009
Copy link
Contributor

masayuki2009 commented Feb 24, 2024

@szafonimateusz-mi

@masayuki2009 fixed here #11764 I messed up something in my patches

Please make sure that your commits work with the latest upstream whenever you modify your commits.

szafonimateusz-mi added a commit to szafonimateusz-mi/nuttx that referenced this pull request Feb 24, 2024
__revoke_low_memory() is called in intel64_lowsetup()

fixes b4b96a6 (PR apache#11758) in which the multiboot2 header was accessed
after revoking the low memory which caused page fault.

Signed-off-by: p-szafonimateusz <p-szafonimateusz@xiaomi.com>
xiaoxiang781216 pushed a commit that referenced this pull request Feb 24, 2024
__revoke_low_memory() is called in intel64_lowsetup()

fixes b4b96a6 (PR #11758) in which the multiboot2 header was accessed
after revoking the low memory which caused page fault.

Signed-off-by: p-szafonimateusz <p-szafonimateusz@xiaomi.com>
@jerpelea jerpelea added this to To-Add in Release Notes - 12.5.0 Mar 26, 2024
@jerpelea jerpelea moved this from To-Add to Not Applicable in Release Notes - 12.5.0 Mar 29, 2024
halyssonJr pushed a commit to halyssonJr/nuttx that referenced this pull request Apr 10, 2024
__revoke_low_memory() is called in intel64_lowsetup()

fixes b4b96a6 (PR apache#11758) in which the multiboot2 header was accessed
after revoking the low memory which caused page fault.

Signed-off-by: p-szafonimateusz <p-szafonimateusz@xiaomi.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

7 participants