This is an archive of the discontinued LLVM Phabricator instance.

Differential D12861

[WebAssembly] Use "long long" for int_fast64_t and int_least64_t on wasm64
ClosedPublic

Authored by sunfish on Sep 14 2015, 1:43 PM.

Details

Reviewers
jfb
Commits
rGab0e31fa3516: [WebAssembly] Use "long long" for int_fast64_t and int_least64_t on wasm64
rC247622: [WebAssembly] Use "long long" for int_fast64_t and int_least64_t on wasm64
rL247622: [WebAssembly] Use "long long" for int_fast64_t and int_least64_t on wasm64
Summary

This makes int_fast64_t and int_least64_t the same type as int64_t, and eliminates a difference between wasm32 and wasm64.

Diff Detail

Repository
rL LLVM

Event Timeline

sunfish updated this revision to Diff 34727.Sep 14 2015, 1:43 PM
sunfish retitled this revision from to [WebAssembly] Use "long long" for int_fast64_t and int_least64_t on wasm64.
sunfish updated this object.
sunfish added a reviewer: jfb.
sunfish set the repository for this revision to rL LLVM.
sunfish added a subscriber: cfe-commits.
Herald added subscribers: dschuff, jfb. · View Herald TranscriptSep 14 2015, 1:43 PM
jfb accepted this revision.Sep 14 2015, 2:10 PM
jfb edited edge metadata.

lgtm

This revision is now accepted and ready to land.Sep 14 2015, 2:10 PM
Closed by commit rL247622: [WebAssembly] Use "long long" for int_fast64_t and int_least64_t on wasm64 (authored by djg). · Explain WhySep 14 2015, 2:51 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
include/
clang/
Basic/
5 lines
lib/
Basic/
13 lines
test/
Preprocessor/
40 lines

Diff 34727

include/clang/Basic/TargetInfo.h

Show First 20 Lines • Show All 249 Lines • ▼ Show 20 Linespublic:
} }
/// \brief Return the width (in bits) of the specified integer type enum. /// \brief Return the width (in bits) of the specified integer type enum.
/// ///
/// For example, SignedInt -> getIntWidth(). /// For example, SignedInt -> getIntWidth().
unsigned getTypeWidth(IntType T) const; unsigned getTypeWidth(IntType T) const;
/// \brief Return integer type with specified width. /// \brief Return integer type with specified width.
IntType getIntTypeByWidth(unsigned BitWidth, bool IsSigned) const; virtual IntType getIntTypeByWidth(unsigned BitWidth, bool IsSigned) const;
/// \brief Return the smallest integer type with at least the specified width. /// \brief Return the smallest integer type with at least the specified width.
IntType getLeastIntTypeByWidth(unsigned BitWidth, bool IsSigned) const; virtual IntType getLeastIntTypeByWidth(unsigned BitWidth,
bool IsSigned) const;
/// \brief Return floating point type with specified width. /// \brief Return floating point type with specified width.
RealType getRealTypeByWidth(unsigned BitWidth) const; RealType getRealTypeByWidth(unsigned BitWidth) const;
/// \brief Return the alignment (in bits) of the specified integer type enum. /// \brief Return the alignment (in bits) of the specified integer type enum.
/// ///
/// For example, SignedInt -> getIntAlign(). /// For example, SignedInt -> getIntAlign().
unsigned getTypeAlign(IntType T) const; unsigned getTypeAlign(IntType T) const;
▲ Show 20 Lines • Show All 666 Lines • Show Last 20 Lines

lib/Basic/Targets.cpp

