Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix invalid switch-case syntax resulting from nvdrv macro expansion #242

Merged
merged 1 commit into from
Jan 29, 2024
+38 −25
Merged

Fix invalid switch-case syntax resulting from nvdrv macro expansion #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/src/main/cpp/skyline/services/nvdrv/devices/deserialisation/macro_def.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
PosixResult name::type(IoctlDescriptor cmd, span<u8> buffer, span<u8> inlineBuffer) { \
using className = name; \
switch (cmd.raw) { \
cases; \
cases \
default: \
return PosixResult::InappropriateIoctlForDevice; \
} \
Expand All @@ -17,11 +17,11 @@
PosixResult name::Ioctl(IoctlDescriptor cmd, span<u8> buffer) { \
using className = name; \
switch (cmd.raw) { \
cases; \
cases \
default: \
cmd.size = 0; \
switch (cmd.raw) { \
variableCases; \
variableCases \
default: \
return PosixResult::InappropriateIoctlForDevice; \
} \
Expand All @@ -32,7 +32,7 @@
PosixResult name::Ioctl(IoctlDescriptor cmd, span<u8> buffer) { \
using className = name; \
switch (cmd.raw) { \
cases; \
cases \
default: \
return PosixResult::InappropriateIoctlForDevice; \
} \
Expand Down
12 changes: 7 additions & 5 deletions app/src/main/cpp/skyline/services/nvdrv/devices/nvhost/as_gpu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,10 +354,11 @@ namespace skyline::service::nvdrv::device::nvhost {
return PosixResult::Success;
}

// @fmt:off
#include <services/nvdrv/devices/deserialisation/macro_def.inc>
static constexpr u32 AsGpuMagic{0x41};

VARIABLE_IOCTL_HANDLER_FUNC(AsGpu, ({
VARIABLE_IOCTL_HANDLER_FUNC(AsGpu,
IOCTL_CASE_ARGS(IN, SIZE(0x4), MAGIC(AsGpuMagic), FUNC(0x1),
BindChannel, ARGS(In<FileDescriptor>))
IOCTL_CASE_ARGS(INOUT, SIZE(0x18), MAGIC(AsGpuMagic), FUNC(0x2),
Expand All @@ -372,14 +373,15 @@ namespace skyline::service::nvdrv::device::nvhost {
GetVaRegions, ARGS(In<u64>, InOut<u32>, Pad<u32>, Out<std::array<VaRegion, 2>>))
IOCTL_CASE_ARGS(IN, SIZE(0x28), MAGIC(AsGpuMagic), FUNC(0x9),
AllocAsEx, ARGS(In<u32>, In<FileDescriptor>, In<u32>, Pad<u32>, In<u64>, In<u64>, In<u64>))
}), ({
,
VARIABLE_IOCTL_CASE_ARGS(INOUT, MAGIC(AsGpuMagic), FUNC(0x14),
Remap, ARGS(AutoSizeSpan<RemapEntry>))
}))
)

INLINE_IOCTL_HANDLER_FUNC(Ioctl3, AsGpu, ({
INLINE_IOCTL_HANDLER_FUNC(Ioctl3, AsGpu,
INLINE_IOCTL_CASE_ARGS(INOUT, SIZE(0x40), MAGIC(AsGpuMagic), FUNC(0x8),
GetVaRegions3, ARGS(In<u64>, InOut<u32>, Pad<u32>, Out<std::array<VaRegion, 2>>))
}))
)
#include <services/nvdrv/devices/deserialisation/macro_undef.inc>
// @fmt:on
}
6 changes: 4 additions & 2 deletions app/src/main/cpp/skyline/services/nvdrv/devices/nvhost/ctrl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,10 +249,11 @@ namespace skyline::service::nvdrv::device::nvhost {
return nullptr;
}

// @fmt:off
#include <services/nvdrv/devices/deserialisation/macro_def.inc>
static constexpr u32 CtrlMagic{0};

IOCTL_HANDLER_FUNC(Ctrl, ({
IOCTL_HANDLER_FUNC(Ctrl,
IOCTL_CASE_ARGS(INOUT, SIZE(0x4), MAGIC(CtrlMagic), FUNC(0x1C),
SyncpointClearEventWait, ARGS(In<SyncpointEventValue>))
IOCTL_CASE_ARGS(INOUT, SIZE(0x10), MAGIC(CtrlMagic), FUNC(0x1D),
Expand All @@ -268,6 +269,7 @@ namespace skyline::service::nvdrv::device::nvhost {

IOCTL_CASE_RESULT(INOUT, SIZE(0x183), MAGIC(CtrlMagic), FUNC(0x1B),
PosixResult::InvalidArgument) // GetConfig isn't available in production
}))
)
#include <services/nvdrv/devices/deserialisation/macro_undef.inc>
// @fmt:on
}
10 changes: 6 additions & 4 deletions app/src/main/cpp/skyline/services/nvdrv/devices/nvhost/ctrl_gpu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,11 @@ namespace skyline::service::nvdrv::device::nvhost {
}
}

// @fmt:off
#include <services/nvdrv/devices/deserialisation/macro_def.inc>
static constexpr u32 CtrlGpuMagic{0x47};

IOCTL_HANDLER_FUNC(CtrlGpu, ({
IOCTL_HANDLER_FUNC(CtrlGpu,
IOCTL_CASE_ARGS(OUT, SIZE(0x4), MAGIC(CtrlGpuMagic), FUNC(0x1),
ZCullGetCtxSize, ARGS(Out<u32>))
IOCTL_CASE_ARGS(OUT, SIZE(0x28), MAGIC(CtrlGpuMagic), FUNC(0x2),
Expand All @@ -90,13 +91,14 @@ namespace skyline::service::nvdrv::device::nvhost {
GetActiveSlotMask, ARGS(Out<u32>, Out<u32>))
IOCTL_CASE_ARGS(INOUT, SIZE(0x10), MAGIC(CtrlGpuMagic), FUNC(0x1C),
GetGpuTime, ARGS(Out<u64>, Pad<u64>))
}))
)

INLINE_IOCTL_HANDLER_FUNC(Ioctl3, CtrlGpu, ({
INLINE_IOCTL_HANDLER_FUNC(Ioctl3, CtrlGpu,
INLINE_IOCTL_CASE_ARGS(INOUT, SIZE(0xB0), MAGIC(CtrlGpuMagic), FUNC(0x5),
GetCharacteristics3, ARGS(InOut<u64>, In<u64>, Out<GpuCharacteristics>))
INLINE_IOCTL_CASE_ARGS(INOUT, SIZE(0x18), MAGIC(CtrlGpuMagic), FUNC(0x6),
GetTpcMasks3, ARGS(In<u32>, Pad<u32, 3>, Out<u32>))
}))
)
#include <services/nvdrv/devices/deserialisation/macro_undef.inc>
// @fmt:on
}
12 changes: 7 additions & 5 deletions app/src/main/cpp/skyline/services/nvdrv/devices/nvhost/gpu_channel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,11 +225,12 @@ namespace skyline::service::nvdrv::device::nvhost {
}
}

// @fmt:off
#include <services/nvdrv/devices/deserialisation/macro_def.inc>
static constexpr u32 GpuChannelUserMagic{0x47};
static constexpr u32 GpuChannelMagic{0x48};

VARIABLE_IOCTL_HANDLER_FUNC(GpuChannel, ({
VARIABLE_IOCTL_HANDLER_FUNC(GpuChannel,
IOCTL_CASE_ARGS(IN, SIZE(0x4), MAGIC(GpuChannelMagic), FUNC(0x1),
SetNvmapFd, ARGS(In<FileDescriptor>))
IOCTL_CASE_ARGS(IN, SIZE(0x4), MAGIC(GpuChannelMagic), FUNC(0x3),
Expand All @@ -250,14 +251,15 @@ namespace skyline::service::nvdrv::device::nvhost {
SetUserData, ARGS(In<u64>))
IOCTL_CASE_ARGS(OUT, SIZE(0x8), MAGIC(GpuChannelUserMagic), FUNC(0x15),
GetUserData, ARGS(Out<u64>))
}), ({
,
VARIABLE_IOCTL_CASE_ARGS(INOUT, MAGIC(GpuChannelMagic), FUNC(0x8),
SubmitGpfifo, ARGS(In<u64>, In<u32>, InOut<SubmitGpfifoFlags>, InOut<Fence>, AutoSizeSpan<soc::gm20b::GpEntry>))
}))
)

INLINE_IOCTL_HANDLER_FUNC(Ioctl2, GpuChannel, ({
INLINE_IOCTL_HANDLER_FUNC(Ioctl2, GpuChannel,
INLINE_IOCTL_CASE_ARGS(INOUT, SIZE(0x18), MAGIC(GpuChannelMagic), FUNC(0x1B),
SubmitGpfifo2, ARGS(In<u64>, In<u32>, InOut<SubmitGpfifoFlags>, InOut<Fence>))
}))
)
#include <services/nvdrv/devices/deserialisation/macro_undef.inc>
// @fmt:on
}
9 changes: 6 additions & 3 deletions app/src/main/cpp/skyline/services/nvdrv/devices/nvhost/host1x_channel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,13 @@ namespace skyline::service::nvdrv::device::nvhost {

return PosixResult::Success;
}

// @fmt:off
#include <services/nvdrv/devices/deserialisation/macro_def.inc>
static constexpr u32 Host1xChannelMagic{0x00};
static constexpr u32 GpuChannelMagic{0x48}; //!< Used for SetNvmapFd which is needed in both GPU and host1x channels

VARIABLE_IOCTL_HANDLER_FUNC(Host1xChannel, ({
VARIABLE_IOCTL_HANDLER_FUNC(Host1xChannel,
IOCTL_CASE_ARGS(IN, SIZE(0x4), MAGIC(GpuChannelMagic), FUNC(0x1),
SetNvmapFd, ARGS(In<FileDescriptor>))
IOCTL_CASE_ARGS(INOUT, SIZE(0x8), MAGIC(Host1xChannelMagic), FUNC(0x2),
Expand All @@ -124,7 +126,7 @@ namespace skyline::service::nvdrv::device::nvhost {
GetWaitBase, ARGS(In<core::ChannelType>, Out<u32>))
IOCTL_CASE_ARGS(IN, SIZE(0x4), MAGIC(Host1xChannelMagic), FUNC(0x7),
SetSubmitTimeout, ARGS(In<u32>))
}), ({
,
VARIABLE_IOCTL_CASE_ARGS(INOUT, MAGIC(Host1xChannelMagic), FUNC(0x1),
Submit, ARGS(Save<u32, 0>, Save<u32, 1>, Save<u32, 2>, Save<u32, 3>,
SlotSizeSpan<SubmitCmdBuf, 0>,
Expand All @@ -134,6 +136,7 @@ namespace skyline::service::nvdrv::device::nvhost {
MapBuffer, ARGS(Save<u32, 0>, Pad<u32>, In<u8>, Pad<u8, 3>, SlotSizeSpan<BufferHandle, 0>))
VARIABLE_IOCTL_CASE_ARGS(INOUT, MAGIC(Host1xChannelMagic), FUNC(0xA),
UnmapBuffer, ARGS(Save<u32, 0>, Pad<u32>, In<u8>, Pad<u8, 3>, SlotSizeSpan<BufferHandle, 0>))
}))
)
#include <services/nvdrv/devices/deserialisation/macro_undef.inc>
// @fmt:on
}
6 changes: 4 additions & 2 deletions app/src/main/cpp/skyline/services/nvdrv/devices/nvmap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,11 @@ namespace skyline::service::nvdrv::device {
return PosixResult::Success;
}

// @fmt:off
#include "deserialisation/macro_def.inc"
static constexpr u32 NvMapMagic{1};

IOCTL_HANDLER_FUNC(NvMap, ({
IOCTL_HANDLER_FUNC(NvMap,
IOCTL_CASE_ARGS(INOUT, SIZE(0x8), MAGIC(NvMapMagic), FUNC(0x1),
Create, ARGS(In<u32>, Out<NvMapCore::Handle::Id>))
IOCTL_CASE_ARGS(INOUT, SIZE(0x8), MAGIC(NvMapMagic), FUNC(0x3),
Expand All @@ -149,7 +150,8 @@ namespace skyline::service::nvdrv::device {
Param, ARGS(In<NvMapCore::Handle::Id>, In<HandleParameterType>, Out<u32>))
IOCTL_CASE_ARGS(INOUT, SIZE(0x8), MAGIC(NvMapMagic), FUNC(0xE),
GetId, ARGS(Out<NvMapCore::Handle::Id>, In<NvMapCore::Handle::Id>))
}))
)
#include "deserialisation/macro_undef.inc"
// @fmt:on
}