diff options
| author | Sverker Eriksson <[email protected]> | 2016-10-26 17:37:35 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-10-26 17:37:35 +0200 |
| commit | 42b9881d075344344a8c78026e282b40fa707a0c (patch) | |
| tree | d9755627cee82a99eff6755c8f092ed45dd7a71e /erts/emulator/hipe/hipe_risc_glue.h | |
| parent | 6408400fc1ca9609169f6a0450f1c4671aced91c (diff) | |
| parent | 1302b09c4aa0f944bdc0e3beeebb2cf84cc06c89 (diff) | |
| download | otp-42b9881d075344344a8c78026e282b40fa707a0c.tar.gz otp-42b9881d075344344a8c78026e282b40fa707a0c.tar.bz2 otp-42b9881d075344344a8c78026e282b40fa707a0c.zip | |
Merge branch 'master' into sverker/hipe-fun-purge
Diffstat (limited to 'erts/emulator/hipe/hipe_risc_glue.h')
| -rw-r--r-- | erts/emulator/hipe/hipe_risc_glue.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/erts/emulator/hipe/hipe_risc_glue.h b/erts/emulator/hipe/hipe_risc_glue.h index 0284265307..1369b392fe 100644 --- a/erts/emulator/hipe/hipe_risc_glue.h +++ b/erts/emulator/hipe/hipe_risc_glue.h @@ -66,13 +66,17 @@ static __inline__ unsigned int max(unsigned int x, unsigned int y) static __inline__ void hipe_arch_glue_init(void) { - static struct sdesc_with_exnra nbif_return_sdesc = { - .exnra = (unsigned long)&nbif_fail, - .sdesc = { - .bucket = { .hvalue = (unsigned long)&nbif_return }, - .summary = (1<<8), - }, - }; + static struct hipe_sdesc_with_exnra nbif_return_sdesc; + + nbif_return_sdesc.exnra = (unsigned long)nbif_fail; + nbif_return_sdesc.sdesc.bucket.hvalue = (unsigned long)nbif_return; + nbif_return_sdesc.sdesc.fsize = 0; + nbif_return_sdesc.sdesc.has_exnra = 1; + nbif_return_sdesc.sdesc.stk_nargs = 0; + nbif_return_sdesc.sdesc.m_aix = atom_val(am_Empty); + nbif_return_sdesc.sdesc.f_aix = atom_val(am_return); + nbif_return_sdesc.sdesc.a = 0; + hipe_init_sdesc_table(&nbif_return_sdesc.sdesc); } |