organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-05 21:45:37 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 12

ICU-98 These are changes to support 64-bit platforms, such as Sun

Browse source 
SPARC V9, which is the only one tested so far.

X-SVN-Rev: 1022
This commit is contained in:
Brendan Murray 2000-03-29 21:41:11 +00:00
parent 3c0e9c341f
commit dd70c2705e
28 changed files with 144 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
icu4c/source/common/digitlst.cpp
View file

@ -518,7 +518,7 @@ DigitList::initializeLONG_MIN_REP()
{
// THIS ASSUMES A 32-BIT LONG_MIN VALUE
char buf[LONG_DIGITS];
sprintf(buf, "%d", LONG_MIN);
sprintf(buf, "%d", T_INT32_MIN);
LONG_MIN_REP_LENGTH = strlen(buf) - 1;
// assert(LONG_MIN_REP_LENGTH == LONG_DIGITS);
for (int32_t i=1; i<=LONG_MIN_REP_LENGTH; ++i) LONG_MIN_REP[i-1] = buf[i];

2
icu4c/source/common/scsu.c
View file

@ -1385,7 +1385,7 @@ scsu_findStaticWindow(int32_t c)
static int32_t
scsu_getLRDefinedWindow(const UnicodeCompressor *comp)
{
int32_t leastRU = LONG_MAX;
int32_t leastRU = T_INT32_MAX;
int32_t whichWindow = INVALIDWINDOW;
int32_t i;

2
icu4c/source/common/ucnv2022.c
View file

@ -688,7 +688,7 @@ static const UConverterImpl _ISO2022Impl={
};
extern const UConverterSharedData _ISO2022Data={
sizeof(UConverterSharedData), ~0,
sizeof(UConverterSharedData), ~((uint32_t) 0),
NULL, NULL, &_ISO2022Impl, "ISO_2022",
2022, UCNV_IBM, UCNV_ISO_2022, 1, 4,
{ 0, 1, 0x1a, 0, 0, 0 }

6
icu4c/source/common/ucnv_utf.c
View file

@ -713,7 +713,7 @@ static const UConverterImpl _UTF8Impl={
};
extern const UConverterSharedData _UTF8Data={
sizeof(UConverterSharedData), ~0,
sizeof(UConverterSharedData), ~((uint32_t) 0),
NULL, NULL, &_UTF8Impl, "UTF8",
1208, UCNV_IBM, UCNV_UTF8, 1, 4,
{ 0, 3, 0xef, 0xbf, 0xbd, 0 }
@ -887,7 +887,7 @@ static const UConverterImpl _UTF16BEImpl={
};
extern const UConverterSharedData _UTF16BEData={
sizeof(UConverterSharedData), ~0,
sizeof(UConverterSharedData), ~((uint32_t) 0),
NULL, NULL, &_UTF16BEImpl, "UTF16_BigEndian",
1200, UCNV_IBM, UCNV_UTF16_BigEndian, 2, 2,
{ 0, 2, 0xff, 0xfd, 0, 0 }
@ -1065,7 +1065,7 @@ static const UConverterImpl _UTF16LEImpl={
};
extern const UConverterSharedData _UTF16LEData={
sizeof(UConverterSharedData), ~0,
sizeof(UConverterSharedData), ~((uint32_t) 0),
NULL, NULL, &_UTF16LEImpl, "UTF16_LittleEndian",
1200, UCNV_IBM, UCNV_UTF16_LittleEndian, 2, 2,
{ 0, 2, 0xfd, 0xff, 0, 0 }

2
icu4c/source/common/ucnvlat1.c
View file

@ -161,7 +161,7 @@ static const UConverterImpl _Latin1Impl={
};
extern const UConverterSharedData _Latin1Data={
sizeof(UConverterSharedData), ~0,
sizeof(UConverterSharedData), ~((uint32_t) 0),
NULL, NULL, &_Latin1Impl, "LATIN_1",
819, UCNV_IBM, UCNV_LATIN_1, 1, 1,
{ 0, 1, 0x1a, 0, 0, 0 }

21
icu4c/source/common/unicode/platform.h.in
View file

@ -80,17 +80,32 @@ typedef unsigned short uint16_t;
#endif
#if ! HAVE_INT32_T
typedef signed long int32_t;
# if defined(_LP64)
typedef signed int int32_t;
# else
typedef signed long int32_t;
# endif
#endif
#if ! HAVE_UINT32_T
typedef unsigned long uint32_t;
# if defined(_LP64)
typedef unsigned int uint32_t;
# else
typedef unsigned long uint32_t;
# endif
#endif
#endif
#include <limits.h>
#define T_INT32_MAX (LONG_MAX)
#if defined(_LP64)
# define T_INT32_MAX (INT_MAX)
# define T_INT32_MIN (INT_MIN)
#else
# define T_INT32_MAX (LONG_MAX)
# define T_INT32_MIN (LONG_MIN)
#endif
/*===========================================================================*/
/* Character data types */

1
icu4c/source/common/unicode/pos2.h
View file

@ -74,6 +74,7 @@ typedef unsigned long uint32_t;
#include <limits.h>
#define T_INT32_MAX (LONG_MAX)
#define T_INT32_MIN (LONG_MIN)
/*===========================================================================*/
/* Character data types */

1
icu4c/source/common/unicode/pos400.h
View file

@ -75,6 +75,7 @@ typedef unsigned long uint32_t;
#include <limits.h>
#define T_INT32_MAX (LONG_MAX)
#define T_INT32_MIN (LONG_MIN)
/*===========================================================================*/
/* Character data types */

21
icu4c/source/common/unicode/pwin32.h
View file

@ -63,17 +63,32 @@ typedef unsigned short uint16_t;
#endif
#if ! HAVE_INT32_T
typedef signed long int32_t;
# if defined(_LP64)
typedef signed int int32_t;
# else
typedef signed long int32_t;
# endif
#endif
#if ! HAVE_UINT32_T
typedef unsigned long uint32_t;
# if defined(_LP64)
typedef unsigned int uint32_t;
# else
typedef unsigned long uint32_t;
# endif
#endif
#endif
#include <limits.h>
#define T_INT32_MAX (LONG_MAX)
#if defined(_LP64)
# define T_INT32_MAX (INT_MAX)
# define T_INT32_MIN (INT_MIN)
#else
# define T_INT32_MAX (LONG_MAX)
# define T_INT32_MIN (LONG_MIN)
#endif
/*===========================================================================*/
/* Character data types */

6
icu4c/source/common/unicode/unistr.h
View file

@ -1334,7 +1334,7 @@ public:
* @stable
*/
inline UnicodeString& remove(UTextOffset start,
int32_t length = LONG_MAX);
int32_t length = T_INT32_MAX);
/**
* Remove the characters in the range
@ -1345,7 +1345,7 @@ public:
* @stable
*/
inline UnicodeString& removeBetween(UTextOffset start,
UTextOffset limit = LONG_MAX);
UTextOffset limit = T_INT32_MAX);
/* Length operations */
@ -1603,7 +1603,7 @@ public:
* @stable
*/
int32_t numDisplayCells(UTextOffset start = 0,
int32_t length = LONG_MAX,
int32_t length = T_INT32_MAX,
bool_t asian = TRUE) const;

2
icu4c/source/common/unicode/utypes.h
View file

@ -115,7 +115,9 @@ updates come out. */
/* Maximum value of a (void*) - use to indicate the limit of
an 'infinite' buffer. */
#ifndef U_MAX_PTR
#define U_MAX_PTR ((void*)-1)
#endif
/*===========================================================================*/
/* Calendar/TimeZone data types */

2
icu4c/source/common/utf_impl.c
View file

@ -70,7 +70,7 @@ utf8_minRegular[4]={ 0, 0x80, 0x800, 0x10000 };
static UChar32
utf8_errorValue[7]={
UTF8_ERROR_VALUE_1, UTF8_ERROR_VALUE_2, UTF_ERROR_VALUE, 0x10ffff,
0x3ffffff, 0x7fffffff, 0xffffffff
0x3ffffff, 0x7fffffff, -1 /* 0xffffffff in a signed value! */
};
U_CAPI UChar32 U_EXPORT2

3
icu4c/source/config.guess vendored
View file

@ -182,6 +182,9 @@ EOF
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit 0 ;;
sun4u:SunOS:5.*:*)
echo sparcv9-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit 0 ;;
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit 0 ;;

55
icu4c/source/config/mh-solaris-sparcv9 Normal file
View file

@ -0,0 +1,55 @@
## -*-makefile-*-
## Solaris-specific setup using Sun's workshop compilers
## Copyright (c) 1999-2000, International Business Machines Corporation and
## others. All Rights Reserved.
## Commands to generate dependency files
GEN_DEPS.c= $(CC) -xtarget=ultra -xarch=v9 -xM $(DEFS) $(CPPFLAGS)
GEN_DEPS.cc= $(CXX) -xtarget=ultra -xarch=v9 -xM $(DEFS) $(CPPFLAGS)
## Commands to compile
COMPILE.c= $(CC) -xtarget=ultra -xarch=v9 -mt $(DEFS) $(CPPFLAGS) $(CFLAGS) -c
COMPILE.cc= $(CXX) -xtarget=ultra -xarch=v9 -mt $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -c
## Commands to link
## For Sun Workshop, use CC to link to bring in C++ runtime
LINK.c= $(CXX) -xtarget=ultra -xarch=v9 -mt $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
LINK.cc= $(CXX) -xtarget=ultra -xarch=v9 -mt $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
## Commands to make a shared library
SHLIB.c= $(CC) -xtarget=ultra -xarch=v9 $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -G
SHLIB.cc= $(CXX) -xtarget=ultra -xarch=v9 $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -G
## Compiler switch to embed a runtime search path
LD_RPATH= -R
LD_RPATH_PRE=
## Shared object suffix
SO= so
## Link commands to link to ICU libs
LIBICU-UC= -L$(top_builddir)/common -licu-uc
LIBICU-I18N= -L$(top_builddir)/i18n -licu-i18n
LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -lctestfw
LIBICU-TOOLUTIL=-L$(top_builddir)/tools/toolutil -licu-toolutil
## Compilation rules
%.o : $(srcdir)/%.c
$(COMPILE.c) -o $@ $<
%.o : $(srcdir)/%.cpp
$(COMPILE.cc) -o $@ $<
../data/%.o : ../data/%.c
$(COMPILE.c) -o $@ $<
## Dependency rules
%.d : $(srcdir)/%.c
@echo "Generating dependency information for $<"
@$(GEN_DEPS.c) $< > $@
%.d : $(srcdir)/%.cpp
@echo "Generating dependency information for $<"
@$(GEN_DEPS.cc) $< > $@
## End Solaris-specific setup

2
icu4c/source/configure vendored
View file

@ -1093,6 +1093,8 @@ case "${host}" in
*-*-solaris*)
if test "$ac_cv_prog_gcc" = yes; then
icu_cv_host_frag=$srcdir/config/mh-solaris-gcc
elif test "$host_cpu" = sparcv9; then
icu_cv_host_frag=$srcdir/config/mh-solaris-sparcv9
else
icu_cv_host_frag=$srcdir/config/mh-solaris
fi ;;

11
icu4c/source/i18n/dbbi.cpp
View file

@ -380,7 +380,7 @@ DictionaryBasedBreakIterator::divideUpDictionaryRange(int32_t startPos, int32_t
}
else {
if ((currentBreakPositions.isEmpty()
|| (int32_t)currentBreakPositions.peek() != text->getIndex())
|| (int32_t)(unsigned long)currentBreakPositions.peek() != text->getIndex())
&& text->getIndex() != startPos) {
currentBreakPositions.push((void*)text->getIndex());
}
@ -395,15 +395,15 @@ DictionaryBasedBreakIterator::divideUpDictionaryRange(int32_t startPos, int32_t
// it. Then back up to that position and start over from there (i.e.,
// treat that position as the beginning of a new word)
else {
int32_t temp = (int32_t)possibleBreakPositions.pop();
int32_t temp = (int32_t)(unsigned long)possibleBreakPositions.pop();
void* temp2 = NULL;
while (!currentBreakPositions.isEmpty() && temp <
(int32_t)currentBreakPositions.peek()) {
(int32_t)(unsigned long)currentBreakPositions.peek()) {
temp2 = currentBreakPositions.pop();
wrongBreakPositions.addElement(temp2);
}
currentBreakPositions.push((void*)temp);
text->setIndex((int32_t)currentBreakPositions.peek());
text->setIndex((int32_t)(unsigned long)currentBreakPositions.peek());
}
// re-sync "c" for the next go-round, and drop out of the loop if
@ -440,7 +440,8 @@ DictionaryBasedBreakIterator::divideUpDictionaryRange(int32_t startPos, int32_t
cachedBreakPositions[0] = startPos;
for (int32_t i = 0; i < currentBreakPositions.size(); i++) {
cachedBreakPositions[i + 1] = (int32_t)currentBreakPositions.elementAt(i);
cachedBreakPositions[i + 1] = (int32_t)(unsigned long)currentBreakPositions.elementAt(i);
}
positionInCache = 0;
}

6
icu4c/source/i18n/dbbi_tbl.cpp
View file

@ -24,13 +24,13 @@ DictionaryBasedBreakIteratorTables::DictionaryBasedBreakIteratorTables(
dictionary(dictionaryFilename, status)
{
if (U_FAILURE(status)) return;
const void** tablesIdx = (const void**)tablesImage;
const void* dbbiImage = (const void*)((const int8_t*)tablesImage + (int32_t)tablesIdx[8]);
const int32_t* tablesIdx = (int32_t*) tablesImage;
const int8_t* dbbiImage = ((const int8_t*)tablesImage + tablesIdx[8]);
// we know the offset into the memory image where the DBBI stuff
// starts is stored in element 8 of the array. There should be
// a way for the RBBI constructor to give us this, but there's
// isn't a good one.
const void** dbbiIdx = (const void**)dbbiImage;
const int32_t* dbbiIdx = (const int32_t*)dbbiImage;
categoryFlags = (int8_t*)((const int8_t*)dbbiImage + (int32_t)dbbiIdx[0]);
}

2
icu4c/source/i18n/decimfmt.cpp
View file

@ -481,7 +481,7 @@ DecimalFormat::format(int32_t number,
if (number < 0) // This can only happen if number == Long.MIN_VALUE
{
int32_t cutoff = LONG_MIN / fMultiplier;
int32_t cutoff = T_INT32_MIN / fMultiplier;
useDouble = (number < cutoff);
}
else

2
icu4c/source/i18n/digitlst.cpp
View file

@ -518,7 +518,7 @@ DigitList::initializeLONG_MIN_REP()
{
// THIS ASSUMES A 32-BIT LONG_MIN VALUE
char buf[LONG_DIGITS];
sprintf(buf, "%d", LONG_MIN);
sprintf(buf, "%d", T_INT32_MIN);
LONG_MIN_REP_LENGTH = strlen(buf) - 1;
// assert(LONG_MIN_REP_LENGTH == LONG_DIGITS);
for (int32_t i=1; i<=LONG_MIN_REP_LENGTH; ++i) LONG_MIN_REP[i-1] = buf[i];

4
icu4c/source/i18n/rbbi_tbl.cpp
View file

@ -19,8 +19,8 @@ RuleBasedBreakIteratorTables::RuleBasedBreakIteratorTables(const void* image)
: refCount(0),
ownTables(FALSE)
{
const void** im = (const void**)(image);
const int8_t* base = (const int8_t*)(image);
const int32_t* im = (const int32_t*)(image);
const int8_t* base = (const int8_t*)(image);
// the memory image begins with an index that gives the offsets into the
// image for each of the fields in the BreakIteratorTables object--

2
icu4c/source/i18n/rbt_data.cpp
View file

@ -47,7 +47,7 @@ TransliterationRuleData::lookupVariable(const UnicodeString& name,
if (value == 0) {
status = U_ILLEGAL_ARGUMENT_ERROR;
}
return (UChar) (int32_t) value;
return (UChar) (int32_t) (unsigned long) value;
}
const UnicodeSet*

4
icu4c/source/i18n/uniset.cpp
View file

@ -976,9 +976,9 @@ void UnicodeSet::doUnion(UnicodeString& c1, const UnicodeString& c2) {
// one of the operands. We can append all of the remaining characters
// in the other operand without doing any extra work.
if (i < c1.length())
result.append(c1, i, LONG_MAX);
result.append(c1, i, T_INT32_MAX);
if (j < c2.length())
result.append(c2, j, LONG_MAX);
result.append(c2, j, T_INT32_MAX);
c1 = result;
}

2
icu4c/source/test/intltest/callimts.cpp
View file

@ -335,7 +335,7 @@ CalendarLimitTest::timeToFields(UDate theTime, int32_t* fields)
// Compute the Julian calendar day number for January 1, rawYear
//double january1 = 365 * (rawYear - 1) + floorDivide(rawYear - 1, 4);
double january1 = 365 * (rawYear - 1) + floorDivide(rawYear - 1, 4L);
dayOfYear = (int32_t)(julianEpochDay - january1); // 0-based
dayOfYear = (int32_t)uprv_fmod(julianEpochDay - january1, 365.0);
// Julian leap years occurred historically every 4 years starting
// with 8 AD. Before 8 AD the spacing is irregular; every 3 years

4
icu4c/source/test/intltest/calregts.cpp
View file

@ -1248,11 +1248,11 @@ CalendarRegressionTest::test4031502()
calendar->adoptTimeZone(TimeZone::createTimeZone("GMT"));
calendar->setTime(makeDate(LONG_MIN),status);
calendar->setTime(makeDate(T_INT32_MIN),status);
int32_t year1 = calendar->get(Calendar::YEAR,status);
int32_t era1 = calendar->get(Calendar::ERA,status);
calendar->setTime(makeDate(LONG_MAX),status);
calendar->setTime(makeDate(T_INT32_MAX),status);
int32_t year2 = calendar->get(Calendar::YEAR,status);
int32_t era2 = calendar->get(Calendar::ERA,status);

8
icu4c/source/test/intltest/numrgts.cpp
View file

@ -1793,15 +1793,15 @@ void
NumberFormatRegressionTest::Test4162198(void)
{
// for some reason, DBL_MAX will not round trip. (bug in sprintf/atof)
double dbl = LONG_MAX * 1000.0;
double dbl = T_INT32_MAX * 1000.0;
UErrorCode status = U_ZERO_ERROR;
NumberFormat *f = NumberFormat::createInstance(status);
if(U_FAILURE(status)) {
errln("Couldn't create number format");
return;
}
f->setMaximumFractionDigits(LONG_MAX);
f->setMaximumIntegerDigits(LONG_MAX);
f->setMaximumFractionDigits(T_INT32_MAX);
f->setMaximumIntegerDigits(T_INT32_MAX);
UnicodeString s;
f->format(dbl,s);
logln(UnicodeString("The number ") + dbl + " formatted to " + s);
@ -2167,7 +2167,7 @@ void NumberFormatRegressionTest::Test4216742(void) {
UErrorCode status = U_ZERO_ERROR;
DecimalFormat *fmt = (DecimalFormat*) NumberFormat::createInstance(Locale::US, status);
failure(status, "createInstance");
int32_t DATA[] = { LONG_MIN, LONG_MAX, -100000000, 100000000 };
int32_t DATA[] = { T_INT32_MIN, T_INT32_MAX, -100000000, 100000000 };
int DATA_length = sizeof(DATA) / sizeof(DATA[0]);
for (int i=0; i<DATA_length; ++i) {
char buf[64];

13
icu4c/source/test/intltest/restest.cpp
View file

@ -430,7 +430,7 @@ ResourceBundleTest::testTag(const char* frag,
if (U_SUCCESS(status))
{
CONFIRM_GE(count,1);
CONFIRM_NE((int32_t)array,(int32_t)0);
CONFIRM_NE((int32_t)(unsigned long)array,(int32_t)0);
for (j=0; j<count; ++j)
{
@ -443,7 +443,7 @@ ResourceBundleTest::testTag(const char* frag,
else
{
CONFIRM_EQ(count,kERROR_COUNT);
CONFIRM_EQ((int32_t)array,(int32_t)0);
CONFIRM_EQ((int32_t)(unsigned long)array,(int32_t)0);
count = 0;
}
@ -497,7 +497,7 @@ ResourceBundleTest::testTag(const char* frag,
{
CONFIRM_GE(row_count,1);
CONFIRM_GE(column_count,(int32_t)0);
CONFIRM_NE((int32_t)array,(int32_t)0);
CONFIRM_NE((int32_t)(unsigned long)array,(int32_t)0);
for (row=0; row<row_count; ++row)
{
@ -515,7 +515,7 @@ ResourceBundleTest::testTag(const char* frag,
{
CONFIRM_EQ(row_count,kERROR_COUNT);
CONFIRM_EQ(column_count,kERROR_COUNT);
CONFIRM_EQ((int32_t)array,(int32_t)0);
CONFIRM_EQ((int32_t)(unsigned long)array,(int32_t)0);
row_count = column_count = 0;
}
@ -574,8 +574,8 @@ ResourceBundleTest::testTag(const char* frag,
if (U_SUCCESS(status)) {
CONFIRM_GE((int32_t)expected_count, (int32_t)0);
CONFIRM_NE((int32_t)tags, (int32_t)0);
CONFIRM_NE((int32_t)items, (int32_t)0);
CONFIRM_NE((int32_t)(unsigned long)tags, (int32_t)0);
CONFIRM_NE((int32_t)(unsigned long)items, (int32_t)0);
for (index = 0; index < expected_count; index++) {
logln("tag = " + tags[index] + ", value = " + items[index]);
@ -639,3 +639,4 @@ ResourceBundleTest::record_fail()
++fail;
}
//eof

4
icu4c/source/test/intltest/tsnmfmt.cpp
View file

@ -153,8 +153,8 @@ IntlTestNumberFormat::testFormat(char *par)
tryIt(9.99999999999996);
tryIt(9.999999999999996);
tryIt((int32_t)LONG_MIN);
tryIt((int32_t)LONG_MAX);
tryIt((int32_t)T_INT32_MIN);
tryIt((int32_t)T_INT32_MAX);
tryIt((double)LONG_MIN);
tryIt((double)LONG_MAX);
tryIt((double)LONG_MIN - 1.0);

2
icu4c/source/test/intltest/tzregts.cpp
View file

@ -663,7 +663,7 @@ TimeZoneRegressionTest::Test4154525()
0, BAD,
-1, BAD,
60*60*1000, GOOD,
LONG_MIN, BAD,
T_INT32_MIN, BAD,
// Integer.MAX_VALUE, ?, // no upper limit on DST savings at this time
};