| 修订版 | 2df4115890b5486c5641a389f0cc77adede1f3b9 (tree) |
|---|---|
| 时间 | 2018-11-17 01:10:29 |
| 作者 | Agustina Arzille <avarzille@rise...> |
| Commiter | Agustina Arzille |
Some corrections
bytecode.cpp (diff) compiler.cpp (diff)
defs.h (diff)| @@ -168,8 +168,11 @@ | ||
| 168 | 168 | } |
| 169 | 169 | else |
| 170 | 170 | { |
| 171 | + io_info info; | |
| 172 | + | |
| 173 | + info.flags &= ~io_info::FLG_RAW; | |
| 171 | 174 | strm->putb (interp, ' '); |
| 172 | - xwrite (interp, strm, val); | |
| 175 | + xwrite (interp, strm, val, info); | |
| 173 | 176 | } |
| 174 | 177 | } |
| 175 | 178 |
| @@ -32,7 +32,9 @@ | ||
| 32 | 32 | |
| 33 | 33 | int operator() (intptr_t left, intptr_t right) const |
| 34 | 34 | { |
| 35 | - return (xcmp (this->ip, (object)left, (object)right)); | |
| 35 | + return (itype (left) != itype (right) ? | |
| 36 | + itype (left) - itype (right) : | |
| 37 | + xcmp (this->ip, (object)left, (object)right)); | |
| 36 | 38 | } |
| 37 | 39 | }; |
| 38 | 40 |
| @@ -373,37 +373,6 @@ | ||
| 373 | 373 | |
| 374 | 374 | #endif |
| 375 | 375 | |
| 376 | -#if defined (QP_ARCH_I386) || defined (QP_ARCH_X8664) || \ | |
| 377 | - defined (QP_ARCH_X32) || defined (QP_ARCH_ARM64) | |
| 378 | - | |
| 379 | -// On x86 and aarch64, we can use unaligned access. | |
| 380 | - | |
| 381 | -inline uint16_t | |
| 382 | -get16 (const void *__ptr) | |
| 383 | -{ | |
| 384 | - return (*(const uint16_t *)__ptr); | |
| 385 | -} | |
| 386 | - | |
| 387 | -inline uint32_t | |
| 388 | -get32 (const void *__ptr) | |
| 389 | -{ | |
| 390 | - return (*(const uint32_t *)__ptr); | |
| 391 | -} | |
| 392 | - | |
| 393 | -inline void | |
| 394 | -put16 (void *__ptr, uint32_t __val) | |
| 395 | -{ | |
| 396 | - *(uint16_t *)__ptr = (uint16_t)__val; | |
| 397 | -} | |
| 398 | - | |
| 399 | -inline void | |
| 400 | -put32 (void *__ptr, uint32_t __val) | |
| 401 | -{ | |
| 402 | - *(uint32_t *)__ptr = __val; | |
| 403 | -} | |
| 404 | - | |
| 405 | -#else | |
| 406 | - | |
| 407 | 376 | inline uint16_t |
| 408 | 377 | get16 (const void *__ptr) |
| 409 | 378 | { |
| @@ -433,8 +402,6 @@ | ||
| 433 | 402 | memcpy (__ptr, &__val, sizeof (__val)); |
| 434 | 403 | } |
| 435 | 404 | |
| 436 | -#endif | |
| 437 | - | |
| 438 | 405 | // Return value for builtins - Assumes 'interp' is bound. |
| 439 | 406 | #define qp_return(val) return (interp->retval = (val)) |
| 440 | 407 |
Fork