From e0e0b460523e029fb0f96e67700e48a08223c18e Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Mon, 26 Jan 2009 18:11:15 +0000 Subject: [PATCH] Implemented SHIFTLEFT and SHIFTRIGHT --- support/tock_intrinsics_arith.h | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/support/tock_intrinsics_arith.h b/support/tock_intrinsics_arith.h index b3eb6a1..ba402b5 100644 --- a/support/tock_intrinsics_arith.h +++ b/support/tock_intrinsics_arith.h @@ -205,14 +205,30 @@ static inline INT occam_LONGDIV (INT dividend_hi, INT dividend_lo, INT divisor, //TODO implement, and move into the correct order above: /////////////////// -static inline INT occam_SHIFTRIGHT (INT, INT, INT, INT*, const char *) occam_unused; -static inline INT occam_SHIFTRIGHT (INT hi_in, INT lo_in, INT places, INT* result1, const char *pos) { - return 0; -} - static inline INT occam_SHIFTLEFT (INT, INT, INT, INT*, const char *) occam_unused; static inline INT occam_SHIFTLEFT (INT hi_in, INT lo_in, INT places, INT* result1, const char *pos) { - return 0; + if (places >= CHAR_BIT*sizeof(INT)) { + *result1 = 0; + return occam_sign(occam_unsign(lo_in) << (places - CHAR_BIT*sizeof(INT))); + } else { + const UINT r_lo = occam_unsign(lo_in) << places; + const UINT r_hi = (occam_unsign(hi_in) << places) | (occam_unsign(lo_in) >> (CHAR_BIT*sizeof(INT)-places)); + *result1 = occam_sign(r_lo); + return r_hi; + } +} + +static inline INT occam_SHIFTRIGHT (INT, INT, INT, INT*, const char *) occam_unused; +static inline INT occam_SHIFTRIGHT (INT hi_in, INT lo_in, INT places, INT* result1, const char *pos) { + if (places >= CHAR_BIT*sizeof(INT)) { + *result1 = occam_sign(occam_unsign(hi_in) >> (places - CHAR_BIT*sizeof(INT))); + return 0; + } else { + const UINT r_hi = occam_unsign(hi_in) >> places; + const UINT r_lo = (occam_unsign(lo_in) >> places) | (occam_unsign(hi_in) << (CHAR_BIT*sizeof(INT)-places)); + *result1 = occam_sign(r_lo); + return r_hi; + } } static inline INT occam_ASHIFTRIGHT (INT, INT, const char *) occam_unused;