2008-06-23 18:32:39 -07:00
|
|
|
#ifndef __ASM_POWERPC_FEATURE_FIXUPS_H
|
|
|
|
|
#define __ASM_POWERPC_FEATURE_FIXUPS_H
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
|
* as published by the Free Software Foundation; either version
|
|
|
|
|
* 2 of the License, or (at your option) any later version.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Feature section common macros
|
|
|
|
|
*
|
|
|
|
|
* Note that the entries now contain offsets between the table entry
|
|
|
|
|
* and the code rather than absolute code pointers in order to be
|
|
|
|
|
* useable with the vdso shared library. There is also an assumption
|
|
|
|
|
* that values will be negative, that is, the fixup table has to be
|
|
|
|
|
* located after the code it fixes up.
|
|
|
|
|
*/
|
2008-06-23 18:32:48 -07:00
|
|
|
#if defined(CONFIG_PPC64) && !defined(__powerpc64__)
|
2008-06-23 18:32:39 -07:00
|
|
|
/* 64 bits kernel, 32 bits code (ie. vdso32) */
|
2008-06-23 18:32:48 -07:00
|
|
|
#define FTR_ENTRY_LONG .llong
|
|
|
|
|
#define FTR_ENTRY_OFFSET .long 0xffffffff; .long
|
2009-04-29 13:58:01 -07:00
|
|
|
#elif defined(CONFIG_PPC64)
|
|
|
|
|
#define FTR_ENTRY_LONG .llong
|
|
|
|
|
#define FTR_ENTRY_OFFSET .llong
|
2008-06-23 18:32:48 -07:00
|
|
|
#else
|
2009-04-29 13:58:01 -07:00
|
|
|
#define FTR_ENTRY_LONG .long
|
|
|
|
|
#define FTR_ENTRY_OFFSET .long
|
2008-06-23 18:32:48 -07:00
|
|
|
#endif
|
|
|
|
|
|
powerpc: Introduce infrastructure for feature sections with alternatives
The current feature section logic only supports nop'ing out code, this means
if you want to choose at runtime between instruction sequences, one or both
cases will have to execute the nop'ed out contents of the other section, eg:
BEGIN_FTR_SECTION
or 1,1,1
END_FTR_SECTION_IFSET(FOO)
BEGIN_FTR_SECTION
or 2,2,2
END_FTR_SECTION_IFCLR(FOO)
and the resulting code will be either,
or 1,1,1
nop
or,
nop
or 2,2,2
For small code segments this is fine, but for larger code blocks and in
performance criticial code segments, it would be nice to avoid the nops.
This commit starts to implement logic to allow the following:
BEGIN_FTR_SECTION
or 1,1,1
FTR_SECTION_ELSE
or 2,2,2
ALT_FTR_SECTION_END_IFSET(FOO)
and the resulting code will be:
or 1,1,1
or,
or 2,2,2
We achieve this by extending the existing FTR macros. The current feature
section semantic just becomes a special case, ie. if the else case is empty
we nop out the default case.
The key limitation is that the size of the else case must be less than or
equal to the size of the default case. If the else case is smaller the
remainder of the section is nop'ed.
We let the linker put the else case code in with the rest of the text,
so that relative branches from the else case are more likley to link,
this has the disadvantage that we can't free the unused else cases.
This commit introduces the required macro and linker script changes, but
does not enable the patching of the alternative sections.
We also need to update two hand-made section entries in reg.h and timex.h
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2008-06-23 18:32:54 -07:00
|
|
|
#define START_FTR_SECTION(label) label##1:
|
|
|
|
|
|
|
|
|
|
#define FTR_SECTION_ELSE_NESTED(label) \
|
|
|
|
|
label##2: \
|
|
|
|
|
.pushsection __ftr_alt_##label,"a"; \
|
|
|
|
|
.align 2; \
|
|
|
|
|
label##3:
|
|
|
|
|
|
2008-06-23 18:32:39 -07:00
|
|
|
#define MAKE_FTR_SECTION_ENTRY(msk, val, label, sect) \
|
powerpc: Introduce infrastructure for feature sections with alternatives
The current feature section logic only supports nop'ing out code, this means
if you want to choose at runtime between instruction sequences, one or both
cases will have to execute the nop'ed out contents of the other section, eg:
BEGIN_FTR_SECTION
or 1,1,1
END_FTR_SECTION_IFSET(FOO)
BEGIN_FTR_SECTION
or 2,2,2
END_FTR_SECTION_IFCLR(FOO)
and the resulting code will be either,
or 1,1,1
nop
or,
nop
or 2,2,2
For small code segments this is fine, but for larger code blocks and in
performance criticial code segments, it would be nice to avoid the nops.
This commit starts to implement logic to allow the following:
BEGIN_FTR_SECTION
or 1,1,1
FTR_SECTION_ELSE
or 2,2,2
ALT_FTR_SECTION_END_IFSET(FOO)
and the resulting code will be:
or 1,1,1
or,
or 2,2,2
We achieve this by extending the existing FTR macros. The current feature
section semantic just becomes a special case, ie. if the else case is empty
we nop out the default case.
The key limitation is that the size of the else case must be less than or
equal to the size of the default case. If the else case is smaller the
remainder of the section is nop'ed.
We let the linker put the else case code in with the rest of the text,
so that relative branches from the else case are more likley to link,
this has the disadvantage that we can't free the unused else cases.
This commit introduces the required macro and linker script changes, but
does not enable the patching of the alternative sections.
We also need to update two hand-made section entries in reg.h and timex.h
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2008-06-23 18:32:54 -07:00
|
|
|
label##4: \
|
|
|
|
|
.popsection; \
|
|
|
|
|
.pushsection sect,"a"; \
|
2008-06-23 18:32:39 -07:00
|
|
|
.align 3; \
|
powerpc: Introduce infrastructure for feature sections with alternatives
The current feature section logic only supports nop'ing out code, this means
if you want to choose at runtime between instruction sequences, one or both
cases will have to execute the nop'ed out contents of the other section, eg:
BEGIN_FTR_SECTION
or 1,1,1
END_FTR_SECTION_IFSET(FOO)
BEGIN_FTR_SECTION
or 2,2,2
END_FTR_SECTION_IFCLR(FOO)
and the resulting code will be either,
or 1,1,1
nop
or,
nop
or 2,2,2
For small code segments this is fine, but for larger code blocks and in
performance criticial code segments, it would be nice to avoid the nops.
This commit starts to implement logic to allow the following:
BEGIN_FTR_SECTION
or 1,1,1
FTR_SECTION_ELSE
or 2,2,2
ALT_FTR_SECTION_END_IFSET(FOO)
and the resulting code will be:
or 1,1,1
or,
or 2,2,2
We achieve this by extending the existing FTR macros. The current feature
section semantic just becomes a special case, ie. if the else case is empty
we nop out the default case.
The key limitation is that the size of the else case must be less than or
equal to the size of the default case. If the else case is smaller the
remainder of the section is nop'ed.
We let the linker put the else case code in with the rest of the text,
so that relative branches from the else case are more likley to link,
this has the disadvantage that we can't free the unused else cases.
This commit introduces the required macro and linker script changes, but
does not enable the patching of the alternative sections.
We also need to update two hand-made section entries in reg.h and timex.h
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2008-06-23 18:32:54 -07:00
|
|
|
label##5: \
|
2008-06-23 18:32:48 -07:00
|
|
|
FTR_ENTRY_LONG msk; \
|
|
|
|
|
FTR_ENTRY_LONG val; \
|
powerpc: Introduce infrastructure for feature sections with alternatives
The current feature section logic only supports nop'ing out code, this means
if you want to choose at runtime between instruction sequences, one or both
cases will have to execute the nop'ed out contents of the other section, eg:
BEGIN_FTR_SECTION
or 1,1,1
END_FTR_SECTION_IFSET(FOO)
BEGIN_FTR_SECTION
or 2,2,2
END_FTR_SECTION_IFCLR(FOO)
and the resulting code will be either,
or 1,1,1
nop
or,
nop
or 2,2,2
For small code segments this is fine, but for larger code blocks and in
performance criticial code segments, it would be nice to avoid the nops.
This commit starts to implement logic to allow the following:
BEGIN_FTR_SECTION
or 1,1,1
FTR_SECTION_ELSE
or 2,2,2
ALT_FTR_SECTION_END_IFSET(FOO)
and the resulting code will be:
or 1,1,1
or,
or 2,2,2
We achieve this by extending the existing FTR macros. The current feature
section semantic just becomes a special case, ie. if the else case is empty
we nop out the default case.
The key limitation is that the size of the else case must be less than or
equal to the size of the default case. If the else case is smaller the
remainder of the section is nop'ed.
We let the linker put the else case code in with the rest of the text,
so that relative branches from the else case are more likley to link,
this has the disadvantage that we can't free the unused else cases.
This commit introduces the required macro and linker script changes, but
does not enable the patching of the alternative sections.
We also need to update two hand-made section entries in reg.h and timex.h
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2008-06-23 18:32:54 -07:00
|
|
|
FTR_ENTRY_OFFSET label##1b-label##5b; \
|
|
|
|
|
FTR_ENTRY_OFFSET label##2b-label##5b; \
|
|
|
|
|
FTR_ENTRY_OFFSET label##3b-label##5b; \
|
|
|
|
|
FTR_ENTRY_OFFSET label##4b-label##5b; \
|
|
|
|
|
.popsection;
|
2008-06-23 18:32:39 -07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
/* CPU feature dependent sections */
|
powerpc: Introduce infrastructure for feature sections with alternatives
The current feature section logic only supports nop'ing out code, this means
if you want to choose at runtime between instruction sequences, one or both
cases will have to execute the nop'ed out contents of the other section, eg:
BEGIN_FTR_SECTION
or 1,1,1
END_FTR_SECTION_IFSET(FOO)
BEGIN_FTR_SECTION
or 2,2,2
END_FTR_SECTION_IFCLR(FOO)
and the resulting code will be either,
or 1,1,1
nop
or,
nop
or 2,2,2
For small code segments this is fine, but for larger code blocks and in
performance criticial code segments, it would be nice to avoid the nops.
This commit starts to implement logic to allow the following:
BEGIN_FTR_SECTION
or 1,1,1
FTR_SECTION_ELSE
or 2,2,2
ALT_FTR_SECTION_END_IFSET(FOO)
and the resulting code will be:
or 1,1,1
or,
or 2,2,2
We achieve this by extending the existing FTR macros. The current feature
section semantic just becomes a special case, ie. if the else case is empty
we nop out the default case.
The key limitation is that the size of the else case must be less than or
equal to the size of the default case. If the else case is smaller the
remainder of the section is nop'ed.
We let the linker put the else case code in with the rest of the text,
so that relative branches from the else case are more likley to link,
this has the disadvantage that we can't free the unused else cases.
This commit introduces the required macro and linker script changes, but
does not enable the patching of the alternative sections.
We also need to update two hand-made section entries in reg.h and timex.h
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2008-06-23 18:32:54 -07:00
|
|
|
#define BEGIN_FTR_SECTION_NESTED(label) START_FTR_SECTION(label)
|
|
|
|
|
#define BEGIN_FTR_SECTION START_FTR_SECTION(97)
|
2008-06-23 18:32:39 -07:00
|
|
|
|
powerpc: Introduce infrastructure for feature sections with alternatives
The current feature section logic only supports nop'ing out code, this means
if you want to choose at runtime between instruction sequences, one or both
cases will have to execute the nop'ed out contents of the other section, eg:
BEGIN_FTR_SECTION
or 1,1,1
END_FTR_SECTION_IFSET(FOO)
BEGIN_FTR_SECTION
or 2,2,2
END_FTR_SECTION_IFCLR(FOO)
and the resulting code will be either,
or 1,1,1
nop
or,
nop
or 2,2,2
For small code segments this is fine, but for larger code blocks and in
performance criticial code segments, it would be nice to avoid the nops.
This commit starts to implement logic to allow the following:
BEGIN_FTR_SECTION
or 1,1,1
FTR_SECTION_ELSE
or 2,2,2
ALT_FTR_SECTION_END_IFSET(FOO)
and the resulting code will be:
or 1,1,1
or,
or 2,2,2
We achieve this by extending the existing FTR macros. The current feature
section semantic just becomes a special case, ie. if the else case is empty
we nop out the default case.
The key limitation is that the size of the else case must be less than or
equal to the size of the default case. If the else case is smaller the
remainder of the section is nop'ed.
We let the linker put the else case code in with the rest of the text,
so that relative branches from the else case are more likley to link,
this has the disadvantage that we can't free the unused else cases.
This commit introduces the required macro and linker script changes, but
does not enable the patching of the alternative sections.
We also need to update two hand-made section entries in reg.h and timex.h
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2008-06-23 18:32:54 -07:00
|
|
|
#define END_FTR_SECTION_NESTED(msk, val, label) \
|
|
|
|
|
FTR_SECTION_ELSE_NESTED(label) \
|
2008-06-23 18:32:39 -07:00
|
|
|
MAKE_FTR_SECTION_ENTRY(msk, val, label, __ftr_fixup)
|
|
|
|
|
|
|
|
|
|
#define END_FTR_SECTION(msk, val) \
|
|
|
|
|
END_FTR_SECTION_NESTED(msk, val, 97)
|
|
|
|
|
|
|
|
|
|
#define END_FTR_SECTION_IFSET(msk) END_FTR_SECTION((msk), (msk))
|
|
|
|
|
#define END_FTR_SECTION_IFCLR(msk) END_FTR_SECTION((msk), 0)
|
|
|
|
|
|
powerpc: Introduce infrastructure for feature sections with alternatives
The current feature section logic only supports nop'ing out code, this means
if you want to choose at runtime between instruction sequences, one or both
cases will have to execute the nop'ed out contents of the other section, eg:
BEGIN_FTR_SECTION
or 1,1,1
END_FTR_SECTION_IFSET(FOO)
BEGIN_FTR_SECTION
or 2,2,2
END_FTR_SECTION_IFCLR(FOO)
and the resulting code will be either,
or 1,1,1
nop
or,
nop
or 2,2,2
For small code segments this is fine, but for larger code blocks and in
performance criticial code segments, it would be nice to avoid the nops.
This commit starts to implement logic to allow the following:
BEGIN_FTR_SECTION
or 1,1,1
FTR_SECTION_ELSE
or 2,2,2
ALT_FTR_SECTION_END_IFSET(FOO)
and the resulting code will be:
or 1,1,1
or,
or 2,2,2
We achieve this by extending the existing FTR macros. The current feature
section semantic just becomes a special case, ie. if the else case is empty
we nop out the default case.
The key limitation is that the size of the else case must be less than or
equal to the size of the default case. If the else case is smaller the
remainder of the section is nop'ed.
We let the linker put the else case code in with the rest of the text,
so that relative branches from the else case are more likley to link,
this has the disadvantage that we can't free the unused else cases.
This commit introduces the required macro and linker script changes, but
does not enable the patching of the alternative sections.
We also need to update two hand-made section entries in reg.h and timex.h
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2008-06-23 18:32:54 -07:00
|
|
|
/* CPU feature sections with alternatives, use BEGIN_FTR_SECTION to start */
|
|
|
|
|
#define FTR_SECTION_ELSE FTR_SECTION_ELSE_NESTED(97)
|
|
|
|
|
#define ALT_FTR_SECTION_END_NESTED(msk, val, label) \
|
|
|
|
|
MAKE_FTR_SECTION_ENTRY(msk, val, label, __ftr_fixup)
|
|
|
|
|
#define ALT_FTR_SECTION_END_NESTED_IFSET(msk, label) \
|
|
|
|
|
ALT_FTR_SECTION_END_NESTED(msk, msk, label)
|
|
|
|
|
#define ALT_FTR_SECTION_END_NESTED_IFCLR(msk, label) \
|
|
|
|
|
ALT_FTR_SECTION_END_NESTED(msk, 0, label)
|
|
|
|
|
#define ALT_FTR_SECTION_END(msk, val) \
|
|
|
|
|
ALT_FTR_SECTION_END_NESTED(msk, val, 97)
|
|
|
|
|
#define ALT_FTR_SECTION_END_IFSET(msk) \
|
|
|
|
|
ALT_FTR_SECTION_END_NESTED_IFSET(msk, 97)
|
|
|
|
|
#define ALT_FTR_SECTION_END_IFCLR(msk) \
|
|
|
|
|
ALT_FTR_SECTION_END_NESTED_IFCLR(msk, 97)
|
2008-06-23 18:32:39 -07:00
|
|
|
|
2008-12-18 12:13:32 -07:00
|
|
|
/* MMU feature dependent sections */
|
|
|
|
|
#define BEGIN_MMU_FTR_SECTION_NESTED(label) START_FTR_SECTION(label)
|
|
|
|
|
#define BEGIN_MMU_FTR_SECTION START_FTR_SECTION(97)
|
|
|
|
|
|
|
|
|
|
#define END_MMU_FTR_SECTION_NESTED(msk, val, label) \
|
|
|
|
|
FTR_SECTION_ELSE_NESTED(label) \
|
|
|
|
|
MAKE_FTR_SECTION_ENTRY(msk, val, label, __mmu_ftr_fixup)
|
|
|
|
|
|
|
|
|
|
#define END_MMU_FTR_SECTION(msk, val) \
|
|
|
|
|
END_MMU_FTR_SECTION_NESTED(msk, val, 97)
|
|
|
|
|
|
|
|
|
|
#define END_MMU_FTR_SECTION_IFSET(msk) END_MMU_FTR_SECTION((msk), (msk))
|
|
|
|
|
#define END_MMU_FTR_SECTION_IFCLR(msk) END_MMU_FTR_SECTION((msk), 0)
|
|
|
|
|
|
|
|
|
|
/* MMU feature sections with alternatives, use BEGIN_FTR_SECTION to start */
|
|
|
|
|
#define MMU_FTR_SECTION_ELSE_NESTED(label) FTR_SECTION_ELSE_NESTED(label)
|
|
|
|
|
#define MMU_FTR_SECTION_ELSE MMU_FTR_SECTION_ELSE_NESTED(97)
|
|
|
|
|
#define ALT_MMU_FTR_SECTION_END_NESTED(msk, val, label) \
|
|
|
|
|
MAKE_FTR_SECTION_ENTRY(msk, val, label, __mmu_ftr_fixup)
|
|
|
|
|
#define ALT_MMU_FTR_SECTION_END_NESTED_IFSET(msk, label) \
|
|
|
|
|
ALT_MMU_FTR_SECTION_END_NESTED(msk, msk, label)
|
|
|
|
|
#define ALT_MMU_FTR_SECTION_END_NESTED_IFCLR(msk, label) \
|
|
|
|
|
ALT_MMU_FTR_SECTION_END_NESTED(msk, 0, label)
|
|
|
|
|
#define ALT_MMU_FTR_SECTION_END(msk, val) \
|
|
|
|
|
ALT_MMU_FTR_SECTION_END_NESTED(msk, val, 97)
|
|
|
|
|
#define ALT_MMU_FTR_SECTION_END_IFSET(msk) \
|
|
|
|
|
ALT_MMU_FTR_SECTION_END_NESTED_IFSET(msk, 97)
|
|
|
|
|
#define ALT_MMU_FTR_SECTION_END_IFCLR(msk) \
|
|
|
|
|
ALT_MMU_FTR_SECTION_END_NESTED_IFCLR(msk, 97)
|
|
|
|
|
|
2008-06-23 18:32:39 -07:00
|
|
|
/* Firmware feature dependent sections */
|
powerpc: Introduce infrastructure for feature sections with alternatives
The current feature section logic only supports nop'ing out code, this means
if you want to choose at runtime between instruction sequences, one or both
cases will have to execute the nop'ed out contents of the other section, eg:
BEGIN_FTR_SECTION
or 1,1,1
END_FTR_SECTION_IFSET(FOO)
BEGIN_FTR_SECTION
or 2,2,2
END_FTR_SECTION_IFCLR(FOO)
and the resulting code will be either,
or 1,1,1
nop
or,
nop
or 2,2,2
For small code segments this is fine, but for larger code blocks and in
performance criticial code segments, it would be nice to avoid the nops.
This commit starts to implement logic to allow the following:
BEGIN_FTR_SECTION
or 1,1,1
FTR_SECTION_ELSE
or 2,2,2
ALT_FTR_SECTION_END_IFSET(FOO)
and the resulting code will be:
or 1,1,1
or,
or 2,2,2
We achieve this by extending the existing FTR macros. The current feature
section semantic just becomes a special case, ie. if the else case is empty
we nop out the default case.
The key limitation is that the size of the else case must be less than or
equal to the size of the default case. If the else case is smaller the
remainder of the section is nop'ed.
We let the linker put the else case code in with the rest of the text,
so that relative branches from the else case are more likley to link,
this has the disadvantage that we can't free the unused else cases.
This commit introduces the required macro and linker script changes, but
does not enable the patching of the alternative sections.
We also need to update two hand-made section entries in reg.h and timex.h
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2008-06-23 18:32:54 -07:00
|
|
|
#define BEGIN_FW_FTR_SECTION_NESTED(label) START_FTR_SECTION(label)
|
|
|
|
|
#define BEGIN_FW_FTR_SECTION START_FTR_SECTION(97)
|
2008-06-23 18:32:39 -07:00
|
|
|
|
powerpc: Introduce infrastructure for feature sections with alternatives
The current feature section logic only supports nop'ing out code, this means
if you want to choose at runtime between instruction sequences, one or both
cases will have to execute the nop'ed out contents of the other section, eg:
BEGIN_FTR_SECTION
or 1,1,1
END_FTR_SECTION_IFSET(FOO)
BEGIN_FTR_SECTION
or 2,2,2
END_FTR_SECTION_IFCLR(FOO)
and the resulting code will be either,
or 1,1,1
nop
or,
nop
or 2,2,2
For small code segments this is fine, but for larger code blocks and in
performance criticial code segments, it would be nice to avoid the nops.
This commit starts to implement logic to allow the following:
BEGIN_FTR_SECTION
or 1,1,1
FTR_SECTION_ELSE
or 2,2,2
ALT_FTR_SECTION_END_IFSET(FOO)
and the resulting code will be:
or 1,1,1
or,
or 2,2,2
We achieve this by extending the existing FTR macros. The current feature
section semantic just becomes a special case, ie. if the else case is empty
we nop out the default case.
The key limitation is that the size of the else case must be less than or
equal to the size of the default case. If the else case is smaller the
remainder of the section is nop'ed.
We let the linker put the else case code in with the rest of the text,
so that relative branches from the else case are more likley to link,
this has the disadvantage that we can't free the unused else cases.
This commit introduces the required macro and linker script changes, but
does not enable the patching of the alternative sections.
We also need to update two hand-made section entries in reg.h and timex.h
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2008-06-23 18:32:54 -07:00
|
|
|
#define END_FW_FTR_SECTION_NESTED(msk, val, label) \
|
|
|
|
|
FTR_SECTION_ELSE_NESTED(label) \
|
2008-06-23 18:32:39 -07:00
|
|
|
MAKE_FTR_SECTION_ENTRY(msk, val, label, __fw_ftr_fixup)
|
|
|
|
|
|
|
|
|
|
#define END_FW_FTR_SECTION(msk, val) \
|
|
|
|
|
END_FW_FTR_SECTION_NESTED(msk, val, 97)
|
|
|
|
|
|
|
|
|
|
#define END_FW_FTR_SECTION_IFSET(msk) END_FW_FTR_SECTION((msk), (msk))
|
|
|
|
|
#define END_FW_FTR_SECTION_IFCLR(msk) END_FW_FTR_SECTION((msk), 0)
|
|
|
|
|
|
powerpc: Introduce infrastructure for feature sections with alternatives
The current feature section logic only supports nop'ing out code, this means
if you want to choose at runtime between instruction sequences, one or both
cases will have to execute the nop'ed out contents of the other section, eg:
BEGIN_FTR_SECTION
or 1,1,1
END_FTR_SECTION_IFSET(FOO)
BEGIN_FTR_SECTION
or 2,2,2
END_FTR_SECTION_IFCLR(FOO)
and the resulting code will be either,
or 1,1,1
nop
or,
nop
or 2,2,2
For small code segments this is fine, but for larger code blocks and in
performance criticial code segments, it would be nice to avoid the nops.
This commit starts to implement logic to allow the following:
BEGIN_FTR_SECTION
or 1,1,1
FTR_SECTION_ELSE
or 2,2,2
ALT_FTR_SECTION_END_IFSET(FOO)
and the resulting code will be:
or 1,1,1
or,
or 2,2,2
We achieve this by extending the existing FTR macros. The current feature
section semantic just becomes a special case, ie. if the else case is empty
we nop out the default case.
The key limitation is that the size of the else case must be less than or
equal to the size of the default case. If the else case is smaller the
remainder of the section is nop'ed.
We let the linker put the else case code in with the rest of the text,
so that relative branches from the else case are more likley to link,
this has the disadvantage that we can't free the unused else cases.
This commit introduces the required macro and linker script changes, but
does not enable the patching of the alternative sections.
We also need to update two hand-made section entries in reg.h and timex.h
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2008-06-23 18:32:54 -07:00
|
|
|
/* Firmware feature sections with alternatives */
|
|
|
|
|
#define FW_FTR_SECTION_ELSE_NESTED(label) FTR_SECTION_ELSE_NESTED(label)
|
|
|
|
|
#define FW_FTR_SECTION_ELSE FTR_SECTION_ELSE_NESTED(97)
|
|
|
|
|
#define ALT_FW_FTR_SECTION_END_NESTED(msk, val, label) \
|
|
|
|
|
MAKE_FTR_SECTION_ENTRY(msk, val, label, __fw_ftr_fixup)
|
|
|
|
|
#define ALT_FW_FTR_SECTION_END_NESTED_IFSET(msk, label) \
|
|
|
|
|
ALT_FW_FTR_SECTION_END_NESTED(msk, msk, label)
|
|
|
|
|
#define ALT_FW_FTR_SECTION_END_NESTED_IFCLR(msk, label) \
|
|
|
|
|
ALT_FW_FTR_SECTION_END_NESTED(msk, 0, label)
|
|
|
|
|
#define ALT_FW_FTR_SECTION_END(msk, val) \
|
|
|
|
|
ALT_FW_FTR_SECTION_END_NESTED(msk, val, 97)
|
|
|
|
|
#define ALT_FW_FTR_SECTION_END_IFSET(msk) \
|
|
|
|
|
ALT_FW_FTR_SECTION_END_NESTED_IFSET(msk, 97)
|
|
|
|
|
#define ALT_FW_FTR_SECTION_END_IFCLR(msk) \
|
|
|
|
|
ALT_FW_FTR_SECTION_END_NESTED_IFCLR(msk, 97)
|
|
|
|
|
|
2009-04-29 13:58:01 -07:00
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
|
|
|
|
|
|
#define ASM_MMU_FTR_IF(section_if, section_else, msk, val) \
|
|
|
|
|
stringify_in_c(BEGIN_MMU_FTR_SECTION) \
|
|
|
|
|
section_if "; " \
|
|
|
|
|
stringify_in_c(MMU_FTR_SECTION_ELSE) \
|
|
|
|
|
section_else "; " \
|
|
|
|
|
stringify_in_c(ALT_MMU_FTR_SECTION_END((msk), (val)))
|
|
|
|
|
|
|
|
|
|
#define ASM_MMU_FTR_IFSET(section_if, section_else, msk) \
|
|
|
|
|
ASM_MMU_FTR_IF(section_if, section_else, (msk), (msk))
|
|
|
|
|
|
|
|
|
|
#define ASM_MMU_FTR_IFCLR(section_if, section_else, msk) \
|
|
|
|
|
ASM_MMU_FTR_IF(section_if, section_else, (msk), 0)
|
|
|
|
|
|
2008-06-23 18:32:39 -07:00
|
|
|
#endif /* __ASSEMBLY__ */
|
|
|
|
|
|
2008-07-01 08:16:40 -07:00
|
|
|
/* LWSYNC feature sections */
|
|
|
|
|
#define START_LWSYNC_SECTION(label) label##1:
|
|
|
|
|
#define MAKE_LWSYNC_SECTION_ENTRY(label, sect) \
|
|
|
|
|
label##2: \
|
|
|
|
|
.pushsection sect,"a"; \
|
|
|
|
|
.align 2; \
|
|
|
|
|
label##3: \
|
|
|
|
|
.long label##1b-label##3b; \
|
|
|
|
|
.popsection;
|
|
|
|
|
|
2008-06-23 18:32:39 -07:00
|
|
|
#endif /* __ASM_POWERPC_FEATURE_FIXUPS_H */
|