diff options
| author | Björn Gustavsson <[email protected]> | 2011-11-30 10:44:42 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-11-30 10:44:42 +0100 |
| commit | f7c881208154dcae6d0b753a160eb771710bd47a (patch) | |
| tree | 14f19e6524a33f5e2d664e162ecf0d3b21d0d959 /erts/emulator/beam/beam_bp.h | |
| parent | 8e5ef86ee21cb6491287710606a7525f45cc50fc (diff) | |
| parent | 3c36d2c5f75827f098a691dfcf534ab3b95d7bd9 (diff) | |
| download | otp-f7c881208154dcae6d0b753a160eb771710bd47a.tar.gz otp-f7c881208154dcae6d0b753a160eb771710bd47a.tar.bz2 otp-f7c881208154dcae6d0b753a160eb771710bd47a.zip | |
Merge branch 'bjorn/llvm-issues/OTP-9712'
* bjorn/llvm-issues/OTP-9712:
INSTALL.md: Update build instructions for Lion
Fix clang linking problem
configure: Define NO_JUMP_TABLE if all we have is llvm-gcc
beam_emu.c: Eliminate warnings when NO_JUMP_TABLE is defined
beam_emu.c: Use the correct void* type for computed gotos
MacOS X: Completely remove obsolete -no-cpp-precomp option
Diffstat (limited to 'erts/emulator/beam/beam_bp.h')
| -rw-r--r-- | erts/emulator/beam/beam_bp.h | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/erts/emulator/beam/beam_bp.h b/erts/emulator/beam/beam_bp.h index 2ec5818688..167069552f 100644 --- a/erts/emulator/beam/beam_bp.h +++ b/erts/emulator/beam/beam_bp.h @@ -144,8 +144,6 @@ extern erts_smp_spinlock_t erts_bp_lock; #define ErtsSmpBPUnlock(BDC) #endif -ERTS_INLINE Uint bp_sched2ix(void); - #ifdef ERTS_SMP #define bp_sched2ix_proc(p) ((p)->scheduler_data->no - 1) #else @@ -247,4 +245,19 @@ BpData *erts_get_time_break(Process *p, BeamInstr *pc); BeamInstr *erts_find_local_func(Eterm mfa[3]); +ERTS_GLB_INLINE Uint erts_bp_sched2ix(void); + +#if ERTS_GLB_INLINE_INCL_FUNC_DEF +ERTS_GLB_INLINE Uint erts_bp_sched2ix(void) +{ +#ifdef ERTS_SMP + ErtsSchedulerData *esdp; + esdp = erts_get_scheduler_data(); + return esdp->no - 1; +#else + return 0; +#endif +} +#endif + #endif /* _BEAM_BP_H */ |