6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-08-02 09:29:24 +00:00
Code Issues Projects Releases Wiki Activity

raw_ostream: Simplify write(unsigned char) to match write(const char*, unsigned).

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@79386 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar 2009-08-19 00:23:39 +00:00
parent d29d497b53
commit ecc67e2e1b
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/Support/raw_ostream.cpp
View File

@ -185,23 +185,18 @@ void raw_ostream::flush_nonempty() {
raw_ostream &raw_ostream::write(unsigned char C) { raw_ostream &raw_ostream::write(unsigned char C) {
// Group exceptional cases into a single branch. // Group exceptional cases into a single branch.
if (OutBufCur >= OutBufEnd) { if (BUILTIN_EXPECT(OutBufCur >= OutBufEnd, false)) {
if (BufferMode == Unbuffered) { if (BUILTIN_EXPECT(!OutBufStart, false)) {
write_impl(reinterpret_cast<char*>(&C), 1);
return *this;
}
if (OutBufStart)
flush_nonempty();
else {
SetBuffered();
// It's possible for the underlying stream to decline
// buffering, so check this condition again.
if (BufferMode == Unbuffered) { if (BufferMode == Unbuffered) {
write_impl(reinterpret_cast<char*>(&C), 1); write_impl(reinterpret_cast<char*>(&C), 1);
return *this; return *this;
} }
// Set up a buffer and start over.
SetBuffered();
return write(C);
} }
flush_nonempty();
} }
*OutBufCur++ = C; *OutBufCur++ = C;
@ -220,6 +215,7 @@ raw_ostream &raw_ostream::write(const char *Ptr, size_t Size) {
SetBuffered(); SetBuffered();
return write(Ptr, Size); return write(Ptr, Size);
} }
// Write out the data in buffer-sized blocks until the remainder // Write out the data in buffer-sized blocks until the remainder
// fits within the buffer. // fits within the buffer.
do { do {
@ -259,12 +255,6 @@ void raw_ostream::copy_to_buffer(const char *Ptr, size_t Size) {
raw_ostream &raw_ostream::operator<<(const format_object_base &Fmt) { raw_ostream &raw_ostream::operator<<(const format_object_base &Fmt) {
// If we have more than a few bytes left in our output buffer, try // If we have more than a few bytes left in our output buffer, try
// formatting directly onto its end. // formatting directly onto its end.
//
// FIXME: This test is a bit silly, since if we don't have enough
// space in the buffer we will have to flush the formatted output
// anyway. We should just flush upfront in such cases, and use the
// whole buffer as our scratch pad. Note, however, that this case is
// also necessary for correctness on unbuffered streams.
size_t NextBufferSize = 127; size_t NextBufferSize = 127;
if (OutBufEnd-OutBufCur > 3) { if (OutBufEnd-OutBufCur > 3) {
size_t BufferBytesLeft = OutBufEnd-OutBufCur; size_t BufferBytesLeft = OutBufEnd-OutBufCur;