diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2008-08-22 22:47:26 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2008-08-22 22:47:26 +0000 |
| commit | 599347b9c9b448d03dc58fc95df88267c744aa29 (patch) | |
| tree | 75a70a2c16d7fcc77a747d532b7be4a38709cf0a /code/qcommon/vm_interpreted.c | |
| parent | 6e6bab9af628a899fca58dffc42c2ebb09eceb69 (diff) | |
| download | ioquake3-aero-599347b9c9b448d03dc58fc95df88267c744aa29.tar.gz ioquake3-aero-599347b9c9b448d03dc58fc95df88267c744aa29.zip | |
* (bug #3729) server dependencies on client.h (Ben Millwood)
* (bug #3731) BUILD_MISSIONPACK flag in Makefile (Gabriel Schnoering
<gabriel.schnoering@gmail.com>)
* (bug #3756) Q3VM crashes on unaligned block copy with SIGBUS (Patrick Baggett
<baggett.patrick@figglesoftware.com>) and...
* (bug #3755) IOQuake3 shouldn't use GCC-specific __FUNCTION__
git-svn-id: svn://svn.icculus.org/quake3/trunk@1456 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/qcommon/vm_interpreted.c')
| -rw-r--r-- | code/qcommon/vm_interpreted.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/code/qcommon/vm_interpreted.c b/code/qcommon/vm_interpreted.c index 897da68..7183e24 100644 --- a/code/qcommon/vm_interpreted.c +++ b/code/qcommon/vm_interpreted.c @@ -489,16 +489,10 @@ nextInstruction2: count = ((srci + count) & dataMask) - srci; count = ((desti + count) & dataMask) - desti; - src = (int *)&image[ r0&dataMask ]; - dest = (int *)&image[ r1&dataMask ]; - if ( ( (intptr_t)src | (intptr_t)dest | count ) & 3 ) { - // happens in westernq3 - Com_Printf( S_COLOR_YELLOW "Warning: OP_BLOCK_COPY not dword aligned\n"); - } - count >>= 2; - for ( i = count-1 ; i>= 0 ; i-- ) { - dest[i] = src[i]; - } + src = (int *)&image[ srci ]; + dest = (int *)&image[ desti ]; + + memcpy(dest, src, count); programCounter += 4; opStack -= 2; } |