Skip to content

Draft: v6.4.3.p4.6 support #5

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

Open
bl4ckb0ne wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Draft: v6.4.3.p4.6 support #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e090a47
add meson build files
bl4ckb0ne May 7, 2024
8eb5bee
add support for v6.4.3.p4.6 headers
bl4ckb0ne May 8, 2024
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
50 changes: 50 additions & 0 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
project('libvivhook',
'c', 'cpp',
version: '1.0.0',
license: 'MIT',
default_options: [
'c_std=gnu99',
],
)

cc = meson.get_compiler('c')
add_project_arguments(cc.get_supported_arguments([
'-feliminate-unused-debug-types',
'-Wnested-externs',
'-Wcast-qual',
'-Wredundant-decls',
'-Werror=write-strings',
'-Wshadow',
]), language: ['c'])

add_project_arguments([
'-D_GNU_SOURCE',
], language: 'c')

dl = cc.find_library('dl', required: true)
galcore = declare_dependency(
include_directories: include_directories(get_option('galcore-include')),
link_args: ['-L'+ get_option('galcore-lib'), '-lGAL'],
)

vivhook_src = files(
'src/elf_hook.c',
'src/flightrecorder.cpp',
'src/viv_hook.c',
)

libvivhook = library('vivhook',
vivhook_src,
dependencies: [dl, galcore],
)

viv_interpose_src = vivhook_src + files(
'src/viv_interpose.c',
)

viv_interpose = shared_library('viv_interpose',
viv_interpose_src,
name_prefix: '',
dependencies: [dl, galcore],
)

2 changes: 2 additions & 0 deletions meson_options.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
option('galcore-include', type: 'string')
option('galcore-lib', type: 'string')
21 changes: 21 additions & 0 deletions src/viv_hook.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,11 @@ static void log_queue(flightrec_event_t evctx, uint64_t queue_handle)
* Assumes that the parent structure id was already added. */
static void log_interface_in(flightrec_event_t evctx, gcsHAL_INTERFACE *id)
{
#ifdef GCABI_SUBCOMMIT
struct _gcsHAL_COMMAND_LOCATION *cmdloc;
#else
struct _gcoCMDBUF *cmdbuf;
#endif
#ifndef GCABI_HAS_STATE_DELTAS
struct _gcoCONTEXT *context;
#endif
Expand All @@ -201,9 +205,17 @@ static void log_interface_in(flightrec_event_t evctx, gcsHAL_INTERFACE *id)
assert(id->u.Commit.count == 1);
id->u.Commit.commandBuffer = id->u.Commit.commandBuffers[0]; /* HACK until dumper can handle multi-commit */
#endif

#ifdef GCABI_SUBCOMMIT
cmdloc = &id->u.Commit.subCommit.commandBuffer;
fdr_event_add_oneshot_range(evctx, cmdloc, sizeof(struct _gcsHAL_COMMAND_LOCATION));
fdr_event_add_oneshot_range(evctx, cmdloc->address + cmdloc->startOffset, cmdloc->address + cmdloc->size);
#else
cmdbuf = VIV_TO_PTR(id->u.Commit.commandBuffer, struct _gcoCMDBUF *);
fdr_event_add_oneshot_range(evctx, cmdbuf, sizeof(struct _gcoCMDBUF));
fdr_event_add_oneshot_range(evctx, VIV_TO_PTR(cmdbuf->logical,uint8_t*) + cmdbuf->startOffset, cmdbuf->offset - cmdbuf->startOffset);
#endif

#ifndef GCABI_HAS_STATE_DELTAS
context = VIV_TO_PTR(id->u.Commit.contextBuffer, struct _gcoCONTEXT *);
if (context) {
Expand All @@ -214,7 +226,12 @@ static void log_interface_in(flightrec_event_t evctx, gcsHAL_INTERFACE *id)
fdr_event_add_oneshot_range(evctx, context->buffer, id->u.Commit.contextBuffer->bufferSize);
}
#endif

#ifdef GCABI_SUBCOMMIT
log_queue(evctx, id->u.Commit.subCommit.queue);
#else
log_queue(evctx, id->u.Commit.queue);
#endif
break;
case gcvHAL_EVENT_COMMIT:
log_queue(evctx, id->u.Event.queue);
Expand Down Expand Up @@ -245,9 +262,11 @@ static void log_interface_in(flightrec_event_t evctx, gcsHAL_INTERFACE *id)
}
}
break;
#ifndef GCABI_NO_ALLOCATE_CONTIGUOUS_MEMORY
case gcvHAL_FREE_CONTIGUOUS_MEMORY:
fdr_remove_monitored_range(_fdr, VIV_TO_PTR(id->u.FreeContiguousMemory.logical, void*), id->u.FreeContiguousMemory.bytes);
break;
#endif
default:
break;
}
Expand Down Expand Up @@ -288,9 +307,11 @@ static void log_interface_out(flightrec_event_t evctx, gcsHAL_INTERFACE *id)
}
}
break;
#ifndef GCABI_NO_ALLOCATE_CONTIGUOUS_MEMORY
case gcvHAL_ALLOCATE_CONTIGUOUS_MEMORY:
//fdr_add_monitored_range(_fdr, VIV_TO_PTR(id->u.AllocateContiguousMemory.logical, void*), id->u.AllocateContiguousMemory.bytes);
break;
#endif
default:
break;
}
Expand Down