summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-05-17 08:21:03 +0200
committerarchshift <admin@archshift.com>2014-05-17 08:21:03 +0200
commitb8c8d0903ec9be4c7d580464480a0136277be803 (patch)
tree9280a9f01e1312d0d8aed493282ae65d2384963c /src/common
parentAdded FindGLEW to cmake-modules (diff)
parentMerge pull request #17 from bunnei/arm-vfp (diff)
downloadyuzu-b8c8d0903ec9be4c7d580464480a0136277be803.tar
yuzu-b8c8d0903ec9be4c7d580464480a0136277be803.tar.gz
yuzu-b8c8d0903ec9be4c7d580464480a0136277be803.tar.bz2
yuzu-b8c8d0903ec9be4c7d580464480a0136277be803.tar.lz
yuzu-b8c8d0903ec9be4c7d580464480a0136277be803.tar.xz
yuzu-b8c8d0903ec9be4c7d580464480a0136277be803.tar.zst
yuzu-b8c8d0903ec9be4c7d580464480a0136277be803.zip
Diffstat (limited to 'src/common')
-rw-r--r--src/common/bit_field.h172
-rw-r--r--src/common/common.vcxproj1
-rw-r--r--src/common/common.vcxproj.filters1
-rw-r--r--src/common/log.h4
-rw-r--r--src/common/log_manager.cpp6
5 files changed, 179 insertions, 5 deletions
diff --git a/src/common/bit_field.h b/src/common/bit_field.h
new file mode 100644
index 000000000..dfd00d198
--- /dev/null
+++ b/src/common/bit_field.h
@@ -0,0 +1,172 @@
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
+
+// Copyright 2014 Tony Wasserka
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+// * Neither the name of the owner nor the names of its contributors may
+// be used to endorse or promote products derived from this software
+// without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+#pragma once
+
+#include <limits>
+#include <type_traits>
+
+#include "common/common.h"
+
+/*
+ * Abstract bitfield class
+ *
+ * Allows endianness-independent access to individual bitfields within some raw
+ * integer value. The assembly generated by this class is identical to the
+ * usage of raw bitfields, so it's a perfectly fine replacement.
+ *
+ * For BitField<X,Y,Z>, X is the distance of the bitfield to the LSB of the
+ * raw value, Y is the length in bits of the bitfield. Z is an integer type
+ * which determines the sign of the bitfield. Z must have the same size as the
+ * raw integer.
+ *
+ *
+ * General usage:
+ *
+ * Create a new union with the raw integer value as a member.
+ * Then for each bitfield you want to expose, add a BitField member
+ * in the union. The template parameters are the bit offset and the number
+ * of desired bits.
+ *
+ * Changes in the bitfield members will then get reflected in the raw integer
+ * value and vice-versa.
+ *
+ *
+ * Sample usage:
+ *
+ * union SomeRegister
+ * {
+ * u32 hex;
+ *
+ * BitField<0,7,u32> first_seven_bits; // unsigned
+ * BitField<7,8,32> next_eight_bits; // unsigned
+ * BitField<3,15,s32> some_signed_fields; // signed
+ * };
+ *
+ * This is equivalent to the little-endian specific code:
+ *
+ * union SomeRegister
+ * {
+ * u32 hex;
+ *
+ * struct
+ * {
+ * u32 first_seven_bits : 7;
+ * u32 next_eight_bits : 8;
+ * };
+ * struct
+ * {
+ * u32 : 3; // padding
+ * s32 some_signed_fields : 15;
+ * };
+ * };
+ *
+ *
+ * Caveats:
+ *
+ * 1)
+ * BitField provides automatic casting from and to the storage type where
+ * appropriate. However, when using non-typesafe functions like printf, an
+ * explicit cast must be performed on the BitField object to make sure it gets
+ * passed correctly, e.g.:
+ * printf("Value: %d", (s32)some_register.some_signed_fields);
+ *
+ * 2)
+ * Not really a caveat, but potentially irritating: This class is used in some
+ * packed structures that do not guarantee proper alignment. Therefore we have
+ * to use #pragma pack here not to pack the members of the class, but instead
+ * to break GCC's assumption that the members of the class are aligned on
+ * sizeof(StorageType).
+ * TODO(neobrain): Confirm that this is a proper fix and not just masking
+ * symptoms.
+ */
+#pragma pack(1)
+template<std::size_t position, std::size_t bits, typename T>
+struct BitField
+{
+private:
+ // This constructor might be considered ambiguous:
+ // Would it initialize the storage or just the bitfield?
+ // Hence, delete it. Use the assignment operator to set bitfield values!
+ BitField(T val) = delete;
+
+public:
+ // Force default constructor to be created
+ // so that we can use this within unions
+ BitField() = default;
+
+ __forceinline BitField& operator=(T val)
+ {
+ storage = (storage & ~GetMask()) | ((val << position) & GetMask());
+ return *this;
+ }
+
+ __forceinline operator T() const
+ {
+ if (std::numeric_limits<T>::is_signed)
+ {
+ std::size_t shift = 8 * sizeof(T)-bits;
+ return (T)(((storage & GetMask()) << (shift - position)) >> shift);
+ }
+ else
+ {
+ return (T)((storage & GetMask()) >> position);
+ }
+ }
+
+private:
+ // StorageType is T for non-enum types and the underlying type of T if
+ // T is an enumeration. Note that T is wrapped within an enable_if in the
+ // former case to workaround compile errors which arise when using
+ // std::underlying_type<T>::type directly.
+ typedef typename std::conditional < std::is_enum<T>::value,
+ std::underlying_type<T>,
+ std::enable_if < true, T >> ::type::type StorageType;
+
+ // Unsigned version of StorageType
+ typedef typename std::make_unsigned<StorageType>::type StorageTypeU;
+
+ __forceinline StorageType GetMask() const
+ {
+ return ((~(StorageTypeU)0) >> (8 * sizeof(T)-bits)) << position;
+ }
+
+ StorageType storage;
+
+ static_assert(bits + position <= 8 * sizeof(T), "Bitfield out of range");
+
+ // And, you know, just in case people specify something stupid like bits=position=0x80000000
+ static_assert(position < 8 * sizeof(T), "Invalid position");
+ static_assert(bits <= 8 * sizeof(T), "Invalid number of bits");
+ static_assert(bits > 0, "Invalid number of bits");
+};
+#pragma pack()
diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj
index 5048bebff..5dc6ff790 100644
--- a/src/common/common.vcxproj
+++ b/src/common/common.vcxproj
@@ -157,6 +157,7 @@
<ClInclude Include="atomic.h" />
<ClInclude Include="atomic_gcc.h" />
<ClInclude Include="atomic_win32.h" />
+ <ClInclude Include="bit_field.h" />
<ClInclude Include="break_points.h" />
<ClInclude Include="chunk_file.h" />
<ClInclude Include="common.h" />
diff --git a/src/common/common.vcxproj.filters b/src/common/common.vcxproj.filters
index e9ea40022..268730228 100644
--- a/src/common/common.vcxproj.filters
+++ b/src/common/common.vcxproj.filters
@@ -39,6 +39,7 @@
<ClInclude Include="utf8.h" />
<ClInclude Include="symbols.h" />
<ClInclude Include="scm_rev.h" />
+ <ClInclude Include="bit_field.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="break_points.cpp" />
diff --git a/src/common/log.h b/src/common/log.h
index 02db8bd55..d95f51f56 100644
--- a/src/common/log.h
+++ b/src/common/log.h
@@ -33,7 +33,7 @@ enum LOG_TYPE {
EXPANSIONINTERFACE,
GDB_STUB,
ARM11,
- GPFIFO,
+ GSP,
OSHLE,
MASTER_LOG,
MEMMAP,
@@ -54,7 +54,7 @@ enum LOG_TYPE {
WII_IPC_FILEIO,
WII_IPC_HID,
WII_IPC_HLE,
- WII_IPC_NET,
+ SVC,
NDMA,
HLE,
RENDER,
diff --git a/src/common/log_manager.cpp b/src/common/log_manager.cpp
index 8e56deb8f..80fd473b9 100644
--- a/src/common/log_manager.cpp
+++ b/src/common/log_manager.cpp
@@ -42,7 +42,7 @@ LogManager::LogManager()
m_Log[LogTypes::STREAMINGINTERFACE] = new LogContainer("Stream", "StreamingInt");
m_Log[LogTypes::DSPINTERFACE] = new LogContainer("DSP", "DSPInterface");
m_Log[LogTypes::DVDINTERFACE] = new LogContainer("DVD", "DVDInterface");
- m_Log[LogTypes::GPFIFO] = new LogContainer("GP", "GPFifo");
+ m_Log[LogTypes::GSP] = new LogContainer("GSP", "GSP");
m_Log[LogTypes::EXPANSIONINTERFACE] = new LogContainer("EXI", "ExpansionInt");
m_Log[LogTypes::GDB_STUB] = new LogContainer("GDB_STUB", "GDB Stub");
m_Log[LogTypes::AUDIO_INTERFACE] = new LogContainer("AI", "AudioInt");
@@ -66,7 +66,7 @@ LogManager::LogManager()
m_Log[LogTypes::WII_IPC_FILEIO] = new LogContainer("WII_IPC_FILEIO", "WII IPC FILEIO");
m_Log[LogTypes::RENDER] = new LogContainer("RENDER", "RENDER");
m_Log[LogTypes::LCD] = new LogContainer("LCD", "LCD");
- m_Log[LogTypes::WII_IPC_NET] = new LogContainer("WII_IPC_NET", "WII IPC NET");
+ m_Log[LogTypes::SVC] = new LogContainer("SVC", "Supervisor Call");
m_Log[LogTypes::NDMA] = new LogContainer("NDMA", "NDMA");
m_Log[LogTypes::HLE] = new LogContainer("HLE", "High Level Emulation");
m_Log[LogTypes::HW] = new LogContainer("HW", "Hardware");
@@ -147,7 +147,7 @@ LogContainer::LogContainer(const char* shortName, const char* fullName, bool ena
{
strncpy(m_fullName, fullName, 128);
strncpy(m_shortName, shortName, 32);
- m_level = LogTypes::LWARNING;
+ m_level = (LogTypes::LOG_LEVELS)MAX_LOGLEVEL;
}
// LogContainer