diff options
| author | Andrew Waterman <andrew@sifive.com> | 2020-11-12 16:11:32 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-12 16:11:32 -0800 |
| commit | 33ae46f1cb7eb36a6eb28cd25cfb7f066d22618a (patch) | |
| tree | 8dac4e1174298eaf6dcf1865e2bc6aeefa2f705d | |
| parent | a4d4298ca10527a51fad86c53a93c48e6f510092 (diff) | |
| parent | 5752f0a173b84a76b772ee0abc8b4a1ad99d301d (diff) | |
| download | riscv-pk-33ae46f1cb7eb36a6eb28cd25cfb7f066d22618a.zip riscv-pk-33ae46f1cb7eb36a6eb28cd25cfb7f066d22618a.tar.gz riscv-pk-33ae46f1cb7eb36a6eb28cd25cfb7f066d22618a.tar.bz2 | |
Merge pull request #220 from zeldin/big-endian
Big endian
| -rw-r--r-- | machine/fdt.c | 5 | ||||
| -rw-r--r-- | pk/pk.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/machine/fdt.c b/machine/fdt.c index 07b574f..4ec1530 100644 --- a/machine/fdt.c +++ b/machine/fdt.c @@ -9,9 +9,14 @@ static inline uint32_t bswap(uint32_t x) { +#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ uint32_t y = (x & 0x00FF00FF) << 8 | (x & 0xFF00FF00) >> 8; uint32_t z = (y & 0x0000FFFF) << 16 | (y & 0xFFFF0000) >> 16; return z; +#else + /* No need to swap on big endian */ + return x; +#endif } static inline int isstring(char c) @@ -129,15 +129,15 @@ static void run_loaded_program(size_t argc, char** argv, uintptr_t kstack_top) // place argc, argv, envp, auxp on stack #define PUSH_ARG(type, value) do { \ *((type*)sp) = (type)value; \ - sp += sizeof(type); \ + sp ++; \ } while (0) #define STACK_INIT(type) do { \ unsigned naux = sizeof(aux)/sizeof(aux[0]); \ stack_top -= (1 + argc + 1 + envc + 1 + 2*naux) * sizeof(type); \ stack_top &= -16; \ - long sp = stack_top; \ - PUSH_ARG(type, argc); \ + type *sp = (void*)stack_top; \ + PUSH_ARG(int, argc); \ for (unsigned i = 0; i < argc; i++) \ PUSH_ARG(type, argv[i]); \ PUSH_ARG(type, 0); /* argv[argc] = NULL */ \ |