Show First 20 Lines • Show All 7,063 Lines • ▼ Show 20 Linesprivate:
bool bool
validateAsmConstraint(const char *&Name, validateAsmConstraint(const char *&Name,
TargetInfo::ConstraintInfo &Info) const final { TargetInfo::ConstraintInfo &Info) const final {
return false; return false;
} }
const char *getClobbers() const final { return ""; } const char *getClobbers() const final { return ""; }
bool isCLZForZeroUndef() const final { return false; } bool isCLZForZeroUndef() const final { return false; }
bool hasInt128Type() const final { return true; } bool hasInt128Type() const final { return true; }
IntType getIntTypeByWidth(unsigned BitWidth,
bool IsSigned) const final {
// WebAssembly prefers long long for explicitly 64-bit integers.
return BitWidth == 64 ? (IsSigned ? SignedLongLong : UnsignedLongLong)
: TargetInfo::getIntTypeByWidth(BitWidth, IsSigned);
}
IntType getLeastIntTypeByWidth(unsigned BitWidth,
bool IsSigned) const final {
// WebAssembly uses long long for int_least64_t and int_fast64_t.
return BitWidth == 64
? (IsSigned ? SignedLongLong : UnsignedLongLong)
: TargetInfo::getLeastIntTypeByWidth(BitWidth, IsSigned);
}
}; };
const Builtin::Info WebAssemblyTargetInfo::BuiltinInfo[] = { const Builtin::Info WebAssemblyTargetInfo::BuiltinInfo[] = {
#define BUILTIN(ID, TYPE, ATTRS) \ #define BUILTIN(ID, TYPE, ATTRS) \
{ #ID, TYPE, ATTRS, nullptr, ALL_LANGUAGES, nullptr }, { #ID, TYPE, ATTRS, nullptr, ALL_LANGUAGES, nullptr },
#define LIBBUILTIN(ID, TYPE, ATTRS, HEADER) \ #define LIBBUILTIN(ID, TYPE, ATTRS, HEADER) \
{ #ID, TYPE, ATTRS, HEADER, ALL_LANGUAGES, nullptr }, { #ID, TYPE, ATTRS, HEADER, ALL_LANGUAGES, nullptr },
#include "clang/Basic/BuiltinsWebAssembly.def" #include "clang/Basic/BuiltinsWebAssembly.def"
▲ Show 20 Lines • Show All 703 Lines • Show Last 20 Lines

test/Preprocessor/init.c

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 8,839 Lines • ▼ Show 20 Lines
// WEBASSEMBLY64-NEXT:#define __INT_FAST16_FMTd__ "hd"{{$}} // WEBASSEMBLY64-NEXT:#define __INT_FAST16_FMTd__ "hd"{{$}}
// WEBASSEMBLY64-NEXT:#define __INT_FAST16_FMTi__ "hi"{{$}} // WEBASSEMBLY64-NEXT:#define __INT_FAST16_FMTi__ "hi"{{$}}
// WEBASSEMBLY64-NEXT:#define __INT_FAST16_MAX__ 32767{{$}} // WEBASSEMBLY64-NEXT:#define __INT_FAST16_MAX__ 32767{{$}}
// WEBASSEMBLY64-NEXT:#define __INT_FAST16_TYPE__ short{{$}} // WEBASSEMBLY64-NEXT:#define __INT_FAST16_TYPE__ short{{$}}
// WEBASSEMBLY64-NEXT:#define __INT_FAST32_FMTd__ "d"{{$}} // WEBASSEMBLY64-NEXT:#define __INT_FAST32_FMTd__ "d"{{$}}
// WEBASSEMBLY64-NEXT:#define __INT_FAST32_FMTi__ "i"{{$}} // WEBASSEMBLY64-NEXT:#define __INT_FAST32_FMTi__ "i"{{$}}
// WEBASSEMBLY64-NEXT:#define __INT_FAST32_MAX__ 2147483647{{$}} // WEBASSEMBLY64-NEXT:#define __INT_FAST32_MAX__ 2147483647{{$}}
// WEBASSEMBLY64-NEXT:#define __INT_FAST32_TYPE__ int{{$}} // WEBASSEMBLY64-NEXT:#define __INT_FAST32_TYPE__ int{{$}}
// WEBASSEMBLY64-NEXT:#define __INT_FAST64_FMTd__ "ld"{{$}} // WEBASSEMBLY64-NEXT:#define __INT_FAST64_FMTd__ "lld"{{$}}
// WEBASSEMBLY64-NEXT:#define __INT_FAST64_FMTi__ "li"{{$}} // WEBASSEMBLY64-NEXT:#define __INT_FAST64_FMTi__ "lli"{{$}}
// WEBASSEMBLY64-NEXT:#define __INT_FAST64_MAX__ 9223372036854775807L{{$}} // WEBASSEMBLY64-NEXT:#define __INT_FAST64_MAX__ 9223372036854775807LL{{$}}
// WEBASSEMBLY64-NEXT:#define __INT_FAST64_TYPE__ long int{{$}} // WEBASSEMBLY64-NEXT:#define __INT_FAST64_TYPE__ long long int{{$}}
// WEBASSEMBLY64-NEXT:#define __INT_FAST8_FMTd__ "hhd"{{$}} // WEBASSEMBLY64-NEXT:#define __INT_FAST8_FMTd__ "hhd"{{$}}
// WEBASSEMBLY64-NEXT:#define __INT_FAST8_FMTi__ "hhi"{{$}} // WEBASSEMBLY64-NEXT:#define __INT_FAST8_FMTi__ "hhi"{{$}}
// WEBASSEMBLY64-NEXT:#define __INT_FAST8_MAX__ 127{{$}} // WEBASSEMBLY64-NEXT:#define __INT_FAST8_MAX__ 127{{$}}
// WEBASSEMBLY64-NEXT:#define __INT_FAST8_TYPE__ signed char{{$}} // WEBASSEMBLY64-NEXT:#define __INT_FAST8_TYPE__ signed char{{$}}
// WEBASSEMBLY64-NEXT:#define __INT_LEAST16_FMTd__ "hd"{{$}} // WEBASSEMBLY64-NEXT:#define __INT_LEAST16_FMTd__ "hd"{{$}}
// WEBASSEMBLY64-NEXT:#define __INT_LEAST16_FMTi__ "hi"{{$}} // WEBASSEMBLY64-NEXT:#define __INT_LEAST16_FMTi__ "hi"{{$}}
// WEBASSEMBLY64-NEXT:#define __INT_LEAST16_MAX__ 32767{{$}} // WEBASSEMBLY64-NEXT:#define __INT_LEAST16_MAX__ 32767{{$}}
// WEBASSEMBLY64-NEXT:#define __INT_LEAST16_TYPE__ short{{$}} // WEBASSEMBLY64-NEXT:#define __INT_LEAST16_TYPE__ short{{$}}
// WEBASSEMBLY64-NEXT:#define __INT_LEAST32_FMTd__ "d"{{$}} // WEBASSEMBLY64-NEXT:#define __INT_LEAST32_FMTd__ "d"{{$}}
// WEBASSEMBLY64-NEXT:#define __INT_LEAST32_FMTi__ "i"{{$}} // WEBASSEMBLY64-NEXT:#define __INT_LEAST32_FMTi__ "i"{{$}}
// WEBASSEMBLY64-NEXT:#define __INT_LEAST32_MAX__ 2147483647{{$}} // WEBASSEMBLY64-NEXT:#define __INT_LEAST32_MAX__ 2147483647{{$}}
// WEBASSEMBLY64-NEXT:#define __INT_LEAST32_TYPE__ int{{$}} // WEBASSEMBLY64-NEXT:#define __INT_LEAST32_TYPE__ int{{$}}
// WEBASSEMBLY64-NEXT:#define __INT_LEAST64_FMTd__ "ld"{{$}} // WEBASSEMBLY64-NEXT:#define __INT_LEAST64_FMTd__ "lld"{{$}}
// WEBASSEMBLY64-NEXT:#define __INT_LEAST64_FMTi__ "li"{{$}} // WEBASSEMBLY64-NEXT:#define __INT_LEAST64_FMTi__ "lli"{{$}}
// WEBASSEMBLY64-NEXT:#define __INT_LEAST64_MAX__ 9223372036854775807L{{$}} // WEBASSEMBLY64-NEXT:#define __INT_LEAST64_MAX__ 9223372036854775807LL{{$}}
// WEBASSEMBLY64-NEXT:#define __INT_LEAST64_TYPE__ long int{{$}} // WEBASSEMBLY64-NEXT:#define __INT_LEAST64_TYPE__ long long int{{$}}
// WEBASSEMBLY64-NEXT:#define __INT_LEAST8_FMTd__ "hhd"{{$}} // WEBASSEMBLY64-NEXT:#define __INT_LEAST8_FMTd__ "hhd"{{$}}
// WEBASSEMBLY64-NEXT:#define __INT_LEAST8_FMTi__ "hhi"{{$}} // WEBASSEMBLY64-NEXT:#define __INT_LEAST8_FMTi__ "hhi"{{$}}
// WEBASSEMBLY64-NEXT:#define __INT_LEAST8_MAX__ 127{{$}} // WEBASSEMBLY64-NEXT:#define __INT_LEAST8_MAX__ 127{{$}}
// WEBASSEMBLY64-NEXT:#define __INT_LEAST8_TYPE__ signed char{{$}} // WEBASSEMBLY64-NEXT:#define __INT_LEAST8_TYPE__ signed char{{$}}
// WEBASSEMBLY64-NEXT:#define __INT_MAX__ 2147483647{{$}} // WEBASSEMBLY64-NEXT:#define __INT_MAX__ 2147483647{{$}}
// WEBASSEMBLY64-NEXT:#define __LDBL_DECIMAL_DIG__ 17{{$}} // WEBASSEMBLY64-NEXT:#define __LDBL_DECIMAL_DIG__ 17{{$}}
// WEBASSEMBLY64-NEXT:#define __LDBL_DENORM_MIN__ 4.9406564584124654e-324L{{$}} // WEBASSEMBLY64-NEXT:#define __LDBL_DENORM_MIN__ 4.9406564584124654e-324L{{$}}
// WEBASSEMBLY64-NEXT:#define __LDBL_DIG__ 15{{$}} // WEBASSEMBLY64-NEXT:#define __LDBL_DIG__ 15{{$}}
▲ Show 20 Lines • Show All 108 Lines • ▼ Show 20 Lines
// WEBASSEMBLY64-NEXT:#define __UINT_FAST16_MAX__ 65535{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_FAST16_MAX__ 65535{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_FAST16_TYPE__ unsigned short{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_FAST16_TYPE__ unsigned short{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_FAST32_FMTX__ "X"{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_FAST32_FMTX__ "X"{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_FAST32_FMTo__ "o"{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_FAST32_FMTo__ "o"{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_FAST32_FMTu__ "u"{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_FAST32_FMTu__ "u"{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_FAST32_FMTx__ "x"{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_FAST32_FMTx__ "x"{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_FAST32_MAX__ 4294967295U{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_FAST32_MAX__ 4294967295U{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_FAST32_TYPE__ unsigned int{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_FAST32_TYPE__ unsigned int{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_FAST64_FMTX__ "lX"{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_FAST64_FMTX__ "llX"{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_FAST64_FMTo__ "lo"{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_FAST64_FMTo__ "llo"{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_FAST64_FMTu__ "lu"{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_FAST64_FMTu__ "llu"{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_FAST64_FMTx__ "lx"{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_FAST64_FMTx__ "llx"{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_FAST64_MAX__ 18446744073709551615UL{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_FAST64_MAX__ 18446744073709551615ULL{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_FAST64_TYPE__ long unsigned int{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_FAST64_TYPE__ long long unsigned int{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_FAST8_FMTX__ "hhX"{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_FAST8_FMTX__ "hhX"{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_FAST8_FMTo__ "hho"{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_FAST8_FMTo__ "hho"{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_FAST8_FMTu__ "hhu"{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_FAST8_FMTu__ "hhu"{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_FAST8_FMTx__ "hhx"{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_FAST8_FMTx__ "hhx"{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_FAST8_MAX__ 255{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_FAST8_MAX__ 255{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_FAST8_TYPE__ unsigned char{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_FAST8_TYPE__ unsigned char{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_LEAST16_FMTX__ "hX"{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_LEAST16_FMTX__ "hX"{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_LEAST16_FMTo__ "ho"{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_LEAST16_FMTo__ "ho"{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_LEAST16_FMTu__ "hu"{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_LEAST16_FMTu__ "hu"{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_LEAST16_FMTx__ "hx"{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_LEAST16_FMTx__ "hx"{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_LEAST16_MAX__ 65535{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_LEAST16_MAX__ 65535{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_LEAST16_TYPE__ unsigned short{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_LEAST16_TYPE__ unsigned short{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_LEAST32_FMTX__ "X"{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_LEAST32_FMTX__ "X"{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_LEAST32_FMTo__ "o"{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_LEAST32_FMTo__ "o"{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_LEAST32_FMTu__ "u"{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_LEAST32_FMTu__ "u"{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_LEAST32_FMTx__ "x"{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_LEAST32_FMTx__ "x"{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_LEAST32_MAX__ 4294967295U{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_LEAST32_MAX__ 4294967295U{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_LEAST32_TYPE__ unsigned int{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_LEAST32_TYPE__ unsigned int{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_LEAST64_FMTX__ "lX"{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_LEAST64_FMTX__ "llX"{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_LEAST64_FMTo__ "lo"{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_LEAST64_FMTo__ "llo"{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_LEAST64_FMTu__ "lu"{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_LEAST64_FMTu__ "llu"{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_LEAST64_FMTx__ "lx"{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_LEAST64_FMTx__ "llx"{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_LEAST64_MAX__ 18446744073709551615UL{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_LEAST64_MAX__ 18446744073709551615ULL{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_LEAST64_TYPE__ long unsigned int{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_LEAST64_TYPE__ long long unsigned int{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_LEAST8_FMTX__ "hhX"{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_LEAST8_FMTX__ "hhX"{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_LEAST8_FMTo__ "hho"{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_LEAST8_FMTo__ "hho"{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_LEAST8_FMTu__ "hhu"{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_LEAST8_FMTu__ "hhu"{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_LEAST8_FMTx__ "hhx"{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_LEAST8_FMTx__ "hhx"{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_LEAST8_MAX__ 255{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_LEAST8_MAX__ 255{{$}}
// WEBASSEMBLY64-NEXT:#define __UINT_LEAST8_TYPE__ unsigned char{{$}} // WEBASSEMBLY64-NEXT:#define __UINT_LEAST8_TYPE__ unsigned char{{$}}
// WEBASSEMBLY64-NEXT:#define __USER_LABEL_PREFIX__ {{$}} // WEBASSEMBLY64-NEXT:#define __USER_LABEL_PREFIX__ {{$}}
// WEBASSEMBLY64-NEXT:#define __VERSION__ "{{.*}}"{{$}} // WEBASSEMBLY64-NEXT:#define __VERSION__ "{{.*}}"{{$}}
Show All 24 Lines