diff options
| author | Damien George <damien.p.george@gmail.com> | 2015-01-01 18:07:43 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2015-01-01 18:07:43 +0000 |
| commit | ebde3c694f301a99addf02c3b8ff3834f04663af (patch) | |
| tree | 108d34fc69d8e45d0a1bbd8e1046cee15c159d19 | |
| parent | ddbcc795509bdd4957e876189577fdada0d486ac (diff) | |
| download | micropython-ebde3c694f301a99addf02c3b8ff3834f04663af.tar.gz micropython-ebde3c694f301a99addf02c3b8ff3834f04663af.zip | |
py: Add guarded includes for asm-based headers.
| -rw-r--r-- | py/asmarm.h | 5 | ||||
| -rw-r--r-- | py/asmthumb.h | 6 | ||||
| -rw-r--r-- | py/asmx64.h | 7 | ||||
| -rw-r--r-- | py/asmx86.h | 7 |
4 files changed, 25 insertions, 0 deletions
diff --git a/py/asmarm.h b/py/asmarm.h index 378b676098..c9819cdaba 100644 --- a/py/asmarm.h +++ b/py/asmarm.h @@ -24,6 +24,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#ifndef __MICROPY_INCLUDED_PY_ASMARM_H__ +#define __MICROPY_INCLUDED_PY_ASMARM_H__ + +#include "py/misc.h" #define ASM_ARM_PASS_COMPUTE (1) #define ASM_ARM_PASS_EMIT (2) @@ -120,3 +124,4 @@ void asm_arm_bcc_label(asm_arm_t *as, int cond, uint label); void asm_arm_b_label(asm_arm_t *as, uint label); void asm_arm_bl_ind(asm_arm_t *as, void *fun_ptr, uint fun_id, uint reg_temp); +#endif // __MICROPY_INCLUDED_PY_ASMARM_H__ diff --git a/py/asmthumb.h b/py/asmthumb.h index beb12502cf..93cad09e78 100644 --- a/py/asmthumb.h +++ b/py/asmthumb.h @@ -23,6 +23,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#ifndef __MICROPY_INCLUDED_PY_ASMTHUMB_H__ +#define __MICROPY_INCLUDED_PY_ASMTHUMB_H__ + +#include "py/misc.h" #define ASM_THUMB_PASS_COMPUTE (1) #define ASM_THUMB_PASS_EMIT (2) @@ -200,3 +204,5 @@ void asm_thumb_mov_reg_local_addr(asm_thumb_t *as, uint rlo_dest, int local_num) void asm_thumb_b_label(asm_thumb_t *as, uint label); // convenience ? void asm_thumb_bcc_label(asm_thumb_t *as, int cc, uint label); // convenience: picks narrow or wide branch void asm_thumb_bl_ind(asm_thumb_t *as, void *fun_ptr, uint fun_id, uint reg_temp); // convenience ? + +#endif // __MICROPY_INCLUDED_PY_ASMTHUMB_H__ diff --git a/py/asmx64.h b/py/asmx64.h index 656aff692b..f3f7ec12b4 100644 --- a/py/asmx64.h +++ b/py/asmx64.h @@ -23,6 +23,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#ifndef __MICROPY_INCLUDED_PY_ASMX64_H__ +#define __MICROPY_INCLUDED_PY_ASMX64_H__ + +#include "py/mpconfig.h" +#include "py/misc.h" // AMD64 calling convention is: // - args pass in: RDI, RSI, RDX, RCX, R08, R09 @@ -108,3 +113,5 @@ void asm_x64_mov_local_to_r64(asm_x64_t* as, int src_local_num, int dest_r64); void asm_x64_mov_r64_to_local(asm_x64_t* as, int src_r64, int dest_local_num); void asm_x64_mov_local_addr_to_r64(asm_x64_t* as, int local_num, int dest_r64); void asm_x64_call_ind(asm_x64_t* as, void* ptr, int temp_r32); + +#endif // __MICROPY_INCLUDED_PY_ASMX64_H__ diff --git a/py/asmx86.h b/py/asmx86.h index 68c6f82948..544786cf7f 100644 --- a/py/asmx86.h +++ b/py/asmx86.h @@ -23,6 +23,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#ifndef __MICROPY_INCLUDED_PY_ASMX86_H__ +#define __MICROPY_INCLUDED_PY_ASMX86_H__ + +#include "py/mpconfig.h" +#include "py/misc.h" // x86 cdecl calling convention is: // - args passed on the stack in reverse order @@ -106,3 +111,5 @@ void asm_x86_mov_local_to_r32(asm_x86_t* as, int src_local_num, int dest_r32); void asm_x86_mov_r32_to_local(asm_x86_t* as, int src_r32, int dest_local_num); void asm_x86_mov_local_addr_to_r32(asm_x86_t* as, int local_num, int dest_r32); void asm_x86_call_ind(asm_x86_t* as, void* ptr, mp_uint_t n_args, int temp_r32); + +#endif // __MICROPY_INCLUDED_PY_ASMX86_H__ |