diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-11-14 10:50:06 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-11-14 10:50:06 +0100 |
| commit | d30cee99c662bf030ce035e56e342d7ebf155513 (patch) | |
| tree | 7ab4b2cfbca419cd6bcc09fdee243b24deb7e6af /erts/emulator/hipe/hipe_x86_bifs.m4 | |
| parent | 24797b6ba55cfd83438381234c3108540ea29acb (diff) | |
| parent | 55c2b0b6d55fe6a011671832b5529cb1c7b636a8 (diff) | |
| download | otp-d30cee99c662bf030ce035e56e342d7ebf155513.tar.gz otp-d30cee99c662bf030ce035e56e342d7ebf155513.tar.bz2 otp-d30cee99c662bf030ce035e56e342d7ebf155513.zip | |
Merge remote branch 'upstream/maint'
Conflicts:
lib/ssl/src/ssl_connection.erl
Diffstat (limited to 'erts/emulator/hipe/hipe_x86_bifs.m4')
| -rw-r--r-- | erts/emulator/hipe/hipe_x86_bifs.m4 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/erts/emulator/hipe/hipe_x86_bifs.m4 b/erts/emulator/hipe/hipe_x86_bifs.m4 index 3cb7d67be0..8cc6340933 100644 --- a/erts/emulator/hipe/hipe_x86_bifs.m4 +++ b/erts/emulator/hipe/hipe_x86_bifs.m4 @@ -35,12 +35,12 @@ include(`hipe/hipe_x86_asm.m4') # define CALL_BIF(F) call CSYM(F) #endif' -define(TEST_GOT_MBUF,`movl P_MBUF(P), %edx # `TEST_GOT_MBUF' +define(TEST_GOT_MBUF,`movl P_MBUF(P), %edx /* `TEST_GOT_MBUF' */ testl %edx, %edx jnz 3f 2:') define(HANDLE_GOT_MBUF,` -3: call nbif_$1_gc_after_bif # `HANDLE_GOT_MBUF' +3: call nbif_$1_gc_after_bif /* `HANDLE_GOT_MBUF' */ jmp 2b') /* @@ -70,7 +70,7 @@ ASYM($1): NBIF_ARG_REG(0,P) NBIF_ARG(2,1,0) lea 8(%esp), %eax - NBIF_ARG_REG(1,%eax) # BIF__ARGS + NBIF_ARG_REG(1,%eax) /* BIF__ARGS */ CALL_BIF($2) TEST_GOT_MBUF @@ -105,7 +105,7 @@ ASYM($1): NBIF_ARG(2,2,0) NBIF_ARG(3,2,1) lea 8(%esp), %eax - NBIF_ARG_REG(1,%eax) # BIF__ARGS + NBIF_ARG_REG(1,%eax) /* BIF__ARGS */ CALL_BIF($2) TEST_GOT_MBUF @@ -141,7 +141,7 @@ ASYM($1): NBIF_ARG(3,3,1) NBIF_ARG(4,3,2) lea 8(%esp), %eax - NBIF_ARG_REG(1,%eax) # BIF__ARGS + NBIF_ARG_REG(1,%eax) /* BIF__ARGS */ CALL_BIF($2) TEST_GOT_MBUF |