mrq/GLdc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix-ci' into 'master'

Browse Source 
Fix ci

See merge request simulant/GLdc!72
This commit is contained in:
Luke Benstead 2021-10-01 20:20:29 +00:00
commit 458fb52efb
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -17,9 +17,9 @@ build:sh4-gcc:
build:x86-gcc: build:x86-gcc:
stage: build stage: build
image: fedora:33 image: fedora:34
before_script: before_script:
- sudo dnf install -y cmake gcc gcc-c++ SDL2-devel.i686 glibc-devel.i686 - sudo dnf install -y cmake gcc gcc-c++ SDL2-devel glibc-devel pkgconf-pkg-config glibc-devel.i686 SDL2-devel.i686
script: script:
- mkdir builddir - mkdir builddir
- cd builddir - cd builddir

3
samples/profiler.c
View File

@ -99,8 +99,11 @@ static int thd_each_cb(kthread_t* thd, void* data) {
* current. Obviouly thought between iterations the * current. Obviouly thought between iterations the
* PC will change so it's not like this is a true snapshot * PC will change so it's not like this is a true snapshot
* in time across threads */ * in time across threads */
int old = irq_disable();
uint32_t PC = thd->context.pc; uint32_t PC = thd->context.pc;
uint32_t PR = thd->context.pr; uint32_t PR = thd->context.pr;
irq_restore(old);
record_thread(PC, PR); record_thread(PC, PR);
return 0; return 0;
} }