mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Denis Orlov <denorl2009@gmail.com>
To: barebox@lists.infradead.org
Cc: Denis Orlov <denorl2009@gmail.com>
Subject: [PATCH 16/17] MIPS: make setjmp/longjmp/initjmp available in 64BIT builds
Date: Mon,  5 Jun 2023 23:10:47 +0300	[thread overview]
Message-ID: <20230605202634.42175-17-denorl2009@gmail.com> (raw)
In-Reply-To: <20230605202634.42175-1-denorl2009@gmail.com>

Make the code compatible with 64-bit configurations by storing saved
register values with unsigned long type and using generic macros in
assembly code.

Signed-off-by: Denis Orlov <denorl2009@gmail.com>
---
 arch/mips/Kconfig              |  2 +-
 arch/mips/include/asm/setjmp.h |  2 +-
 arch/mips/lib/setjmp.S         | 48 +++++++++++++++++-----------------
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index de2f539cc1..e05ee2d7f1 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -10,6 +10,7 @@ config MIPS
 	select HAVE_PBL_MULTI_IMAGES
 	select HAS_DMA
 	select ARCH_HAS_DATA_ABORT_MASK
+	select ARCH_HAS_SJLJ
 	select ELF
 	default y
 
@@ -305,7 +306,6 @@ choice
 config 32BIT
 	bool "32-bit barebox"
 	depends on CPU_SUPPORTS_32BIT_KERNEL && SYS_SUPPORTS_32BIT_KERNEL
-	select ARCH_HAS_SJLJ
 	help
 	  Select this option if you want to build a 32-bit barebox.
 
