From 42a4c450582e796d05467e39e233496b6477855b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ciro=20Santilli=20=E5=85=AD=E5=9B=9B=E4=BA=8B=E4=BB=B6=20?= =?UTF-8?q?=E6=B3=95=E8=BD=AE=E5=8A=9F?= Date: Sat, 29 Jun 2019 00:00:00 +0000 Subject: [PATCH] asm: fix some forgotten # comments, mostly migration bugs --- userland/arch/arm/tst.S | 2 +- userland/arch/x86_64/bswap.S | 4 +--- userland/arch/x86_64/cmps.S | 2 -- userland/arch/x86_64/fscale.S | 28 +++++++++++++------------- userland/arch/x86_64/fxch.S | 38 +++++++++++++++++------------------ userland/arch/x86_64/movs.S | 5 ----- 6 files changed, 35 insertions(+), 44 deletions(-) diff --git a/userland/arch/arm/tst.S b/userland/arch/arm/tst.S index 29a6705..7cea827 100644 --- a/userland/arch/arm/tst.S +++ b/userland/arch/arm/tst.S @@ -16,7 +16,7 @@ LKMC_PROLOGUE mov r0, 0xFF tst r0, 0x0F LKMC_ASSERT(bne) - # r0 was not modified. + /* r0 was not modified. */ LKMC_ASSERT_EQ(r0, =0xFF) LKMC_EPILOGUE diff --git a/userland/arch/x86_64/bswap.S b/userland/arch/x86_64/bswap.S index c6e56fa..8695978 100644 --- a/userland/arch/x86_64/bswap.S +++ b/userland/arch/x86_64/bswap.S @@ -1,6 +1,4 @@ -# # bswap - - # Little endian <=> big endian. +/* https://github.com/cirosantilli/linux-kernel-module-cheat#x86-data-transfer-instructions */ #include diff --git a/userland/arch/x86_64/cmps.S b/userland/arch/x86_64/cmps.S index b89ca8d..91d656d 100644 --- a/userland/arch/x86_64/cmps.S +++ b/userland/arch/x86_64/cmps.S @@ -1,7 +1,5 @@ /* https://github.com/cirosantilli/linux-kernel-module-cheat#x86-string-instructions */ - # Compare two arrays - #include .section .rodata diff --git a/userland/arch/x86_64/fscale.S b/userland/arch/x86_64/fscale.S index 4348b4f..96f75f7 100644 --- a/userland/arch/x86_64/fscale.S +++ b/userland/arch/x86_64/fscale.S @@ -8,27 +8,27 @@ double_4_0: .double 4.0 LKMC_PROLOGUE fldl double_4_0 - # ST0 = 4.0 + /* ST0 = 4.0 */ fldl double_2_5 - # ST0 = 2.5 - # ST1 = 4.0 + /* ST0 = 2.5 + * ST1 = 4.0 */ fldl double_1_0 - # ST0 = 1.0 - # ST1 = 2.5 - # ST2 = 4.0 + /* ST0 = 1.0 + * ST1 = 2.5 + * ST2 = 4.0 */ - # ST0 = 1 * 2 ^ (RoundTowardZero(2.5)) - # = 1 * 2 ^ 2 - # = 4 + /* ST0 = 1 * 2 ^ (RoundTowardZero(2.5)) + * = 1 * 2 ^ 2 + * = 4 */ fscale - # ST0 = 4.0 - # ST1 = 2.5 - # ST2 = 4.0 + /* ST0 = 4.0 + * ST1 = 2.5 + * ST2 = 4.0 */ fcomip %st(2) - # ST0 = 4.0 - # ST1 = 2.5 + /* ST0 = 4.0 + * ST1 = 2.5 */ LKMC_ASSERT(je) LKMC_EPILOGUE diff --git a/userland/arch/x86_64/fxch.S b/userland/arch/x86_64/fxch.S index 53dc417..389bcf0 100644 --- a/userland/arch/x86_64/fxch.S +++ b/userland/arch/x86_64/fxch.S @@ -7,39 +7,39 @@ double_1_0: .double 1.0 LKMC_PROLOGUE fldz - # ST0 = 0.0 + /* ST0 = 0.0 */ fld1 - # ST0 = 1.0 - # ST1 = 0.0 + /* ST0 = 1.0 + * ST1 = 0.0 */ - # Swap ST0 and ST1. + /* Swap ST0 and ST1. */ fxch %st(1) - # ST0 = 0.0 - # ST1 = 1.0 + /* ST0 = 0.0 + * ST1 = 1.0 */ fldz - # ST0 = 0.0 - # ST1 = 0.0 - # ST2 = 1.0 + /* ST0 = 0.0 + * ST1 = 0.0 + * ST2 = 1.0 */ fcomip %st(1) - # ST0 = 0.0 - # ST1 = 1.0 + /* ST0 = 0.0 + * ST1 = 1.0 */ LKMC_ASSERT(je) - # Swap ST0 and ST1. + /* Swap ST0 and ST1. */ fxch %st(1) - # ST0 = 1.0 - # ST1 = 0.0 + /* ST0 = 1.0 + * ST1 = 0.0 */ fld1 - # ST0 = 1.0 - # ST1 = 1.0 - # ST2 = 0.0 + /* ST0 = 1.0 + * ST1 = 1.0 + * ST2 = 0.0 */ fcomip %st(1) - # ST0 = 1.0 - # ST1 = 0.0 + /* ST0 = 1.0 + * ST1 = 0.0 */ LKMC_ASSERT(je) LKMC_EPILOGUE diff --git a/userland/arch/x86_64/movs.S b/userland/arch/x86_64/movs.S index 74ab624..3b7647b 100644 --- a/userland/arch/x86_64/movs.S +++ b/userland/arch/x86_64/movs.S @@ -1,9 +1,4 @@ /* https://github.com/cirosantilli/linux-kernel-module-cheat#x86-string-instructions */ -# # movs - - # Copy one string into another. - - # Input pointed by esi, output by edi. #include