Aksal/nuttx
3
1
Fork 1
mirror of https://github.com/apache/nuttx.git synced 2026-09-03 23:52:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

libc/machine: Remove FAR from sparc

Browse source 
since sparc is 32bit arcch, FAR is useless

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2023-10-17 00:10:40 +08:00 • committed by archer
parent 58c6b60df5
commit b892ec5c6e
1 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

52
libs/libc/machine/sparc/arch_elf.c
View file

@ -63,7 +63,7 @@
*
****************************************************************************/
bool up_checkarch(FAR const Elf32_Ehdr *ehdr)
bool up_checkarch(const Elf32_Ehdr *ehdr)
{
/* Make sure it's an Sparc executable */
@ -120,7 +120,7 @@ bool up_checkarch(FAR const Elf32_Ehdr *ehdr)
*
****************************************************************************/
int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
int up_relocate(const Elf32_Rel *rel, const Elf32_Sym *sym,
uintptr_t addr)
{
unsigned int relotype;
@ -140,7 +140,7 @@ int up_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
return OK;
}
int up_relocateadd(FAR const Elf32_Rela *rel, FAR const Elf32_Sym *sym,
int up_relocateadd(const Elf32_Rela *rel, const Elf32_Sym *sym,
uintptr_t addr)
{
unsigned int relotype;
@ -170,76 +170,76 @@ int up_relocateadd(FAR const Elf32_Rela *rel, FAR const Elf32_Sym *sym,
case R_SPARC_NONE:
break;
case R_SPARC_8:
(*(FAR uint8_t *)addr) = (uint8_t)value;
(*(uint8_t *)addr) = (uint8_t)value;
break;
case R_SPARC_16:
(*(FAR uint16_t *)addr) = (uint16_t)value;
(*(uint16_t *)addr) = (uint16_t)value;
break;
case R_SPARC_32:
(*(FAR uint32_t *)addr) = value;
(*(uint32_t *)addr) = value;
break;
case R_SPARC_DISP8:
case R_SPARC_DISP16:
case R_SPARC_DISP32:
(*(FAR uint32_t *)addr) = value - addr;
(*(uint32_t *)addr) = value - addr;
break;
case R_SPARC_WDISP30:
value -= addr;
(*(FAR uint32_t *)addr) &= (~0x3fffffff);
(*(FAR uint32_t *)addr) |= (value >> 2) & 0x3fffffff;
(*(uint32_t *)addr) &= (~0x3fffffff);
(*(uint32_t *)addr) |= (value >> 2) & 0x3fffffff;
break;
case R_SPARC_WDISP22:
value -= addr;
(*(FAR uint32_t *)addr) &= (~0x3fffff);
(*(FAR uint32_t *)addr) |= (value >> 2) & 0x3fffff;
(*(uint32_t *)addr) &= (~0x3fffff);
(*(uint32_t *)addr) |= (value >> 2) & 0x3fffff;
break;
case R_SPARC_HI22:
(*(FAR uint32_t *)addr) &= (~0x3fffff);
(*(FAR uint32_t *)addr) |= (value >> 10) & 0x3fffff;
(*(uint32_t *)addr) &= (~0x3fffff);
(*(uint32_t *)addr) |= (value >> 10) & 0x3fffff;
break;
case R_SPARC_22:
(*(FAR uint32_t *)addr) &= (~0x3fffff);
(*(FAR uint32_t *)addr) |= value & 0x3fffff;
(*(uint32_t *)addr) &= (~0x3fffff);
(*(uint32_t *)addr) |= value & 0x3fffff;
break;
case R_SPARC_13:
(*(FAR uint32_t *)addr) &= (~0x1ffff);
(*(FAR uint32_t *)addr) |= value & 0x1ffff;
(*(uint32_t *)addr) &= (~0x1ffff);
(*(uint32_t *)addr) |= value & 0x1ffff;
break;
case R_SPARC_LO10:
(*(FAR uint32_t *)addr) &= (~0x3ff);
(*(FAR uint32_t *)addr) |= value & 0x3ff;
(*(uint32_t *)addr) &= (~0x3ff);
(*(uint32_t *)addr) |= value & 0x3ff;
break;
case R_SPARC_PC10:
value -= addr;
(*(FAR uint32_t *)addr) &= (~0x3ff);
(*(FAR uint32_t *)addr) |= value & 0x3ff;
(*(uint32_t *)addr) &= (~0x3ff);
(*(uint32_t *)addr) |= value & 0x3ff;
break;
case R_SPARC_PC22:
value -= addr;
(*(FAR uint32_t *)addr) &= (~0x3fffff);
(*(FAR uint32_t *)addr) |= (value >> 10) & 0x3fffff;
(*(uint32_t *)addr) &= (~0x3fffff);
(*(uint32_t *)addr) |= (value >> 10) & 0x3fffff;
break;
case R_SPARC_UA32:
case R_SPARC_GLOB_DAT:
(*(FAR uint32_t *)addr) = value;
(*(uint32_t *)addr) = value;
break;
case R_SPARC_JMP_SLOT:
(*(FAR uint32_t *)(addr + 1)) = OPCODE_SETHI_G1 | ((value >> 10) &
(*(uint32_t *)(addr + 1)) = OPCODE_SETHI_G1 | ((value >> 10) &
0x3fffff);
(*(FAR uint32_t *)(addr + 2)) = OPCODE_JMP_G1 | (value & 0x3ff);
(*(uint32_t *)(addr + 2)) = OPCODE_JMP_G1 | (value & 0x3ff);
break;
default: