Commit 64a17a0f authored by Ralf Baechle's avatar Ralf Baechle

MIPS: Move definition of __BITFIELD_FIELD to sharable header.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 60b5f90d
...@@ -4,6 +4,7 @@ include include/uapi/asm-generic/Kbuild.asm ...@@ -4,6 +4,7 @@ include include/uapi/asm-generic/Kbuild.asm
generic-y += auxvec.h generic-y += auxvec.h
generic-y += ipcbuf.h generic-y += ipcbuf.h
header-y += bitfield.h
header-y += bitsperlong.h header-y += bitsperlong.h
header-y += break.h header-y += break.h
header-y += byteorder.h header-y += byteorder.h
......
/*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
* Copyright (C) 2014 by Ralf Baechle <ralf@linux-mips.org>
*/
#ifndef __UAPI_ASM_BITFIELD_H
#define __UAPI_ASM_BITFIELD_H
/*
* * Damn ... bitfields depend from byteorder :-(
* */
#ifdef __MIPSEB__
#define __BITFIELD_FIELD(field, more) \
field; \
more
#elif defined(__MIPSEL__)
#define __BITFIELD_FIELD(field, more) \
more \
field;
#else /* !defined (__MIPSEB__) && !defined (__MIPSEL__) */
#error "MIPS but neither __MIPSEL__ nor __MIPSEB__?"
#endif
#endif /* __UAPI_ASM_BITFIELD_H */
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
#ifndef _UAPI_ASM_INST_H #ifndef _UAPI_ASM_INST_H
#define _UAPI_ASM_INST_H #define _UAPI_ASM_INST_H
#include <asm/bitfield.h>
/* /*
* Major opcodes; before MIPS IV cop1x was called cop3. * Major opcodes; before MIPS IV cop1x was called cop3.
*/ */
...@@ -480,24 +482,6 @@ enum MIPS6e_i8_func { ...@@ -480,24 +482,6 @@ enum MIPS6e_i8_func {
*/ */
#define MM_NOP16 0x0c00 #define MM_NOP16 0x0c00
/*
* Damn ... bitfields depend from byteorder :-(
*/
#ifdef __MIPSEB__
#define __BITFIELD_FIELD(field, more) \
field; \
more
#elif defined(__MIPSEL__)
#define __BITFIELD_FIELD(field, more) \
more \
field;
#else /* !defined (__MIPSEB__) && !defined (__MIPSEL__) */
#error "MIPS but neither __MIPSEL__ nor __MIPSEB__?"
#endif
struct j_format { struct j_format {
__BITFIELD_FIELD(unsigned int opcode : 6, /* Jump format */ __BITFIELD_FIELD(unsigned int opcode : 6, /* Jump format */
__BITFIELD_FIELD(unsigned int target : 26, __BITFIELD_FIELD(unsigned int target : 26,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment