From c27b7d91aaf6bc764807a8998a9c885e57c22a1b Mon Sep 17 00:00:00 2001
From: jsmall-nvidia <jsmall@nvidia.com>
Date: Tue, 29 Oct 2019 08:51:24 -0400
Subject: Feature/container format (#1098)

* WIP RiffContainer.

* WIP riff container.

* Testing out RiffContainer.

* * Naming improvements
* Visitor functions

* Ability to dump riffs.

* Renamed RiffChunk to RiffHeader

* Remove m_ prefix on RiffHeader members.

* Riff stream reading writing.
Simple test of riff reading/writing.

* Fix Riff alignment issue.
Make IR serialization use the RiffContainer API.

* Improve documentation.

* Remove SubChunk fuctionality as not needed with RiffContainer.
---
 source/core/slang-stream.cpp | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

(limited to 'source/core/slang-stream.cpp')

diff --git a/source/core/slang-stream.cpp b/source/core/slang-stream.cpp
index b5eef1d9b..bfbe43b0c 100644
--- a/source/core/slang-stream.cpp
+++ b/source/core/slang-stream.cpp
@@ -181,9 +181,10 @@ void FileStream::seek(SeekOrigin origin, Int64 offset)
 		throw IOException("FileStream seek failed.");
 	}
 }
-Int64 FileStream::read(void* buffer, Int64 length)
+
+size_t FileStream::read(void* buffer, size_t length)
 {
-	auto bytes = fread_s(buffer, (size_t)length, 1, (size_t)length, m_handle);
+	auto bytes = fread_s(buffer, length, 1, length, m_handle);
 	if (bytes == 0 && length > 0)
 	{
 		if (!feof(m_handle))
@@ -192,25 +193,29 @@ Int64 FileStream::read(void* buffer, Int64 length)
 			throw EndOfStreamException("End of file is reached.");
 		m_endReached = true;
 	}
-	return (int)bytes;
+	return bytes;
 }
-Int64 FileStream::write(const void* buffer, Int64 length)
+
+size_t FileStream::write(const void* buffer, size_t length)
 {
-	auto bytes = (Int64)fwrite(buffer, 1, (size_t)length, m_handle);
+	auto bytes = fwrite(buffer, 1, length, m_handle);
 	if (bytes < length)
 	{
 		throw IOException("FileStream write failed.");
 	}
 	return bytes;
 }
+
 bool FileStream::canRead()
 {
 	return ((int)m_fileAccess & (int)FileAccess::Read) != 0;
 }
+
 bool FileStream::canWrite()
 {
 	return ((int)m_fileAccess & (int)FileAccess::Write) != 0;
 }
+
 void FileStream::close()
 {
 	if (m_handle)
@@ -219,6 +224,7 @@ void FileStream::close()
 		m_handle = 0;
 	}
 }
+
 bool FileStream::isEnd()
 {
 	return m_endReached;
@@ -251,18 +257,17 @@ void MemoryStreamBase::seek(SeekOrigin origin, Int64 offset)
     pos = (pos < 0) ? 0 : pos;
     pos = (pos > Int64(m_contentsSize)) ? Int64(m_contentsSize) : pos;
 
-    m_position = UInt(pos);
+    m_position = ptrdiff_t(pos);
 }
 
-Int64 MemoryStreamBase::read(void* buffer, Int64 length)
+size_t MemoryStreamBase::read(void* buffer, size_t length)
 {
     if (!canRead())
     {
         throw IOException("Cannot read this stream.");
     }
 
-    const Int64 maxRead = Int64(m_contentsSize - m_position);
-
+    const size_t maxRead = size_t(m_contentsSize - m_position);
     if (maxRead == 0 && length > 0)
     {
         m_atEnd = true;
@@ -271,14 +276,14 @@ Int64 MemoryStreamBase::read(void* buffer, Int64 length)
 
     length = length > maxRead ? maxRead : length;
 
-    ::memcpy(buffer, m_contents + m_position, size_t(length));
-    m_position += UInt(length);
+    ::memcpy(buffer, m_contents + m_position, length);
+    m_position += ptrdiff_t(length);
     return maxRead;
 }
 
 // !!!!!!!!!!!!!!!!!!!!!!!!!!!!! OwnedMemoryStream !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-Int64 OwnedMemoryStream::write(const void * buffer, Int64 length)
+size_t OwnedMemoryStream::write(const void * buffer, size_t length)
 {
     if (!canWrite())
     {
@@ -287,11 +292,11 @@ Int64 OwnedMemoryStream::write(const void * buffer, Int64 length)
 
     if (m_position == m_ownedContents.getCount())
     {
-        m_ownedContents.addRange((const uint8_t*)buffer, UInt(length));
+        m_ownedContents.addRange((const uint8_t*)buffer, Index(length));
     }
     else
     {
-        m_ownedContents.insertRange(m_position, (const uint8_t*)buffer, UInt(length));
+        m_ownedContents.insertRange(m_position, (const uint8_t*)buffer, Index(length));
     }
 
     m_contents = m_ownedContents.getBuffer();
-- 
cgit v1.2.3