| Message ID | 20190408182748.1238-2-jan.bobek@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Fix RISU build for i386 | expand |
Jan Bobek <jan.bobek@gmail.com> writes: > In order to build risu successfully for i386, we need files > risu_reginfo_i386.{h,c}; this patch adds the former by extracting the > relevant code from risu_i386.c. > > This patch is pure code motion; no functional changes were made. > > Signed-off-by: Jan Bobek <jan.bobek@gmail.com> > --- > risu_i386.c | 23 +---------------------- > risu_reginfo_i386.h | 37 +++++++++++++++++++++++++++++++++++++ > 2 files changed, 38 insertions(+), 22 deletions(-) > create mode 100644 risu_reginfo_i386.h > > diff --git a/risu_i386.c b/risu_i386.c > index 5e7e01d..6798a78 100644 > --- a/risu_i386.c > +++ b/risu_i386.c > @@ -14,28 +14,7 @@ > #include <string.h> > > #include "risu.h" > - > -/* This is the data structure we pass over the socket. > - * It is a simplified and reduced subset of what can > - * be obtained with a ucontext_t* > - */ > -struct reginfo { > - uint32_t faulting_insn; > - gregset_t gregs; > -}; > - > -#ifndef REG_GS > -/* Assume that either we get all these defines or none */ > -#define REG_GS 0 > -#define REG_FS 1 > -#define REG_ES 2 > -#define REG_DS 3 > -#define REG_ESP 7 > -#define REG_TRAPNO 12 > -#define REG_EIP 14 > -#define REG_EFL 16 > -#define REG_UESP 17 > -#endif > +#include "risu_reginfo_i386.h" > > struct reginfo master_ri, apprentice_ri; > > diff --git a/risu_reginfo_i386.h b/risu_reginfo_i386.h > new file mode 100644 > index 0000000..5bba439 > --- /dev/null > +++ b/risu_reginfo_i386.h > @@ -0,0 +1,37 @@ > +/******************************************************************************* > + * Copyright (c) 2010 Linaro Limited > + * All rights reserved. This program and the accompanying materials > + * are made available under the terms of the Eclipse Public License v1.0 > + * which accompanies this distribution, and is available at > + * http://www.eclipse.org/legal/epl-v10.html > + * > + * Contributors: > + * Peter Maydell (Linaro) - initial implementation > + ******************************************************************************/ > + > +#ifndef RISU_REGINFO_I386_H > +#define RISU_REGINFO_I386_H > + > +/* This is the data structure we pass over the socket. > + * It is a simplified and reduced subset of what can > + * be obtained with a ucontext_t* > + */ > +struct reginfo { > + uint32_t faulting_insn; > + gregset_t gregs; > +}; > + The actual reg definitions can be dropped here (as rth does in his fixup series). We can get them from ucontext. Otherwise: Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > +#ifndef REG_GS > +/* Assume that either we get all these defines or none */ > +# define REG_GS 0 > +# define REG_FS 1 > +# define REG_ES 2 > +# define REG_DS 3 > +# define REG_ESP 7 > +# define REG_TRAPNO 12 > +# define REG_EIP 14 > +# define REG_EFL 16 > +# define REG_UESP 17 > +#endif /* !defined(REG_GS) */ > + > +#endif /* RISU_REGINFO_I386_H */ -- Alex Bennée
diff --git a/risu_i386.c b/risu_i386.c index 5e7e01d..6798a78 100644 --- a/risu_i386.c +++ b/risu_i386.c @@ -14,28 +14,7 @@ #include <string.h> #include "risu.h" - -/* This is the data structure we pass over the socket. - * It is a simplified and reduced subset of what can - * be obtained with a ucontext_t* - */ -struct reginfo { - uint32_t faulting_insn; - gregset_t gregs; -}; - -#ifndef REG_GS -/* Assume that either we get all these defines or none */ -#define REG_GS 0 -#define REG_FS 1 -#define REG_ES 2 -#define REG_DS 3 -#define REG_ESP 7 -#define REG_TRAPNO 12 -#define REG_EIP 14 -#define REG_EFL 16 -#define REG_UESP 17 -#endif +#include "risu_reginfo_i386.h" struct reginfo master_ri, apprentice_ri; diff --git a/risu_reginfo_i386.h b/risu_reginfo_i386.h new file mode 100644 index 0000000..5bba439 --- /dev/null +++ b/risu_reginfo_i386.h @@ -0,0 +1,37 @@ +/******************************************************************************* + * Copyright (c) 2010 Linaro Limited + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Peter Maydell (Linaro) - initial implementation + ******************************************************************************/ + +#ifndef RISU_REGINFO_I386_H +#define RISU_REGINFO_I386_H + +/* This is the data structure we pass over the socket. + * It is a simplified and reduced subset of what can + * be obtained with a ucontext_t* + */ +struct reginfo { + uint32_t faulting_insn; + gregset_t gregs; +}; + +#ifndef REG_GS +/* Assume that either we get all these defines or none */ +# define REG_GS 0 +# define REG_FS 1 +# define REG_ES 2 +# define REG_DS 3 +# define REG_ESP 7 +# define REG_TRAPNO 12 +# define REG_EIP 14 +# define REG_EFL 16 +# define REG_UESP 17 +#endif /* !defined(REG_GS) */ + +#endif /* RISU_REGINFO_I386_H */
In order to build risu successfully for i386, we need files risu_reginfo_i386.{h,c}; this patch adds the former by extracting the relevant code from risu_i386.c. This patch is pure code motion; no functional changes were made. Signed-off-by: Jan Bobek <jan.bobek@gmail.com> --- risu_i386.c | 23 +---------------------- risu_reginfo_i386.h | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 22 deletions(-) create mode 100644 risu_reginfo_i386.h