mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

elf: Update EM_MOXIE definition

Browse Source 
EM_MOXIE now has a proper assigned elf code. Use it. Register the old
interim value as EM_MOXIE_OLD and accept either in elf loading.

Cc: Anthony Green <green@moxielogic.com>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Peter Crosthwaite 2015-08-29 12:07:50 -07:00 committed by Paolo Bonzini
parent 7cc472218c
commit 98dbe5aca8
4 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/moxie/moxiesim.c
View File

@ -34,6 +34,7 @@
#include "hw/loader.h" #include "hw/loader.h"
#include "hw/char/serial.h" #include "hw/char/serial.h"
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
#include "elf.h"
#define PHYS_MEM_BASE 0x80000000 #define PHYS_MEM_BASE 0x80000000

3
include/elf.h
View File

@ -135,6 +135,9 @@ typedef int64_t Elf64_Sxword;
#define EM_TILEGX 191 /* TILE-Gx */ #define EM_TILEGX 191 /* TILE-Gx */
#define EM_MOXIE 223 /* Moxie processor family */
#define EM_MOXIE_OLD 0xFEED
/* This is the info that is needed to parse the dynamic section of the file */ /* This is the info that is needed to parse the dynamic section of the file */
#define DT_NULL 0 #define DT_NULL 0
#define DT_NEEDED 1 #define DT_NEEDED 1

8
include/hw/elf_ops.h
View File

@ -305,6 +305,14 @@ static int glue(load_elf, SZ)(const char *name, int fd,
} }
} }
break; break;
case EM_MOXIE:
if (ehdr.e_machine != EM_MOXIE) {
if (ehdr.e_machine != EM_MOXIE_OLD) {
ret = ELF_LOAD_WRONG_ARCH;
goto fail;
}
}
break;
default: default:
if (elf_machine != ehdr.e_machine) { if (elf_machine != ehdr.e_machine) {
ret = ELF_LOAD_WRONG_ARCH; ret = ELF_LOAD_WRONG_ARCH;

2
target-moxie/cpu.h
View File

@ -26,7 +26,7 @@
#define CPUArchState struct CPUMoxieState #define CPUArchState struct CPUMoxieState
#define ELF_MACHINE 0xFEED /* EM_MOXIE */ #define ELF_MACHINE EM_MOXIE
#define MOXIE_EX_DIV0 0 #define MOXIE_EX_DIV0 0
#define MOXIE_EX_BAD 1 #define MOXIE_EX_BAD 1