diff --git a/arch/mips/include/asm/setjmp.h b/arch/mips/include/asm/setjmp.h
index 81f4d4c15f..39e01e27df 100644
--- a/arch/mips/include/asm/setjmp.h
+++ b/arch/mips/include/asm/setjmp.h
@@ -19,7 +19,7 @@ typedef struct __jmp_buf_internal_tag {
 	void *__sp;
 
 	/* Callee-saved registers s0 through s7.  */
-	int __regs[8];
+	unsigned long __regs[8];
 
 	/* The frame pointer.  */
 	void *__fp;
diff --git a/arch/mips/lib/setjmp.S b/arch/mips/lib/setjmp.S
index b09a7c5529..42a2ec15a9 100644
--- a/arch/mips/lib/setjmp.S
+++ b/arch/mips/lib/setjmp.S
@@ -6,34 +6,34 @@
 
 /* int setjmp (jmp_buf);  */
 LEAF(setjmp)
-	sw	ra, (0 * 4)(a0)
-	sw	sp, (1 * 4)(a0)
-	sw	s0, (2 * 4)(a0)
-	sw	s1, (3 * 4)(a0)
-	sw	s2, (4 * 4)(a0)
-	sw	s3, (5 * 4)(a0)
-	sw	s4, (6 * 4)(a0)
-	sw	s5, (7 * 4)(a0)
-	sw	s6, (8 * 4)(a0)
-	sw	s7, (9 * 4)(a0)
-	sw	fp, (10 * 4)(a0)
+	REG_S	ra, (0 * SZREG)(a0)
+	REG_S	sp, (1 * SZREG)(a0)
+	REG_S	s0, (2 * SZREG)(a0)
+	REG_S	s1, (3 * SZREG)(a0)
+	REG_S	s2, (4 * SZREG)(a0)
+	REG_S	s3, (5 * SZREG)(a0)
+	REG_S	s4, (6 * SZREG)(a0)
+	REG_S	s5, (7 * SZREG)(a0)
+	REG_S	s6, (8 * SZREG)(a0)
+	REG_S	s7, (9 * SZREG)(a0)
+	REG_S	fp, (10 * SZREG)(a0)
 	move	v0, zero
 	j	ra
 END(setjmp)
 
 /* volatile void longjmp (jmp_buf, int);  */
 LEAF(longjmp)
-	lw	ra, (0 * 4)(a0)
-	lw	sp, (1 * 4)(a0)
-	lw	s0, (2 * 4)(a0)
-	lw	s1, (3 * 4)(a0)
-	lw	s2, (4 * 4)(a0)
-	lw	s3, (5 * 4)(a0)
-	lw	s4, (6 * 4)(a0)
-	lw	s5, (7 * 4)(a0)
-	lw	s6, (8 * 4)(a0)
-	lw	s7, (9 * 4)(a0)
-	lw	fp, (10 * 4)(a0)
+	REG_L	ra, (0 * SZREG)(a0)
+	REG_L	sp, (1 * SZREG)(a0)
+	REG_L	s0, (2 * SZREG)(a0)
+	REG_L	s1, (3 * SZREG)(a0)
+	REG_L	s2, (4 * SZREG)(a0)
+	REG_L	s3, (5 * SZREG)(a0)
+	REG_L	s4, (6 * SZREG)(a0)
+	REG_L	s5, (7 * SZREG)(a0)
+	REG_L	s6, (8 * SZREG)(a0)
+	REG_L	s7, (9 * SZREG)(a0)
+	REG_L	fp, (10 * SZREG)(a0)
 	bne	a1, zero, 1f
 	li	a1, 1
 1:
@@ -43,8 +43,8 @@ END(longjmp)
 
 /* int initjmp(jmp_buf jmp, void __noreturn (*func)(void), void *stack_top); */
 LEAF(initjmp)
-	sw	a1, (0 * 4)(a0)
-	sw	a2, (1 * 4)(a0)
+	REG_S	a1, (0 * SZREG)(a0)
+	REG_S	a2, (1 * SZREG)(a0)
 	move	v0, zero
 	j	ra
 END(initjmp)
-- 
2.41.0




  parent reply	other threads:[~2023-06-05 21:31 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-05 20:10 [PATCH 00/17] MIPS: fix and improve 64BIT support Denis Orlov
2023-06-05 20:10 ` [PATCH 01/17] MIPS: malta: allow to choose MIPS64 target CPU in config Denis Orlov
2023-06-06  8:06   ` Ahmad Fatoum
2023-06-05 20:10 ` [PATCH 02/17] MIPS: malta: use CKSEG instead of KSEG macros Denis Orlov
2023-06-06  8:03   ` Ahmad Fatoum
2023-06-06  9:14     ` Denis Orlov
2023-06-05 20:10 ` [PATCH 03/17] MIPS: reloc: fix relocation with CONFIG_64BIT enabled Denis Orlov
2023-06-06  8:08   ` Ahmad Fatoum
2023-06-05 20:10 ` [PATCH 04/17] MIPS: o32: provide ta0..ta3 register definitions Denis Orlov
2023-06-06  8:13   ` Ahmad Fatoum
2023-06-06  9:38     ` Denis Orlov
2023-06-05 20:10 ` [PATCH 05/17] MIPS: pbl: use o32/n64 compatible " Denis Orlov
2023-06-06  8:20   ` Ahmad Fatoum
2023-06-05 20:10 ` [PATCH 06/17] MIPS: pbl: fix linking errors with CONFIG_64BIT Denis Orlov
2023-06-05 20:10 ` [PATCH 07/17] MIPS: use MIPS32/MIPS64 generic instruction macros Denis Orlov
2023-06-06  8:23   ` Ahmad Fatoum
2023-06-05 20:10 ` [PATCH 08/17] MIPS: malta: fix GT64120 base virtual address on 64BIT Denis Orlov
2023-06-06  8:35   ` Ahmad Fatoum
2023-06-05 20:10 ` [PATCH 09/17] MIPS: fix addresses of exception vectors in 64-bit mode Denis Orlov
2023-06-06  8:36   ` Ahmad Fatoum
2023-06-05 20:10 ` [PATCH 10/17] MIPS: fix *ADDR macro usage warnings on CONFIG_64BIT Denis Orlov
2023-06-05 20:10 ` [PATCH 11/17] MIPS: Makefile: sign-extend TEXT_BASE value " Denis Orlov
2023-06-06  9:04   ` Ahmad Fatoum
2023-06-06  9:23     ` Denis Orlov
2023-06-09  6:40       ` Ahmad Fatoum
2023-06-05 20:10 ` [PATCH 12/17] MIPS: enable 64-bit kernel segment addressing " Denis Orlov
2023-06-06  9:06   ` Ahmad Fatoum
2023-06-05 20:10 ` [PATCH 13/17] MIPS: traps: fix passing wrong sp when returning from exception Denis Orlov
2023-06-05 20:10 ` [PATCH 14/17] MIPS: pbl_macros: use generic load/store macros in copy_to_link_location Denis Orlov
2023-06-06  9:07   ` Ahmad Fatoum
2023-06-05 20:10 ` [PATCH 15/17] MIPS: add 64-bit support for optimized string functions Denis Orlov
2023-06-05 20:10 ` Denis Orlov [this message]
2023-06-05 20:10 ` [PATCH 17/17] MIPS: main_entry-pbl: fix conversion warnings on CONFIG_64BIT Denis Orlov
2023-06-06  8:02 ` [PATCH 00/17] MIPS: fix and improve 64BIT support Ahmad Fatoum
2023-06-06  8:43   ` Denis Orlov
2023-06-09  6:43 ` Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230605202634.42175-17-denorl2009@gmail.com \
    --to=denorl2009@gmail.com \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox